w2tags 0.9.58 → 0.9.59

data/Manifest.txt

@@ -21,102 +21,92 @@ lib/w2tags/block/plain_text.rb
 lib/w2tags/block/remark.rb
 lib/w2tags/block/sass.rb
 lib/w2tags/try
-lib/w2tags/try/public
-lib/w2tags/try/try.rb
-lib/w2tags/try/views
-lib/w2tags/try/public/css
-lib/w2tags/try/public/img
-lib/w2tags/try/public/javascripts
-lib/w2tags/try/public/js
-lib/w2tags/try/public/skyeight.jpeg
-lib/w2tags/try/public/stylesheets
-lib/w2tags/try/public/w2
-lib/w2tags/try/public/css/csscolors.css
-lib/w2tags/try/public/css/jscolors.css
-lib/w2tags/try/public/css/rubycolors.css
-lib/w2tags/try/public/css/xmlcolors.css
-lib/w2tags/try/public/img/loading.gif
-lib/w2tags/try/public/javascripts/jquery.cluetip.js
-lib/w2tags/try/public/javascripts/jquery.js
-lib/w2tags/try/public/javascripts/jquery.live.accordion.js
-lib/w2tags/try/public/js/codemirror.js
-lib/w2tags/try/public/js/editor.js
-lib/w2tags/try/public/js/highlight.js
-lib/w2tags/try/public/js/mirrorframe.js
-lib/w2tags/try/public/js/parsecss.js
-lib/w2tags/try/public/js/parsehtmlmixed.js
-lib/w2tags/try/public/js/parsejavascript.js
-lib/w2tags/try/public/js/parsew2tags.js
-lib/w2tags/try/public/js/parsexml.js
-lib/w2tags/try/public/js/select.js
-lib/w2tags/try/public/js/stringstream.js
-lib/w2tags/try/public/js/tokenize.js
-lib/w2tags/try/public/js/tokenizejavascript.js
-lib/w2tags/try/public/js/undo.js
-lib/w2tags/try/public/js/util.js
-lib/w2tags/try/public/stylesheets/back
-lib/w2tags/try/public/stylesheets/icons
-lib/w2tags/try/public/stylesheets/jquery.cluetip.css
-lib/w2tags/try/public/stylesheets/jquery.live.accordion.css
-lib/w2tags/try/public/stylesheets/back/back_menu.gif
-lib/w2tags/try/public/stylesheets/icons/folder-closed.gif
-lib/w2tags/try/public/stylesheets/icons/folder-open.gif
-lib/w2tags/try/public/stylesheets/icons/leaf.gif
-lib/w2tags/try/public/w2/basic.w2erb
-lib/w2tags/try/public/w2/basic1.w2erb
-lib/w2tags/try/public/w2/basic2.w2erb
-lib/w2tags/try/public/w2/basic3.w2erb
-lib/w2tags/try/public/w2/basic4.w2erb
-lib/w2tags/try/public/w2/checkbox.w2erb
-lib/w2tags/try/public/w2/check_onhot.w2erb
-lib/w2tags/try/public/w2/combobox.w2erb
-lib/w2tags/try/public/w2/combo_onhot.w2erb
-lib/w2tags/try/public/w2/demo.hot.html
-lib/w2tags/try/public/w2/diet.w2erb
-lib/w2tags/try/public/w2/diet1.w2erb
-lib/w2tags/try/public/w2/each.w2erb
-lib/w2tags/try/public/w2/each2.w2erb
-lib/w2tags/try/public/w2/erb_base.hot.html
-lib/w2tags/try/public/w2/erb_rails.hot.html
-lib/w2tags/try/public/w2/html.hot.html
-lib/w2tags/try/public/w2/if.w2erb
-lib/w2tags/try/public/w2/layout.w2erb
-lib/w2tags/try/public/w2/layout1.w2erb
-lib/w2tags/try/public/w2/layout2.w2erb
-lib/w2tags/try/public/w2/navigation.w2erb
-lib/w2tags/try/public/w2/nestli.w2erb
-lib/w2tags/try/public/w2/params.erb
-lib/w2tags/try/public/w2/params.w2erb
-lib/w2tags/try/public/w2/popup.w2erb
-lib/w2tags/try/public/w2/popup2.w2erb
-lib/w2tags/try/public/w2/rails.hot.html
-lib/w2tags/try/public/w2/table_each2.w2erb
-lib/w2tags/try/public/w2/table_onhot.w2erb
-lib/w2tags/try/public/w2/table_simple.w2erb
-lib/w2tags/try/public/w2/try.rb.hot.html
-lib/w2tags/try/public/w2/upload.w2erb
-lib/w2tags/try/public/w2/vcard.w2erb
-lib/w2tags/try/views/index.erb
-lib/w2tags/try/views/layout.erb
-lib/w2tags/try/views/parse.erb
+lib\w2tags\try\public
+lib\w2tags\try\try.rb
+lib\w2tags\try\views
+lib\w2tags\try\public\css
+lib\w2tags\try\public\img
+lib\w2tags\try\public\javascripts
+lib\w2tags\try\public\js
+lib\w2tags\try\public\skyeight.jpeg
+lib\w2tags\try\public\stylesheets
+lib\w2tags\try\public\w2
+lib\w2tags\try\public\css\csscolors.css
+lib\w2tags\try\public\css\jscolors.css
+lib\w2tags\try\public\css\rubycolors.css
+lib\w2tags\try\public\css\xmlcolors.css
+lib\w2tags\try\public\img\loading.gif
+lib\w2tags\try\public\javascripts\jquery.cluetip.js
+lib\w2tags\try\public\javascripts\jquery.js
+lib\w2tags\try\public\javascripts\jquery.live.accordion.js
+lib\w2tags\try\public\js\codemirror.js
+lib\w2tags\try\public\js\editor.js
+lib\w2tags\try\public\js\highlight.js
+lib\w2tags\try\public\js\mirrorframe.js
+lib\w2tags\try\public\js\parsecss.js
+lib\w2tags\try\public\js\parsehtmlmixed.js
+lib\w2tags\try\public\js\parsejavascript.js
+lib\w2tags\try\public\js\parsew2tags.js
+lib\w2tags\try\public\js\parsexml.js
+lib\w2tags\try\public\js\select.js
+lib\w2tags\try\public\js\stringstream.js
+lib\w2tags\try\public\js\tokenize.js
+lib\w2tags\try\public\js\tokenizejavascript.js
+lib\w2tags\try\public\js\undo.js
+lib\w2tags\try\public\js\util.js
+lib\w2tags\try\public\stylesheets\back
+lib\w2tags\try\public\stylesheets\icons
+lib\w2tags\try\public\stylesheets\jquery.cluetip.css
+lib\w2tags\try\public\stylesheets\jquery.live.accordion.css
+lib\w2tags\try\public\stylesheets\back\back_menu.gif
+lib\w2tags\try\public\stylesheets\icons\folder-closed.gif
+lib\w2tags\try\public\stylesheets\icons\folder-open.gif
+lib\w2tags\try\public\stylesheets\icons\leaf.gif
+lib\w2tags\try\public\w2\basic.w2erb
+lib\w2tags\try\public\w2\basic1.w2erb
+lib\w2tags\try\public\w2\basic2.w2erb
+lib\w2tags\try\public\w2\basic3.w2erb
+lib\w2tags\try\public\w2\basic4.w2erb
+lib\w2tags\try\public\w2\checkbox.w2erb
+lib\w2tags\try\public\w2\check_onhot.w2erb
+lib\w2tags\try\public\w2\combobox.w2erb
+lib\w2tags\try\public\w2\combo_onhot.w2erb
+lib\w2tags\try\public\w2\demo.hot.html
+lib\w2tags\try\public\w2\diet.w2erb
+lib\w2tags\try\public\w2\diet1.w2erb
+lib\w2tags\try\public\w2\each.w2erb
+lib\w2tags\try\public\w2\each2.w2erb
+lib\w2tags\try\public\w2\erb_base.hot.html
+lib\w2tags\try\public\w2\erb_rails.hot.html
+lib\w2tags\try\public\w2\html.hot.html
+lib\w2tags\try\public\w2\if.w2erb
+lib\w2tags\try\public\w2\input.w2erb
+lib\w2tags\try\public\w2\input_inhot.w2erb
+lib\w2tags\try\public\w2\layout.w2erb
+lib\w2tags\try\public\w2\layout1.w2erb
+lib\w2tags\try\public\w2\layout2.w2erb
+lib\w2tags\try\public\w2\navigation.w2erb
+lib\w2tags\try\public\w2\nestli.w2erb
+lib\w2tags\try\public\w2\params.erb
+lib\w2tags\try\public\w2\params.w2erb
+lib\w2tags\try\public\w2\popup.w2erb
+lib\w2tags\try\public\w2\popup2.w2erb
+lib\w2tags\try\public\w2\rails.hot.html
+lib\w2tags\try\public\w2\table_each2.w2erb
+lib\w2tags\try\public\w2\table_onhot.w2erb
+lib\w2tags\try\public\w2\table_simple.w2erb
+lib\w2tags\try\public\w2\try.rb.hot.html
+lib\w2tags\try\public\w2\upload.w2erb
+lib\w2tags\try\public\w2\vcard.w2erb
+lib\w2tags\try\views\index.erb
+lib\w2tags\try\views\layout.erb
+lib\w2tags\try\views\parse.erb
 hot/demo.hot
 hot/erb.hot
 hot/erb_base.hot
