deplate 0.7.3 → 0.8

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

@@ -3,8 +3,8 @@
 # @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.36
+# @Last Change: 20-Nov-2005.
+# @Revision:    0.39
 #
 # = Description
 # = Usage
@@ -31,16 +31,14 @@ class Deplate::Input::DeplateHeadings < Deplate::Input
 end
 
 class Deplate::Element::Swallowed < Deplate::Element::Paragraph
-    @formatter = :format_paragraph
-    @rx = /^([ \t]*)(.*)[ \t]*$/
+    set_formatter :format_paragraph
+    set_rx(/^([ \t]*)(.*)[ \t]*$/)
     def finish
         nil
     end
 end
 
 class Deplate::Core
-    # declare_input_format(Deplate::Input::DeplateHeadings)
-
     def input_initialize_deplate
         @options.input_class = Deplate::Input::DeplateHeadings
     end

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

@@ -3,8 +3,8 @@
 # @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.27
+# @Last Change: 14-Apr-2006.
+# @Revision:    0.42
 #
 # = Description
 # = Usage
@@ -23,7 +23,8 @@ class Deplate::Input::DeplateRestricted < Deplate::Input
                               Deplate::Command::INC,
                               # Deplate::Command::IMG, 
                               Deplate::Command::MODULE, 
-                              "WITH", "ABBREV",
+                              Deplate::Command::WITH,
+                              Deplate::Command::ABBREV,
         ])
         remove_named_elements(args, :regions, Deplate::Region.regions, [
                               Deplate::Regions::DefCommand,
@@ -32,12 +33,15 @@ class Deplate::Input::DeplateRestricted < Deplate::Input
                               Deplate::Regions::DefRegionN,
                               Deplate::Regions::DefMacro,
                               Deplate::Regions::DefMacroN,
-                              "Native", "Inlatex", "Img", "R", "Ruby", 
+                              Deplate::Regions::Native,
+                              Deplate::Regions::Img,
+                              Deplate::Regions::R,
+                              Deplate::Regions::Ruby,
         ])
         remove_named_elements(args, :macros, Deplate::Macro.macros, [
                               Deplate::Macro::Insert, 
-                              Deplate::Macro::Latex, 
-                              Deplate::Macro::Math, 
+                              # Deplate::Macro::Latex, 
+                              # Deplate::Macro::Math, 
                               Deplate::Macro::Ruby,
         ])
         # remove_named_elements(args, :particles, Deplate::Particle.particles, [])
@@ -54,15 +58,17 @@ class Deplate::Input::DeplateRestricted < Deplate::Input
                 arr.delete(e)
             else
                 i = arr.index(e)
-                arr.delete(e) if i
+                arr.delete(i) if i
             end
         end
     end
+    
+    def allow_set_variable(var)
+        var && var[0..0] == '_'
+    end
 end
 
 class Deplate::Core
-    # declare_input_format(Deplate::Input::DeplateRestricted)
-    
     def input_initialize_deplate
         @options.input_class = Deplate::Input::DeplateRestricted
     end

data/lib/deplate/input/deplate.rb

@@ -3,8 +3,8 @@
 # @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.15
+# @Last Change: 20-Nov-2005.
+# @Revision:    0.16
 #
 # = Description
 # = Usage
@@ -19,8 +19,6 @@ class Deplate::Input::VikiDeplate < Deplate::Input
 end
 
 class Deplate::Core
-    # declare_input_format(Deplate::Input::VikiDeplate)
-    
     def input_initialize_deplate
         @options.input_class = Deplate::Input
     end

data/lib/deplate/input/rdoc.rb

@@ -3,8 +3,8 @@
 # @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.251
+# @Last Change: 06-Jan-2006.
+# @Revision:    0.274
 #
 # = Description
 # Based upon Programming Ruby 2, 190ff
