assorted-commits Mailing List for Assorted projects (Page 4)
Brought to you by:
yangzhang
You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(9) |
Dec
(12) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(86) |
Feb
(265) |
Mar
(96) |
Apr
(47) |
May
(136) |
Jun
(28) |
Jul
(57) |
Aug
(42) |
Sep
(20) |
Oct
(67) |
Nov
(37) |
Dec
(34) |
2009 |
Jan
(39) |
Feb
(85) |
Mar
(96) |
Apr
(24) |
May
(82) |
Jun
(13) |
Jul
(10) |
Aug
(8) |
Sep
(2) |
Oct
(20) |
Nov
(31) |
Dec
(17) |
2010 |
Jan
(16) |
Feb
(11) |
Mar
(17) |
Apr
(53) |
May
(31) |
Jun
(13) |
Jul
(3) |
Aug
(6) |
Sep
(11) |
Oct
(4) |
Nov
(17) |
Dec
(17) |
2011 |
Jan
(3) |
Feb
(19) |
Mar
(5) |
Apr
(17) |
May
(3) |
Jun
(4) |
Jul
(14) |
Aug
(3) |
Sep
(2) |
Oct
(1) |
Nov
(3) |
Dec
(2) |
2012 |
Jan
(3) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(1) |
Jun
|
Jul
(4) |
Aug
(5) |
Sep
(2) |
Oct
(3) |
Nov
|
Dec
|
2013 |
Jan
|
Feb
|
Mar
(9) |
Apr
(5) |
May
|
Jun
(2) |
Jul
(1) |
Aug
(10) |
Sep
(1) |
Oct
(2) |
Nov
|
Dec
|
2014 |
Jan
(1) |
Feb
(3) |
Mar
(3) |
Apr
(1) |
May
(4) |
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
2016 |
Jan
(1) |
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
2017 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(5) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <yan...@us...> - 2012-02-10 09:05:54
|
Revision: 1827 http://assorted.svn.sourceforge.net/assorted/?rev=1827&view=rev Author: yangzhang Date: 2012-02-10 09:05:45 +0000 (Fri, 10 Feb 2012) Log Message: ----------- Consolidate JS, remove email obfuscation JS Modified Paths: -------------- personal-site/trunk/Makefile personal-site/trunk/src/footer.html personal-site/trunk/src/header.html personal-site/trunk/src/index.txt Modified: personal-site/trunk/Makefile =================================================================== --- personal-site/trunk/Makefile 2012-02-10 08:59:45 UTC (rev 1826) +++ personal-site/trunk/Makefile 2012-02-10 09:05:45 UTC (rev 1827) @@ -23,7 +23,7 @@ sed 's/<body>/<div style="float:right"> <a href="https://twitter.com/yaaang" class="twitter-follow-button" data-show-count="true" data-size="large" data-align="right" data-width="260px">Follow @yaaang</a> </div> - <body onload="javascript:body_onload();">/' > $(PLAIN) + <body>/' > $(PLAIN) publish: all scp -o CompressionLevel=9 -r out/* yz.mit.edu:/var/www/ Modified: personal-site/trunk/src/footer.html =================================================================== --- personal-site/trunk/src/footer.html 2012-02-10 08:59:45 UTC (rev 1826) +++ personal-site/trunk/src/footer.html 2012-02-10 09:05:45 UTC (rev 1827) @@ -2,6 +2,23 @@ <div id="spamlink" style="position: absolute; top: -250px; left: -250px;"> <a href="http://people.csail.mit.edu/yang/appraisal.php">pattern</a> </div> -<!-- -<style>a.pudris{color:#FFF;font:bold 10px arial,sans-serif;text-decoration:none;}</style><table cellspacing="0"cellpadding="0"border="0"style="background:#999;width:230px;"><tr><td valign="top"style="padding: 1px 2px 5px 4px;border-right:solid 1px #CCC;"><span style="font:bold 30px arial,sans-serif;color:#666;top:0px;position:relative;">@</span></td><td valign="top" align="left" style="padding:3px 0 0 4px;"><a href="http://www.projecthoneypot.org/" class="pudris">MEMBER OF PROJECT HONEY POT</a><br/><a href="http://www.unspam.com"class="pudris">Spam Harvester Protection Network<br/>provided by Unspam</a></td></tr></table> ---> +<script type="text/javascript"> + // <![CDATA[ + + // Google Analytics + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-1561381-1']); + _gaq.push(['_trackPageview']); + (function() { + var ga = document.createElement('script'); + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : + 'http://www') + '.google-analytics.com/ga.js'; + ga.setAttribute('async', 'true'); + document.documentElement.firstChild.appendChild(ga); + })(); + + // Twitter button + !function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs"); + + // ]]> +</script> Modified: personal-site/trunk/src/header.html =================================================================== --- personal-site/trunk/src/header.html 2012-02-10 08:59:45 UTC (rev 1826) +++ personal-site/trunk/src/header.html 2012-02-10 09:05:45 UTC (rev 1827) @@ -1,41 +1,3 @@ <meta name="no-email-collection" content="http://www.unspam.com/noemailcollection" /> <meta name="verify-v1" content="d8peXpEYa9lz6TBtLim5WB9X0DP40G5qmNZENCT3rGA=" /> <meta name="verify-v1" content="xcIyp637+f42aznWePbI2c0qUCVoqQhIDIoKCsQV9fM=" /> - - <script type="text/javascript"> - // <![CDATA[ - - function link( prot, name, domain ) { - addr = name; - if ( domain ) { - addr += '@' + domain; - } - if ( prot != null ) { - html = '<a href="' + prot + escape( addr ) + '">' + addr + '</a>'; - } else { - html = addr; - } - return html; - } - function body_onload() { - // create email link - document.getElementById( 'email' ).innerHTML = - link( 'mailto:', 'yaaang', 'gmail.com' ); - // hide spam link - document.getElementById( 'spamlink' ).style.visibility = 'hidden'; - } - - // Google Analytics --> - var _gaq = _gaq || []; - _gaq.push(['_setAccount', 'UA-1561381-1']); - _gaq.push(['_trackPageview']); - (function() { - var ga = document.createElement('script'); - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : - 'http://www') + '.google-analytics.com/ga.js'; - ga.setAttribute('async', 'true'); - document.documentElement.firstChild.appendChild(ga); - })(); - - // ]]> - </script> Modified: personal-site/trunk/src/index.txt =================================================================== --- personal-site/trunk/src/index.txt 2012-02-10 08:59:45 UTC (rev 1826) +++ personal-site/trunk/src/index.txt 2012-02-10 09:05:45 UTC (rev 1827) @@ -217,8 +217,6 @@ - 6.033 Computer Systems Engineering (TA, spring 2007) - 6.00 Introduction to Computer Science (TA, fall 2008) -<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> - <!-- vim:ft=mkd:et:sw=2:ts=2:nocin --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2012-02-10 08:59:51
|
Revision: 1826 http://assorted.svn.sourceforge.net/assorted/?rev=1826&view=rev Author: yangzhang Date: 2012-02-10 08:59:45 +0000 (Fri, 10 Feb 2012) Log Message: ----------- Tweak home page, add Twitter button Modified Paths: -------------- personal-site/trunk/Makefile personal-site/trunk/src/index.txt Modified: personal-site/trunk/Makefile =================================================================== --- personal-site/trunk/Makefile 2012-02-10 08:56:23 UTC (rev 1825) +++ personal-site/trunk/Makefile 2012-02-10 08:59:45 UTC (rev 1826) @@ -20,7 +20,10 @@ $(PLAIN): src/index.txt src/header.html out src/footer.html pandoc -s -S --tab-stop=2 -H src/header.html -A src/footer.html src/index.txt -c plain.css | \ - sed 's/<body>/<body onload="javascript:body_onload();">/' > $(PLAIN) + sed 's/<body>/<div style="float:right"> + <a href="https://twitter.com/yaaang" class="twitter-follow-button" data-show-count="true" data-size="large" data-align="right" data-width="260px">Follow @yaaang</a> + </div> + <body onload="javascript:body_onload();">/' > $(PLAIN) publish: all scp -o CompressionLevel=9 -r out/* yz.mit.edu:/var/www/ Modified: personal-site/trunk/src/index.txt =================================================================== --- personal-site/trunk/src/index.txt 2012-02-10 08:56:23 UTC (rev 1825) +++ personal-site/trunk/src/index.txt 2012-02-10 08:59:45 UTC (rev 1826) @@ -1,26 +1,21 @@ % Yang Zhang % Yang Zhang -<div style="font-weight: bold"> - [Twitter] | [Blog] -</div> - <a name="about"></a> -About me +About Me -------- <div style="float: right; text-align: center;"> <div style="padding: 1em;"> - <img src="http://www.gravatar.com/avatar/e17a97a879e919ebc943bfb9d3fec409.png" - alt="Tim the Beaver and me" + <img src="https://twimg0-a.akamaihd.net/profile_images/286030335/n708869_32164651_1406112_reasonably_small.jpg" + alt="Mmm...Gourmet Dumpling House!" style="box-shadow: 3px 3px 10px black; -webkit-box-shadow: 3px 3px 10px black;"/> </div> </div> I'm a graduate student working with Prof. [Sam Madden] in [CSAIL] at [MIT] -doing research in high-scaling distributed database systems. I graduated from -[UC Berkeley] in 2005 with a BS in Electrical Engineering and Computer Science. +doing research in high-scaling distributed database systems. [Sam Madden]: http://db.csail.mit.edu/madden/ [CSAIL]: http://www.csail.mit.edu/ @@ -129,7 +124,7 @@ <a name="software"></a> -Misc Software +More Software ------------- These are various other software I've worked on, not exclusively associated @@ -207,7 +202,7 @@ <a name="classes"></a> -MIT classes +MIT Classes ----------- - 6.829 Computer Networks (fall 2005) @@ -222,6 +217,8 @@ - 6.033 Computer Systems Engineering (TA, spring 2007) - 6.00 Introduction to Computer Science (TA, fall 2008) +<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> + <!-- vim:ft=mkd:et:sw=2:ts=2:nocin --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2012-02-10 08:56:32
|
Revision: 1825 http://assorted.svn.sourceforge.net/assorted/?rev=1825&view=rev Author: yangzhang Date: 2012-02-10 08:56:23 +0000 (Fri, 10 Feb 2012) Log Message: ----------- Restyle home page Modified Paths: -------------- personal-site/trunk/static/plain.css Modified: personal-site/trunk/static/plain.css =================================================================== --- personal-site/trunk/static/plain.css 2012-02-10 08:55:54 UTC (rev 1824) +++ personal-site/trunk/static/plain.css 2012-02-10 08:56:23 UTC (rev 1825) @@ -10,17 +10,43 @@ padding:0; background-color: white; color: black; - font-family: arial; - font-size: 10pt; + font-family: MyriadProLight, arial, sans-serif; + font-size: 13pt; /*font-size: medium;*/ line-height: 1.3em; color: #333; + color: black; margin-left: auto; margin-right: auto; min-width: 200px; max-width: 600px; } +/* http://www.fontsquirrel.com/fontface/generator */ +@font-face { + font-family: 'MyriadProRegular'; + src: url('http://yz.mit.edu/fonts/myriadpro-regular-webfont.eot'); + src: local('?'), url('http://yz.mit.edu/fonts/myriadpro-regular-webfont.woff') format('woff'), url('http://yz.mit.edu/fonts/myriadpro-regular-webfont.ttf') format('truetype'), url('http://yz.mit.edu/fonts/myriadpro-regular-webfont.svg#webfonteknRmz0m') format('svg'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'MyriadProLight'; + src: url('http://yz.mit.edu/fonts/myriadpro-light-webfont.eot'); + src: local('?'), url('http://yz.mit.edu/fonts/myriadpro-light-webfont.woff') format('woff'), url('http://yz.mit.edu/fonts/myriadpro-light-webfont.ttf') format('truetype'), url('http://yz.mit.edu/fonts/myriadpro-light-webfont.svg#webfont2SBUkD9p') format('svg'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'MyriadProSemibold'; + src: url('http://yz.mit.edu/fonts/myriadpro-semibold-webfont.eot'); + src: local('?'), url('http://yz.mit.edu/fonts/myriadpro-semibold-webfont.woff') format('woff'), url('http://yz.mit.edu/fonts/myriadpro-semibold-webfont.ttf') format('truetype'), url('http://yz.mit.edu/fonts/myriadpro-semibold-webfont.svg#webfontM3ufnW4Z') format('svg'); + font-weight: normal; + font-style: normal; +} + a { color: #0000bb; text-decoration: underline; @@ -42,26 +68,26 @@ } h1, h2, h3, h4, h5, h6, h1 a, h2 a { - font-size: 18pt; + font-size: 20pt; font-weight: normal; - font-family: arial; - text-transform: uppercase; + font-family: MyriadProSemibold, arial, sans-serif; margin-top: 1.2em; margin-bottom: 0.5em; line-height: 1.3; text-decoration: none; + color: #333; } h1 { border-bottom: 2px solid silver; color: gray; - letter-spacing: -2px; + letter-spacing: 0px; font-size: 20pt; } h2 { border-bottom: 2px solid; padding-top: 0.5em; - letter-spacing: -2px; + letter-spacing: 0px; } div.sectionbody { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2012-02-10 08:56:00
|
Revision: 1824 http://assorted.svn.sourceforge.net/assorted/?rev=1824&view=rev Author: yangzhang Date: 2012-02-10 08:55:54 +0000 (Fri, 10 Feb 2012) Log Message: ----------- Add Twitter button to wp header.php Modified Paths: -------------- personal-site/trunk/README Modified: personal-site/trunk/README =================================================================== --- personal-site/trunk/README 2012-02-10 08:55:18 UTC (rev 1823) +++ personal-site/trunk/README 2012-02-10 08:55:54 UTC (rev 1824) @@ -78,6 +78,13 @@ $filtered = $filtered . '<p><em><a href="http://twitter.com/yaaang">Follow me on Twitter</a> for stuff far more interesting than what I blog.</em></p>'; +Finally edit Twenty Eleven's header.php by adding the following long line after +the search form: + + <?php get_search_form(); ?> + <div style='position:absolute;right:7.6%;top:7em'><a href="https://twitter.com/yaaang" class="twitter-follow-button" data-show-count="true" data-size="large" data-width="240px" data-align="right">Follow @yaaang</a><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script></div> + <?php endif; ?> + Apache ------ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2012-02-10 08:55:29
|
Revision: 1823 http://assorted.svn.sourceforge.net/assorted/?rev=1823&view=rev Author: yangzhang Date: 2012-02-10 08:55:18 +0000 (Fri, 10 Feb 2012) Log Message: ----------- Load virtualenvwrapper even non-interactively Modified Paths: -------------- shell-tools/trunk/src/bash-commons/bashrc.bash Modified: shell-tools/trunk/src/bash-commons/bashrc.bash =================================================================== --- shell-tools/trunk/src/bash-commons/bashrc.bash 2012-02-10 08:52:23 UTC (rev 1822) +++ shell-tools/trunk/src/bash-commons/bashrc.bash 2012-02-10 08:55:18 UTC (rev 1823) @@ -912,6 +912,6 @@ fi # Load virtualenvwrapper commands -if [[ "$PS1" && -t 1 ]] && type virtualenvwrapper.sh &> /dev/null +if type virtualenvwrapper.sh &> /dev/null then . virtualenvwrapper.sh fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2012-02-10 08:52:29
|
Revision: 1822 http://assorted.svn.sourceforge.net/assorted/?rev=1822&view=rev Author: yangzhang Date: 2012-02-10 08:52:23 +0000 (Fri, 10 Feb 2012) Log Message: ----------- Note some screen escape keys Modified Paths: -------------- configs/trunk/src/screenrc Modified: configs/trunk/src/screenrc =================================================================== --- configs/trunk/src/screenrc 2012-02-10 08:51:10 UTC (rev 1821) +++ configs/trunk/src/screenrc 2012-02-10 08:52:23 UTC (rev 1822) @@ -142,6 +142,9 @@ # Yang # +# Good keys for screen: +#escape ^^^ # similar to but better than byobu +#escape ^`` #escape ^__ #escape ^]] #escape ^xx This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2012-02-10 08:51:17
|
Revision: 1821 http://assorted.svn.sourceforge.net/assorted/?rev=1821&view=rev Author: yangzhang Date: 2012-02-10 08:51:10 +0000 (Fri, 10 Feb 2012) Log Message: ----------- Share SSH connections Modified Paths: -------------- configs/trunk/src/ssh/config Modified: configs/trunk/src/ssh/config =================================================================== --- configs/trunk/src/ssh/config 2012-01-20 07:45:04 UTC (rev 1820) +++ configs/trunk/src/ssh/config 2012-02-10 08:51:10 UTC (rev 1821) @@ -6,6 +6,10 @@ TCPKeepAlive=yes ServerAliveInterval=300 +Host * + ControlPath ~/.ssh/master-%l-%r@%h:%p + ControlMaster auto + # StrictHostKeyChecking no # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2012-01-20 07:45:10
|
Revision: 1820 http://assorted.svn.sourceforge.net/assorted/?rev=1820&view=rev Author: yangzhang Date: 2012-01-20 07:45:04 +0000 (Fri, 20 Jan 2012) Log Message: ----------- Update setup in README Modified Paths: -------------- personal-site/trunk/README Modified: personal-site/trunk/README =================================================================== --- personal-site/trunk/README 2012-01-19 19:36:57 UTC (rev 1819) +++ personal-site/trunk/README 2012-01-20 07:45:04 UTC (rev 1820) @@ -81,30 +81,60 @@ Apache ------ -In apache2.conf, lower prefork's `MaxClients` to something manageable (5). +In apache2.conf, lower prefork's `MaxClients` to something manageable (4). +In ports.conf, listen on port 88 instead of 80. + In sites-enabled/000-default: - <Directory /var/www/wp/> - RewriteEngine On - RewriteBase /wp/ - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule . /wp/index.php [L] - </Directory> + <VirtualHost *:88> - RedirectMatch permanent ^/notes([/]*)$ /notes/ - <Location /notes/> - Allow from all - ProxyPass http://127.0.0.1:5001/ - SetOutputFilter proxy-html - ProxyPassReverse / - ProxyHTMLURLMap / /notes/ - RequestHeader unset Accept-Encoding - AddOutputFilterByType SUBSTITUTE application/atom+xml - Substitute "s|127.0.0.1:5001|yz.mit.edu/notes|" - </Location> + ... + <Directory /var/www/wp/> + RewriteEngine On + RewriteBase /wp/ + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule . /wp/index.php [L] + </Directory> + + RedirectMatch permanent ^/notes([/]*)$ /notes/ + <Location /notes/> + Allow from all + ProxyPass http://127.0.0.1:5001/ + SetOutputFilter proxy-html + ProxyPassReverse / + ProxyHTMLURLMap / /notes/ + RequestHeader unset Accept-Encoding + AddOutputFilterByType SUBSTITUTE application/atom+xml + Substitute "s|127.0.0.1:5001|yz.mit.edu/notes|" + </Location> + + </VirtualHost> + +Nginx +----- + +Install nginx: + + sudo aptitude install nginx + +In /etc/nginx/sites-enabled/default: + + server { + listen 80 default; + server_name yz.mit.edu; + + access_log /var/log/nginx/localhost.access.log; + + location / { + proxy_pass http://127.0.0.1:88; + proxy_set_header Host $host; # So WP URL rewriter works. + proxy_read_timeout 99999; + } + } + Gitit ----- @@ -142,7 +172,8 @@ respawn - exec su - yang -c 'cd gitit/; exec gitit -f config' + # Limit runtime to 50M heap + exec su - yang -c 'cd gitit/; exec gitit -f config +RTS -M50m' Install this cronjob script: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2012-01-19 19:37:03
|
Revision: 1819 http://assorted.svn.sourceforge.net/assorted/?rev=1819&view=rev Author: yangzhang Date: 2012-01-19 19:36:57 +0000 (Thu, 19 Jan 2012) Log Message: ----------- Tweak Apache config to fix gitit feed links Modified Paths: -------------- personal-site/trunk/README Modified: personal-site/trunk/README =================================================================== --- personal-site/trunk/README 2012-01-19 19:36:36 UTC (rev 1818) +++ personal-site/trunk/README 2012-01-19 19:36:57 UTC (rev 1819) @@ -37,7 +37,7 @@ sudo cabal install --global # Misc - sudo a2enmod headers proxy_html proxy_http rewrite + sudo a2enmod headers proxy_html proxy_http rewrite substitute Static Website -------------- @@ -81,7 +81,7 @@ Apache ------ -In apache2.conf, lower prefork's `MaxClients` to something manageable (15). +In apache2.conf, lower prefork's `MaxClients` to something manageable (5). In sites-enabled/000-default: @@ -101,6 +101,8 @@ ProxyPassReverse / ProxyHTMLURLMap / /notes/ RequestHeader unset Accept-Encoding + AddOutputFilterByType SUBSTITUTE application/atom+xml + Substitute "s|127.0.0.1:5001|yz.mit.edu/notes|" </Location> Gitit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2012-01-19 19:36:43
|
Revision: 1818 http://assorted.svn.sourceforge.net/assorted/?rev=1818&view=rev Author: yangzhang Date: 2012-01-19 19:36:36 +0000 (Thu, 19 Jan 2012) Log Message: ----------- Tweak home page Modified Paths: -------------- personal-site/trunk/src/index.txt Modified: personal-site/trunk/src/index.txt =================================================================== --- personal-site/trunk/src/index.txt 2011-12-22 04:33:25 UTC (rev 1817) +++ personal-site/trunk/src/index.txt 2012-01-19 19:36:36 UTC (rev 1818) @@ -2,7 +2,7 @@ % Yang Zhang <div style="font-weight: bold"> - <span id="email"></span> | [Twitter] | [Blog] + [Twitter] | [Blog] </div> <a name="about"></a> @@ -53,8 +53,8 @@ Projects -------- -Here are the (non-confidential) projects in which I've been involved. More -details when I have time! +Here are the projects I worked on that I can publicly talk about. More details +when I have time! - [Relational Cloud]: database as a service that provides transparent scalability and partitioning that maximizes the locality of co-accessed data. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2011-12-22 04:33:31
|
Revision: 1817 http://assorted.svn.sourceforge.net/assorted/?rev=1817&view=rev Author: yangzhang Date: 2011-12-22 04:33:25 +0000 (Thu, 22 Dec 2011) Log Message: ----------- Add altscreen note to screenrc Modified Paths: -------------- configs/trunk/src/screenrc Modified: configs/trunk/src/screenrc =================================================================== --- configs/trunk/src/screenrc 2011-12-08 05:38:27 UTC (rev 1816) +++ configs/trunk/src/screenrc 2011-12-22 04:33:25 UTC (rev 1817) @@ -305,3 +305,5 @@ # These wrap the formatter for each window. #hardstatus string '%=%?%-Lw%?%{r}(%{W}%n*%f%t%?(%u)%?%{r})%{w}%?%+Lw%?%?%=' +# Enable this if you want less to clear the screen on quit. +#altscreen on This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2011-12-08 05:38:33
|
Revision: 1816 http://assorted.svn.sourceforge.net/assorted/?rev=1816&view=rev Author: yangzhang Date: 2011-12-08 05:38:27 +0000 (Thu, 08 Dec 2011) Log Message: ----------- Fix swap() Modified Paths: -------------- shell-tools/trunk/src/bash-commons/bashrc.bash Modified: shell-tools/trunk/src/bash-commons/bashrc.bash =================================================================== --- shell-tools/trunk/src/bash-commons/bashrc.bash 2011-11-17 20:04:59 UTC (rev 1815) +++ shell-tools/trunk/src/bash-commons/bashrc.bash 2011-12-08 05:38:27 UTC (rev 1816) @@ -747,10 +747,16 @@ # swap two files swap() { - local t="$(mktemp "$(dirname "$1")/XXXXXX")" && - mv -n "$1" "$t" && - mv -n "$2" "$1" && - mv -n "$t" "$2" + local ret=0 + while true ; do + local tmp="$1.swap$RANDOM" renamed_first=false && + mv -n "$1" "$tmp" && + local renamed_first=true && + mv -n "$2" "$1" && + mv -n "$tmp" "$2" || ret=$? + $renamed_first && break + done + return $ret } # TODO This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2011-11-17 20:05:05
|
Revision: 1815 http://assorted.svn.sourceforge.net/assorted/?rev=1815&view=rev Author: yangzhang Date: 2011-11-17 20:04:59 +0000 (Thu, 17 Nov 2011) Log Message: ----------- Add xorg.conf.d Added Paths: ----------- configs/trunk/src/xorg.conf.d/ configs/trunk/src/xorg.conf.d/10-wacom.conf Added: configs/trunk/src/xorg.conf.d/10-wacom.conf =================================================================== --- configs/trunk/src/xorg.conf.d/10-wacom.conf (rev 0) +++ configs/trunk/src/xorg.conf.d/10-wacom.conf 2011-11-17 20:04:59 UTC (rev 1815) @@ -0,0 +1,35 @@ +Section "InputClass" + Identifier "Wacom class" +# WALTOP needs a patched kernel driver, that isn't in mainline lk yet, +# so for now just let it fall through and be picked up by evdev instead. +# MatchProduct "Wacom|WALTOP|WACOM" + MatchProduct "Wacom|WACOM" + MatchDevicePath "/dev/input/event*" + Driver "wacom" +EndSection + +Section "InputClass" + Identifier "Wacom serial class" + MatchProduct "Serial Wacom Tablet" + Driver "wacom" +# Option "ForceDevice" "ISDV4" # deprecated starting with +# xf86-input-wacom-0.10.8 +EndSection + +Section "InputClass" + Identifier "Wacom serial class identifiers" + MatchProduct "WACf|FUJ02e5|FUJ02e7|FUJ02e9" + Driver "wacom" +EndSection + + +# N-Trig Duosense Electromagnetic Digitizer +Section "InputClass" + Identifier "Wacom N-Trig class" + MatchProduct "HID 1b96:0001|N-Trig Pen" + MatchDevicePath "/dev/input/event*" + Driver "wacom" + Option "Button2" "3" + Option "TPCButton" "on" +EndSection + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2011-11-17 05:25:32
|
Revision: 1814 http://assorted.svn.sourceforge.net/assorted/?rev=1814&view=rev Author: yangzhang Date: 2011-11-17 05:25:26 +0000 (Thu, 17 Nov 2011) Log Message: ----------- Improve pg-stat Modified Paths: -------------- shell-tools/trunk/src/bash-commons/common.bash Modified: shell-tools/trunk/src/bash-commons/common.bash =================================================================== --- shell-tools/trunk/src/bash-commons/common.bash 2011-11-09 06:55:33 UTC (rev 1813) +++ shell-tools/trunk/src/bash-commons/common.bash 2011-11-17 05:25:26 UTC (rev 1814) @@ -761,14 +761,18 @@ select usename as usr, waiting, - current_query, + case + when length(current_query) <= 40 then current_query + else substring(current_query for 20) || '...' || + substring(current_query from length(current_query) - 16) + end as current_query, array_to_string(array_agg(distinct nspname), ', ') as schemas, array_to_string(array_agg(distinct relname), ', ') as tables from pg_stat_activity - inner join pg_locks on (pid=procpid) - inner join pg_class on (relfilenode=relation) - inner join pg_namespace n on (n.oid=relnamespace) + left outer join pg_locks on (pid=procpid) + left outer join pg_class on (relfilenode=relation) + left outer join pg_namespace n on (n.oid=relnamespace) where current_query not like '%pg_stat_activity%' group by procpid, usename, waiting, current_query;" } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2011-11-09 06:55:40
|
Revision: 1813 http://assorted.svn.sourceforge.net/assorted/?rev=1813&view=rev Author: yangzhang Date: 2011-11-09 06:55:33 +0000 (Wed, 09 Nov 2011) Log Message: ----------- Update/clean up links, removing Buzz Modified Paths: -------------- personal-site/trunk/src/index.txt Modified: personal-site/trunk/src/index.txt =================================================================== --- personal-site/trunk/src/index.txt 2011-10-04 00:54:39 UTC (rev 1812) +++ personal-site/trunk/src/index.txt 2011-11-09 06:55:33 UTC (rev 1813) @@ -2,7 +2,7 @@ % Yang Zhang <div style="font-weight: bold"> - <span id="email"></span> | [Google (Buzz) Profile] | [Twitter] | [Blog] + <span id="email"></span> | [Twitter] | [Blog] </div> <a name="about"></a> @@ -16,8 +16,6 @@ alt="Tim the Beaver and me" style="box-shadow: 3px 3px 10px black; -webkit-box-shadow: 3px 3px 10px black;"/> </div> - <a rel="me" target="_blank" title="Follow on Google Buzz" class="google-buzz-button" href="http://www.google.com/profiles/yaaang" data-button-style="follow">Follow on Buzz</a> - <script type="text/javascript" src="http://www.google.com/buzz/api/button.js"></script> </div> I'm a graduate student working with Prof. [Sam Madden] in [CSAIL] at [MIT] @@ -29,21 +27,19 @@ [MIT]: http://mit.edu/ [UC Berkeley]: http://berkeley.edu/ -- [Google (Buzz) profile]: includes my Google Reader shared items - [Twitter] - [Blog] - [Delicious Bookmarks]: Mirrors my Google Bookmarks using - [gbookmark2delicious]. I post articles, software, projects, services, - homepages, and anything else - of non-transient noteworthiness that I come across. + [gbookmark2delicious]. - [Notes Wiki]: My pile of notes, mostly on computer science. -- [Facebook](http://www.facebook.com/yaaang) -- [LinkedIn](http://www.linkedin.com/in/yzhang) -- [GitHub](http://github.com/yang/) -- [Quora](http://www.quora.com/Yang-Zhang) -- [GPG Key] ([MIT PKS entry]) +- Elsewhere on the web: + [Facebook](http://www.facebook.com/yaaang) + [LinkedIn](http://www.linkedin.com/in/yzhang) + [Google+](https://plus.google.com/102558885266680974197) + [GitHub](http://github.com/yang/) + [Quora](http://www.quora.com/Yang-Zhang) + <!-- [GPG Key] ([MIT PKS entry]) --> -[Google (Buzz) profile]: http://www.google.com/profiles/yaaang [Blog]: http://yz.mit.edu/wp/ [Notes Wiki]: http://yz.mit.edu/notes/ [Delicious Bookmarks]: http://del.icio.us/yaaang/ @@ -139,7 +135,7 @@ These are various other software I've worked on, not exclusively associated with any particular project above. -- [Wikipedia Kaggle]: I got 8th place out of 200 teams in the only machine +- [Wikipedia Kaggle]: I got 8th place out of 200 teams in the one machine learning competition I've tried my hand at - [Assorted Projects]: my code dump---find a bunch more programs here - [SRON]: scalable resilient overlay system This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2011-10-04 00:54:46
|
Revision: 1812 http://assorted.svn.sourceforge.net/assorted/?rev=1812&view=rev Author: yangzhang Date: 2011-10-04 00:54:39 +0000 (Tue, 04 Oct 2011) Log Message: ----------- Replace workping.com with slice-data.com Modified Paths: -------------- configs/trunk/src/ssh/config Modified: configs/trunk/src/ssh/config =================================================================== --- configs/trunk/src/ssh/config 2011-09-24 02:08:50 UTC (rev 1811) +++ configs/trunk/src/ssh/config 2011-10-04 00:54:39 UTC (rev 1812) @@ -22,7 +22,7 @@ # Host dev.partyondata.com -Host workping.com +Host slice-data.com Host partycat.partyondata.com Host nuthouse.partyondata.com This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2011-09-24 02:08:56
|
Revision: 1811 http://assorted.svn.sourceforge.net/assorted/?rev=1811&view=rev Author: yangzhang Date: 2011-09-24 02:08:50 +0000 (Sat, 24 Sep 2011) Log Message: ----------- Wikipedia Kaggle code Modified Paths: -------------- personal-site/trunk/src/index.txt Modified: personal-site/trunk/src/index.txt =================================================================== --- personal-site/trunk/src/index.txt 2011-09-24 02:07:23 UTC (rev 1810) +++ personal-site/trunk/src/index.txt 2011-09-24 02:08:50 UTC (rev 1811) @@ -139,6 +139,8 @@ These are various other software I've worked on, not exclusively associated with any particular project above. +- [Wikipedia Kaggle]: I got 8th place out of 200 teams in the only machine + learning competition I've tried my hand at - [Assorted Projects]: my code dump---find a bunch more programs here - [SRON]: scalable resilient overlay system - [gbookmark2delicious]: Python script to migrate/sync Google Bookmarks to @@ -151,6 +153,7 @@ - [ICFPC 2007 entry]: with Christophe Poucet, Dmitry Astapov, David Himmelstrup, Per Vognsen, Johannes Ahlmann, and Cale Gibbard +[Wikipedia Kaggle]: https://github.com/yang/wikipedia-kaggle/ [Assorted Projects]: http://assorted.sf.net/ [BattleCode 2008 entry]: http://www.assembla.com/spaces/battlecode2008 [ICFPC 2008 entry]: http://www.assembla.com/spaces/icfpc08-csail This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2011-09-24 02:07:29
|
Revision: 1810 http://assorted.svn.sourceforge.net/assorted/?rev=1810&view=rev Author: yangzhang Date: 2011-09-24 02:07:23 +0000 (Sat, 24 Sep 2011) Log Message: ----------- OLTP benchmark link Modified Paths: -------------- personal-site/trunk/src/index.txt Modified: personal-site/trunk/src/index.txt =================================================================== --- personal-site/trunk/src/index.txt 2011-08-23 19:09:12 UTC (rev 1809) +++ personal-site/trunk/src/index.txt 2011-09-24 02:07:23 UTC (rev 1810) @@ -62,6 +62,7 @@ - [Relational Cloud]: database as a service that provides transparent scalability and partitioning that maximizes the locality of co-accessed data. + (OLTP/Web benchmarking code [here][oltpbenchmark]) - Hedwig: a topic-based publish-subscribe wide-area messaging system designed as a replication service in distributed systems like Yahoo [PNUTS]. - [H-Store]: a distributed main-memory relational database management system @@ -107,6 +108,7 @@ [SIPB]: http://sipb.mit.edu/ [XVM]: http://xvm.mit.edu/ [Corey]: http://pdos.csail.mit.edu/~sbw/corey/ +[oltpbenchmark]: http://code.google.com/p/oltpbenchmark/ [H-Store]: http://db.cs.yale.edu/hstore/ [WebTables]: slides/webtables-presentation-google07.pdf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2011-08-23 19:09:18
|
Revision: 1809 http://assorted.svn.sourceforge.net/assorted/?rev=1809&view=rev Author: yangzhang Date: 2011-08-23 19:09:12 +0000 (Tue, 23 Aug 2011) Log Message: ----------- Use darker Emacs terminal colors Modified Paths: -------------- configs/trunk/src/emacs/yang.el Modified: configs/trunk/src/emacs/yang.el =================================================================== --- configs/trunk/src/emacs/yang.el 2011-08-23 19:08:39 UTC (rev 1808) +++ configs/trunk/src/emacs/yang.el 2011-08-23 19:09:12 UTC (rev 1809) @@ -272,7 +272,7 @@ (trailing-whitespace ((t (:background "gray90"))))))) (if (fboundp 'color-theme-initialize) (color-theme-initialize)) -(if window-system (my-color-theme-dark)) +(if window-system (my-color-theme-dark) (color-theme-charcoal-black)) ;; }}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2011-08-23 19:08:45
|
Revision: 1808 http://assorted.svn.sourceforge.net/assorted/?rev=1808&view=rev Author: yangzhang Date: 2011-08-23 19:08:39 +0000 (Tue, 23 Aug 2011) Log Message: ----------- Add virtualenvwrapper to bashrc Modified Paths: -------------- shell-tools/trunk/src/bash-commons/bashrc.bash Modified: shell-tools/trunk/src/bash-commons/bashrc.bash =================================================================== --- shell-tools/trunk/src/bash-commons/bashrc.bash 2011-08-08 22:46:37 UTC (rev 1807) +++ shell-tools/trunk/src/bash-commons/bashrc.bash 2011-08-23 19:08:39 UTC (rev 1808) @@ -904,3 +904,8 @@ setup_prompt fi + +# Load virtualenvwrapper commands +if [[ "$PS1" && -t 1 ]] && type virtualenvwrapper.sh &> /dev/null +then . virtualenvwrapper.sh +fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2011-08-08 22:46:45
|
Revision: 1807 http://assorted.svn.sourceforge.net/assorted/?rev=1807&view=rev Author: yangzhang Date: 2011-08-08 22:46:37 +0000 (Mon, 08 Aug 2011) Log Message: ----------- Add a few more options Modified Paths: -------------- configs/trunk/src/vim/plugin/_yang.vim Modified: configs/trunk/src/vim/plugin/_yang.vim =================================================================== --- configs/trunk/src/vim/plugin/_yang.vim 2011-07-25 09:04:29 UTC (rev 1806) +++ configs/trunk/src/vim/plugin/_yang.vim 2011-08-08 22:46:37 UTC (rev 1807) @@ -168,12 +168,15 @@ set ruler " TODO ??? set shiftwidth=2 set showmatch +set smartcase set nosmartindent " TODO ??? set showcmd " show the partial command; in visual mode, show num lines selected set switchbuf=useopen " TODO ??? set tabstop=2 +set title set updatetime=500 set whichwrap+=<,>,[,],h,l " wrap on these letters +set wildmenu set winaltkeys=menu set winaltkeys=no set wrapscan " TODO ??? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2011-07-25 09:04:35
|
Revision: 1806 http://assorted.svn.sourceforge.net/assorted/?rev=1806&view=rev Author: yangzhang Date: 2011-07-25 09:04:29 +0000 (Mon, 25 Jul 2011) Log Message: ----------- Add Circumflex demo Added Paths: ----------- sandbox/trunk/src/scala/CircumflexOrm.scala Added: sandbox/trunk/src/scala/CircumflexOrm.scala =================================================================== --- sandbox/trunk/src/scala/CircumflexOrm.scala (rev 0) +++ sandbox/trunk/src/scala/CircumflexOrm.scala 2011-07-25 09:04:29 UTC (rev 1806) @@ -0,0 +1,78 @@ +import ru.circumflex.orm._ +import java.sql._ + +class Column extends Record[String, Column] { + val name = "column_name".TEXT.NOT_NULL + val dataType = "data_type".TEXT.NOT_NULL + val table = "table_name".TEXT.NOT_NULL + val schema_ = "table_schema".TEXT.NOT_NULL + def PRIMARY_KEY = name + def relation = Column +} + +object Column extends Column with Table[String, Column] + +class User extends Record[Int, User] with IdentityGenerator[Int, User] { + val id = "id".INTEGER.NOT_NULL.AUTO_INCREMENT + val name = "name".TEXT.NOT_NULL + def PRIMARY_KEY = id + def relation = User +} + +object User extends User with Table[Int, User] { + override def relationName = "user_" +} + +object CircumflexOrm extends App { + val con = DriverManager.getConnection("jdbc:postgresql://localhost/yang") + //val cp = new ConnectionProvider { + // def openConnection() = con + // def close() = con.close() + //} + val tm = new TransactionManager { + def get = new Transaction { + override def getConnection = con + } + } + val tx = tm.get + def SELECT[T](p: Projection[T]) = new Select(p) { + override def resultSet[A](actions: ResultSet => A): A = { + val result = { + tx.execute(toSql, { st => + setParams(st, 1) + val rs = st.executeQuery() + try { + actions(rs) + } finally { + rs.close() + } + }, { throw _ }) + } + Statistics.executeSql(this) + result + } + } + +/* + abstract class MyRecord[PK, R <: Record[PK, R]] extends Record[PK, R] { + protected def _persist(fields: Seq[Field[_, R]]): Int = PRIMARY_KEY.value match { + case Some(id: PK) => + val result = new Insert(relation, fields.filter(!_.isNull)).execute() + if (relation.isAutoRefresh) refresh() + result + case _ => throw new ORMException("Application-assigned identifier is expected. " + + "Use one of the generators if you wish identifiers to be generated automatically.") + } + } +*/ + + // new DDLUnit(User).CREATE + val u = new User + u.name := "Yang" + u.save() + + { + val u = User AS "u" + println(SELECT (u.*) FROM (u) list) + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2011-07-25 09:04:17
|
Revision: 1805 http://assorted.svn.sourceforge.net/assorted/?rev=1805&view=rev Author: yangzhang Date: 2011-07-25 09:04:10 +0000 (Mon, 25 Jul 2011) Log Message: ----------- Add Squeryl demo Added Paths: ----------- sandbox/trunk/src/scala/Squeryl.scala Added: sandbox/trunk/src/scala/Squeryl.scala =================================================================== --- sandbox/trunk/src/scala/Squeryl.scala (rev 0) +++ sandbox/trunk/src/scala/Squeryl.scala 2011-07-25 09:04:10 UTC (rev 1805) @@ -0,0 +1,31 @@ +import org.squeryl.PrimitiveTypeMode._ +import org.squeryl._ +import org.squeryl.adapters._ +import org.squeryl.annotations.Column + +object SquerylTest extends App { + class User(var name: String) extends KeyedEntity[Int] { + val id = 0 + def this() = this("") + } + + object PodSchema extends Schema { + val users = table[User]("user_") + on(users)(u => declare( + u.id is(autoIncremented) + )) + } + import PodSchema._ + + Class.forName("org.postgresql.Driver"); + + SessionFactory.concreteFactory = Some(() => + Session.create(DriverManager.getConnection("jdbc:postgresql://localhost/yang"), new PostgreSqlAdapter)) + + transaction { + PodSchema.printDdl + users.insert(new User("Yang Zhang")) + println(users.where(u => u.name === "Yang Zhang")) + for (u <- from(users)(u => where(u.name === "Yang Zhang") select(u))) println((u.id, u.name)) + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2011-07-21 05:49:27
|
Revision: 1804 http://assorted.svn.sourceforge.net/assorted/?rev=1804&view=rev Author: yangzhang Date: 2011-07-21 05:49:21 +0000 (Thu, 21 Jul 2011) Log Message: ----------- Add .pyo to .gitignore Modified Paths: -------------- configs/trunk/src/gitignore Modified: configs/trunk/src/gitignore =================================================================== --- configs/trunk/src/gitignore 2011-07-21 05:45:29 UTC (rev 1803) +++ configs/trunk/src/gitignore 2011-07-21 05:49:21 UTC (rev 1804) @@ -7,7 +7,7 @@ *.hi .*.sw? *.class -*.pyc +*.py[co] *.o *.lo *.la This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yan...@us...> - 2011-07-21 05:45:36
|
Revision: 1803 http://assorted.svn.sourceforge.net/assorted/?rev=1803&view=rev Author: yangzhang Date: 2011-07-21 05:45:29 +0000 (Thu, 21 Jul 2011) Log Message: ----------- Add jade vim support Added Paths: ----------- configs/trunk/src/vim/ftdetect/jade.vim configs/trunk/src/vim/ftplugin/jade.vim configs/trunk/src/vim/indent/jade.vim configs/trunk/src/vim/syntax/jade.vim Added: configs/trunk/src/vim/ftdetect/jade.vim =================================================================== --- configs/trunk/src/vim/ftdetect/jade.vim (rev 0) +++ configs/trunk/src/vim/ftdetect/jade.vim 2011-07-21 05:45:29 UTC (rev 1803) @@ -0,0 +1,2 @@ +" Jade +autocmd BufNewFile,BufReadPost *.jade set filetype=jade Added: configs/trunk/src/vim/ftplugin/jade.vim =================================================================== --- configs/trunk/src/vim/ftplugin/jade.vim (rev 0) +++ configs/trunk/src/vim/ftplugin/jade.vim 2011-07-21 05:45:29 UTC (rev 1803) @@ -0,0 +1,53 @@ +" Vim filetype plugin +" Language: Jade +" Maintainer: Joshua Borton +" Credits: Tim Pope + +" Only do this when not done yet for this buffer +if exists("b:did_ftplugin") + finish +endif + +let s:save_cpo = &cpo +set cpo-=C + +" Define some defaults in case the included ftplugins don't set them. +let s:undo_ftplugin = "" +let s:browsefilter = "All Files (*.*)\t*.*\n" +let s:match_words = "" + +runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim +unlet! b:did_ftplugin + +" Override our defaults if these were set by an included ftplugin. +if exists("b:undo_ftplugin") + let s:undo_ftplugin = b:undo_ftplugin + unlet b:undo_ftplugin +endif +if exists("b:browsefilter") + let s:browsefilter = b:browsefilter + unlet b:browsefilter +endif +if exists("b:match_words") + let s:match_words = b:match_words + unlet b:match_words +endif + +" Change the browse dialog on Win32 to show mainly Haml-related files +if has("gui_win32") + let b:browsefilter="Jade Files (*.jade)\t*.jade\n" . s:browsefilter +endif + +" Load the combined list of match_words for matchit.vim +if exists("loaded_matchit") + let b:match_words = s:match_words +endif + +setlocal comments= commentstring=-#\ %s + +let b:undo_ftplugin = "setl cms< com< " + \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin + +let &cpo = s:save_cpo + +" vim:set sw=2: Added: configs/trunk/src/vim/indent/jade.vim =================================================================== --- configs/trunk/src/vim/indent/jade.vim (rev 0) +++ configs/trunk/src/vim/indent/jade.vim 2011-07-21 05:45:29 UTC (rev 1803) @@ -0,0 +1,70 @@ +" Vim indent file +" Language: Jade +" Maintainer: Joshua Borton +" Credits: Tim Pope (vim-jade) +" Last Change: 2010 Sep 22 + +if exists("b:did_indent") + finish +endif + +unlet! b:did_indent +let b:did_indent = 1 + +setlocal autoindent sw=2 et +setlocal indentexpr=GetJadeIndent() +setlocal indentkeys=o,O,*<Return>,},],0),!^F + +" Only define the function once. +if exists("*GetJadeIndent") + finish +endif + +let s:attributes = '\%((.\{-\})\)' +let s:tag = '\([%.#][[:alnum:]_-]\+\|'.s:attributes.'\)*[<>]*' + +if !exists('g:jade_self_closing_tags') + let g:jade_self_closing_tags = 'meta|link|img|hr|br' +endif + +setlocal formatoptions+=r +setlocal comments+=n:\| + +function! GetJadeIndent() + let lnum = prevnonblank(v:lnum-1) + if lnum == 0 + return 0 + endif + let line = substitute(getline(lnum),'\s\+$','','') + let cline = substitute(substitute(getline(v:lnum),'\s\+$','',''),'^\s\+','','') + let lastcol = strlen(line) + let line = substitute(line,'^\s\+','','') + let indent = indent(lnum) + let cindent = indent(v:lnum) + let increase = indent + &sw + if indent == indent(lnum) + let indent = cindent <= indent ? -1 : increase + endif + + let group = synIDattr(synID(lnum,lastcol,1),'name') + + if line =~ '^!!!' + return indent + elseif line =~ '^/\%(\[[^]]*\]\)\=$' + return increase + elseif group == 'jadeFilter' + return increase + elseif line =~ '^'.s:tag.'[&!]\=[=~-].*,\s*$' + return increase + elseif line == '-#' + return increase + elseif line =~? '^\v%('.g:jade_self_closing_tags.')>' + return indent + elseif group =~? '\v^%(jadeTag|jadeAttributesDelimiter|jadeClass|jadeId|htmlTagName|htmlSpecialTagName)$' + return increase + else + return indent + endif +endfunction + +" vim:set sw=2: Added: configs/trunk/src/vim/syntax/jade.vim =================================================================== --- configs/trunk/src/vim/syntax/jade.vim (rev 0) +++ configs/trunk/src/vim/syntax/jade.vim 2011-07-21 05:45:29 UTC (rev 1803) @@ -0,0 +1,65 @@ +" Vim syntax file +" Language: Jade +" Maintainer: Joshua Borton +" Credits: Tim Pope +" Filenames: *.jade + +if exists("b:current_syntax") + finish +endif + +if !exists("main_syntax") + let main_syntax = 'jade' +endif + +runtime! syntax/html.vim +unlet! b:current_syntax + +syn case match + +syn cluster jadeTop contains=jadeBegin,jadeComment +syn match jadeBegin "^\s*\%([<>]\|&[^=~ ]\)\@!" nextgroup=jadeTag,jadeClassChar,jadeIdChar,jadePlainChar +syn match jadeTag "\w\+\%(:\w\+\)\=" contained contains=htmlTagName,htmlSpecialTagName nextgroup=@jadeComponent +syn cluster jadeComponent contains=jadeAttributes,jadeIdChar,jadeClassChar,jadePlainChar +syn match jadeComment ' *\/\/.*$' +syn region jadeAttributes matchgroup=jadeAttributesDelimiter start="(" skip=+\%(\\\\\)*\\'+ end=")" contained contains=htmlArg,jadeAttributeString,htmlEvent,htmlCssDefinition nextgroup=@jadeComponent +syn match jadeClassChar "\." contained nextgroup=jadeClass +syn match jadeIdChar "#{\@!" contained nextgroup=jadeId +syn match jadeClass "\%(\w\|-\)\+" contained nextgroup=@jadeComponent +syn match jadeId "\%(\w\|-\)\+" contained nextgroup=@jadeComponent +syn region jadeDocType start="^\s*!!!" end="$" + +syn match jadePlainChar "\\" contained +syn region jadeInterpolation matchgroup=jadeInterpolationDelimiter start="#{" end="}" contains=@htmlJavaScript +syn match jadeInterpolationEscape "\\\@<!\%(\\\\\)*\\\%(\\\ze#{\|#\ze{\)" + +syn region jadeAttributeString start=+\%(=\s*\)\@<='+ skip=+\%(\\\\\)*\\'+ end=+'+ contains=jadeInterpolation +syn region jadeAttributeString start=+\%(:\s*\)\@<='+ skip=+\%(\\\\\)*\\'+ end=+'+ contains=jadeInterpolation +syn region jadeAttributeString start=+\%(=\s*\)\@<="+ skip=+\%(\\\\\)*\\'+ end=+"+ contains=jadeInterpolation +syn region jadeAttributeString start=+\%(:\s*\)\@<="+ skip=+\%(\\\\\)*\\'+ end=+"+ contains=jadeInterpolation + +syn region jadeJavascriptFilter matchgroup=jadeFilter start="^\z(\s*\):javascript\s*$" end="^\%(\z1 \| *$\)\@!" contains=@htmlJavaScript +syn region jadeMarkdownFilter matchgroup=jadeFilter start="^\z(\s*\):markdown\s*$" end="^\%(\z1 \| *$\)\@!" + +syn region jadeJavascriptBlock start="^\z(\s*\)script" nextgroup=@jadeComponent,jadeError end="^\%(\z1 \| *$\)\@!" contains=@jadeTop,@htmlJavascript keepend +syn region jadeCssBlock start="^\z(\s*\)style" nextgroup=@jadeComponent,jadeError end="^\%(\z1 \| *$\)\@!" contains=@jadeTop,@htmlCss keepend + +syn match jadeError "\$" contained + +hi def link jadeTag Special +hi def link jadeAttributeString String +hi def link jadeAttributesDelimiter Identifier +hi def link jadeIdChar Special +hi def link jadeClassChar Special +hi def link jadeId Identifier +hi def link jadeClass Type +hi def link jadeInterpolationDelimiter Delimiter +hi def link jadeFilter PreProc +hi def link jadeDocType PreProc +hi def link jadeComment Comment + +let b:current_syntax = "jade" + +if main_syntax == "jade" + unlet main_syntax +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |