deplate 0.8 → 0.8.1

data/lib/deplate/input/deplate-headings.rb

@@ -1,17 +1,12 @@
-# deplate-restricted.rb
-# @Author:      Thomas Link (samul AT web.de)
+# deplate-headings.rb
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-M�r-2005.
-# @Last Change: 20-Nov-2005.
-# @Revision:    0.39
-#
-# = Description
-# = Usage
-# = TODO
-# = CHANGES
+# @Last Change: 2007-03-31.
+# @Revision:    0.42
 
-# require ''
+# require 'deplate/input/deplate.rb'
 
 # Deplate: Headings only
 class Deplate::Input::DeplateHeadings < Deplate::Input
@@ -40,7 +35,10 @@ end
 
 class Deplate::Core
     def input_initialize_deplate
-        @options.input_class = Deplate::Input::DeplateHeadings
+        unless @variables['inputFormat']
+            @options.input_class = Deplate::Input::DeplateHeadings
+            @variables['inputFormat'] = @options.input_class.myname
+        end
     end
 end
 

data/lib/deplate/input/deplate-restricted.rb

@@ -1,17 +1,10 @@
 # deplate-restricted.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-M�r-2005.
-# @Last Change: 14-Apr-2006.
-# @Revision:    0.42
-#
-# = Description
-# = Usage
-# = TODO
-# = CHANGES
-
-# require ''
+# @Last Change: 2007-03-31.
+# @Revision:    0.44
 
 # Deplate: Standard input
 class Deplate::Input::DeplateRestricted < Deplate::Input
@@ -49,19 +42,6 @@ class Deplate::Input::DeplateRestricted < Deplate::Input
         args[:onthefly_particles] ||= false
         super
     end
-
-    def remove_named_elements(hash, field, default, elements)
-        arr = hash[field] ||= default
-        for e in elements
-            case e
-            when String
-                arr.delete(e)
-            else
-                i = arr.index(e)
-                arr.delete(i) if i
-            end
-        end
-    end
     
     def allow_set_variable(var)
         var && var[0..0] == '_'

data/lib/deplate/input/deplate.rb

@@ -1,5 +1,5 @@
 # deplate.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-M�r-2005.

data/lib/deplate/input/play.rb