-hot/erb_form.hot
-hot/erb_head.hot
-hot/erb_jquery.hot
-hot/erb_merb.hot
 hot/erb_rails.hot
-hot/erb_table.hot
 hot/html.hot
-hot/jquery.hot
-hot/nvelocity.hot
 hot/rails.hot
-hot/vm2.hot
-hot/vm.hot
-hot/vm_crud.hot
-hot/vm_popup.hot
-hot/xul.hot
 hot/rails/scaffold.hot
 hot/rails/sc_zebra.hot
 spec/spec_helper.rb

data/hot/demo.hot

@@ -1,6 +1,6 @@
 >>_nav
- %ul$#
-   -itm$. $*
+%ul$#
+  -itm$. $*
 
 >>_itm
 %li$. <a href="#">$0</a>
@@ -20,11 +20,25 @@
     ^{value="=$1"}= $2
 
 >>_check
-%label{for="*#"}
-  %input$#{type="checkbox"}
-  $0
+%input$#{type="checkbox"}
+%label{for="*#"} $0
 
 >>_area
-%label{for="*#"} $0<
-  %textarea$$
+%label{for="*#"} $0
+%textarea:*#$#$@
+  
+>>_input
+%label{for="*#"} $0
+:*#$#{type="text"}
+  
+>>_tarea_li
+%li
+  -area$$ $0
+  
+>>_input_li
+%li
+  -input$$ $0
 
