jmtk 0.0.3.3-java → 0.4-java

data/lib/mtk/lang/intensities.rb

@@ -3,57 +3,56 @@ module MTK
 
     # Defines intensity constants using standard dynamic symbols.
     #
-    # These can be thought of like constants, but in order to distinguish 'f' (forte) from the {PitchClass} 'F'
-    # it was necessary to use lower-case names and therefore define them as "pseudo constant" methods.
-    # The methods are available either through the module (MTK::Intensities::f) or via mixin (include MTK::Intensities;  f)
+    # These can be thought of like constants, but in order to support the lower case names,
+    # it was necessary to define them as "pseudo constant" methods.
+    # Like constants, these methods are available either through the module (MTK::Lang::Intensities::f) or
+    # via mixin (include MTK::Lang::Intensities; f). They are listed under the "Instance Attribute Summary" of this page.
     #
     # These values are intensities in the range 0.125 - 1.0 (in increments of 1/8), so they can be easily scaled (unlike MIDI velocities).
     #
-    # It is also possible to retrieve values in increments of 1/24 by using the '+' and '-' suffix when looking
-    # up values via the {.[]} method.
-    #
     # @note Including this module shadows Ruby's built-in p() method.
-    #   If you include this module, you can access the built-in p() method via Kernel.p()
+    #       If you include this module, you can access the built-in p() method via Kernel.p()
+    #       Also be aware you might shadow existing variable names, like f.
     #
-    # @see Note
+    # @see Core::Intensity
+    # @see Events::Note
     module Intensities
       extend MTK::Lang::PseudoConstants
 
-      # NOTE: the yard doc macros here only fill in [$2] with the actual value when generating docs under Ruby 1.9+
+      # @private
+      # @!macro [attach] define_intensity
+      #   $3: $4% intensity
+      #   @!attribute [r]
+      #   @return [MTK::Core::Interval] intensity of $4%
+      def self.define_intensity name, value, description, percentage_intensity
+        define_constant name, value
+      end
+
 
-      # pianississimo
-      # @macro [attach] intensities.define_constant
-      #   @attribute [r]
-      #   @return [$2] intensity value for $1
-      define_constant 'ppp', MTK::Core::Intensity[0.125]
+      define_intensity 'ppp', MTK::Core::Intensity[0.125], 'pianississimo', '12.5'
 
-      # pianissimo
-      define_constant 'pp', MTK::Core::Intensity[0.25]
+      define_intensity 'pp', MTK::Core::Intensity[0.25], 'pianissimo', 25
 
-      # piano
       # @note Including this module shadows Ruby's built-in p() method.
       #   If you include this module, you can access the built-in p() method via Kernel.p()
-      define_constant 'p', MTK::Core::Intensity[0.375]
+      define_intensity 'p', MTK::Core::Intensity[0.375], 'piano', '37.5'
+
+      define_intensity 'mp', MTK::Core::Intensity[0.5], 'mezzo-piano', 50
 
-      # mezzo-piano
-      define_constant 'mp', MTK::Core::Intensity[0.5]
+      define_intensity 'mf', MTK::Core::Intensity[0.625], 'mezzo-forte', '62.5'
 
-      # mezzo-forte
-      define_constant 'mf', MTK::Core::Intensity[0.625]
+      define_intensity 'f', MTK::Core::Intensity[0.75], 'forte', 75
 
-      # forte
-      define_constant 'o', MTK::Core::Intensity[0.75]
+      define_intensity 'ff', MTK::Core::Intensity[0.875], 'fortissimo', '87.5'
 
-      # fortissimo
-      define_constant 'ff', MTK::Core::Intensity[0.875]
+      define_intensity 'fff', MTK::Core::Intensity[1.0], 'fortississimo', 100
 
-      # fortississimo
-      define_constant 'fff', MTK::Core::Intensity[1.0]
 
-      # The values of all "psuedo constants" defined in this module
-      INTENSITIES = [ppp, pp, p, mp, mf, o, ff, fff].freeze
+      # All "psuedo constants" defined in this module
+      INTENSITIES = [ppp, pp, p, mp, mf, f, ff, fff].freeze
 
       # The names of all "psuedo constants" defined in this module
+      # @see MTK::Core::Intensity::NAMES
       INTENSITY_NAMES = MTK::Core::Intensity::NAMES
 
     end