@@ -0,0 +1,208 @@
+# play.rb
+# @Author:      Thomas Link (micathom AT gmail com)
+# @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# @Created:     2007-03-31.
+# @Last Change: 2007-09-30.
+# @Revision:    0.213
+
+# require 'deplate/input/deplate.rb'
+
+class Deplate::Input::Play < Deplate::Input
+    self.myname = 'play'
+
+    class << self
+        def styled_text(style, text)
+            "{text style=#{style}: #{Deplate::Core.escape_characters(text, :esc => '{}')}}"
+        end
+    end
+
+    def initialize(deplate, args)
+        # deplate.log('WARNING: The play class is in flux and will most likely change', :anyway)
+        args_fill_with_default(args)
+        args[:elements] = [
+            Deplate::Element::Command,
+            Deplate::Element::Region,
+            Deplate::Input::Play::Heading,
+            Deplate::Input::Play::Directive,
+            Deplate::Input::Play::Dialog,
+            Deplate::Element::Anchor,
+            Deplate::Element::Table,
+            Deplate::Element::Whitespace,
+        ]
+        args[:commands] = Deplate::Command.commands
+        args[:commands]['ACT'] = Deplate::Input::Play::ACT
+        args[:commands]['CAST'] = Deplate::Input::Play::CAST
+
+        # args[:particles] = Deplate::Particle.particles + [
+        #     Deplate::Input::Play::Direct,
+        # ]
+        args[:particles] = [
+            Deplate::Input::Play::Direct,
+        ] + Deplate::Particle.particles
+        args[:paragraph_class] = Deplate::Input::Play::General
+        super
+    end
+end
+
+
+class Deplate::Input::Play::ACT < Deplate::Command
+    register_as 'ACT'
+    set_formatter :format_ACT
+end
+
+
+class Deplate::Input::Play::CAST < Deplate::Command
+    register_as 'CAST'
+    set_formatter :format_CAST
+end
+
+
+class Deplate::Input::Play::Direct < Deplate::SimpleParticle
+    set_rx(/^\[([^\[].*?)\]/)
+    # set_rx(/^\(\((.*?)\)\)/)
+    def_get :text, 1
+    set_formatter :format_direct
+end
+
+class Deplate::Input::Play::Heading < Deplate::Element::Heading
+    def finish
+        # m = /^((.*?)\s*::\s*)?(.*?)(\s*--\s*((I|E|X|INT.?|EXT.?|\<|\>)\/)?(.*?))\s*?$/.match(@accum.join)
+        m = /^((.*?)\s*::\s*)?(.*?)(\s*--\s*((.*?)\/)?(.*?))?\s*?$/.match(@accum.join)
+        # @args['plain'] = true
+        @args['playScene']    = m[2]
+        @args['playLocation'] = m[3]
+        @args['playIntExt']   = m[6] || ''
+        @args['playTime']     = m[7] || ''
+        # style = @deplate.variables['playStyle'] || @deplate.variables['class'] || 'hollywood'
+        style = @deplate.variables['playStyle'] || 'hollywood'
+        meth  = "style_#{style}"
+        if respond_to?(meth)
+            @accum = send(meth)
+        else
+            log(['Unknown style', style], :error)
+            @accum = []
+        end
+        update_styles(['play'])
+        # self.html_args = [self.html_args, 'class="play"'].join(' ')
+        # "{text style=play-intext: #{}" unless .empty?
+        # "{text style=play-location: #{m[2].gsub(/[{}]/, '\\\\\\0')}}",
+        # "{text style=play-time: #{m[3].gsub(/[{}]/, '\\\\\\0')}}",
+        super
+    end
+
+    def style_hollywood
+        intext = get_intext()
+        accum = []
+        accum << Deplate::Input::Play.styled_text('play-intext', intext) unless intext.empty?
+        accum << Deplate::Input::Play.styled_text('play-location', @args['playLocation'])
+        if (time = get_time)
+            accum << Deplate::Input::Play.styled_text('play-flexsep', '--') << 
+                Deplate::Input::Play.styled_text('play-right', time)
+        end
+        [accum.join(' ')]
+    end
+
+    def style_austria
+        intext = get_intext('AUSSEN', 'INNEN')
+        accum = []
+        accum << Deplate::Input::Play.styled_text('play-location', @args['playLocation'])
+        accum << Deplate::Input::Play.styled_text('play-flexsep', '--')
+        accum << Deplate::Input::Play.styled_text('play-right', [intext, '/', get_time].join)
+        [accum.join(' ')]
+    end
+
+    def get_intext(ext='EXT.', int='INT.')
+        intext = @args['playIntExt']
+        case intext.upcase
+        when 'I', 'INT', 'INT.', '<'
+            intext = @deplate.variables['int'] || int
+        when 'X', 'E', 'EXT', 'EXT.', '>', 'A'
+            intext = @deplate.variables['ext'] || ext
+        # else
+        #     intext = @deplate.variables['int'] || int
+        end
+        intext
+    end
+
+    def get_time
+        ti = @args['playTime']
+        case ti.upcase
+        when 'D', 'T'
+            @deplate.msg('Day')
+        when 'N'
+            @deplate.msg('Night')
+        when 'M'
+            @deplate.msg('Morning')
+        when 'A', 'E'
+            @deplate.msg('Evening')
+        else
+            ti
+        end
+    end
+end
+
+class Deplate::Input::Play::Directive < Deplate::List::Itemize
+    # register_element
+    set_rx(/^(([[:blank:]]+)([-+])[[:blank:]]+)(.+)$/)
+    self.listtype = 'Itemize'
+
+    def finish_elt
+        # update_styles(['play-directive'])
+        update_styles(['play'])
+        super
+    end
+end
+
+class Deplate::Input::Play::Dialog < Deplate::List::Description
+    # register_element
+    # set_rx(/^(([[:blank:]]+)(.+?)[[:blank:]]+::[[:blank:]])(.*)$/)
+    self.listtype = 'Description'
+
+    def finish_item
+        # sp_alias = @deplate.variables['alias']
+        # if sp_alias
+        #     @item.sub!(/^[[:upper:]]+/) do |text|
+        #         sp_alias[text] || text
+        #     end
+        # end
+        # m = /^(.+?)\s+\[(.+?)\]$/.match(@item)
+        # p = nil
+        # if m
+        #     p = m[1]
+        #     acc = [Deplate::Input::Play.styled_text('play-character', m[1])]
+        #     acc << '{nl}' << Deplate::Input::Play.styled_text('play-direct', m[2]) if m[2]
+        #     @item = acc.join
+        # else
+        p = @item.match(/^\S+/)[0]
+        @item = Deplate::Input::Play.styled_text('play-character', @item)
+        @args['tag'] = [@args['tag'], "#{Deplate::Core.clean_name(p, :extra => ' ')}_speaks"].compact.join(',')
+        # update_styles('play')
+        super
+    end
+
+    def process
+        if @args['cast'] or tagged_as?('cast')
+            push_styles(['play-cast'])
+        else
+            push_styles(['play-dialog'])
+        end
+        super
+    end
+end
+
+class Deplate::Input::Play::General < Deplate::Element::Paragraph
+    def setup
+        update_styles(['play-description'])
+        super
+    end
+end
+
+class Deplate::Core
+    def input_initialize_play
+        # unless @variables['inputFormat']
+            @options.input_class = Deplate::Input::Play
+        #     @variables['inputFormat'] = @options.input_class.myname
+        # end
+    end
+end
+

data/lib/deplate/input/rdoc.rb

@@ -1,10 +1,10 @@
 # rdoc.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-M�r-2005.
-# @Last Change: 06-Jan-2006.
-# @Revision:    0.274
+# @Last Change: 2007-09-01.
+# @Revision:    0.298
 #
 # = Description
 # Based upon Programming Ruby 2, 190ff
@@ -18,7 +18,7 @@ class Deplate::Input::Rdoc < Deplate::Input
     self.myname = 'rdoc'
 
     def initialize(deplate, args)
-        args[:elements] ||= [
+        args[:elements] = [
             Deplate::Input::Rdoc::Directive,
             Deplate::Input::Wiki::HeadingPrefixEqual,
             Deplate::Input::Wiki::OrderedNotIndented,
@@ -32,8 +32,8 @@ class Deplate::Input::Rdoc < Deplate::Input
             # Deplate::Input::Rdoc::NoProcess,
             Deplate::Element::Whitespace,
         ]
-        args[:particles] ||= [
-            Deplate::Particle::Escaped,
+        args[:particles] = [
+            # Deplate::Particle::Escaped,
             Deplate::Input::Rdoc::LabelledLink2,
             Deplate::Input::Rdoc::LabelledLink,
             Deplate::Input::Wiki::ImgUrl,
@@ -47,19 +47,19 @@ class Deplate::Input::Rdoc < Deplate::Input
             Deplate::Input::Rdoc::Bold2,
             Deplate::Input::Rdoc::Typewriter2,
         ]
-        args[:particles_ext]      ||= []
-        args[:commands]  ||= {
+        args[:particles_ext] = []
+        args[:commands] = {
             'include'   => Deplate::Input::Rdoc::Include,
             'title'     => Deplate::Input::Rdoc::Title,
             'maketitle' => Deplate::Command::MAKETITLE,
             'author'    => Deplate::Command::AUTHOR,
         }
-        args[:regions]   ||= {}
-        args[:macros]    ||= {}
-        args[:onthefly_particles] ||= false
-        args[:paragraph_class]    ||= Deplate::Input::Rdoc::ParagraphOrVerbatim
-        args[:comment_class]      ||= Deplate::Input::Rdoc::NoProcess
-        args[:command_class]      ||= Deplate::Input::Rdoc::Directive
+        args[:regions] = {}
+        args[:macros] = {}
+        args[:onthefly_particles] = false
+        args[:paragraph_class]    = Deplate::Input::Rdoc::ParagraphOrVerbatim
+        args[:comment_class]      = Deplate::Input::Rdoc::NoProcess
+        args[:command_class]      = Deplate::Input::Rdoc::Directive
         super
     end
 end
@@ -70,6 +70,14 @@ class Deplate::Input::Rdoc::ParagraphOrVerbatim < Deplate::Input::Wiki::Paragrap
         super
         @args['wrap'] ||= @deplate.variables['verbatimMargin'] || '72'
     end
+
+    def to_be_continued?(line, klass, match)
+      if klass == Deplate::Element::Whitespace
+        return line.size > 0
+      else
+        super
+      end
+    end
 end
 
 class Deplate::Input::Rdoc::Italic2 < Deplate::Particle::Emphasize
@@ -171,7 +179,21 @@ class Deplate::Input::Wiki::OrderedSharpNotIndented < Deplate::List::Ordered
 end
 
 class Deplate::Input::Rdoc::Description1 < Deplate::Input::Wiki::AbstractDescription
-    set_rx(/^(()(\S.*?)\b::[ \t]+)(.*)$/)
+    # set_rx(/^(()(\S.*?)\b::[ \t]+)(.*)$/)
+    set_rx(/^(()(\S.*?)::)(([ \t]+)(.*))?$/)
+    def_get :text, 6
+
+    def to_be_continued?(line, klass, match)
+      unless @accum.empty?
+        return false
+      end
+      case klass
+      when Deplate::Input::Rdoc::ParagraphOrVerbatim
+        return line =~ /^\s+/
+      else
+        super
+      end
+    end
 end
 
 class Deplate::Input::Rdoc::Description2 < Deplate::Input::Wiki::AbstractDescription

data/lib/deplate/input/template.rb

@@ -1,21 +1,16 @@
 # template.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-M�r-2005.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.119
-#
-# = Description
-# = Usage
-# = TODO
-# = CHANGES
-
-# require ''
+# @Last Change: 2007-09-01.
+# @Revision:    0.125
 
 class Deplate::Input::Template < Deplate::Input
+    self.myname = 'template'
+
     def initialize(deplate, args)
-        args.update(Deplate::Template.deplate_options)
+        args.update(Deplate::Template.deplate_options.dup)
         super
         @deplate.options.keep_whitespace = true
     end

data/lib/deplate/lib/Makefile.config

@@ -1,5 +1,5 @@
-BASE={arg: base0}
 FILE={arg: base}
+BASE=$(basename ${FILE})
 OTHER={arg: files}
 
 DEPLATE=deplate
@@ -7,13 +7,14 @@ DEPLATE=deplate
 DFLAGS={arg: options}
 
 HTML_DIR=html
-HTML_DFLAGS=-d $\{HTML_DIR\} -f html
+HTML_PLUS=
+HTML_DFLAGS=$\{HTML_PLUS\} -d $\{HTML_DIR\} -f html
 
 WEBSITE_DIR=website
-WEBSITE_DFLAGS=-d $\{WEBSITE_DIR\} -f htmlsite
+WEBSITE_DFLAGS=$\{HTML_PLUS\} -d $\{WEBSITE_DIR\} -f htmlsite
 
 PHP_DIR=php
-PHP_DFLAGS=-d $\{PHP_DIR\} -f phpsite
+PHP_DFLAGS=$\{HTML_PLUS\} -d $\{PHP_DIR\} -f phpsite
 
 TEX_DIR=tex
 TEX_DFLAGS=-d $\{TEX_DIR\} -f latex
@@ -27,3 +28,51 @@ DBK_DFLAGS=-d $\{DBK_DIR\} -f dbk-article
 REF_DIR=$\{DBK_DIR\}
 REF_DFLAGS=-d $\{REF_DIR\} -f dbk-ref
 
+LATEX_FLAGS=-interaction=nonstopmode
+PDFLATEX_FLAGS=$\{LATEX_FLAGS\}
+BIBTEX_FLAGS=
+
+copy_images=if ls *.{jpg,jpeg,png,gif} 2> /dev/null; then cp -uv *.{jpg,jpeg,png,gif} $(1); fi
+copy_css=if ls *.css 2> /dev/null; then cp -vu *.css $(1); fi
+
+.PHONY: view show cleantex website makefile pdfclean dviclean \
+	dbk html pdf tex text man \
+	prepare_website prepare_html prepare_text prepare_php prepare_dbk \
+	prepare_tex prepare_ref prepare_dvi prepare_pdf
+
+default: html
+
+prepare_website:
+	mkdir -p $\{WEBSITE_DIR\}
+	$(call copy_images,"$\{WEBSITE_DIR\}")
+	$(call copy_css,"$\{WEBSITE_DIR\}")
+
+prepare_html:
+	mkdir -p $\{HTML_DIR\}
+	$(call copy_images,"$\{HTML_DIR\}")
+	$(call copy_css,"$\{HTML_DIR\}")
+
+prepare_text:
+	mkdir -p $\{TEXT_DIR\}
+
+prepare_php:
+	mkdir -p $\{PHP_DIR\}
+	$(call copy_images,"$\{PHP_DIR\}")
+	$(call copy_css,"$\{PHP_DIR\}")
+
+prepare_dbk:
+	mkdir -p $\{DBK_DIR\}cp -uv *.{jpg,jpeg,png,gif} $(1) || echo ... ignore errorcp -uv *.{jpg,jpeg,png,gif} $(1) || echo ... ignore error
+	$(call copy_images,"$\{DBG_DIR\}")
+
+prepare_tex:
+	mkdir -p $\{TEX_DIR\}
+	$(call copy_images,"$\{TEX_DIR\}")
+
+prepare_ref:
+	mkdir -p $\{REF_DIR\}
+
+prepare_dvi:
+
+prepare_pdf:
+
+