@@ -21,8 +21,8 @@ class Deplate::Input::Rdoc < Deplate::Input
         args[:elements] ||= [
             Deplate::Input::Rdoc::Directive,
             Deplate::Input::Wiki::HeadingPrefixEqual,
-            Deplate::Input::Wiki::NumberedNotIndented,
-            Deplate::Input::Wiki::NumberedSharpNotIndented,
+            Deplate::Input::Wiki::OrderedNotIndented,
+            Deplate::Input::Wiki::OrderedSharpNotIndented,
             Deplate::Input::Wiki::ItemizeNotIndented,
             Deplate::Input::Rdoc::Description4,
             Deplate::Input::Rdoc::Description3,
@@ -36,7 +36,7 @@ class Deplate::Input::Rdoc < Deplate::Input
             Deplate::Particle::Escaped,
             Deplate::Input::Rdoc::LabelledLink2,
             Deplate::Input::Rdoc::LabelledLink,
-            Deplate::Input::Rdoc::ImgUrl,
+            Deplate::Input::Wiki::ImgUrl,
             Deplate::Input::Rdoc::Link,
             Deplate::HyperLink::Url,
             Deplate::Input::Wiki::ItalicWordSingleUnderscore,
@@ -65,7 +65,7 @@ class Deplate::Input::Rdoc < Deplate::Input
 end
 
 class Deplate::Input::Rdoc::ParagraphOrVerbatim < Deplate::Input::Wiki::ParagraphIndentedVerbatim
-    @rx = Deplate::Input::Wiki::ParagraphIndentedVerbatim.rx
+    set_rx Deplate::Input::Wiki::ParagraphIndentedVerbatim.rx
     def setup
         super
         @args['wrap'] ||= @deplate.variables['verbatimMargin'] || '72'
@@ -73,32 +73,37 @@ class Deplate::Input::Rdoc::ParagraphOrVerbatim < Deplate::Input::Wiki::Paragrap
 end
 
 class Deplate::Input::Rdoc::Italic2 < Deplate::Particle::Emphasize
-    @rx = /^<em>(.+?)<\/em>/
+    set_rx(/^<em>(.+?)<\/em>/)
 end
 
 class Deplate::Input::Rdoc::Italic3 < Deplate::Particle::Emphasize
-    @rx = /^<i>(.+?)<\/i>/
+    set_rx(/^<i>(.+?)<\/i>/)
 end
 
 class Deplate::Input::Rdoc::Bold2 < Deplate::Particle::Emphasize
-    @rx = /^<b>(.+?)<\/b>/
+    set_rx(/^<b>(.+?)<\/b>/)
+    def setup
+        @args['style'] = 'bold'
+        update_styles
+        super
+    end
 end
 
 class Deplate::Input::Rdoc::Typewriter2 < Deplate::Particle::Code
-    @rx = /^<tt>(.+?)<\/tt>/
-end
-
-class Deplate::Input::Rdoc::ImgUrl < Deplate::Input::Wiki::AbstractImgUrl
-    @rx = /^((file|https?|mailto|ftps?|www):(\S+?)\.(png|jpg|jpeg|gif|bmp))/
+    set_rx(/^<tt>(.+?)<\/tt>/)
 end
 
 class Deplate::Input::Rdoc::Link < Deplate::HyperLink::Extended
-    @rx = /^link:([^+*&<>,.\t :!?#]+(\.\w+)?)(#([^+*?&<>\\\/,.:!?]+?))?/
+    set_rx(/^link:([^+*&<>,.\t :!?#]+(\.\w+)?)(#([^+*?&<>\\\/,.:!?]+?))?/)
     
     def get_destination
         @match[1]
     end
 
+    def get_interwiki
+        nil
+    end
+
     def get_anchor
         @match[4]
     end
@@ -113,12 +118,16 @@ class Deplate::Input::Rdoc::Link < Deplate::HyperLink::Extended
 end
 
 class Deplate::Input::Rdoc::LabelledLink < Deplate::HyperLink::Extended
-    @rx = /^(\S+)\[((file|https?|mailto|ftps?|www):.*?)(#(.+))?\]/
+    set_rx(/^(\S+)\[((file|https?|mailto|ftps?|www):.*?)(#(.+))?\]/)
     
     def get_destination
         @match[2]
     end
 
+    def get_interwiki
+        nil
+    end
+
     def get_anchor
         @match[5]
     end
@@ -133,12 +142,16 @@ class Deplate::Input::Rdoc::LabelledLink < Deplate::HyperLink::Extended
 end
 
 class Deplate::Input::Rdoc::LabelledLink2 < Deplate::HyperLink::Extended
-    @rx = /^\{(.+?)\}\[((file|https?|mailto|ftps?|www):.*?)(#(.+))?\]/
+    set_rx(/^\{(.+?)\}\[((file|https?|mailto|ftps?|www):.*?)(#(.+))?\]/)
     
     def get_destination
         @match[2]
     end
 
+    def get_interwiki
+        nil
+    end
+
     def get_anchor
         @match[5]
     end
@@ -152,39 +165,29 @@ class Deplate::Input::Rdoc::LabelledLink2 < Deplate::HyperLink::Extended
     end
 end
 
-class Deplate::Input::Wiki::NumberedSharpNotIndented < Deplate::List::Numbered
+class Deplate::Input::Wiki::OrderedSharpNotIndented < Deplate::List::Ordered
     include Deplate::Input::Wiki::ListExtra
-    @formatter = :format_list
-    @name = "Numbered"
-    @rx   = /^(()(#)[ \t]+)(.+)$/
+    set_rx(/^(()(#)[ \t]+)(.+)$/)
 end
 
 class Deplate::Input::Rdoc::Description1 < Deplate::Input::Wiki::AbstractDescription
-    @rx = /^(()(\S.*?)\b::[ \t]+)(.*)$/
-    @formatter = :format_list
-    @name = "Description"
+    set_rx(/^(()(\S.*?)\b::[ \t]+)(.*)$/)
 end
 
 class Deplate::Input::Rdoc::Description2 < Deplate::Input::Wiki::AbstractDescription
-    @rx = /^(()\+(.*?)\+::[ \t]+)(.*)$/
-    @formatter = :format_list
-    @name = "Description"
+    set_rx(/^(()\+(.*?)\+::[ \t]+)(.*)$/)
 end
 
 class Deplate::Input::Rdoc::Description3 < Deplate::Input::Wiki::AbstractDescription
-    @rx = /^(()\[(.+?)\][ \t]+)(.*)$/
-    @formatter = :format_list
-    @name = "Description"
+    set_rx(/^(()\[(.+?)\][ \t]+)(.*)$/)
 end
 
 class Deplate::Input::Rdoc::Description4 < Deplate::Input::Wiki::AbstractDescription
-    @rx = /^(()\[\+(.+?)\+\][ \t]+)(.*)$/
-    @formatter = :format_list
-    @name = "Description"
+    set_rx(/^(()\[\+(.+?)\+\][ \t]+)(.*)$/)
 end
 
 class Deplate::Input::Rdoc::NoProcess < Deplate::Element
-    @rx = /^(\s*)#--/
+    set_rx(/^(\s*)#--/)
    
     def setup
         @endRx = /^(\s*)#\+\+/
@@ -195,11 +198,11 @@ class Deplate::Input::Rdoc::NoProcess < Deplate::Element
 end
 
 class Deplate::Input::Rdoc::Directive < Deplate::Element::Command
-    @rx = /^\s*:(call-seq|include|title|main|stopdoc|startdoc|enddoc|maketitle|author):\s*(.*?)\s*$/
+    set_rx(/^\s*:(call-seq|include|title|main|stopdoc|startdoc|enddoc|maketitle|author):\s*(.*?)\s*$/)
     @enddoc = false
    
     class << self
-        def is_volatile?(match)
+        def is_volatile?(match, input)
             case match[1]
             when "title"
                 true
@@ -265,8 +268,6 @@ end
 # :main: name
 
 class Deplate::Core
-    # declare_input_format(Deplate::Input::Rdoc)
-    
     def input_initialize_rdoc
         unless @variables['inputFormat']
             @options.input_class = Deplate::Input::Rdoc

data/lib/deplate/lib/Makefile.config

@@ -0,0 +1,29 @@
+BASE={arg: base0}
+FILE={arg: base}
+OTHER={arg: files}
+
+DEPLATE=deplate
+
+DFLAGS={arg: options}
+
+HTML_DIR=html
+HTML_DFLAGS=-d $\{HTML_DIR\} -f html
+
+WEBSITE_DIR=website
+WEBSITE_DFLAGS=-d $\{WEBSITE_DIR\} -f htmlsite
+
+PHP_DIR=php
+PHP_DFLAGS=-d $\{PHP_DIR\} -f phpsite
+
+TEX_DIR=tex
+TEX_DFLAGS=-d $\{TEX_DIR\} -f latex
+
+TEXT_DIR=plain
+TEXT_DFLAGS=-d $\{TEXT_DIR\} -f plain
+
+DBK_DIR=docbook
+DBK_DFLAGS=-d $\{DBK_DIR\} -f dbk-article
+
+REF_DIR=$\{DBK_DIR\}
+REF_DFLAGS=-d $\{REF_DIR\} -f dbk-ref
+

data/lib/deplate/lib/latex/deplate.sty

@@ -0,0 +1,54 @@
+% Custom lists
+\\newcommand{\\customListPrefs}{\\setlength{\\parsep}{0cm}\\setlength{\\itemsep}{0cm}}
+\\newenvironment{customList}{\\begin{list}{}{\\customListPrefs{}}}{\\end{list}}
+\\newcommand{\\customItem}[2]{\\item[#1] #2}
+
+% Task lists
+\\newenvironment{tasklist}{\\begin{list}{}{\\customListPrefs{}}}{\\end{list}}
+\\newcommand{\\task}[2]{\\item[\\textbf{#1}] #2}
+
+% \\usepackage{color}
+\\definecolor{taskA}{rgb}{1,.5,.5}
+\\definecolor{taskB}{rgb}{.5,1,.5}
+\\definecolor{taskC}{rgb}{.5,.5,1}
+\\definecolor{taskD}{rgb}{.5,1,1}
+\\definecolor{taskE}{rgb}{1,.5,1}
+\\definecolor{taskF}{rgb}{1,1,.5}
+\\definecolor{taskdone}{rgb}{.5,.5,.5}
+
+\\newcommand{\\taskdone}[1]{{\\footnotesize\\textcolor{taskdone}{#1}}}
+% \\newcommand{\\taskdone}[1]{\\sout{\\textcolor{taskdone}{#1}}}
+\\newcommand{\\taskA}[1]{\\colorbox{taskA}{#1}}
+\\newcommand{\\taskB}[1]{\\colorbox{taskB}{#1}}
+\\newcommand{\\taskC}[1]{\\colorbox{taskC}{#1}}
+\\newcommand{\\taskD}[1]{\\colorbox{taskD}{#1}}
+\\newcommand{\\taskE}[1]{\\colorbox{taskE}{#1}}
+\\newcommand{\\taskF}[1]{\\colorbox{taskF}{#1}}
+
+% Text styles
+\\newcommand{\\emphStyle}{\\em}
+\\newcommand{\\emphSpan}[1]{\\emph{#1}}
+\\newcommand{\\boldSpan}[1]{\\textbf{#1}}
+\\newcommand{\\remoteSpan}[1]{#1}
+
+\\newenvironment{overlayBlock}{}{}
+\\newenvironment{scriptsizeBlock}{\\scriptsize{}}{}
+\\newenvironment{boxBlock}{}{}
+\\newenvironment{footnotesizeBlock}{\\footnotesize{}}{}
+\\newenvironment{smallBlock}{\\small{}}{}
+\\newenvironment{landscapeBlock}{}{}
+\\newenvironment{gridBlock}{}{}
+\\newenvironment{formalBlock}{}{}
+
+
+% From the Deplate manual
+\\newenvironment{todoBlock}{}{}
+
+\\newenvironment{bookBlock}{}{}
+\\newenvironment{booksList}{\\begin{list}{}{\\customListPrefs{}}}{\\end{list}}
+\\newcommand{\\booksItem}[2]{\\item[\\textbf{#1}] #2}
+
+\\newenvironment{exampleBlock}{\\bfseries{}}{}
+\\newenvironment{examplesList}{\\begin{list}{}{\\customListPrefs{}}}{\\end{list}}
+\\newcommand{\\examplesItem}[2]{\\item[#1] #2}
+

data/lib/deplate/lib/php/page-comment.inc.php

@@ -0,0 +1,216 @@
+<?php
+/**
+ * page-comments.inc.php
+ * @author   Thomas Link (samul AT web de)
+ * @license  GPL (see http://www.gnu.org/licenses/gpl.txt)
+ * @created  21-Apr-2006.
+ * @date     07-Mai-2006.
+ * @version  0.99
+ *
+ * TODO:
+ * - MySQL backend
+ * - Login
+ * - User interface (edit own messages)
+ * - Admin interface (delete, edit messages)
+ */
+
+
+@include('page-comment.cfg.php');
+
+if (!defined(PAGE_COMMENT_BACKEND))
+    define('PAGE_COMMENT_BACKEND', '{arg default=file: commentBackend}');
+
+#IF: commentBackend==mysql
+if (!defined(PAGE_COMMENT_MYSQL_HOST))
+    define('PAGE_COMMENT_MYSQL_HOST', '{arg default=localhost: commentDbHost}');
+
+if (!defined(PAGE_COMMENT_MYSQL_USER))
+    define('PAGE_COMMENT_MYSQL_USER', '{arg default=user: commentDbUser}');
+
+if (!defined(PAGE_COMMENT_MYSQL_PW))
+    define('PAGE_COMMENT_MYSQL_PW', '{arg: commentDbPassword}');
+
+function page_comment_commit_mysql($page, $def) {
+    // <+TBD+>
+}
+
+function page_comment_retrieve_mysql($page) {
+    // <+TBD+>
+}
+
+#ELSE
+if (!defined(PAGE_COMMENT_FDIR))
+    define('PAGE_COMMENT_FDIR', '{arg default=%s__comments: commentFdir}');
+
+function page_comment_commit_file($page, $def) {
+    $def  = serialize($def);
+    $mid  = page_comment_msg_id();
+    $pdir = sprintf(PAGE_COMMENT_FDIR, $page);
+    $fn   = "$pdir/$mid";
+    if (!is_file($fn)) {
+        if (!is_dir($pdir))
+            mkdir($pdir);
+        $h = fopen($fn, 'w');
+        if ($h) {
+            fwrite($h, $def);
+            fclose($h);
+            return $mid;
+        }
+    }
+    return null;
+}
+
+function page_comment_retrieve_file($page) {
+    $pdir = sprintf(PAGE_COMMENT_FDIR, $page);
+    if (is_dir($pdir)) {
+        $h = opendir($pdir);
+        while ($file = readdir($h)) { 
+            if ($file != '.' && $file != '..') { 
+                $def = file_get_contents("$pdir/$file");
+                $def = unserialize($def);
+                $idx = $def['date'];
+                $comments[$idx] = $def;
+            } 
+        }
+        closedir($h);
+
+        ksort($comments);
+        return $comments;
+    }
+}
+
+#ENDIF
+
+
+function page_comment_form($page) {
+    ?>
+<div class="comment_form">
+    <form action="" name="comment" method="post">
+        <input type="hidden" name="page" value="<?php echo page_comment_id($page);?>">
+        <table class="comment_form">
+            <tr class="comment_form">
+                <td class="comment_form">{msg: Name}:</td>
+                <td class="comment_form"><input type="text" name="name" value="" size="50" maxlength="50" /></td>
+            </tr>
+            <tr class="comment_form">
+                <td class="comment_form">{msg: E-Mail}:</td>
+                <td class="comment_form"><input type="text" name="email" value="" size="50" maxlength="50" /></td>
+            </tr>
+            <tr class="comment_form">
+                <td class="comment_form">{msg: Subject}:</td>
+                <td class="comment_form"><input type="text" name="subject" value="" size="50" maxlength="30" /></td>
+            </tr>
+            <tr>
+                <td class="comment_form">{msg: Comment}:</td>
+                <td class="comment_form"><textarea name="text" cols="70" rows="8"></textarea></td>
+            </tr>
+            <tr class="comment_form">
+                <td class="comment_form">&nbsp;</td>
+                <td class="comment_form">
+                    <button name="submit" value="<?php echo $page;?>" type="submit">{msg: Submit}</button>
+                    <button name="reset" type="reset">{msg: Cancel}</button>
+                </td>
+            </tr>
+        </table>
+    </form>
+</div>
+<?php
+}
+
+function page_comment_view($def) {
+    $name  = htmlentities($def['name']);
+    $email = htmlentities($def['email']);
+    $subj  = htmlentities($def['subject']);
+    $date  = $def['date'];
+    $text  = str_replace("\\n", "<br/>\\n", htmlentities($def['text']));
+    echo <<<EOT
+<div class="comment">
+    <div class="comment_title">
+        <span class="comment_author">$name</span>
+        <span class="comment_subject">$subj</span>
+EOT;
+    if ($date) {
+        // $date = strftime('%x %X', $date);
+        $date = strftime('%d. %B %y, %X', $date);
+        echo <<<EOT
+        <br/><span class="comment_date">$date</span>
+EOT;
+    }
+    echo <<<EOT
+    </div>
+    <div class="comment_text">
+        $text
+    </div>
+</div>
+EOT;
+}
+
+function page_comment_list($page) {
+    $fn       = 'page_comment_retrieve_'. PAGE_COMMENT_BACKEND;
+    $comments = $fn($page);
+    if ($comments) {
+        foreach($comments as $def) {
+            page_comment_view($def);
+        }
+    }
+}
+
+/**
+ * Get the message ID
+ */
+function page_comment_msg_id() {
+    global $r_name, $r_email, $r_submit, $r_text, $r_subject;
+    return md5("$r_name\\n$r_email\\n$r_subject\\n$r_text");
+}
+
+/**
+ * Get an ID for a page name
+ */
+function page_comment_id($page) {
+    // <+TBD+> encrypt/hash: date + salt + page name
+    return $page;
+}
+
+/**
+ * List comments and view an entry form.
+ */
+function page_comment($page) {
+    #IF: commentLocale
+    setlocale(LC_ALL, "{arg: commentLocale}");
+    #ENDIF
+    import_request_variables('p', 'r_');
+    global $r_name, $r_email, $r_submit, $r_text, $r_subject;
+
+    // if ($r_submit === $page and $r_text) {
+    if ($r_submit and $page === page_comment_id($page) and $r_text) {
+        if (!$r_name)
+            $r_name = "{msg: Anonymous}";
+        $def = array(
+            'name'         => $r_name,
+            'email'        => $r_email,
+            'subject'      => $r_subject,
+            'text'         => $r_text,
+            'date'         => time(),
+            'user_ip'      => getenv('REMOTE_ADDR'),
+            'user_host'    => getenv('REMOTE_HOST'),
+            'user_ref'     => getenv('HTTP_REFERER'),
+            'user_agent'   => getenv('HTTP_USER_AGENT'),
+            'user_request' => getenv('REQUEST_URI'),
+        );
+        $fn = 'page_comment_commit_'. PAGE_COMMENT_BACKEND;
+        if ($mid = $fn($page, $def)) {
+            $email = '{arg: commentEmail}';
+            if ($email) {
+                $subj = sprintf('{arg default=[Comment] %s -- %s: commentSubject}',
+                    $page, $mid);
+                @mail($email, $subj, var_export($def, true), 
+                    "From: $email\\r\\nX-Mailer: PHP/" . phpversion());
+            }
+        }
+    }
+
+    page_comment_list($page);
+    
+    page_comment_form($page);
+}
+?>