data/lib/mtk/lang/intervals.rb

@@ -1,72 +1,139 @@
 module MTK
   module Lang
 
-    # Defines a constant for intervals up to an octave using diatonic naming conventions (see http://en.wikipedia.org/wiki/Interval_(music)#Main_intervals)
+    # Defines a constant for {Core::Interval}s up to an octave using diatonic naming conventions
     #
     # Naming conventions
     #   P#: perfect interval
     #   M#: major interval
     #   m#: minor interval
-    #   TT: tritone (AKA augmented 4th or diminished 5th)
+    #   TT: tritone
+    #   a#: augmented interval
+    #   d#: diminished interval
     #
-    # These can be thought of like constants, but in order to succinctly distinguish 'm2' (minor) from 'M2' (major),
-    # it was necessary to use lower-case names for some of the values and therefore define them as "pseudo constant" methods.
-    # The methods are available either through the module (MTK::Core::Intervals::m2) or via mixin (include MTK::Core::Intervals; m2)
+    # These can be thought of like constants, but in order to support the lower case names,
+    # it was necessary to define them as "pseudo constant" methods.
+    # Like constants, these methods are available either through the module (MTK::Lang::Intervals::m2) or
+    # via mixin (include MTK::Lang::Intervals; m2). They are listed under the "Instance Attribute Summary" of this page.
+    #
+    # @see Core::Interval
+    # @see http://en.wikipedia.org/wiki/Interval_(music)#Main_intervals
     module Intervals
       extend MTK::Lang::PseudoConstants
 
-      # NOTE: the yard doc macros here only fill in [$2] with the actual value when generating docs under Ruby 1.9+
+      # @private
+      # @!macro [attach] define_interval
+      #   $3: $4 semitones
+      #   @!attribute [r]
+      #   @return [MTK::Core::Interval] interval of $4 semitones
+      def self.define_interval name, value, description, semitones
+        define_constant name, value
+      end
+
+
+      # @see #d2
+      define_interval 'P1', MTK::Core::Interval[0], 'perfect unison', 0
+
+      # @see #P1
+      define_interval 'd2', MTK::Core::Interval[0], 'diminished second', 0
+
+
+      # @see #a1
+      define_interval 'm2', MTK::Core::Interval[1], 'minor second', 1
+
+      # @see #m2
+      define_interval 'a1', MTK::Core::Interval[1], 'augmented unison', 1
+
+
+      # @see #d3
+      define_interval 'M2', MTK::Core::Interval[2], 'major second', 2
+
+      # @see #M2
+      define_interval 'd3', MTK::Core::Interval[2], 'diminished third', 2
+
+
+      # @see #a2
+      define_interval 'm3', MTK::Core::Interval[3], 'minor third', 3
+
+      # @see #m3
+      define_interval 'a2', MTK::Core::Interval[3], 'augmented second', 3
+
+
+      # @see #d4
+      define_interval 'M3', MTK::Core::Interval[4], 'major third', 4
+
+      # @see #M3
+      define_interval 'd4', MTK::Core::Interval[4], 'diminished fourth', 4
+
+
+      # @see #a3
+      define_interval 'P4', MTK::Core::Interval[5], 'perfect fourth', 5
+
+      # @see #P4
+      define_interval 'a3', MTK::Core::Interval[5], 'augmented third', 5
+
+
+      # @see #a4
+      # @see #d5
+      define_interval 'TT', MTK::Core::Interval[6], 'tritone', 6
+
+      # @see #TT
+      # @see #d5
+      define_interval 'a4', MTK::Core::Interval[6], 'augmented fourth', 6
+
+      # @see #TT
+      # @see #a4
+      define_interval 'd5', MTK::Core::Interval[6], 'diminished fifth', 6
+
+
+      # @see #d6
+      define_interval 'P5', MTK::Core::Interval[7], 'perfect fifth', 7
+
+      # @see #P5
+      define_interval 'd6', MTK::Core::Interval[7], 'diminished sixth', 7
+
+
+      # @see #a5
+      define_interval 'm6', MTK::Core::Interval[8], 'minor sixth', 8
+
+      # @see #m6
+      define_interval 'a5', MTK::Core::Interval[8], 'augmented fifth', 8
 
