teepee 0.15.7 → 0.15.8

data/lib/teepee/commander-mixins/mathematics.rb

@@ -0,0 +1,296 @@
+# -*- coding: utf-8 -*-
+# -*- mode: Ruby -*-
+
+# Copyright © 2013-2016, Christopher Mark Gore,
+# Soli Deo Gloria,
+# All rights reserved.
+#
+# 2317 South River Road, Saint Charles, Missouri 63303 USA.
+# Web: http://cgore.com
+# Email: cgore@cgore.com
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+#   * Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+#   * Neither the name of Christopher Mark Gore nor the names of other
+#     contributors may be used to endorse or promote products derived from
+#     this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+
+module Teepee
+  module CommanderMixins
+    module Mathematics
+      def numeric? *numbers
+        numbers.all? {|number| number.kind_of? Numeric}
+      end
+
+      def non_numeric_error nan
+        command_error "The value \"#{nan}\" is not a number."
+      end
+
+      def ensure_numeric number
+        if number.kind_of? Complex
+          command_error "Complex numbers are not yet supported."
+        elsif not number.kind_of? Numeric
+          command_error "Non-numeric result."
+        else
+          number
+        end
+      end
+
+      def number_from_word word
+        begin
+          word.to_number
+        rescue ArgumentError, NoMethodError
+          nil
+        end
+      end
+
+      def to_numbers words
+        words.map {|word| number_from_word word}.reject &:nil?
+      end
+
+      def + numbers
+        ensure_numeric to_numbers(numbers).inject 0, :+
+      end
+
+      def - numbers
+        numbers = to_numbers numbers
+        if numbers.length == 1
+          ensure_numeric -numbers.first
+        else
+          ensure_numeric numbers.reduce :-
+        end
+      end
+
+      def * numbers
+        ensure_numeric to_numbers(numbers).inject 1, :*
+      end
+
+      def / numbers
+        numbers = to_numbers numbers
+        if numbers.length == 1
+          ensure_numeric 1 / numbers.first
+        else
+          ensure_numeric numbers.reduce :/
+        end
+      end
+
+      def ** numbers
+        ensure_numeric to_numbers(numbers).reduce :**
+      end
+
+      def % numbers
+        to_numbers(numbers).inject { |base, percent| base*percent/100.0 }
+      end
+
+      def add_percentage numbers
+        to_numbers(numbers).inject {|base, percent| base * (1+percent/100.0) }
+      end
+
+      def subtract_percentage numbers
+        to_numbers(numbers).inject {|base, percent| base * (1-percent/100.0) }
+      end
+
+      def percent_total numbers
+        to_numbers(numbers).inject {|total, part| Float(part)/Float(total)*100.0 }
+      end
+
+      def acos angle
+        ensure_numeric Math.acos angle.to_number
+      end
+
+      def acosh angle
+        ensure_numeric Math.acosh angle.to_number
+      end
+
+      def asin angle
+        ensure_numeric Math.asin angle.to_number
+      end
+
+      def asinh angle
+        ensure_numeric Math.asinh angle.to_number
+      end
+
+      def atan angle
+        ensure_numeric Math.atan angle.to_number
+      end
+
+      def atanh angle
+        ensure_numeric Math.atanh angle.to_number
+      end
+
+      def ceiling number
+        ensure_numeric number.to_number.ceil
+      end
+
+      def cos angle
+        ensure_numeric Math.cos angle.to_number
+      end
+
+      def cosh angle
+        ensure_numeric Math.cosh angle.to_number
+      end
+
+      def degrees2radians degrees
+        ensure_numeric degrees.to_number * Math::PI / 180.0
+      end
+
+      def e
+        Math::E
+      end
+
+      def erf number
+        ensure_numeric Math.erf number.to_number
+      end
+
+      def erfc number
+        ensure_numeric Math.erfc number.to_number
+      end
+
+      def floor number
+        ensure_numeric number.to_number.floor
+      end
+
+      def gamma number
+        ensure_numeric Math.gamma number.to_number
+      end
+
+      def greater_than numbers
+        if numbers.empty?
+          true_constant
+        elsif numbers.length == 1
+          true_constant
+        else
+          numbers[0].to_number > numbers[1].to_number and greater_than numbers.rest
+        end
+      end
+
+      def greater_than_or_equal numbers
+        if numbers.empty?
+          true_constant
+        elsif numbers.length == 1
+          true_constant
+        else
+          numbers[0].to_number >= numbers[1].to_number and greater_than_or_equal numbers.rest
+        end
+      end
+
+      def i
+        command_error "Complex numbers are not yet supported."
+      end
+
+      def hypot numbers
+        ensure_numeric Math.sqrt to_numbers(numbers).map {|n| n**2}
+      end
+
+      def ld number
+        ensure_numeric Math.log2 number.to_number
+      end
+
+      def ldexp fraction, exponent
+        ensure_numeric Math.ldexp fraction.to_number, exponent.to_number
+      end
+
+      def less_than numbers
+        if numbers.empty?
+          true_constant
+        elsif numbers.length == 1
+          true_constant
+        else
+          numbers[0].to_number < numbers[1].to_number and less_than numbers.rest
+        end
+      end
+
+      def less_than_or_equal numbers
+        if numbers.empty?
+          true_constant
+        elsif numbers.length == 1
+          true_constant
+        else
+          numbers[0].to_number <= numbers[1].to_number and less_than_or_equal numbers.rest
+        end
+      end
+
+      def lgamma number
+        ensure_numeric Math::lgamma(number.to_number).first
+      end
+
+      def ln number
+        ensure_numeric Math.log number.to_number
+      end
+
+      def log base, number
+        if number.nil?
+          number, base = base, number
+          ensure_numeric Math.log10 number.to_number # default to log base 10
+        else
+          ensure_numeric Math.log number.to_number, base.to_number
+        end
+      end
+
+      def log10 number
+        ensure_numeric Math.log10 number.to_number
+      end
+
+      def mod numbers
+        ensure_numeric to_numbers(numbers).reduce :%
+      end
+
+      def pi
+        Math::PI
+      end
+
+      def radians2degrees radians
+        ensure_numeric(radians.to_number * 180.0 / Math::PI)
+      end
+
+      def round number, precision = nil, *_
+        if precision.nil? or precision.to_number.nil?
+          ensure_numeric number.to_number.round
+        else
+          ensure_numeric number.to_number.round precision.to_number
+        end
+      end
+
+      def sin angle
+        ensure_numeric Math.sin angle.to_number
+      end
+
+      def sinh angle
+        ensure_numeric Math.sinh angle.to_number
+      end
+
+      def sqrt number
+        ensure_numeric Math.sqrt number.to_number
+      end
+
+      def tan angle
+        ensure_numeric Math.tan angle.to_number
+      end
+
+      def tanh angle
+        ensure_numeric Math.tanh angle.to_number
+      end
+    end
+  end
+end

