deckrb 0.1.1 → 0.2.0

data/README.md

@@ -1,53 +1,101 @@
 # deck.rb
 
-*curing deck.js of angle bracket addiction*
+*slides in markdown, using deck.js*
 
-## Summary
+
+## Installation
+
+    gem install deckrb
+
+## Usage
+
+Put this in a file named `meals.md`:
+
+    # Breakfast
+    * scrambled eggs
+    * coffee
+    * bacon
+
+    # Lunch
+    ## Ham Sandwich
+    ## Caesar Salad
+
+    <!SLIDE>
+    ![a picture of my lunch](ham-sandwich.jpg)
+
+    # Dinner
+    > "To eat is to live." -Anon.
+
+then run this:
+
+    deck meals.md
+
+and you'll get a web server running on `http://localhost:4333` serving up a slide presentation with four slides:
+
+* One titled "Breakfast" with three bullet points
+* One titled "Lunch" with three H2 headers ("Lunch", "Ham Sandwich", and "Caesar Salad")
+* One with no headers, just a picture (stored in the same directory as `meals.md`)
+* One titled "Dinner" with a blockquote
+
+## Details
 
 [deck.js](http://imakewebthings.github.com/deck.js) is a JavaScript library for building slide presentations using HTML 5. [deck.rb](http://github.com/alexch/deck.rb) builds on top of deck.js, adding some features:
 
 * clean(ish) page skeleton allows you to focus on your slides, not the HTML/CSS infrastructure
 * multiple slide source formats, including
-  * Erector
   * Markdown
 * presentations can comprise several source files
 * source files look good as source, built HTML, preview HTML, or as a deck doc
+  * each H1 designates the beginning of a new slide
+  * explicit `!SLIDE` or `<!SLIDE>` directives can split slides too
   * slide directives look like comments when rendered into HTML (e.g. as &lt;!SLIDE&gt;)
-  * links to auxiliary files (e.g. `img src`) are resolved relative to the source file
-  * generated HTML is pretty-printed
+  * generated HTML is pretty-printed for easier "view source"
+  * links to auxiliary files (e.g. `img src`) are resolved relative to the source file -- no more broken images in markdown previews!
+  * add CSS classes to slides inside the slide directive -- e.g. `<!SLIDE center>` gives `<section class="slide center">`
+* uses deck.js` "swiss" theme and several extensions, including `goto`, `menu`, `navigation`, `status`, `hash`,  and `scale`
 * uses RedCarpet markdown extensions, including
   * tables <http://michelf.com/projects/php-markdown/extra/#table>
   * fenced code blocks <http://michelf.com/projects/php-markdown/extra/#fenced-code-blocks>
+* mostly compatible with Showoff
+  * specifying 'showoff.json' on the command line loads all slides in its 'sections' section
+* if the parameter starts with '# ' then it's parsed as literal markdown, not a file
+* code syntax highlighting using Coderay
+  * specify language at the top of the block using either ::: or @@@
+  * e.g. `@@@ ruby`
 
-## Command-Line API (proposed)
+## Command-Line API
 
 `deck run foo.md`
 
  * start a local Rack server (probably Sinatra) on port 4333
- * http://localhost:4333/ serves the presentation in foo.md
+ * http://localhost:4333/ serves the presentation built from `foo.md`
  * can specify multiple source files in a row
+ * can also specify a showoff.json file to load multiple markdown files
 
 `deck build foo.md`
 
- * create a static site
- * default output dir = ./public (even if foo.md is elsewhere)
- * copies deck.js source
- * also copies "img" directory if it exists
-
-`deck deploy` ???
-
- * some way to build/rebuild a project that is deployable to heroku
+ * creates a static page `foo.html` in the current directory
+ * unfortunately the `deck.js` source code will not be around so this won't really work yet
 
 ### Options
 
 * none yet :-)
 
+## Command-Line API (proposed)
+
+`deck build foo.md`
+
+ * create a static site
+ * default output dir = ./public (even if foo.md is elsewhere)
+ * copies (or inlines) deck.js source
+ * also copies (or inlines) "img" directory if it exists
+
 ## Credits
 
 * deck.js by Caleb at <http://imakewebthings.com>
 * deck.rb by Alex Chaffee <http://alexchaffee.com>, with help from
   * Steven! Ragnarök <http://nuclearsandwich.com>
-  
+
 ### See Also
 
 * showoff by Scott Chacon
@@ -55,38 +103,49 @@
 
 ## Bugs and Limitations
 
-* auxiliary files are interleaved in URL path space, so overlapping file names might not resolve to the right file
-* H1s are converted to H2s for compatibility with deck.js's CSS
+* auxiliary files (e.g. images) are interleaved in URL path space, so overlapping file names might not resolve to the right file
+  * todo: rewrite internal links to files and serve them relative to current dir, not slide dir
+* H1s (which split slides) are converted to H2s for compatibility with deck.js's CSS themes
   * unless they're the only item on the slide, in which case they remain H1s
+* we use RedCarpet to process markdown, which doesn't work exactly the same as RDiscount... for example:
+  * indented code blocks under a bullet point may need to be indented more
+  * code blocks must be separated from the previous text by a newline
 
 ## TODO
 
-* config file
-* config: 
+* fix title tag (base it off of presentation name or something)
+* scale images to fit on the page
+
+* if no files are specified, use either './showoff.json' or all `.md` files under current directory
+* deck.json config file
+* config options:
   * show/hide theme selector
   * show/hide page number/nav
   * choose deck extensions
+  * theme
+  * specify which Redcarpet Markdown extensions to use
 * command-line tool can take a directory
   * first pass: globs all *.md files in it
-* command-line options:
+* command-line options (overriding or complementing config file options)
   * --output dir
   * --config deck.json
   * --port portnum
   * --theme themename
 * more slide file types
+  * Erector - `foo/bar_bar.rb` would expect `class BarBar < Deck::Slide` in there
   * html
   * slim http://slim-lang.com/index.html
   * haml
   * tilt
-* specify Redcarpet Markdown extensions
-* option to render all JS and CSS inline, for a self-contained HTML doc 
+* option to render all JS and CSS inline, for a self-contained HTML doc
   * and maybe images too, base64-encoded
-* image scaling
 * build and push into a gh-pages branch
 * build and push into a heroku app
 * find any lines that start with a <p>.(something) and turn them into <p class="something">
   * see showoff.rb:189
-* fix title tag (base it off of presentation name or something)
+* some way to build/rebuild a project that is deployable to heroku
+* PDF
+* rewrite internal links to files and serve them relative to current dir, not slide dir
 
 ## TODO (community)
 

data/bin/deck

@@ -20,7 +20,7 @@ when 'build'
     # output_dir ||= File.dirname(arg)
     basename ||= File.basename(arg, ".md")
     output_path ||= "#{output_dir}/#{basename}.html"
-  
+
     slides += Slide.from_file arg  
   end
 
@@ -35,7 +35,6 @@ when 'run'
   # Fix Rack bug https://github.com/rack/rack/issues/301
   require 'deck/rack_static_patch'
   
-  
   port = 4333  # todo: option
   slide_files = ARGV
   Rack::Handler.default.run Deck::RackApp.build(slide_files), :Port => port
@@ -44,11 +43,11 @@ else
   puts "Unknown command '#{command}'"
   puts <<-USAGE
 Usage:
+  deck run src.md...
   deck build src.md...
   
-  deck run src.md...
+see http://github.com/alexch/deck.rb README for more help.
 
   USAGE
   exit 1
 end
-

data/lib/deck/rack_app.rb

@@ -1,7 +1,9 @@
 here = File.expand_path File.dirname(__FILE__)
 
+require 'json'
 require 'coderay'
 require 'rack/codehighlighter'
+require 'deck'
 
 module Deck
   class RackApp
@@ -30,23 +32,37 @@ module Deck
     end
 
     def initialize slide_files
-      @slide_files = [slide_files].flatten
+      @slide_files = [slide_files].flatten.map do |slide_file|
+        case slide_file
+        when /\/?showoff.json$/
+          json_file_dir = File.expand_path(File.dirname(slide_file))
+          json_file = slide_file
+          config = JSON.parse(File.read(json_file))
+          config['sections'].map do |markdown_file|
+            if markdown_file =~ /^# /   # you can use literal markdown instead of a file name
+              s = Slide.split(markdown_file)
+              s
+            else
+              File.new(json_file_dir + '/' + markdown_file)
+            end
+          end
+        else
+          File.new(slide_file)
+        end
+      end.flatten
 
       @file_servers =
         [Rack::File.new("#{::Deck::RackApp.app_root}/public")] +
         @slide_files.map do |slide_file|
-          Rack::File.new(File.dirname slide_file)
+          File.expand_path File.dirname(slide_file) if slide_file.is_a? File
+        end.compact.uniq.map do |slide_file_dir|
+          Rack::File.new(slide_file_dir)
         end
     end
 
     def call env
       request = Rack::Request.new(env)
       if request.path == "/"
-        slides = []
-        @slide_files.each do |file|
-          slides += Slide.from_file file
-        end
-        deck = SlideDeck.new :slides => slides
         [200, {'Content-Type' => 'text/html'}, [deck.to_pretty]]
       else
         result = [404, {}, []]
@@ -57,5 +73,21 @@ module Deck
         result
       end
     end
+
+    def deck
+      SlideDeck.new :slides => slides
+    end
+
+    def slides
+      out = []
+      @slide_files.each do |file|
+        out += if file.is_a? Slide
+          [file]
+        else
+          Slide.from_file file
+        end
+      end
+      out
+    end
   end
 end

data/lib/deck/slide.rb

@@ -13,6 +13,7 @@ module Deck
   end
 
   # given a chunk of Markdown text, splits it into an array of Slide objects
+  # todo: move into SlideDeck?
   def self.split content
     unless content =~ /^\<?!SLIDE/m     # this only applies to files with no !SLIDEs at all, which is odd
       content = content.
@@ -47,8 +48,8 @@ module Deck
 
   attr_reader :classes, :markdown_text
 
-  needs :classes => nil, :markdown_text => nil, :slide_id => nil
-
+  needs :classes => nil, :slide_id => nil
+  needs :markdown_text => nil
 
   def initialize options = {}
     super options
@@ -57,6 +58,12 @@ module Deck
     @markdown_text = ""
   end
 
+  def ==(other)
+    Slide === other and
+    @classes == other.classes and
+    @markdown_text == other.markdown_text
+  end
+
   def process_classes
     ["slide"] + case @classes
     when NilClass

data/lib/deck/slide_deck.rb

@@ -8,8 +8,17 @@ module Deck
   needs :title => "deck.rb presentation",
     :description => nil,
     :author => nil
-
+  needs :extensions => [
+      'goto',
+      'menu',
+      'navigation',
+      'status',
+      'hash',
+      'scale',
+      # 'theme-picker',
+    ]
   needs :slides => nil
+  attr_reader :extensions
 
   def page_title
     @title
@@ -34,18 +43,6 @@ module Deck
     link({:rel => "stylesheet", :href => src}.merge(attributes))
   end
 
-  def extensions
-    @extensions || [
-      'goto',
-      'menu',
-      'navigation',
-      'status',
-      'hash',
-      'scale',
-      # 'theme-picker',
-    ]
-  end
-
   def head_content
     super
     meta 'charset' => 'utf-8'

data/lib/deck/version.rb

@@ -1,3 +1,3 @@
 module Deck
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/public/coderay.css

@@ -0,0 +1,84 @@
+/* Code ray css */
+
+.CodeRay { background: white; padding: 10px }
+
+.CodeRay .line-numbers a:target { color: blue !important; }
+.CodeRay .line-numbers .highlighted { color: red !important; }
+.CodeRay .line-numbers .highlighted a { color: red !important; }
+.CodeRay span.line-numbers { padding: 0px 4px; }
+.CodeRay .line { display: block; float: left; width: 100%; }
+.CodeRay .code { width: 100%; }
+.CodeRay .code pre { overflow: auto; }
+
+.CodeRay .debug { color: white !important; background: blue !important; }
+
+.CodeRay .annotation { color:#007 }
+.CodeRay .attribute-name { color:#b48 }
+.CodeRay .attribute-value { color:#700 }
+.CodeRay .binary { color:#509 }
+.CodeRay .char .content { color:#D20 }
+.CodeRay .char .delimiter { color:#710 }
+.CodeRay .char { color:#D20 }
+.CodeRay .class { color:#B06; font-weight:bold }
+.CodeRay .class-variable { color:#369 }
+.CodeRay .color { color:#0A0 }
+.CodeRay .comment { color:#777 }
+.CodeRay .comment .char { color:#444 }
+.CodeRay .comment .delimiter { color:#444 }
+.CodeRay .complex { color:#A08 }
+.CodeRay .constant { color:#036; font-weight:bold }
+.CodeRay .decorator { color:#B0B }
+.CodeRay .definition { color:#099; font-weight:bold }
+.CodeRay .delimiter { color:black }
+.CodeRay .directive { color:#088; font-weight:bold }
+.CodeRay .doc { color:#970 }
+.CodeRay .doc-string { color:#D42; font-weight:bold }
+.CodeRay .doctype { color:#34b }
+.CodeRay .entity { color:#800; font-weight:bold }
+.CodeRay .error { color:#F00; background-color:#FAA }
+.CodeRay .escape  { color:#666 }
+.CodeRay .exception { color:#C00; font-weight:bold }
+.CodeRay .float { color:#60E }
+.CodeRay .function { color:#06B; font-weight:bold }
+.CodeRay .global-variable { color:#d70 }
+.CodeRay .hex { color:#02b }
+.CodeRay .imaginary { color:#f00 }
+.CodeRay .include { color:#B44; font-weight:bold }
+.CodeRay .inline { background-color: hsla(0,0%,0%,0.07); color: black }
+.CodeRay .inline-delimiter { font-weight: bold; color: #666 }
+.CodeRay .instance-variable { color:#33B }
+.CodeRay .integer  { color:#00D }
+.CodeRay .key .char { color: #60f }
+.CodeRay .key .delimiter { color: #404 }
+.CodeRay .key { color: #606 }
+.CodeRay .keyword { color:#080; font-weight:bold }
+.CodeRay .label { color:#970; font-weight:bold }
+.CodeRay .local-variable { color:#963 }
+.CodeRay .namespace { color:#707; font-weight:bold }
+.CodeRay .octal { color:#40E }
+.CodeRay .operator { }
+.CodeRay .predefined { color:#369; font-weight:bold }
+.CodeRay .predefined-constant { color:#069 }
+.CodeRay .predefined-type { color:#0a5; font-weight:bold }
+.CodeRay .preprocessor { color:#579 }
+.CodeRay .pseudo-class { color:#00C; font-weight:bold }
+.CodeRay .regexp .content { color:#808 }
+.CodeRay .regexp .delimiter { color:#404 }
+.CodeRay .regexp .modifier { color:#C2C }
+.CodeRay .regexp { background-color:hsla(300,100%,50%,0.06); }
+.CodeRay .reserved { color:#080; font-weight:bold }
+.CodeRay .shell .content { color:#2B2 }
+.CodeRay .shell .delimiter { color:#161 }
+.CodeRay .shell { background-color:hsla(120,100%,50%,0.06); }
+.CodeRay .string .char { color: #b0b }
+.CodeRay .string .content { color: #D20 }
+.CodeRay .string .delimiter { color: #710 }
+.CodeRay .string .modifier { color: #E40 }
+.CodeRay .string { background-color:hsla(0,100%,50%,0.05); }
+.CodeRay .symbol .content { color:#A60 }
+.CodeRay .symbol .delimiter { color:#630 }
+.CodeRay .symbol { color:#A60 }
+.CodeRay .tag { color:#070 }
+.CodeRay .type { color:#339; font-weight:bold }
+.CodeRay .value { color: #088; }
+.CodeRay .variable  { color:#037 }

data/public/deck.js/GPL-license.txt

@@ -0,0 +1,278 @@
+GNU GENERAL PUBLIC LICENSE
+           Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+          Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+        GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+          NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.