+>>_submit_li
+%li$$
+  %button{type="submit"} $0

data/hot/html.hot

@@ -67,3 +67,11 @@
 
 >>post
 %form$:$#.lelouch.*.{*@method="post"~action="$0"~}
+
+>>_ie
+<!--[if IE]>
+--if_end
+
+>>_ie_end
+<</
+<![endif]-->

data/lib/w2tags/block/block_hot.rb

@@ -9,7 +9,7 @@ module W2Tags
       
       def bhot_skip
         @rgx = nil
-        if(/(^[\t ]*)(!H!) *(\w+)\n/ =~ @row;@rgx = $~)
+        if(/(^[\t ]*)(!H!) *(\w+) *\n/ =~ @row;@rgx = $~)
           @key_hot= $3.strip
           @doc_hot= [] #bhot buffer
           @bht = @spc.size

data/lib/w2tags/block/sass.rb

@@ -10,7 +10,7 @@ module W2Tags
       
       def sass_skip
         @rgx = nil
-        if(/(^[\t ]*)(~~~)\n/ =~ @row;@rgx = $~)
+        if(/(^[\t ]*)(~~~) *\n/ =~ @row;@rgx = $~)
           @row = ''
           @sas = @spc.size
           @doc_sas = [[' '*@sas,"<style>\n"].join]