data/lib/teepee/commander-mixins/thinking-bicycle-models.rb

@@ -0,0 +1,134 @@
+# -*- coding: utf-8 -*-
+# -*- mode: Ruby -*-
+
+# Copyright © 2013-2016, Christopher Mark Gore,
+# Soli Deo Gloria,
+# All rights reserved.
+#
+# 2317 South River Road, Saint Charles, Missouri 63303 USA.
+# Web: http://cgore.com
+# Email: cgore@cgore.com
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+#   * Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+#   * Neither the name of Christopher Mark Gore nor the names of other
+#     contributors may be used to endorse or promote products derived from
+#     this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+
+module Teepee
+  module CommanderMixins
+    module ThinkingBicycleModels
+      def tb_href target, string
+        %{<a href="#{TB_COM}/#{target}">#{string}</a>}
+      end
+
+      def id_command_handler(id,
+                             klass,
+                             singular = klass.to_s.camelcase_to_snakecase,
+                             plural = singular.pluralize,
+                             partial = "#{plural}/inline",
+                             view="")
+        if not id
+          command_error "#{singular}_id: error: no #{singular} ID specified"
+        elsif not id.to_s =~ /\A[0-9]+\z/
+          command_error "#{singular}_id: error: invalid #{singular} ID specified"
+        else
+          tb_href "#{plural}/#{id.to_s}/#{view}", "#{klass.to_s} ##{id.to_s}"
+        end
+      end
+
+      def bookmarks_folder_id id
+        id_command_handler id, :Folder, "folder", "folders", "folders/bookmarks_inline", "bookmarks"
+      end
+
+      def folder_id id
+        id_command_handler id, :Folder
+      end
+
+      def forum_id id
+        id_command_handler id, :Forum
+      end
+
+      def image expressions
+        expressions = strip expressions
+        uri, *alt_text = expressions
+        uri = ERB::Util.html_escape uri.to_html
+        if not valid_uri? uri
+          command_error "Not a valid URI for the image."
+        else
+          if alt_text.empty?
+            html_tag :img, nil, {src: uri}
+          else
+            html_tag :img, nil, {src: uri, alt: alt_text.map(&:to_html).join.strip}
+          end
+        end
+      end
+
+      def keyword_id id
+        id_command_handler id, :Keyword
+      end
+
+      def link expressions
+        expressions = strip expressions
+        uri, *desc = expressions
+        uri = ERB::Util.html_escape uri.to_html
+        if not valid_uri? uri
+          command_error "Not a valid URI."
+        else
+          desc = [uri] if desc.empty?
+          html_tag :a, desc, {href: uri}
+        end
+      end
+
+      def link_id id
+        id_command_handler id, :Link
+      end
+
+      def mailto email_address
+        email_address = email_address.to_html
+        if valid_email_address? email_address
+          html_tag :a, [email_address], {href: "mailto:#{email_address}"}
+        else
+          command_error "I'm not sure that's a valid email address."
+        end
+      end
+
+      def note_id id
+        id_command_handler id, :Note
+      end
+
+      def tag_id id
+        id_command_handler id, :Tag
+      end
+
+      def user user
+        if not user
+          command_error "user: error: no user specified"
+        else
+          tb_href "users/#{user}", user.to_html
+        end
+      end
+    end
+  end
+end

data/lib/teepee/commander.rb

@@ -35,8 +35,20 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+require 'teepee/commander-mixins/boolean'
+require 'teepee/commander-mixins/control'
+require 'teepee/commander-mixins/formatting'
+require 'teepee/commander-mixins/mathematics'
+require 'teepee/commander-mixins/thinking-bicycle-models'
+
 module Teepee
   class Commander
+    include CommanderMixins::Boolean
+    include CommanderMixins::Control
+    include CommanderMixins::Formatting
+    include CommanderMixins::Mathematics
+    include CommanderMixins::ThinkingBicycleModels
+
     attr_accessor :parser
 
     def initialize params
@@ -61,73 +73,6 @@ module Teepee
       command_error "The variable \"#{variable}\" is not defined."
     end
 
-    def numeric? *numbers
-      numbers.all? {|number| number.kind_of? Numeric}
-    end
-
-    def non_numeric_error nan
-      command_error "The value \"#{nan}\" is not a number."
-    end
-
-    def ensure_numeric number
-      if number.kind_of? Complex
-        command_error "Complex numbers are not yet supported."
-      elsif not number.kind_of? Numeric
-        command_error "Non-numeric result."
-      else
-        number
-      end
-    end
-
-    def ensure_boolean boolean
-      if boolean.to_html == "true" or boolean.to_html == "false"
-        boolean
-      else
-        command_error "Non-boolean value."
-      end
-    end
-
-    def html_tag tag, expressions, attribs=nil
-      opening_tag = if attribs
-                      attribs_string = attribs.map {|k,v| %{#{k}="#{v}"}}.join " "
-                      if expressions.nil?
-                        "<#{tag} #{attribs_string}/>"
-                      else
-                        "<#{tag} #{attribs_string}>"
-                      end
-                    else
-                      if expressions.nil?
-                        "<#{tag}/>"
-                      else
-                        "<#{tag}>"
-                      end
-                    end
-      if expressions.nil?
-        opening_tag
-      else
-        opening_tag + expressions.map(&:to_html).join.strip + "</#{tag}>"
-      end
-    end
-
-    def tb_href target, string
-      %{<a href="#{TB_COM}/#{target}">#{string}</a>}
-    end
-
-    def id_command_handler(id,
-                           klass,
-                           singular = klass.to_s.camelcase_to_snakecase,
-                           plural = singular.pluralize,
-                           partial = "#{plural}/inline",
-                           view="")
-      if not id
-        command_error "#{singular}_id: error: no #{singular} ID specified"
-      elsif not id.to_s =~ /\A[0-9]+\z/
-        command_error "#{singular}_id: error: invalid #{singular} ID specified"
-      else
-        tb_href "#{plural}/#{id.to_s}/#{view}", "#{klass.to_s} ##{id.to_s}"
-      end
-    end
-
     def left_strip expressions
       while expressions.first.kind_of? WhitespaceToken
         expressions.shift
@@ -147,109 +92,13 @@ module Teepee
     end
 
     def valid_email_address? email_address
-      email_address =~ /\A[[:graph:]]+@[\w.]+\z/
-    end
-
-    def true_constant? expression
-      expression.to_html == "true"
-    end
-
-    def false_constant? expression
-      expression.to_html == "false"
+      email_address =~ /\A[[:graph:]]+@[\w._-]+\z/
     end
 
     def pipe? expression
       expression.is_a? PipeToken
     end
 
-    def number_from_word word
-      begin
-        word.to_number
-      rescue ArgumentError, NoMethodError
-        nil
-      end
-    end
-
-    def to_numbers words
-      words.map {|word| number_from_word word}.reject &:nil?
-    end
-
-    #----------------------------------------------------------------------------
-
-    def + numbers
-      ensure_numeric to_numbers(numbers).inject 0, :+
-    end
-
-    def - numbers
-      numbers = to_numbers numbers
-      if numbers.length == 1
-        ensure_numeric -numbers.first
-      else
-        ensure_numeric numbers.reduce :-
-      end
-    end
-
-    def * numbers
-      ensure_numeric to_numbers(numbers).inject 1, :*
-    end
-
-    def / numbers
-      numbers = to_numbers numbers
-      if numbers.length == 1
-        ensure_numeric 1 / numbers.first
-      else
-        ensure_numeric numbers.reduce :/
-      end
-    end
-
-    def ** numbers
-      ensure_numeric to_numbers(numbers).reduce :**
-    end
-
-    def % numbers
-      to_numbers(numbers).inject { |base, percent| base*percent/100.0 }
-    end
-
-    def add_percentage numbers
-      to_numbers(numbers).inject {|base, percent| base * (1+percent/100.0) }
-    end
-
-    def subtract_percentage numbers
-      to_numbers(numbers).inject {|base, percent| base * (1-percent/100.0) }
-    end
-
-    def percent_total numbers
-      to_numbers(numbers).inject {|total, part| Float(part)/Float(total)*100.0 }
-    end
-
-    def acos angle
-      ensure_numeric Math.acos angle.to_number
-    end
-
-    def acosh angle
-      ensure_numeric Math.acosh angle.to_number
-    end
-
-    def asin angle
-      ensure_numeric Math.asin angle.to_number
-    end
-
-    def asinh angle
-      ensure_numeric Math.asinh angle.to_number
-    end
-
-    def atan angle
-      ensure_numeric Math.atan angle.to_number
-    end
-
-    def atanh angle
-      ensure_numeric Math.atanh angle.to_number
-    end
-
-    def b expressions
-      html_tag :b, expressions
-    end
-
     def backquote
       "`"
     end
@@ -258,375 +107,10 @@ module Teepee
       "\\"
     end
 
-    def big expressions
-      html_tag :big, expressions
-    end
-
-    def bookmarks_folder_id id
-      id_command_handler id, :Folder, "folder", "folders", "folders/bookmarks_inline", "bookmarks"
-    end
-
-    def boolean_and booleans
-      if booleans.empty?
-        return true_constant
-      end
-      b = booleans.first.to_html
-      if false_constant? b
-        false_constant
-      elsif true_constant? b or booleans.first.kind_of? WhitespaceToken
-        boolean_and booleans[1..-1]
-      else
-        command_error "Not a boolean value #{booleans.first}"
-      end
-    end
-
-    def boolean_nand booleans
-      boolean_not boolean_and booleans
-    end
-
-    def boolean_nor booleans
-      boolean_not boolean_or booleans
-    end
-
-    def boolean_not boolean
-      boolean = boolean.to_html
-      if true_constant? boolean
-        false_constant
-      elsif false_constant? boolean
-        true_constant
-      else
-        command_error "Not a boolean value"
-      end
-    end
-
-    def boolean_or booleans
-      if booleans.empty?
-        return false_constant
-      end
-      b = booleans.first.to_html
-      if true_constant? b
-        true_constant
-      elsif false_constant? b or booleans.first.kind_of? WhitespaceToken
-        boolean_or booleans[1..-1]
-      else
-        command_error "Not a boolean value"
-      end
-    end
-
-    def boolean_xnor booleans
-      boolean_not boolean_xor booleans
-    end
-
-    def boolean_xor booleans
-      # There are two schools of thought as to what a multi-variable XOR is.
-      # 1. Chained XORs, giving a parity check.
-      # 2. 'Exclusively' one true for ALL inputs.
-      # I'm going with the second: one and only one true, the rest false.
-      # It seems therefore that the zero-argument version should be false then.
-      if booleans.empty?
-        false_constant
-      else
-        any_trues = false
-        booleans.each do |boolean|
-          if true_constant? boolean
-            if any_trues
-              return false_constant
-            else
-              any_trues = true
-            end
-          elsif false_constant? boolean
-            # do nothing
-          elsif boolean.kind_of? WhitespaceToken
-            # do nothing
-          else
-            return command_error "Not a boolean value"
-          end
-        end
-        return any_trues.to_html
-      end
-    end
-
-    def br
-      html_tag :br, nil
-    end
-
-    def case_operator expressions
-      value, _, *rest = strip expressions
-      if value and not rest.empty?
-        def cond_helper value, expressions
-          test_value, _, form, *rest = strip expressions
-          if equal [value.to_html, test_value.to_html]
-            form
-          elsif not rest.empty?
-            cond_helper value, rest
-          end
-        end
-        cond_helper value, rest
-      end
-    end
-
-    def ceiling number
-      ensure_numeric number.to_number.ceil
-    end
-
-    def comment expressions
-      nil
-    end
-
-    def cond_operator expressions
-      conditional, _, form, *rest = strip expressions
-      if true_constant? conditional.to_html
-        form
-      elsif not rest.empty?
-        cond_operator rest
-      end
-    end
-
-    def cos angle
-      ensure_numeric Math.cos angle.to_number
-    end
-
-    def cosh angle
-      ensure_numeric Math.cosh angle.to_number
-    end
-
-    def decrement variable
-      return variable_not_defined_error variable if not is_defined? variable
-      old_value = get_operator(variable).to_number
-      return non_numeric_error old_value if not numeric? old_value
-      @parser.variables[variable.to_html] = old_value - 1
-    end
-
-    def define expressions
-      variable, _, value = expressions
-      k = variable.to_html
-      v = value.to_html
-      @parser.variables[k] = v
-      get_operator k
-    end
-
-    def is_defined? variables
-      if not variables.is_a? Array
-        return is_defined? [variables]
-      elsif Set.new(variables.map(&:to_html)).subset? Set.new(@parser.variables.keys)
-        true_constant
-      else
-        false_constant
-      end
-    end
-
-    def degrees2radians degrees
-      ensure_numeric degrees.to_number * Math::PI / 180.0
-    end
-
-    def del expressions
-      html_tag :del, expressions
-    end
-
     def dollar
       "$"
     end
 
-    def dotimes expressions
-      n = expressions.first.to_number
-      return "" if n.nil? or n < 1
-      span_operator expressions[1..-1] * n
-    end
-
-    def e
-      Math::E
-    end
-
-    def equal expressions
-      if expressions.empty?
-        true_constant
-      elsif expressions.length == 1
-        true_constant
-      else
-        expressions[0].to_html == expressions[1].to_html and equal expressions.rest
-      end
-    end
-
-    def enumerate expressions
-      html_tag :ol, expressions
-    end
-
-    def enumerate_numeric expressions
-      html_tag :ol, expressions, {type: "1"}
-    end
-
-    def enumerate_uppercase expressions
-      html_tag :ol, expressions, {type: "A"}
-    end
-
-    def enumerate_lowercase expressions
-      html_tag :ol, expressions, {type: "a"}
-    end
-
-    def enumerate_roman_uppercase expressions
-      html_tag :ol, expressions, {type: "I"}
-    end
-
-    def enumerate_roman_lowercase expressions
-      html_tag :ol, expressions, {type: "i"}
-    end
-
-    def erf number
-      ensure_numeric Math.erf number.to_number
-    end
-
-    def erfc number
-      ensure_numeric Math.erfc number.to_number
-    end
-
-    def false_constant
-      "false"
-    end
-
-    def floor number
-      ensure_numeric number.to_number.floor
-    end
-
-    def folder_id id
-      id_command_handler id, :Folder
-    end
-
-    def forum_id id
-      id_command_handler id, :Forum
-    end
-
-    def gamma number
-      ensure_numeric Math.gamma number.to_number
-    end
-
-    def get_operator variable
-      @parser.variables[variable.to_html].to_html
-    end
-
-    def greater_than numbers
-      if numbers.empty?
-        true_constant
-      elsif numbers.length == 1
-        true_constant
-      else
-        numbers[0].to_number > numbers[1].to_number and greater_than numbers.rest
-      end
-    end
-
-    def greater_than_or_equal numbers
-      if numbers.empty?
-        true_constant
-      elsif numbers.length == 1
-        true_constant
-      else
-        numbers[0].to_number >= numbers[1].to_number and greater_than_or_equal numbers.rest
-      end
-    end
-
-    def h1 expressions
-      html_tag :h1, expressions
-    end
-
-    def h2 expressions
-      html_tag :h2, expressions
-    end
-
-    def h3 expressions
-      html_tag :h3, expressions
-    end
-
-    def h4 expressions
-      html_tag :h4, expressions
-    end
-
-    def h5 expressions
-      html_tag :h5, expressions
-    end
-
-    def h6 expressions
-      html_tag :h6, expressions
-    end
-
-    def i
-      command_error "Complex numbers are not yet supported."
-    end
-
-    def if_operator expressions
-      expressions = strip expressions
-      conditional, _, true_clause, _, false_clause = expressions
-      if true_constant? conditional.to_html
-        true_clause.to_html
-      elsif false_clause
-        false_clause.to_html
-      end
-    end
-
-    def image expressions
-      expressions = strip expressions
-      uri, *alt_text = expressions
-      uri = ERB::Util.html_escape uri.to_html
-      if not valid_uri? uri
-        command_error "Not a valid URI for the image."
-      else
-        if alt_text.empty?
-          html_tag :img, nil, {src: uri}
-        else
-          html_tag :img, nil, {src: uri, alt: alt_text.map(&:to_html).join.strip}
-        end
-      end
-    end
-
-    def increment variable
-      return variable_not_defined_error variable if not is_defined? variable
-      old_value = get_operator(variable).to_number
-      return non_numeric_error old_value if not numeric? old_value
-      @parser.variables[variable.to_html] = old_value + 1
-    end
-
-    def it expressions
-      html_tag :i, expressions
-    end
-
-    def item expressions
-      html_tag :li, expressions
-    end
-
-    def itemize expressions
-      html_tag :ul, expressions
-    end
-
-    def itemize_disc expressions
-      html_tag :ul, expressions, {style: "list-style-type:disc"}
-    end
-
-    def itemize_circle expressions
-      html_tag :ul, expressions, {style: "list-style-type:circle"}
-    end
-
-    def itemize_square expressions
-      html_tag :ul, expressions, {style: "list-style-type:square"}
-    end
-
-    def itemize_none expressions
-      html_tag :ul, expressions, {style: "list-style-type:none"}
-    end
-
-    def hypot numbers
-      ensure_numeric Math.sqrt to_numbers(numbers).map {|n| n**2}
-    end
-
-    def keyword_id id
-      id_command_handler id, :Keyword
-    end
-
-    def ld number
-      ensure_numeric Math.log2 number.to_number
-    end
-
-    def ldexp fraction, exponent
-      ensure_numeric Math.ldexp fraction.to_number, exponent.to_number
-    end
-
     def left_brace
       "{"
     end
@@ -635,123 +119,10 @@ module Teepee
       "["
     end
 
-    def less_than numbers
-      if numbers.empty?
-        true_constant
-      elsif numbers.length == 1
-        true_constant
-      else
-        numbers[0].to_number < numbers[1].to_number and less_than numbers.rest
-      end
-    end
-
-    def less_than_or_equal numbers
-      if numbers.empty?
-        true_constant
-      elsif numbers.length == 1
-        true_constant
-      else
-        numbers[0].to_number <= numbers[1].to_number and less_than_or_equal numbers.rest
-      end
-    end
-
-    def lgamma number
-      ensure_numeric Math::lgamma(number.to_number).first
-    end
-
-    def link expressions
-      expressions = strip expressions
-      uri, *desc = expressions
-      uri = ERB::Util.html_escape uri.to_html
-      if not valid_uri? uri
-        command_error "Not a valid URI."
-      else
-        desc = [uri] if desc.empty?
-        html_tag :a, desc, {href: uri}
-      end
-    end
-
-    def link_id id
-      id_command_handler id, :Link
-    end
-
-    def ln number
-      ensure_numeric Math.log number.to_number
-    end
-
-    def log base, number
-      if number.nil?
-        number, base = base, number
-        ensure_numeric Math.log10 number.to_number # default to log base 10
-      else
-        ensure_numeric Math.log number.to_number, base.to_number
-      end
-    end
-
-    def log10 number
-      ensure_numeric Math.log10 number.to_number
-    end
-
-    def mailto email_address
-      email_address = email_address.to_html
-      if valid_email_address? email_address
-        html_tag :a, [email_address], {href: "mailto:#{email_address}"}
-      else
-        command_error "I'm not sure that's a valid email address."
-      end
-    end
-
-    def mod numbers
-      ensure_numeric to_numbers(numbers).reduce :%
-    end
-
-    def nbsp count
-      if count and count.to_number and count.to_number > 0
-        "&nbsp;" * count.to_number
-      else
-        "&nbsp;"
-      end
-    end
-
-    def not_equal numbers
-      if numbers.empty?
-        true_constant
-      elsif numbers.length == 1
-        true_constant
-      else
-        numbers[0].to_number != numbers[1].to_number and equal numbers.rest
-      end
-    end
-
-    def note_id id
-      id_command_handler id, :Note
-    end
-
-    def pi
-      Math::PI
-    end
-
     def pipe
       "|"
     end
 
-    def prog1_operator expressions
-      expressions.map(&:to_html).first
-    end
-
-    def progn_operator expressions
-      expressions.map(&:to_html).last
-    end
-
-    def prognil expressions
-      expressions.map(&:to_html)
-      ""
-    end
-
-    def radians2degrees radians
-      ensure_numeric(radians.to_number * 180.0 / Math::PI)
-    end
-
     def right_brace
       "}"
     end
@@ -760,129 +131,12 @@ module Teepee
       "]"
     end
 
-    def round number, precision = nil, *_
-      if precision.nil? or precision.to_number.nil?
-        ensure_numeric number.to_number.round
-      else
-        ensure_numeric number.to_number.round precision.to_number
-      end
-    end
-
-    def sin angle
-      ensure_numeric Math.sin angle.to_number
-    end
-
-    def sinh angle
-      ensure_numeric Math.sinh angle.to_number
-    end
-
-    def small expressions
-      html_tag :small, expressions
-    end
-
     def squiggle
       "~"
     end
 
-    def sqrt number
-      ensure_numeric Math.sqrt number.to_number
-    end
-
     def space
       " "
     end
-
-    def span_operator expressions
-      html_tag :span, expressions
-    end
-
-    def sub expressions
-      html_tag :sub, expressions
-    end
-
-    def sup expressions
-      html_tag :sup, expressions
-    end
-
-    def table expressions
-      html_tag :table, expressions
-    end
-
-    def table_data expressions
-      html_tag :td, expressions
-    end
-
-    def table_header expressions
-      html_tag :th, expressions
-    end
-
-    def table_row expressions
-      html_tag :tr, expressions
-    end
-
-    def tag_id id
-      id_command_handler id, :Tag
-    end
-
-    def tan angle
-      ensure_numeric Math.tan angle.to_number
-    end
-
-    def tanh angle
-      ensure_numeric Math.tanh angle.to_number
-    end
-
-    def true_constant
-      "true"
-    end
-
-    def tt expressions
-      html_tag :tt, expressions
-    end
-
-    def u expressions
-      html_tag :u, expressions
-    end
-
-    def undefine expressions
-      expressions.each do |expression|
-        @parser.variables.delete expression.to_html
-      end
-      ""
-    end
-
-    def unless_operator expressions
-      expressions = strip expressions
-      conditional = expressions.first
-      expressions = strip expressions.rest
-      if false_constant? conditional.to_html
-        if expressions.length <= 1
-          expressions.first
-        else
-          span_operator expressions
-        end
-      end
-    end
-
-    def user user
-      if not user
-        command_error "user: error: no user specified"
-      else
-        tb_href "users/#{user}", user.to_html
-      end
-    end
-
-    def when_operator expressions
-      expressions = strip expressions
-      conditional = expressions.first
-      expressions = strip expressions.rest
-      if true_constant? conditional.to_html
-        if expressions.length <= 1
-          expressions.first
-        else
-          span_operator expressions
-        end
-      end
-    end
   end
 end