oode 0.1.6 → 0.2.0

data/lib/oode/ext/ext.rb

@@ -0,0 +1,29 @@
+# This wonderful code taken from http://github.com/michaeldv/awesome_print.
+class String
+  [:gray, :red, :green, :yellow, :blue, :purple, :cyan, :white].each_with_index do |color, offset|
+    define_method color          do "\033[1;#{30+offset}m#{self}\033[0m" end
+    define_method :"#{color}ish" do "\033[0;#{30+offset}m#{self}\033[0m" end
+  end
+end
+
+# Allow numbers to be formatted with human readable data sizes.
+class Numeric
+  def to_human
+    units = %w{B KB MB GB TB}
+    e = (Math.log(self)/Math.log(1024)).floor
+    s = "%.3f" % (to_f / 1024**e)
+    s.sub(/\.?0*$/, units[e])
+  end
+end
+
+def error message
+  abort "ERROR: #{message}".red
+end
+
+def notify message
+  puts "INFO: #{message}".yellow
+end
+
+def warning message
+  puts "WARN: #{message}".purple
+end

data/lib/oode/net/downloader.rb

@@ -0,0 +1,8 @@
+module Oode
+  class Downloader < Transferer
+    def download!(path)
+      filename = ::File.basename(path)
+      @transfer.download! path, "./#{filename}"
+    end
+  end
+end

data/lib/oode/net/session.rb

@@ -0,0 +1,44 @@
+require 'net/ssh'
+
+SSH_ERROR = <<ERROR
+Something went wrong with your SSH connection. Please file a bug report at:
+
+  http://github.com/xoebus/oode/issues
+
+with your error message.
+ERROR
+
+module Oode
+  class Session
+    SERVER = 'ssh.inf.ed.ac.uk'
+    DEFAULT_HOST = 'student.login'
+    
+    attr_reader :user
+    
+    def initialize(user, options = {})
+      @user = user
+      @machine = options[:machine] || DEFAULT_HOST
+      
+      begin
+        @session = Net::SSH.start(SERVER, user.username, :password => user.password)
+      rescue Net::SSH::AuthenticationFailed
+        error "Your login credentials were incorrect. Please fix this and try again."
+      rescue Net::SSH::Exception
+        error SSH_ERROR
+      end
+    end
+    
+    def connection
+      @session
+    end
+    
+    def close
+      @session.close
+    end
+    
+    def exec!(command, options = {})
+      host = options[:machine] || @machine
+      @session.exec!("ssh #{host} #{command}").chomp
+    end
+  end
+end

data/lib/oode/net/transferer.rb

@@ -0,0 +1,10 @@
+require "net/sftp"
+
+module Oode
+  class Transferer < Session
+    def initialize(user, options = {})
+      super(user, options)
+      @transfer = connection.sftp
+    end
+  end
+end

data/lib/oode/net/uploader.rb

@@ -0,0 +1,30 @@
+module Oode
+  class Uploader < Transferer
+    UPLOAD_FOLDER_NAME = ".oode"
+    
+    def upload!(file, options = {})
+      create_upload_folder
+      
+      destination = options[:destination] || file.remote_path
+      @transfer.upload! file.path, destination
+    end
+    
+    def clean!      
+      command = "rm -r #{default_upload_path}"
+      @session.exec!(command)
+    end
+    
+    def default_upload_path
+      "#{user.home}/#{UPLOAD_FOLDER_NAME}"
+    end
+
+    def create_upload_folder
+      directories = @transfer.dir.entries(user.home)
+      directory_names = directories.map { |d| d.name }
+      
+      unless directory_names.include? UPLOAD_FOLDER_NAME
+        @transfer.mkdir! default_upload_path
+      end
+    end
+  end
+end

data/lib/oode/print/printer.rb