-      # perfect unison
-      # @macro [attach] interval.define_constant
-      #   @attribute [r]
-      #   @return [$2] number of semitones in the interval $1
-      define_constant 'P1', MTK::Core::Interval[0]
 
-      # minor second
-      # @macro [attach] interval.define_constant
-      #   @attribute [r]
-      #   @return [$2] number of semitones in the interval $1
-      define_constant 'm2', MTK::Core::Interval[1]
+      # @see #d7
+      define_interval 'M6', MTK::Core::Interval[9], 'major sixth', 9
 
-      # major second
-      define_constant 'M2', MTK::Core::Interval[2]
+      # @see #M6
+      define_interval 'd7', MTK::Core::Interval[9], 'diminished seventh', 9
 
-      # minor third
-      define_constant 'm3', MTK::Core::Interval[3]
 
-      # major third
-      define_constant 'M3', MTK::Core::Interval[4]
+      # @see #a6
+      define_interval 'm7', MTK::Core::Interval[10], 'minor seventh', 10
 
-      # pefect fourth
-      define_constant 'P4', MTK::Core::Interval[5]
+      # @see #m7
+      define_interval 'a6', MTK::Core::Interval[10], 'augmented sixth', 10
 
-      # tritone (AKA augmented fourth or diminished fifth)
-      define_constant 'TT', MTK::Core::Interval[6]
 
-      # perfect fifth
-      define_constant 'P5', MTK::Core::Interval[7]
+      # @see #d8
+      define_interval 'M7', MTK::Core::Interval[11], 'major seventh', 11
 
-      # minor sixth
-      define_constant 'm6', MTK::Core::Interval[8]
+      # @see #M7
+      define_interval 'd8', MTK::Core::Interval[11], 'diminished octave', 11
 
-      # major sixth
-      define_constant 'M6', MTK::Core::Interval[9]
 
-      # minor seventh
-      define_constant 'm7', MTK::Core::Interval[10]
+      # @see #a7
+      define_interval 'P8', MTK::Core::Interval[12], 'perfect octave', 12
 
-      # major seventh
-      define_constant 'M7', MTK::Core::Interval[11]
+      # @see #P8
+      define_interval 'a7', MTK::Core::Interval[12], 'augmented seventh', 12
 
-      # pefect octave
-      define_constant 'P8', MTK::Core::Interval[12]
 
-      # The values of all "psuedo constants" defined in this module
-      INTERVALS = [P1, m2, M2, m3, M3, P4, TT, P5, m6, M6, m7, M7, P8].freeze
+      # All "psuedo constants" defined in this module
+      INTERVALS = [P1, d2, m2, a1, M2, d3, m3, a2, M3, d4, P4, a3, TT, a4, d5, P5, d6, m6, a5, M6, d7, m7, a6, M7, d8, P8, a7].freeze
 
       # The names of all "psuedo constants" defined in this module
-      INTERVAL_NAMES = MTK::Core::Interval::NAMES
+      # @see MTK::Core::Interval::NAMES_BY_VALUE
+      INTERVAL_NAMES = MTK::Core::Interval::ALL_NAMES
 
     end
   end

data/lib/mtk/lang/mtk_grammar.citrus

@@ -133,25 +133,35 @@ grammar MTK_Grammar
   end
 
   rule pitch_class