data/lib/{w2tags/try/public/css → /w2tags//try//public//css/}/rubycolors.css

@@ -1,18 +1,20 @@
 .editbox {
-  padding: .4em;
+/*padding: .4em;
+  line-height: 1.1em;*/
+  line-height:1.02em;
   margin: 0;
   font-family: inconsolata, consolas, monospace;
   font-size: 12pt;
-  line-height: 1.1em;
   color: black;
   background-color:#000000;
   color:#F8F8F8;
 }
 
 .editbox .rb-linenum {
+  line-height:1.02em;
   background-color:#EEEEEE;
   color:#888888;
-  padding:0.1em 1em 0.2em 0;
+/* padding:0.1em 1em 0.2em 0;*/
   width:75px;
 }
 .editbox .rb-pan {

data/lib/{w2tags/try/public/js → /w2tags//try//public//js/}/parsew2tags.js

@@ -14,10 +14,19 @@ var CSSParser = Editor.Parser = (function() {
       if (ch == "=") { source.nextWhileMatches(/\w/); return "rb-operator"; } else 
       if (ch == "@") { source.nextWhileMatches(/\w/); return "rb-keyword";  } else 
       if (ch == "$") { source.nextWhileMatches(/[\d*]/); return "rb-regexp";   } else 
+      if (ch == "!" && source.equals("h")) { source.nextWhileMatches(/./); return "rb-regexp";  } else
       if (ch == "!" && source.equals("H")) { source.nextWhileMatches(/./); return "rb-regexp";  } else
       if (ch == "/" && source.equals("*")) {
         setState(inCComment);
         return null;
+      } /*
+      else if (ch == "@") {
+        source.nextWhileMatches(/\w/);
+        return "css-at";
+      }
+      else if (ch == "/" && source.equals("*")) {
+        setState(inCComment);
+        return null;
       }
       else if (ch == "<" && source.equals("!")) {
         setState(inSGMLComment);
@@ -29,15 +38,20 @@ var CSSParser = Editor.Parser = (function() {
       else if (source.equals("=") && (ch == "~" || ch == "|")) {
         source.next();
         return "css-compare";
-      }
+      } */
       else if (ch == "\"" || ch == "'") {
         setState(inString(ch));
         return null;
-      }
+      } /*
       else if (ch == "#") {
         source.nextWhileMatches(/\w/);
         return "css-hash";
       }
+      else if (ch == "!") {
+        source.nextWhileMatches(/[ \t]/);
+        source.nextWhileMatches(/\w/);
+        return "css-important";
+      } */
       else if (/\d/.test(ch)) {
         source.nextWhileMatches(/[\w.%]/);
         return "css-unit";
@@ -46,7 +60,7 @@ var CSSParser = Editor.Parser = (function() {
         return "css-select-op";
       }
       else if (/[;{}:\[\]]/.test(ch)) {
-        return "rb-heredoc";
+        return "css-punctuation";
       }
       else {
         source.nextWhileMatches(/[\w\\\-_]/);
@@ -66,7 +80,7 @@ var CSSParser = Editor.Parser = (function() {
       }
       return "css-comment";
     }
-
+    /* 
     function inSGMLComment(source, setState) {
       var dashes = 0;
       while (!source.endOfLine()) {
@@ -78,7 +92,7 @@ var CSSParser = Editor.Parser = (function() {
         dashes = (ch == "-") ? dashes + 1 : 0;
       }
       return "css-comment";
-    }
+    }*/
 
     function inString(quote) {
       return function(source, setState) {
@@ -91,7 +105,7 @@ var CSSParser = Editor.Parser = (function() {
         }
         if (!escaped)
           setState(normal);
-        return "rb-string";
+        return "css-string";
       };
     }
 
@@ -102,9 +116,11 @@ var CSSParser = Editor.Parser = (function() {
 
   function indentCSS(inBraces, inRule, base) {
     return function(nextChars) {
-      if (!inBraces || /^\}/.test(nextChars)) return base;
-      else if (inRule) return base + indentUnit * 2;
-      else return base + indentUnit;
+      /*if (!inBraces || /^\}/.test(nextChars)) return base;
+      else 
+      if (inRule) return base + indentUnit * 2;
+      else return base + indentUnit; */
+      return 0;
     };
   }
 

data/lib//w2tags//try//public//w2//checkbox.w2erb

@@ -0,0 +1,16 @@
+%fieldset
+  %legend Which of the following sports do you enjoy?
+  %input#football{type="checkbox"}
+  %label{for="football"} Football
+  %input#golf{type="checkbox"}
+  %label{for="golf"} Golf
+  %input#rugby{type="checkbox"}
+  %label{for="rugby"} Rugby
+  %input#tennis{type="checkbox"}
+  %label{for="tennis"} Tennis
+  %input#basketball{type="checkbox"}
+  %label{for="basketball"} Basketball
+  %input#boxing{type="checkbox"}
+  %label{for="boxing"} Boxing
+  %label{for="comments"} Comments
+  %textarea#comments{rows="7" cols="25"}

data/lib//w2tags//try//public//w2//input.w2erb

@@ -0,0 +1,18 @@
+-#http://webdesignernotebook.com/examples/style-form.html
+%form{action="/form"}
+  %p Send us your comments and feedback:
+  %ol
+    %li
+      %label{for="name"} Name
+      :name#name{type="text"}
+    %li
+      %label{for="email"} Email
+      :email#email{type="text"}
+    %li
+      %label{for="website"} Website
+      :website#website{type="text"}
+    %li
+      %label{for="message"} Message
+      %textarea:message#message
+    %li#send
+      %button{type="submit"} Send

data/lib//w2tags//try//public//w2//input_inhot.w2erb

@@ -0,0 +1,10 @@
+-#http://webdesignernotebook.com/examples/style-form.html
+!hot!demo
+%form{action="/form"}
+  %p Send us your comments and feedback:
+  %ol
+    -input_li#name    Name
+    -input_li#email   Email
+    -input_li#website Website
+    -tarea_li#message Message
+    -submit_li#send   Send

data/lib//w2tags//try//public//w2//layout1.w2erb

@@ -0,0 +1,7 @@
+%xhtml 1.1
+  %head
+    %title Todo
+    %link{rel='stylesheet' href='/stylesheets/style.css' type = "text/css"}       
+  %body
+    #banner My To Do List
+    = yield

data/lib//w2tags//try//public//w2//layout2.w2erb

@@ -0,0 +1,20 @@
+%xhtml 1.1
+  %head
+    = stylesheet_link_tag "compiled/screen.css", :media => "screen, projection"
+    = stylesheet_link_tag "compiled/print.css", :media => "print"
+    -ie
+      = stylesheet_link_tag "compiled/ie.css", :media => "screen, projection"
+  %body
+    .container
+      #Header
+        = link_to "Wikicards", root_path
+      #Main
+        .content
+          -each2 flash;key,value
+            = content_tag 'p', h(value), :class => key.to_s
+          = yield
+        .navigation
+          navigation
+      #Footer
+        %hr
+        about blog