@@ -0,0 +1,82 @@
+SIZE_WARNING = <<WARNING
+Your file is pretty big: (%s).
+It may take a while to print... (don't blame me!)
+WARNING
+
+module Oode
+  class Printer
+    OO_FILETYPES = ['doc', 'docx', 'odf', 'rtf']
+    
+    SIZE_LIMIT = 5242880 # 5MB
+    JOB_LIMIT = 5
+    
+    attr_reader :printer_name
+    attr_reader :session
+    attr_reader :options
+    
+    def initialize(name, session, options = {})
+      @printer_name = name
+      @session = session
+      @options = options
+    end
+    
+    def print! file
+      check_size file
+      check_working
+
+      command = print_command(file)
+      notify "Printing file: #{command}"
+      session.exec!(command)
+    end
+    
+    private
+      def print_command file
+        copies = @options[:number] || 1
+        has_layout = @options[:format] || nil
+        
+        if OO_FILETYPES.include? file.extension
+          if !has_layout.nil? || copies != 1
+            warning "Cannot print #{file.basename} with formatting arguments..."
+          end
+          
+          "soffice -pt #{printer_name} #{file.remote_path}"
+        else
+          args = ""
+          args << "-# #{copies} " if copies > 1
+          
+          if @options[:format].eql? :four
+            args << "-Z 4up "
+          elsif @options[:format].eql? :two
+            args << "-Z 2up "
+          end
+          
+          "lpr -P #{printer_name} #{args} #{file.remote_path}".squeeze " "
+        end
+      end
+
+      def check_size file
+        if file.size > SIZE_LIMIT
+          warning SIZE_WARNING % [file.size.to_human]
+          false
+        else
+          true
+        end
+      end
+      
+      def check_working
+        unless @options[:force]
+          command = "lpq -P #{@printer_name}"
+          output = @session.exec!(command)
+          print_jobs = output.split("\n").length - 2
+
+          if (print_jobs > JOB_LIMIT) || !(output =~ /is not ready/).nil?
+            error "#{@printer_name} isn't doing too well at the moment. Try another printer."
+            return false
+          else
+            return true
+          end
+        end
+        true
+      end
+  end
+end

data/lib/oode/version.rb

@@ -1,3 +1,3 @@
 module Oode
-  Version = VERSION = '0.1.6'
+  Version = VERSION = '0.2.0'
 end

data/man/index.txt

@@ -0,0 +1 @@
+oode(1) oode.1.ronn

data/man/oode.1

@@ -1,98 +1,79 @@
-.\" generated with Ronn/v0.5
-.\" http://github.com/rtomayko/ronn/
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "OODE" "1" "May 2010" "XOEBUS" "Oode Manual"
+.TH "OODE" "1" "April 2011" "Lolsoft" "Oode Manual"
 .
 .SH "NAME"
-\fBoode\fR \-\- print from a laptop to an AT printer
+\fBoode\fR \- work with DICE from a laptop
 .
 .SH "SYNOPSIS"
-\fBoode\fR [\fIOPTIONS\fR] \fIFILE\fR...
-.
-.br
+\fBoode\fR [\fIGLOBAL OPTIONS\fR] \fICOMMAND\fR [\fIOPTIONS\fR] \fIFILE\fR\.\.\.
 .
 .SH "DESCRIPTION"
-\fBoode\fR makes printing to the printers in Appleton Tower much easier
-from laptops by automating some of the tediousness from the sequence
-of tasks required.
+\fBoode\fR is a program that simplifies working with the DICE network from a laptop in Appleton Tower\. As of the current version \fBoode\fR is able to print to any of the printers on the DICE network with more functionality in the near future\.
 .
 .SH "SAMPLE USAGE"
 .
 .TP
-\fBoode \-p at3 file.pdf\fR
-  Print \fBfile.pdf\fR to the printer \fBat3\fR.
-.
-.TP
-\fBoode \-p at13c \-4 \-n 5 file.pdf\fR
-  Print 5 copies of \fBfile.pdf\fR to printer \fBat13c\fR using the 4\-up layout.
+\fBoode print \-P at3 file\.pdf\fR
+Print the file \fIfile\.pdf\fR to the printer \fIat3\fR\.
 .
 .TP
-\fBoode \-p at13c \-u s08xxxxx \-a passw0rd file.pdf\fR
-  Print \fBfile.pdf\fR to \fBat13c\fR as user \fBs08xxxxx\fR authenticating with password \fBpassw0rd\fR.
+\fBoode print \-P at13c \-2 \-n 3 file\.pdf\fR
+Print \fI3\fR copies of the file \fIfile\.pdf\fR to the printer \fIat3\fR in the \fItwo\-up\fR page layout\.
 .
 .SH "CONFIGURATION"
-\fBoode\fR can read SSH authentication usernames and passwords from a
-configuration file so you don't have to type them in every time. A
-file called \fB.ooderc\fR should be placed in your home directory with
-the following contents:
-.
-.IP "" 4
-.
-.nf
-
-:user: <username>
-:password: <password>
-.
-.fi
+\fBoode\fR can read SSH authentication usernames and passwords from a configuration file so you don\'t have to type them in every time\.
 .
-.IP "" 0
+.P
+The following command will create the file \fB~/\.ooderc\fR that contains global options so that you don\'t have to type them each time\.
 .
 .P
-Either of these can be missed if you would rather enter them yourself
-each time.
+\fBoode \-u s0xxxxxx \-p passw0rd initconfig\fR
 .
-.SH "OPTIONS"
-The following options and flags can be used with \fBoode\fR:
+.P
+Either of these can be omitted if you would rather enter them yourself each time or you can specify them at the command line like above for individual commands\.
 .
-.SS "Authentication"
+.SS "GLOBAL OPTIONS"
 .
 .TP
-\fB\-u\fR, \fB\-\-user\fR=\fIUSERNAME\fR
-  Your DICE username so that \fBoode\fR can authenticate.
+\fB\-u\fR, \fB\-\-username\fR=\fIUSERNAME\fR
+Your DICE username so that \fBoode\fR can authenticate\.
 .
 .TP
-\fB\-a\fR, \fB\-\-password\fR=\fIPASSWORD\fR
-  Your DICE password so that \fBoode\fR can authenticate.
+\fB\-p\fR, \fB\-\-password\fR=\fIPASSWORD\fR
+Your DICE password so that \fBoode\fR can authenticate\.
 .
-.SS "Miscellaneous"
+.SH "COMMANDS"
+The following options and flags can be used with \fBoode\fR:
+.
+.SS "Print"
 .
 .TP
-\fB\-p\fR, \fB\-\-printer\fR=\fIPRINTER\fR
-  Use the printer, \fIPRINTER\fR, to print the \fIFILES\fR.
+\fB\-P\fR, \fB\-\-printer\fR=\fIPRINTER\fR
+Use the printer, \fIPRINTER\fR, to print the \fIFILES\fR\.
 .
 .TP
 \fB\-f\fR, \fB\-\-force\fR
-  Force \fBoode\fR to use a certain printer even if it is not desired.
-.
-.SS "Printing"
+Force \fBoode\fR to use a certain printer even if it is not desired\.
 .
 .TP
 \fB\-n\fR, \fB\-\-number\fR=\fINUMBER\fR
-  Print \fINUMBER\fR copies of the \fIFILES\fR.
+Print \fINUMBER\fR copies of the \fIFILES\fR\.
 .
 .TP
-\fB\-2\fR, \fB\-\-two\-up\fR
-  Print the files in the 2\-up style.
+\fB\-2\fR, \fB\-\-two\fR
+Print the files in the 2\-up style\.
 .
 .TP
-\fB\-4\fR, \fB\-\-four\-up\fR
-  Print the files in the 4\-up style.
+\fB\-4\fR, \fB\-\-four\fR
+Print the files in the 4\-up style\.
 .
 .SH "BUGS"
-\fIhttp://github.com/xoebus/oode/issues\fR
+\fIhttp://github\.com/xoebus/oode/issues\fR
 .
 .SH "AUTHOR"
-Chris Brown :: cb@tardis.ed.ac.uk :: @xoebus
+Chris Brown :: cb@tardis\.ed\.ac\.uk :: @xoebus
 .
 .SH "SEE ALSO"
-\fIhttp://github.com\fR, \fIhttp://github.com/xoebus/oode\fR
+\fIhttp://github\.com\fR, \fIhttp://github\.com/xoebus/oode\fR

data/man/oode.1.html

@@ -2,151 +2,167 @@
 <html>
 <head>
   <meta http-equiv='content-type' value='text/html;charset=utf8'>
-  <meta name='generator' value='Ronn/v0.5'>
-  <title>oode(1) -- print from a laptop to an AT printer</title>
-  <style type='text/css'>
-    body {margin:0}
-    #man, #man code, #man pre, #man tt, #man kbd, #man samp {
-      font-family:consolas,monospace;
-      font-size:16px;
-      line-height:1.3;
-      color:#343331;
-      background:#fff; }
-    #man { max-width:89ex; text-align:justify; margin:0 25px 25px 25px }
-    #man h1, #man h2, #man h3 { color:#232221;clear:left }
-    #man h1 { font-size:28px; margin:15px 0 30px 0; text-align:center }
-    #man h2 { font-size:18px; margin-bottom:0; margin-top:10px; line-height:1.3; }
-    #man h3 { font-size:16px; margin:0 0 0 4ex; }
-    #man p, #man ul, #man ol, #man dl, #man pre { margin:0 0 18px 0; }
-    #man pre {
-      color:#333231;
-      background:#edeceb;
-      padding:5px 7px;
-      margin:0px 0 20px 0;
-      border-left:2ex solid #ddd}
-    #man pre + h2, #man pre + h3 {
-      margin-top:22px;
-    }
-    #man h2 + pre, #man h3 + pre {
-      margin-top:5px;
-    }
-    #man > p, #man > ul, #man > ol, #man > dl, #man > pre { margin-left:8ex; }
-    #man dt { margin:0; clear:left }
-    #man dt.flush { float:left; width:8ex }
-    #man dd { margin:0 0 0 9ex }
-    #man code, #man strong, #man b { font-weight:bold; color:#131211; }
-    #man pre code { font-weight:normal; color:#232221; background:inherit }
-    #man em, var, u {
-      font-style:normal; color:#333231; border-bottom:1px solid #999; }
-    #man h1.man-title { display:none; }
-    #man ol.man, #man ol.man li { margin:2px 0 10px 0; padding:0;
-      float:left; width:33%; list-style-type:none;
-      text-transform:uppercase; font-size:18px; color:#999;
-      letter-spacing:1px;}
-    #man ol.man { width:100%; }
-    #man ol.man li.tl { text-align:left }
-    #man ol.man li.tc { text-align:center;letter-spacing:4px }
-    #man ol.man li.tr { text-align:right }
-    #man ol.man a { color:#999 }
-    #man ol.man a:hover { color:#333231 }
+  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
+  <title>oode(1) - work with DICE from a laptop</title>
+  <style type='text/css' media='all'>
+  /* style: man */
+  body#manpage {margin:0}
+  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
+  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
+  .mp h2 {margin:10px 0 0 0}
+  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
+  .mp h3 {margin:0 0 0 4ex}
+  .mp dt {margin:0;clear:left}
+  .mp dt.flush {float:left;width:8ex}
+  .mp dd {margin:0 0 0 9ex}
+  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
+  .mp pre {margin-bottom:20px}
+  .mp pre+h2,.mp pre+h3 {margin-top:22px}
+  .mp h2+pre,.mp h3+pre {margin-top:5px}
+  .mp img {display:block;margin:auto}
+  .mp h1.man-title {display:none}
+  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
+  .mp h2 {font-size:16px;line-height:1.25}
+  .mp h1 {font-size:20px;line-height:2}
+  .mp {text-align:justify;background:#fff}
+  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
+  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
+  .mp u {text-decoration:underline}
+  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
+  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
+  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
+  .mp b.man-ref {font-weight:normal;color:#434241}
+  .mp pre {padding:0 4ex}
+  .mp pre code {font-weight:normal;color:#434241}
+  .mp h2+pre,h3+pre {padding-left:0}
+  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
+  ol.man-decor {width:100%}
+  ol.man-decor li.tl {text-align:left}
+  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
+  ol.man-decor li.tr {text-align:right;float:right}
+  </style>
+  <style type='text/css' media='print'>
+  /* style: print */
+  .mp {max-width:none}
+  .man-navigation {display:none !important}
+  .mp a[href]:not([href^="#"]):not([data-bare-link]):after {content:" " attr(href)}
+  </style>
+  <style type='text/css' media='all'>
+  /* style: toc */
+  .man-navigation {display:block !important;position:fixed;top:0;left:113ex;height:100%;width:100%;padding:48px 0 0 0;border-left:1px solid #dbdbdb;background:#eee}
+  .man-navigation a,.man-navigation a:hover,.man-navigation a:link,.man-navigation a:visited {display:block;margin:0;padding:5px 2px 5px 30px;color:#999;text-decoration:none}
+  .man-navigation a:hover {color:#111;text-decoration:underline}
   </style>
 </head>
-<body>
-<div id='man'>
-
-<h1 class='man-title'>oode(1)</h1>
-
-<ol class='head man'>
-  <li class='tl'>oode(1)</li>
-  <li class='tc'>Oode Manual</li>
-  <li class='tr'>oode(1)</li>
-</ol>
-
-<h2 id='NAME'>NAME</h2>
-<p><code>oode</code> -- print from a laptop to an AT printer</p>
-
-<h2>SYNOPSIS</h2>
-
-<p><code>oode</code> [<var>OPTIONS</var>] <var>FILE</var>...<br /></p>
-
-<h2>DESCRIPTION</h2>
-
-<p><code>oode</code> makes printing to the printers in Appleton Tower much easier
-from laptops by automating some of the tediousness from the sequence
-of tasks required.</p>
-
-<h2>SAMPLE USAGE</h2>
+<!--
+  The following styles are deprecated and will be removed at some point:
+  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
+
+  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
+  .man-navigation should be used instead.
+-->
+<body id='manpage'>
+  <div class='mp' id='man'>
+
+  <div class='man-navigation' style='display:none'>
+    <a href="#NAME">NAME</a>
+    <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#SAMPLE-USAGE">SAMPLE USAGE</a>
+    <a href="#CONFIGURATION">CONFIGURATION</a>
+    <a href="#COMMANDS">COMMANDS</a>
+    <a href="#BUGS">BUGS</a>
+    <a href="#AUTHOR">AUTHOR</a>
+    <a href="#SEE-ALSO">SEE ALSO</a>
+  </div>
+
+  <ol class='man-decor man-head man head'>
+    <li class='tl'>oode(1)</li>
+    <li class='tc'>Oode Manual</li>
+    <li class='tr'>oode(1)</li>
+  </ol>
+
+  <h2 id="NAME">NAME</h2>
+<p class="man-name">
+  <code>oode</code> - <span class="man-whatis">work with DICE from a laptop</span>
+</p>
+
+<h2 id="SYNOPSIS">SYNOPSIS</h2>
+
+<p><code>oode</code> [<var>GLOBAL OPTIONS</var>] <var>COMMAND</var> [<var>OPTIONS</var>] <var>FILE</var>...</p>
+
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
+
+<p><code>oode</code> is a program that simplifies working with the DICE network from
+a laptop in Appleton Tower. As of the current version <code>oode</code> is able to
+print to any of the printers on the DICE network with more functionality
+in the near future.</p>
+
+<h2 id="SAMPLE-USAGE">SAMPLE USAGE</h2>
 
 <dl>
-<dt><code>oode -p at3 file.pdf</code></dt><dd><p>  Print <code>file.pdf</code> to the printer <code>at3</code>.</p></dd>
-<dt><code>oode -p at13c -4 -n 5 file.pdf</code></dt><dd><p>  Print 5 copies of <code>file.pdf</code> to printer <code>at13c</code> using the 4-up layout.</p></dd>
-<dt><code>oode -p at13c -u s08xxxxx -a passw0rd file.pdf</code></dt><dd><p>  Print <code>file.pdf</code> to <code>at13c</code> as user <code>s08xxxxx</code> authenticating with password <code>passw0rd</code>.</p></dd>
+<dt><code>oode print -P at3 file.pdf</code></dt><dd><p>  Print the file <em>file.pdf</em> to the printer <em>at3</em>.</p></dd>
+<dt><code>oode print -P at13c -2 -n 3 file.pdf</code></dt><dd><p>Print <em>3</em> copies of the file <em>file.pdf</em> to the printer <em>at3</em> in the
+<em>two-up</em> page layout.</p></dd>
 </dl>
 
 
-<h2>CONFIGURATION</h2>
+<h2 id="CONFIGURATION">CONFIGURATION</h2>
 
 <p><code>oode</code> can read SSH authentication usernames and passwords from a
-configuration file so you don't have to type them in every time. A
-file called <code>.ooderc</code> should be placed in your home directory with
-the following contents:</p>
-
-<pre><code>:user: &lt;username>
-:password: &lt;password>
-</code></pre>
+configuration file so you don't have to type them in every time.</p>
 
-<p>Either of these can be missed if you would rather enter them yourself
-each time.</p>
+<p>The following command will create the file <code>~/.ooderc</code> that contains
+global options so that you don't have to type them each time.</p>
 
-<h2>OPTIONS</h2>
+<p>  <code>oode -u s0xxxxxx -p passw0rd initconfig</code></p>
 
-<p>The following options and flags can be used with <code>oode</code>:</p>
+<p>Either of these can be omitted if you would rather enter them yourself
+each time or you can specify them at the command line like above for
+individual commands.</p>
 
-<h3>Authentication</h3>
+<h3 id="GLOBAL-OPTIONS">GLOBAL OPTIONS</h3>
 
 <dl>
-<dt><code>-u</code>, <code>--user</code>=<var>USERNAME</var></dt><dd><p>  Your DICE username so that <code>oode</code> can authenticate.</p></dd>
-<dt><code>-a</code>, <code>--password</code>=<var>PASSWORD</var></dt><dd><p>  Your DICE password so that <code>oode</code> can authenticate.</p></dd>
+<dt><code>-u</code>, <code>--username</code>=<var>USERNAME</var></dt><dd><p>  Your DICE username so that <code>oode</code> can authenticate.</p></dd>
+<dt><code>-p</code>, <code>--password</code>=<var>PASSWORD</var></dt><dd><p>  Your DICE password so that <code>oode</code> can authenticate.</p></dd>
 </dl>
 
 
-<h3>Miscellaneous</h3>
-
-<dl>
-<dt><code>-p</code>, <code>--printer</code>=<var>PRINTER</var></dt><dd><p>  Use the printer, <var>PRINTER</var>, to print the <var>FILES</var>.</p></dd>
-<dt><code>-f</code>, <code>--force</code></dt><dd><p>  Force <code>oode</code> to use a certain printer even if it is not desired.</p></dd>
-</dl>
+<h2 id="COMMANDS">COMMANDS</h2>
 
+<p>The following options and flags can be used with <code>oode</code>:</p>
 
-<h3>Printing</h3>
+<h3 id="Print">Print</h3>
 
 <dl>
+<dt><code>-P</code>, <code>--printer</code>=<var>PRINTER</var></dt><dd><p>  Use the printer, <var>PRINTER</var>, to print the <var>FILES</var>.</p></dd>
+<dt><code>-f</code>, <code>--force</code></dt><dd><p>  Force <code>oode</code> to use a certain printer even if it is not desired.</p></dd>
 <dt><code>-n</code>, <code>--number</code>=<var>NUMBER</var></dt><dd><p>  Print <var>NUMBER</var> copies of the <var>FILES</var>.</p></dd>
-<dt><code>-2</code>, <code>--two-up</code></dt><dd><p>  Print the files in the 2-up style.</p></dd>
-<dt><code>-4</code>, <code>--four-up</code></dt><dd><p>  Print the files in the 4-up style.</p></dd>
+<dt><code>-2</code>, <code>--two</code></dt><dd><p>  Print the files in the 2-up style.</p></dd>
+<dt><code>-4</code>, <code>--four</code></dt><dd><p>  Print the files in the 4-up style.</p></dd>
 </dl>
 
 
-<h2>BUGS</h2>
+<h2 id="BUGS">BUGS</h2>
 
-<p><a href="http://github.com/xoebus/oode/issues">http://github.com/xoebus/oode/issues</a></p>
+<p><a href="http://github.com/xoebus/oode/issues" data-bare-link="true">http://github.com/xoebus/oode/issues</a></p>
 
-<h2>AUTHOR</h2>
+<h2 id="AUTHOR">AUTHOR</h2>
 
 <p>Chris Brown :: cb@tardis.ed.ac.uk :: @xoebus</p>
 
-<h2>SEE ALSO</h2>
+<h2 id="SEE-ALSO">SEE ALSO</h2>
 
-<p><a href="http://github.com">http://github.com</a>,
-<a href="http://github.com/xoebus/oode">http://github.com/xoebus/oode</a></p>
+<p><a href="http://github.com" data-bare-link="true">http://github.com</a>, <a href="http://github.com/xoebus/oode" data-bare-link="true">http://github.com/xoebus/oode</a></p>
 
 
-<ol class='foot man'>
-  <li class='tl'>XOEBUS</li>
-  <li class='tc'>May 2010</li>
-  <li class='tr'>oode(1)</li>
-</ol>
+  <ol class='man-decor man-foot man foot'>
+    <li class='tl'>Lolsoft</li>
+    <li class='tc'>April 2011</li>
+    <li class='tr'>oode(1)</li>
+  </ol>
 
-</div>
+  </div>
 </body>
 </html>