-    ( [A-Ga-g] [#b]*2 ) {
+    ( diatonic_pitch_class accidental? ) {
       MTK::Core::PitchClass[to_s]
     }
   end
 
+  rule diatonic_pitch_class
+    ( [A-G] ) {
+      MTK::Core::PitchClass[to_s]
+    }
+  end
+
+  rule accidental
+    ('#'1*2 | 'b'1*2)
+  end
+
   rule interval
-    ( [Pp] [1458] | ('maj'|'min'|[Mm]) [2367] | 'TT' | 'tt' ) {
+    ( 'P' [1458] | [Mm] [2367] | 'a' [1-7] | 'd' [2-8] | 'TT' ) {
       MTK::Core::Interval.from_s(to_s)
     }
   end
 
   rule intensity
-    ( ('p'1*3 | 'mp' | 'mf' | 'o' | 'f'2*3) ('+'|'-')? ) {
+    ( ('p'1*3 | 'mp' | 'mf' | 'f'1*3) ('+'|'-')? ) {
       MTK::Core::Intensity.from_s(to_s)
     }
   end
 
   rule duration
-    ( rest:'-'? multiplier:number? [whqisrx] ('.'|'t')* ) {
+    ( rest:'-'? multiplier:number? [whqesrx] ('.'|'t')* ) {
       MTK::Core::Duration.from_s(to_s)
     }
   end

data/lib/mtk/lang/parser.rb

@@ -12,15 +12,20 @@ Citrus.load File.join(File.dirname(__FILE__),'mtk_grammar')
 module MTK
   module Lang
 
-    # Parser for the {file:lib/mtk/lang/mtk_grammar.citrus MTK grammar}
+    # Parser for the {file:lib/mtk/lang/mtk_grammar.citrus MTK syntax}
     class Parser
 
-      def self.parse(syntax, root=:root, dump=false)
+      # Parse the given MTK syntax according to the {file:lib/mtk/lang/mtk_grammar.citrus grammar rules}
+      # @return [Sequencers::LegatoSequencer] by default
+      # @return [Core,Patterns,Sequencers] a core object, pattern or sequencer when an optional grammar rule
+      #                                   is given. Depends on the rule.
+      # @raise [Citrus::ParseError] for invalid syntax
+      def self.parse(syntax, grammar_rule=:root, dump=false)
         syntax = syntax.to_s.strip
         return nil if syntax.empty?
-        matcher = ::MTK_Grammar.parse(syntax, :root => root)
-        puts matcher.dump if dump
-        matcher.value
+        match = ::MTK_Grammar.parse(syntax, root: grammar_rule)
+        puts match.dump if dump
+        match.value
       end
 
     end

data/lib/mtk/lang/pitch_classes.rb

@@ -1,29 +1,57 @@
 module MTK
   module Lang
 
-    # Defines a constant for each {PitchClass} in the Western chromatic scale.
+    # Defines a constant for each {Core::PitchClass} in the Western chromatic scale.
+    #
+    # Because '#' is not a valid identifier character in Ruby. All chromatic pitch classes are defined as
+    # the flat of a diatonic pitch class, for example Eb is a constant because D# is not a valid Ruby constant name.
+    #
+    # To help automate the documentation, the constants are listed under "Instance Attribute Summary" on this page.
+    #
+    # @see Core::PitchClass
+    #
     module PitchClasses
 
-      # The values of all constants defined in this module
-      PITCH_CLASSES = MTK::Core::PitchClass::PITCH_CLASSES
+      # @private
+      # @!macro [attach] define_pitch_class
+      #   PitchClass $1 $3
+      #   @!attribute [r]
+      #   @return [MTK::Core::PitchClass] PitchClass $1 (value $2)
+      def self.define_pitch_class name, value, more_info=nil
+        const_set name, MTK::Core::PitchClass.from_name(name)
+      end
+
+      define_pitch_class 'C', 0
+
+      define_pitch_class 'Db', 1, '(also known as C#)'
+
+      define_pitch_class 'D', 2
+
+      define_pitch_class 'Eb', 3, '(also known as D#)'
+
+      define_pitch_class 'E', 4
+
+      define_pitch_class 'F', 5
+
+      define_pitch_class 'Gb', 6, '(also known as F#)'
+
+      define_pitch_class 'G', 7
+
+      define_pitch_class 'Ab', 8, '(also known as G#)'
+
+      define_pitch_class 'A', 9
+
+      define_pitch_class 'Bb', 10, '(also known as A#)'
+
+      define_pitch_class 'B', 11
+
+      # All constants defined in this module
+      PITCH_CLASSES = [C, Db, D, Eb, E, F, Gb, G, Ab, A, Bb, B].freeze
 
       # The names of all constants defined in this module
+      # @see MTK::Core::PitchClass::NAMES
       PITCH_CLASS_NAMES = MTK::Core::PitchClass::NAMES
 
-      PITCH_CLASSES.each { |pc| const_set pc.name, pc }
-
-      # Lookup the value of an pitch class constant by name.
-      # @example lookup value of 'C'
-      #         MTK::Core::PitchClasses['C']
-      # @see Groups::PitchClass.[]
-      def self.[](name)
-        begin
-          const_get name
-        rescue
-          nil
-        end
-      end
-
     end
   end
 end

data/lib/mtk/lang/pitches.rb

@@ -2,51 +2,188 @@ module MTK
   module Lang
 
     # Defines a constants for each {Core::Pitch} in the standard MIDI range using scientific pitch notation.
+    # The constants range from C-1 (MIDI value 0) to G9 (MIDI value)
     #
-    # See http://en.wikipedia.org/wiki/Scientific_pitch_notation
+    # Because the character '#' cannot be used in the name of a constant,
+    # the "black key" pitches are all named as flats with 'b' (for example, Gb3 or Db4).
+    # And because the character '-' (minus) cannot be used in the name of a constant,
+    # the low pitches use '_' (underscore) in place of '-' (minus) (for example C_1).
     #
-    # @note Because the character '#' cannot be used in the name of a constant,
-    #     the "black key" pitches are all named as flats with 'b' (for example, Gb3 or Cb4)
-    # @note Because the character '-' (minus) cannot be used in the name of a constant,
-    #     the low pitches use '_' (underscore) in place of '-' (minus) (for example C_1).
-    module Pitches
+    # To help automate the documentation, the constants are listed under "Instance Attribute Summary" on this page.
+    #
+    # @see Core::Pitch
+    # @see Events::Note
+    # @see http://en.wikipedia.org/wiki/Scientific_pitch_notation
+  module Pitches
+
+      # @private
+      # @!macro [attach] define_pitch
+      #   Pitch $1 (MIDI pitch $2)
+      #   @!attribute [r]
+      #   @return [MTK::Core::Pitch] Pitch $1 (value $2)
+      def self.define_pitch name, value
+        pitch = MTK::Core::Pitch.from_i(value)
+        const_set name, pitch
+        PITCHES << pitch
+        PITCH_NAMES << name
+      end
 
       # The values of all constants defined in this module
+      # @note This is populated dynamically so the documentation does not reflect the actual value
       PITCHES = []
 
       # The names of all constants defined in this module
+      # @note This is populated dynamically so the documentation does not reflect the actual value
       PITCH_NAMES = []
 
-      128.times do |note_number|
-        pitch = MTK::Core::Pitch.from_i( note_number )
-        PITCHES << pitch
-
-        octave_str = pitch.octave.to_s.sub(/-/,'_') # '_1' for -1
-        name = "#{pitch.pitch_class}#{octave_str}"
-        PITCH_NAMES << name
-
-        # TODO? also define lower case pseudo constants for consistency with the grammar?
-
-        const_set name, pitch
-      end
+      define_pitch 'C_1', 0
+      define_pitch 'Db_1', 1
+      define_pitch 'D_1', 2
+      define_pitch 'Eb_1', 3
+      define_pitch 'E_1', 4
+      define_pitch 'F_1', 5
+      define_pitch 'Gb_1', 6
+      define_pitch 'G_1', 7
+      define_pitch 'Ab_1', 8
+      define_pitch 'A_1', 9
+      define_pitch 'Bb_1', 10
+      define_pitch 'B_1', 11
+      define_pitch 'C0', 12
+      define_pitch 'Db0', 13
+      define_pitch 'D0', 14
+      define_pitch 'Eb0', 15
+      define_pitch 'E0', 16
+      define_pitch 'F0', 17
+      define_pitch 'Gb0', 18
+      define_pitch 'G0', 19
+      define_pitch 'Ab0', 20
+      define_pitch 'A0', 21
+      define_pitch 'Bb0', 22
+      define_pitch 'B0', 23
+      define_pitch 'C1', 24
+      define_pitch 'Db1', 25
+      define_pitch 'D1', 26
+      define_pitch 'Eb1', 27
+      define_pitch 'E1', 28
+      define_pitch 'F1', 29
+      define_pitch 'Gb1', 30
+      define_pitch 'G1', 31
+      define_pitch 'Ab1', 32
+      define_pitch 'A1', 33
+      define_pitch 'Bb1', 34
+      define_pitch 'B1', 35
+      define_pitch 'C2', 36
+      define_pitch 'Db2', 37
+      define_pitch 'D2', 38
+      define_pitch 'Eb2', 39
+      define_pitch 'E2', 40
+      define_pitch 'F2', 41
+      define_pitch 'Gb2', 42
+      define_pitch 'G2', 43
+      define_pitch 'Ab2', 44
+      define_pitch 'A2', 45
+      define_pitch 'Bb2', 46
+      define_pitch 'B2', 47
+      define_pitch 'C3', 48
+      define_pitch 'Db3', 49
+      define_pitch 'D3', 50
+      define_pitch 'Eb3', 51
+      define_pitch 'E3', 52
+      define_pitch 'F3', 53
+      define_pitch 'Gb3', 54
+      define_pitch 'G3', 55
+      define_pitch 'Ab3', 56
+      define_pitch 'A3', 57
+      define_pitch 'Bb3', 58
+      define_pitch 'B3', 59
+      define_pitch 'C4', 60
+      define_pitch 'Db4', 61
+      define_pitch 'D4', 62
+      define_pitch 'Eb4', 63
+      define_pitch 'E4', 64
+      define_pitch 'F4', 65
+      define_pitch 'Gb4', 66
+      define_pitch 'G4', 67
+      define_pitch 'Ab4', 68
+      define_pitch 'A4', 69
+      define_pitch 'Bb4', 70
+      define_pitch 'B4', 71
+      define_pitch 'C5', 72
+      define_pitch 'Db5', 73
+      define_pitch 'D5', 74
+      define_pitch 'Eb5', 75
+      define_pitch 'E5', 76
+      define_pitch 'F5', 77
+      define_pitch 'Gb5', 78
+      define_pitch 'G5', 79
+      define_pitch 'Ab5', 80
+      define_pitch 'A5', 81
+      define_pitch 'Bb5', 82
+      define_pitch 'B5', 83
+      define_pitch 'C6', 84
+      define_pitch 'Db6', 85
+      define_pitch 'D6', 86
+      define_pitch 'Eb6', 87
+      define_pitch 'E6', 88
+      define_pitch 'F6', 89
+      define_pitch 'Gb6', 90
+      define_pitch 'G6', 91
+      define_pitch 'Ab6', 92
+      define_pitch 'A6', 93
+      define_pitch 'Bb6', 94
+      define_pitch 'B6', 95
+      define_pitch 'C7', 96
+      define_pitch 'Db7', 97
+      define_pitch 'D7', 98
+      define_pitch 'Eb7', 99
+      define_pitch 'E7', 100
+      define_pitch 'F7', 101
+      define_pitch 'Gb7', 102
+      define_pitch 'G7', 103
+      define_pitch 'Ab7', 104
+      define_pitch 'A7', 105
+      define_pitch 'Bb7', 106
+      define_pitch 'B7', 107
+      define_pitch 'C8', 108
+      define_pitch 'Db8', 109
+      define_pitch 'D8', 110
+      define_pitch 'Eb8', 111
+      define_pitch 'E8', 112
+      define_pitch 'F8', 113
+      define_pitch 'Gb8', 114
+      define_pitch 'G8', 115
+      define_pitch 'Ab8', 116
+      define_pitch 'A8', 117
+      define_pitch 'Bb8', 118
+      define_pitch 'B8', 119
+      define_pitch 'C9', 120
+      define_pitch 'Db9', 121
+      define_pitch 'D9', 122
+      define_pitch 'Eb9', 123
+      define_pitch 'E9', 124
+      define_pitch 'F9', 125
+      define_pitch 'Gb9', 126
+      define_pitch 'G9', 127
 
       PITCHES.freeze
       PITCH_NAMES.freeze
 
-      # Lookup the value of an pitch constant by name.
-      # @example lookup value of 'C3'
-      #         MTK::Core::Pitches['C3']
-      # @see Core::Pitch.from_s
-      # @note Unlike {Core::Pitch.from_s} this method will accept either '_' (underscore) or '-' (minus) and treat it like '-' (minus)
-      # @note Unlike {Core::Pitch.from_s} this method only accepts the accidental 'b'
-      def self.[](name)
-        begin
-          const_get name.sub('-','_')
-        rescue
-          nil
-        end
-      end
-
     end
   end
 end
+
+
+
+=begin
+
+Script for generating the define_pitch statements in this file.
+Run in the irb console after requiring 'mtk'
+
+128.times do |value|
+  pitch = MTK::Core::Pitch.from_i(value)
+  octave_str = pitch.octave.to_s.sub(/-/,'_') # '_1' for -1
+  name = "#{pitch.pitch_class}#{octave_str}"
+  puts "      define_pitch '#{name}', #{value}"
+end
+
+=end