diff --git a/bin/lazy.sh b/bin/lazy.sh index eb0603701..372799288 100755 --- a/bin/lazy.sh +++ b/bin/lazy.sh @@ -5,7 +5,7 @@ # Optional parameter is the username for signing edits node ./tiddlywiki.js \ - editions/server \ + editions/tw5.com-server \ --verbose \ --server 8080 $:/core/save/lazy-images text/plain text/html $1 $2\ || exit 1 diff --git a/bin/readme.md b/bin/readme.md index 28064f02d..22cb2965e 100644 --- a/bin/readme.md +++ b/bin/readme.md @@ -1,3 +1,3 @@ -

Script Files

The TiddlyWiki5 repository contains several scripts in the bin folder that you can use to automate common tasks, or as a useful starting point for your own scripts. See Scripts for building tiddlywiki.com for details of the scripts used to build and release http://tiddlywiki.com/.

All the scripts expect to be run from the root folder of the repository.

serve: serves tw5.com

./bin/serve.sh -h
+
Script Files
The TiddlyWiki5 repository contains several scripts in the bin folder that you can use to automate common tasks, or as a useful starting point for your own scripts. See Scripts for building tiddlywiki.com for details of the scripts used to build and release https://tiddlywiki.com/.
All the scripts expect to be run from the root folder of the repository.
serve: serves tw5.com
./bin/serve.sh -h
 ./bin/serve.sh [edition dir] [username] [password] [host] [port]
Or:
./bin/serve.cmd -h
-./bin/serve.cmd [edition dir] [username] [password] [host] [port]
This script starts TiddlyWiki5 running as an HTTP server, defaulting to the content from the tw5.com-server edition. By default, the Node.js serves on port 8080. If the optional username parameter is provided, it is used for signing edits. If the password is provided then HTTP basic authentication is used. Run the script with the -h parameter to see online help.
To experiment with this configuration, run the script and then visit http://127.0.0.1:8080 in a browser.
Changes made in the browser propagate to the server over HTTP (use the browser developer console to see these requests). The server then syncs changes to the file system (and logs each change to the screen).
test: build and run tests
This script runs the test edition of TiddlyWiki on the server to perform the server-side tests and to build test.html for running the tests in the browser.
lazy: serves tw5.com with lazily loaded images
./bin/lazy.sh <username> [<password>]
Or:
./bin/lazy.cmd <username> [<password>]
This script serves the tw5.com-server edition content with LazyLoading applied to images.
2bld: builds TiddlyWiki 2.6.5
This script builds TiddlyWiki 2.6.5 from the original source and then displays the differences between them (diff is used for *nix, fc for Windows).

\ No newline at end of file
+./bin/serve.cmd [edition dir] [username] [password] [host] [port]

This script starts TiddlyWiki5 running as an HTTP server, defaulting to the content from the tw5.com-server edition. By default, the Node.js serves on port 8080. If the optional username parameter is provided, it is used for signing edits. If the password is provided then HTTP basic authentication is used. Run the script with the -h parameter to see online help.

To experiment with this configuration, run the script and then visit http://127.0.0.1:8080 in a browser.

Changes made in the browser propagate to the server over HTTP (use the browser developer console to see these requests). The server then syncs changes to the file system (and logs each change to the screen).

test: build and run tests

This script runs the test edition of TiddlyWiki on the server to perform the server-side tests and to build test.html for running the tests in the browser.

lazy: serves tw5.com with lazily loaded images

./bin/lazy.sh <username> [<password>]

Or:

./bin/lazy.cmd <username> [<password>]

This script serves the tw5.com-server edition content with LazyLoading applied to images.

2bld: builds TiddlyWiki 2.6.5

This script builds TiddlyWiki 2.6.5 from the original source and then displays the differences between them (diff is used for *nix, fc for Windows).

\ No newline at end of file diff --git a/boot/boot.css.tid b/boot/boot.css.tid index 2cf486be8..27c8884cd 100644 --- a/boot/boot.css.tid +++ b/boot/boot.css.tid @@ -9,37 +9,50 @@ Basic styles used before we boot up the parsing engine Error message and password prompt */ -.tc-password-wrapper, .tc-error-form { +.tc-error-form { + font-family: sans-serif; + color: #fff; + z-index: 20000; + position: fixed; + background-color: rgb(255, 75, 75); + border: 8px solid rgb(255, 0, 0); + border-radius: 8px; + width: 50%; + margin-left: 25%; + margin-top: 4em; + padding: 0 2em 1em 2em; +} + +.tc-error-form h1 { + text-align: center; +} + +.tc-error-prompt { + text-align: center; + color: #000; +} + +.tc-error-message { + overflow: auto; + max-height: 40em; + padding-right: 1em; + margin: 1em 0; + white-space: pre-line; +} + +.tc-password-wrapper { font-family: sans-serif; z-index: 20000; position: fixed; text-align: center; width: 200px; top: 4em; - left: 50%; - margin-left: -144px; /* - width/2 - paddingHorz/2 - border */ + left: 50%; + margin-left: -144px; /* - width/2 - paddingHorz/2 - border */ padding: 16px 16px 16px 16px; border-radius: 8px; } -.tc-error-form { - color: #fff; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); - background-color: rgb(255, 75, 75); - border: 8px solid rgb(255, 0, 0); - width: 480px; - margin-left: -244px; /* - width/2 - paddingHorz/2 - border */ -} - -.tc-error-form div { - padding-bottom: 1em; -} - -.tc-error-prompt { - color: #000; - text-shadow: none; -} - .tc-password-wrapper { color: #000; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); diff --git a/boot/boot.js b/boot/boot.js index c955f6e88..d6647884d 100644 --- a/boot/boot.js +++ b/boot/boot.js @@ -135,8 +135,8 @@ $tw.utils.error = function(err) { var dm = $tw.utils.domMaker, heading = dm("h1",{text: errHeading}), prompt = dm("div",{text: promptMsg, "class": "tc-error-prompt"}), - message = dm("div",{text: err}), - button = dm("button",{text: ( $tw.language == undefined ? "close" : $tw.language.getString("Buttons/Close/Caption") )}), + message = dm("div",{text: err, "class":"tc-error-message"}), + button = dm("div",{children: [dm("button",{text: ( $tw.language == undefined ? "close" : $tw.language.getString("Buttons/Close/Caption") )})], "class": "tc-error-prompt"}), form = dm("form",{children: [heading,prompt,message,button], "class": "tc-error-form"}); document.body.insertBefore(form,document.body.firstChild); form.addEventListener("submit",function(event) { @@ -251,29 +251,35 @@ $tw.utils.parseDate = function(value) { // Stringify an array of tiddler titles into a list string $tw.utils.stringifyList = function(value) { - var result = []; - for(var t=0; t>>24]<<24^f[c>>16&255]<<16^f[c>>8&255]<<8^f[c&255];if(a%b===0){c=c<<8^c>>>24^h<<24;h=h<<1^(h>>7)*283}}d[a]=d[a-b]^c}for(b=0;a;b++,a--){c=d[b&3?a:a-4];e[b]=a<=4||b<4?c:g[0][f[c>>>24]]^g[1][f[c>>16&255]]^g[2][f[c>>8&255]]^ -g[3][f[c&255]]}}; -sjcl.cipher.aes.prototype={encrypt:function(a){return this.I(a,0)},decrypt:function(a){return this.I(a,1)},h:[[[],[],[],[],[]],[[],[],[],[],[]]],z:function(){var a=this.h[0],b=this.h[1],c=a[4],d=b[4],e,f,g,h=[],i=[],k,j,l,m;for(e=0;e<0x100;e++)i[(h[e]=e<<1^(e>>7)*283)^e]=e;for(f=g=0;!c[f];f^=k||1,g=i[g]||1){l=g^g<<1^g<<2^g<<3^g<<4;l=l>>8^l&255^99;c[f]=l;d[l]=f;j=h[e=h[k=h[f]]];m=j*0x1010101^e*0x10001^k*0x101^f*0x1010100;j=h[l]*0x101^l*0x1010100;for(e=0;e<4;e++){a[e][f]=j=j<<24^j>>>8;b[e][l]=m=m<<24^m>>>8}}for(e= -0;e<5;e++){a[e]=a[e].slice(0);b[e]=b[e].slice(0)}},I:function(a,b){if(a.length!==4)throw new sjcl.exception.invalid("invalid aes block size");var c=this.a[b],d=a[0]^c[0],e=a[b?3:1]^c[1],f=a[2]^c[2];a=a[b?1:3]^c[3];var g,h,i,k=c.length/4-2,j,l=4,m=[0,0,0,0];g=this.h[b];var n=g[0],o=g[1],p=g[2],q=g[3],r=g[4];for(j=0;j>>24]^o[e>>16&255]^p[f>>8&255]^q[a&255]^c[l];h=n[e>>>24]^o[f>>16&255]^p[a>>8&255]^q[d&255]^c[l+1];i=n[f>>>24]^o[a>>16&255]^p[d>>8&255]^q[e&255]^c[l+2];a=n[a>>>24]^o[d>>16& -255]^p[e>>8&255]^q[f&255]^c[l+3];l+=4;d=g;e=h;f=i}for(j=0;j<4;j++){m[b?3&-j:j]=r[d>>>24]<<24^r[e>>16&255]<<16^r[f>>8&255]<<8^r[a&255]^c[l++];g=d;d=e;e=f;f=a;a=g}return m}}; -sjcl.bitArray={bitSlice:function(a,b,c){a=sjcl.bitArray.P(a.slice(b/32),32-(b&31)).slice(1);return c===undefined?a:sjcl.bitArray.clamp(a,c-b)},extract:function(a,b,c){var d=Math.floor(-b-c&31);return((b+c-1^b)&-32?a[b/32|0]<<32-d^a[b/32+1|0]>>>d:a[b/32|0]>>>d)&(1<0&&b)a[c-1]=sjcl.bitArray.partial(b,a[c-1]&2147483648>>b-1,1);return a},partial:function(a,b,c){if(a===32)return b;return(c?b|0:b<<32-a)+a*0x10000000000},getPartial:function(a){return Math.round(a/0x10000000000)||32},equal:function(a,b){if(sjcl.bitArray.bitLength(a)!==sjcl.bitArray.bitLength(b))return false;var c=0,d;for(d=0;d=32;b-=32){d.push(c);c=0}if(b===0)return d.concat(a);for(e=0;e>>b);c=a[e]<<32-b}e=a.length?a[a.length-1]:0;a=sjcl.bitArray.getPartial(e);d.push(sjcl.bitArray.partial(b+a&31,b+a>32?c:d.pop(),1));return d},k:function(a,b){return[a[0]^b[0],a[1]^b[1],a[2]^b[2],a[3]^b[3]]}}; -sjcl.codec.utf8String={fromBits:function(a){var b="",c=sjcl.bitArray.bitLength(a),d,e;for(d=0;d>>24);e<<=8}return decodeURIComponent(escape(b))},toBits:function(a){a=unescape(encodeURIComponent(a));var b=[],c,d=0;for(c=0;c>>e)>>>26);if(e<6){g=a[c]<<6-e;e+=26;c++}else{g<<=6;e-=6}}for(;d.length&3&&!b;)d+="=";return d},toBits:function(a,b){a=a.replace(/\s|=/g,"");var c=[],d=0,e=sjcl.codec.base64.F,f=0,g;if(b)e=e.substr(0,62)+"-_";for(b=0;b26){d-=26;c.push(f^g>>>d);f=g<<32-d}else{d+=6;f^=g<<32-d}}d&56&&c.push(sjcl.bitArray.partial(d&56,f,1));return c}};sjcl.codec.base64url={fromBits:function(a){return sjcl.codec.base64.fromBits(a,1,1)},toBits:function(a){return sjcl.codec.base64.toBits(a,1)}};sjcl.hash.sha256=function(a){this.a[0]||this.z();if(a){this.n=a.n.slice(0);this.i=a.i.slice(0);this.e=a.e}else this.reset()};sjcl.hash.sha256.hash=function(a){return(new sjcl.hash.sha256).update(a).finalize()}; -sjcl.hash.sha256.prototype={blockSize:512,reset:function(){this.n=this.N.slice(0);this.i=[];this.e=0;return this},update:function(a){if(typeof a==="string")a=sjcl.codec.utf8String.toBits(a);var b,c=this.i=sjcl.bitArray.concat(this.i,a);b=this.e;a=this.e=b+sjcl.bitArray.bitLength(a);for(b=512+b&-512;b<=a;b+=512)this.D(c.splice(0,16));return this},finalize:function(){var a,b=this.i,c=this.n;b=sjcl.bitArray.concat(b,[sjcl.bitArray.partial(1,1)]);for(a=b.length+2;a&15;a++)b.push(0);b.push(Math.floor(this.e/ -4294967296));for(b.push(this.e|0);b.length;)this.D(b.splice(0,16));this.reset();return c},N:[],a:[],z:function(){function a(e){return(e-Math.floor(e))*0x100000000|0}var b=0,c=2,d;a:for(;b<64;c++){for(d=2;d*d<=c;d++)if(c%d===0)continue a;if(b<8)this.N[b]=a(Math.pow(c,0.5));this.a[b]=a(Math.pow(c,1/3));b++}},D:function(a){var b,c,d=a.slice(0),e=this.n,f=this.a,g=e[0],h=e[1],i=e[2],k=e[3],j=e[4],l=e[5],m=e[6],n=e[7];for(a=0;a<64;a++){if(a<16)b=d[a];else{b=d[a+1&15];c=d[a+14&15];b=d[a&15]=(b>>>7^b>>>18^ -b>>>3^b<<25^b<<14)+(c>>>17^c>>>19^c>>>10^c<<15^c<<13)+d[a&15]+d[a+9&15]|0}b=b+n+(j>>>6^j>>>11^j>>>25^j<<26^j<<21^j<<7)+(m^j&(l^m))+f[a];n=m;m=l;l=j;j=k+b|0;k=i;i=h;h=g;g=b+(h&i^k&(h^i))+(h>>>2^h>>>13^h>>>22^h<<30^h<<19^h<<10)|0}e[0]=e[0]+g|0;e[1]=e[1]+h|0;e[2]=e[2]+i|0;e[3]=e[3]+k|0;e[4]=e[4]+j|0;e[5]=e[5]+l|0;e[6]=e[6]+m|0;e[7]=e[7]+n|0}}; -sjcl.mode.ccm={name:"ccm",encrypt:function(a,b,c,d,e){var f,g=b.slice(0),h=sjcl.bitArray,i=h.bitLength(c)/8,k=h.bitLength(g)/8;e=e||64;d=d||[];if(i<7)throw new sjcl.exception.invalid("ccm: iv must be at least 7 bytes");for(f=2;f<4&&k>>>8*f;f++);if(f<15-i)f=15-i;c=h.clamp(c,8*(15-f));b=sjcl.mode.ccm.H(a,b,c,d,e,f);g=sjcl.mode.ccm.J(a,g,c,b,e,f);return h.concat(g.data,g.tag)},decrypt:function(a,b,c,d,e){e=e||64;d=d||[];var f=sjcl.bitArray,g=f.bitLength(c)/8,h=f.bitLength(b),i=f.clamp(b,h-e),k=f.bitSlice(b, -h-e);h=(h-e)/8;if(g<7)throw new sjcl.exception.invalid("ccm: iv must be at least 7 bytes");for(b=2;b<4&&h>>>8*b;b++);if(b<15-g)b=15-g;c=f.clamp(c,8*(15-b));i=sjcl.mode.ccm.J(a,i,c,k,e,b);a=sjcl.mode.ccm.H(a,i.data,c,d,e,b);if(!f.equal(i.tag,a))throw new sjcl.exception.corrupt("ccm: tag doesn't match");return i.data},H:function(a,b,c,d,e,f){var g=[],h=sjcl.bitArray,i=h.k;e/=8;if(e%2||e<4||e>16)throw new sjcl.exception.invalid("ccm: invalid tag length");if(d.length>0xffffffff||b.length>0xffffffff)throw new sjcl.exception.bug("ccm: can't deal with 4GiB or more data"); -f=[h.partial(8,(d.length?64:0)|e-2<<2|f-1)];f=h.concat(f,c);f[3]|=h.bitLength(b)/8;f=a.encrypt(f);if(d.length){c=h.bitLength(d)/8;if(c<=65279)g=[h.partial(16,c)];else if(c<=0xffffffff)g=h.concat([h.partial(16,65534)],[c]);g=h.concat(g,d);for(d=0;d>>31,a[1]<<1^a[2]>>>31,a[2]<<1^a[3]>>>31,a[3]<<1^(a[0]>>>31)*135]}};sjcl.misc.hmac=function(a,b){this.M=b=b||sjcl.hash.sha256;var c=[[],[]],d=b.prototype.blockSize/32;this.l=[new b,new b];if(a.length>d)a=b.hash(a);for(b=0;b0;){b++;e>>>=1}this.b[g].update([d,this.u++,2,b,f,a.length].concat(a))}break;case "string":if(b=== -undefined)b=a.length;this.b[g].update([d,this.u++,3,b,f,a.length]);this.b[g].update(a);break;default:i=1}if(i)throw new sjcl.exception.bug("random: addEntropy only supports number, array of numbers or string");this.j[g]+=b;this.f+=b;if(h===0){this.isReady()!==0&&this.K("seeded",Math.max(this.g,this.f));this.K("progress",this.getProgress())}},isReady:function(a){a=this.C[a!==undefined?a:this.t];return this.g&&this.g>=a?this.j[0]>80&&(new Date).valueOf()>this.O?3:1:this.f>=a?2:0},getProgress:function(a){a= -this.C[a?a:this.t];return this.g>=a?1:this.f>a?1:this.f/a},startCollectors:function(){if(!this.m){if(window.addEventListener){window.addEventListener("load",this.o,false);window.addEventListener("mousemove",this.p,false)}else if(document.attachEvent){document.attachEvent("onload",this.o);document.attachEvent("onmousemove",this.p)}else throw new sjcl.exception.bug("can't attach event");this.m=true}},stopCollectors:function(){if(this.m){if(window.removeEventListener){window.removeEventListener("load", -this.o,false);window.removeEventListener("mousemove",this.p,false)}else if(window.detachEvent){window.detachEvent("onload",this.o);window.detachEvent("onmousemove",this.p)}this.m=false}},addEventListener:function(a,b){this.r[a][this.Q++]=b},removeEventListener:function(a,b){var c;a=this.r[a];var d=[];for(c in a)a.hasOwnProperty(c)&&a[c]===b&&d.push(c);for(b=0;b=1<this.g)this.g=c;this.A++;this.T(b)},p:function(a){sjcl.random.addEntropy([a.x||a.clientX||a.offsetX||0,a.y||a.clientY||a.offsetY||0],2,"mouse")},o:function(){sjcl.random.addEntropy((new Date).valueOf(),2,"loadtime")},K:function(a,b){var c;a=sjcl.random.r[a]; -var d=[];for(c in a)a.hasOwnProperty(c)&&d.push(a[c]);for(c=0;c4)throw new sjcl.exception.invalid("json encrypt: invalid parameters");if(typeof a==="string"){g=sjcl.misc.cachedPbkdf2(a,f);a=g.key.slice(0,f.ks/32);f.salt=g.salt}if(typeof b==="string")b=sjcl.codec.utf8String.toBits(b);if(typeof c==="string")c=sjcl.codec.utf8String.toBits(c);g=new sjcl.cipher[f.cipher](a);e.c(d,f);d.key=a;f.ct=sjcl.mode[f.mode].encrypt(g,b,f.iv,c,f.ts);return e.encode(f)},decrypt:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json;b=e.c(e.c(e.c({},e.defaults),e.decode(b)), -c,true);var f;c=b.adata;if(typeof b.salt==="string")b.salt=sjcl.codec.base64.toBits(b.salt);if(typeof b.iv==="string")b.iv=sjcl.codec.base64.toBits(b.iv);if(!sjcl.mode[b.mode]||!sjcl.cipher[b.cipher]||typeof a==="string"&&b.iter<=100||b.ts!==64&&b.ts!==96&&b.ts!==128||b.ks!==128&&b.ks!==192&&b.ks!==0x100||!b.iv||b.iv.length<2||b.iv.length>4)throw new sjcl.exception.invalid("json decrypt: invalid parameters");if(typeof a==="string"){f=sjcl.misc.cachedPbkdf2(a,b);a=f.key.slice(0,b.ks/32);b.salt=f.salt}if(typeof c=== -"string")c=sjcl.codec.utf8String.toBits(c);f=new sjcl.cipher[b.cipher](a);c=sjcl.mode[b.mode].decrypt(f,b.ct,b.iv,c,b.ts);e.c(d,b);d.key=a;return sjcl.codec.utf8String.fromBits(c)},encode:function(a){var b,c="{",d="";for(b in a)if(a.hasOwnProperty(b)){if(!b.match(/^[a-z0-9]+$/i))throw new sjcl.exception.invalid("json encode: invalid property name");c+=d+'"'+b+'":';d=",";switch(typeof a[b]){case "number":case "boolean":c+=a[b];break;case "string":c+='"'+escape(a[b])+'"';break;case "object":c+='"'+ -sjcl.codec.base64.fromBits(a[b],1)+'"';break;default:throw new sjcl.exception.bug("json encode: unsupported type");}}return c+"}"},decode:function(a){a=a.replace(/\s/g,"");if(!a.match(/^\{.*\}$/))throw new sjcl.exception.invalid("json decode: this isn't json!");a=a.replace(/^\{|\}$/g,"").split(/,/);var b={},c,d;for(c=0;c>>24]<<24^f[c>>16&255]<<16^f[c>>8&255]<<8^f[c&255],0===a%b&&(c=c<<8^c>>>24^h<<24,h=h<<1^283*(h>>7));d[a]=d[a-b]^c}for(b=0;a;b++,a--)c=d[b&3?a:a-4],e[b]=4>=a||4>b?c:g[0][f[c>>>24]]^g[1][f[c>>16&255]]^g[2][f[c>>8&255]]^g[3][f[c& +255]]}; +sjcl.cipher.aes.prototype={encrypt:function(a){return t(this,a,0)},decrypt:function(a){return t(this,a,1)},s:[[[],[],[],[],[]],[[],[],[],[],[]]],O:function(){var a=this.s[0],b=this.s[1],c=a[4],d=b[4],e,f,g,h=[],k=[],l,n,m,p;for(e=0;0x100>e;e++)k[(h[e]=e<<1^283*(e>>7))^e]=e;for(f=g=0;!c[f];f^=l||1,g=k[g]||1)for(m=g^g<<1^g<<2^g<<3^g<<4,m=m>>8^m&255^99,c[f]=m,d[m]=f,n=h[e=h[l=h[f]]],p=0x1010101*n^0x10001*e^0x101*l^0x1010100*f,n=0x101*h[m]^0x1010100*m,e=0;4>e;e++)a[e][f]=n=n<<24^n>>>8,b[e][m]=p=p<<24^p>>>8;for(e= +0;5>e;e++)a[e]=a[e].slice(0),b[e]=b[e].slice(0)}}; +function t(a,b,c){if(4!==b.length)throw new sjcl.exception.invalid("invalid aes block size");var d=a.b[c],e=b[0]^d[0],f=b[c?3:1]^d[1],g=b[2]^d[2];b=b[c?1:3]^d[3];var h,k,l,n=d.length/4-2,m,p=4,r=[0,0,0,0];h=a.s[c];a=h[0];var q=h[1],v=h[2],w=h[3],x=h[4];for(m=0;m>>24]^q[f>>16&255]^v[g>>8&255]^w[b&255]^d[p],k=a[f>>>24]^q[g>>16&255]^v[b>>8&255]^w[e&255]^d[p+1],l=a[g>>>24]^q[b>>16&255]^v[e>>8&255]^w[f&255]^d[p+2],b=a[b>>>24]^q[e>>16&255]^v[f>>8&255]^w[g&255]^d[p+3],p+=4,e=h,f=k,g=l;for(m= +0;4>m;m++)r[c?3&-m:m]=x[e>>>24]<<24^x[f>>16&255]<<16^x[g>>8&255]<<8^x[b&255]^d[p++],h=e,e=f,f=g,g=b,b=h;return r} +sjcl.bitArray={bitSlice:function(a,b,c){a=sjcl.bitArray.$(a.slice(b/32),32-(b&31)).slice(1);return void 0===c?a:sjcl.bitArray.clamp(a,c-b)},extract:function(a,b,c){var d=Math.floor(-b-c&31);return((b+c-1^b)&-32?a[b/32|0]<<32-d^a[b/32+1|0]>>>d:a[b/32|0]>>>d)&(1<>b-1,1));return a},partial:function(a,b,c){return 32===a?b:(c?b|0:b<<32-a)+0x10000000000*a},getPartial:function(a){return Math.round(a/0x10000000000)||32},equal:function(a,b){if(sjcl.bitArray.bitLength(a)!==sjcl.bitArray.bitLength(b))return!1;var c=0,d;for(d=0;d>>b),c=a[e]<<32-b;e=a.length?a[a.length-1]:0;a=sjcl.bitArray.getPartial(e);d.push(sjcl.bitArray.partial(b+a&31,32>>24|c>>>8&0xff00|(c&0xff00)<<8|c<<24;return a}}; +sjcl.codec.utf8String={fromBits:function(a){var b="",c=sjcl.bitArray.bitLength(a),d,e;for(d=0;d>>8>>>8>>>8),e<<=8;return decodeURIComponent(escape(b))},toBits:function(a){a=unescape(encodeURIComponent(a));var b=[],c,d=0;for(c=0;c>>g)>>>e),gn){if(!b)try{return sjcl.codec.base32hex.toBits(a)}catch(p){}throw new sjcl.exception.invalid("this isn't "+m+"!");}h>e?(h-=e,f.push(l^n>>>h),l=n<>>e)>>>26),6>e?(g=a[c]<<6-e,e+=26,c++):(g<<=6,e-=6);for(;d.length&3&&!b;)d+="=";return d},toBits:function(a,b){a=a.replace(/\s|=/g,"");var c=[],d,e=0,f=sjcl.codec.base64.B,g=0,h;b&&(f=f.substr(0,62)+"-_");for(d=0;dh)throw new sjcl.exception.invalid("this isn't base64!");26>>e),g=h<<32-e):(e+=6,g^=h<<32-e)}e&56&&c.push(sjcl.bitArray.partial(e&56,g,1));return c}};sjcl.codec.base64url={fromBits:function(a){return sjcl.codec.base64.fromBits(a,1,1)},toBits:function(a){return sjcl.codec.base64.toBits(a,1)}};sjcl.hash.sha256=function(a){this.b[0]||this.O();a?(this.F=a.F.slice(0),this.A=a.A.slice(0),this.l=a.l):this.reset()};sjcl.hash.sha256.hash=function(a){return(new sjcl.hash.sha256).update(a).finalize()}; +sjcl.hash.sha256.prototype={blockSize:512,reset:function(){this.F=this.Y.slice(0);this.A=[];this.l=0;return this},update:function(a){"string"===typeof a&&(a=sjcl.codec.utf8String.toBits(a));var b,c=this.A=sjcl.bitArray.concat(this.A,a);b=this.l;a=this.l=b+sjcl.bitArray.bitLength(a);if(0x1fffffffffffffb;c++){e=!0;for(d=2;d*d<=c;d++)if(0===c%d){e= +!1;break}e&&(8>b&&(this.Y[b]=a(Math.pow(c,.5))),this.b[b]=a(Math.pow(c,1/3)),b++)}}}; +function u(a,b){var c,d,e,f=a.F,g=a.b,h=f[0],k=f[1],l=f[2],n=f[3],m=f[4],p=f[5],r=f[6],q=f[7];for(c=0;64>c;c++)16>c?d=b[c]:(d=b[c+1&15],e=b[c+14&15],d=b[c&15]=(d>>>7^d>>>18^d>>>3^d<<25^d<<14)+(e>>>17^e>>>19^e>>>10^e<<15^e<<13)+b[c&15]+b[c+9&15]|0),d=d+q+(m>>>6^m>>>11^m>>>25^m<<26^m<<21^m<<7)+(r^m&(p^r))+g[c],q=r,r=p,p=m,m=n+d|0,n=l,l=k,k=h,h=d+(k&l^n&(k^l))+(k>>>2^k>>>13^k>>>22^k<<30^k<<19^k<<10)|0;f[0]=f[0]+h|0;f[1]=f[1]+k|0;f[2]=f[2]+l|0;f[3]=f[3]+n|0;f[4]=f[4]+m|0;f[5]=f[5]+p|0;f[6]=f[6]+r|0;f[7]= +f[7]+q|0} +sjcl.mode.ccm={name:"ccm",G:[],listenProgress:function(a){sjcl.mode.ccm.G.push(a)},unListenProgress:function(a){a=sjcl.mode.ccm.G.indexOf(a);-1k)throw new sjcl.exception.invalid("ccm: iv must be at least 7 bytes");for(f=2;4>f&&l>>>8*f;f++);f<15-k&&(f=15-k);c=h.clamp(c, +8*(15-f));b=sjcl.mode.ccm.V(a,b,c,d,e,f);g=sjcl.mode.ccm.C(a,g,c,b,e,f);return h.concat(g.data,g.tag)},decrypt:function(a,b,c,d,e){e=e||64;d=d||[];var f=sjcl.bitArray,g=f.bitLength(c)/8,h=f.bitLength(b),k=f.clamp(b,h-e),l=f.bitSlice(b,h-e),h=(h-e)/8;if(7>g)throw new sjcl.exception.invalid("ccm: iv must be at least 7 bytes");for(b=2;4>b&&h>>>8*b;b++);b<15-g&&(b=15-g);c=f.clamp(c,8*(15-b));k=sjcl.mode.ccm.C(a,k,c,l,e,b);a=sjcl.mode.ccm.V(a,k.data,c,d,e,b);if(!f.equal(k.tag,a))throw new sjcl.exception.corrupt("ccm: tag doesn't match"); +return k.data},na:function(a,b,c,d,e,f){var g=[],h=sjcl.bitArray,k=h.i;d=[h.partial(8,(b.length?64:0)|d-2<<2|f-1)];d=h.concat(d,c);d[3]|=e;d=a.encrypt(d);if(b.length)for(c=h.bitLength(b)/8,65279>=c?g=[h.partial(16,c)]:0xffffffff>=c&&(g=h.concat([h.partial(16,65534)],[c])),g=h.concat(g,b),b=0;be||16n&&(sjcl.mode.ccm.fa(g/ +k),n+=m),c[3]++,e=a.encrypt(c),b[g]^=e[0],b[g+1]^=e[1],b[g+2]^=e[2],b[g+3]^=e[3];return{tag:d,data:h.clamp(b,l)}}}; +sjcl.mode.ocb2={name:"ocb2",encrypt:function(a,b,c,d,e,f){if(128!==sjcl.bitArray.bitLength(c))throw new sjcl.exception.invalid("ocb iv must be 128 bits");var g,h=sjcl.mode.ocb2.S,k=sjcl.bitArray,l=k.i,n=[0,0,0,0];c=h(a.encrypt(c));var m,p=[];d=d||[];e=e||64;for(g=0;g+4e.bitLength(c)&&(h=f(h,d(h)),c=e.concat(c,[-2147483648,0,0,0]));g=f(g,c); +return a.encrypt(f(d(f(h,d(h))),g))},S:function(a){return[a[0]<<1^a[1]>>>31,a[1]<<1^a[2]>>>31,a[2]<<1^a[3]>>>31,a[3]<<1^135*(a[0]>>>31)]}}; +sjcl.mode.gcm={name:"gcm",encrypt:function(a,b,c,d,e){var f=b.slice(0);b=sjcl.bitArray;d=d||[];a=sjcl.mode.gcm.C(!0,a,f,d,c,e||128);return b.concat(a.data,a.tag)},decrypt:function(a,b,c,d,e){var f=b.slice(0),g=sjcl.bitArray,h=g.bitLength(f);e=e||128;d=d||[];e<=h?(b=g.bitSlice(f,h-e),f=g.bitSlice(f,0,h-e)):(b=f,f=[]);a=sjcl.mode.gcm.C(!1,a,f,d,c,e);if(!g.equal(a.tag,b))throw new sjcl.exception.corrupt("gcm: tag doesn't match");return a.data},ka:function(a,b){var c,d,e,f,g,h=sjcl.bitArray.i;e=[0,0, +0,0];f=b.slice(0);for(c=0;128>c;c++){(d=0!==(a[Math.floor(c/32)]&1<<31-c%32))&&(e=h(e,f));g=0!==(f[3]&1);for(d=3;0>>1|(f[d-1]&1)<<31;f[0]>>>=1;g&&(f[0]^=-0x1f000000)}return e},j:function(a,b,c){var d,e=c.length;b=b.slice(0);for(d=0;de&&(a=b.hash(a));for(d=0;dd||0>c)throw new sjcl.exception.invalid("invalid params to pbkdf2");"string"===typeof a&&(a=sjcl.codec.utf8String.toBits(a));"string"===typeof b&&(b=sjcl.codec.utf8String.toBits(b));e=e||sjcl.misc.hmac;a=new e(a);var f,g,h,k,l=[],n=sjcl.bitArray;for(k=1;32*l.length<(d||1);k++){e=f=a.encrypt(n.concat(b,[k]));for(g=1;gg;g++)e.push(0x100000000*Math.random()|0);for(g=0;g=1<this.o&&(this.o= +f);this.P++;this.b=sjcl.hash.sha256.hash(this.b.concat(e));this.L=new sjcl.cipher.aes(this.b);for(d=0;4>d&&(this.h[d]=this.h[d]+1|0,!this.h[d]);d++);}for(d=0;d>>1;this.c[g].update([d,this.N++,2,b,f,a.length].concat(a))}break;case "string":void 0===b&&(b=a.length);this.c[g].update([d,this.N++,3,b,f,a.length]);this.c[g].update(a);break;default:k=1}if(k)throw new sjcl.exception.bug("random: addEntropy only supports number, array of numbers or string");this.m[g]+=b;this.f+=b;h===this.u&&(this.isReady()!==this.u&&A("seeded",Math.max(this.o,this.f)),A("progress",this.getProgress()))}, +isReady:function(a){a=this.T[void 0!==a?a:this.M];return this.o&&this.o>=a?this.m[0]>this.ba&&(new Date).valueOf()>this.Z?this.J|this.I:this.I:this.f>=a?this.J|this.u:this.u},getProgress:function(a){a=this.T[a?a:this.M];return this.o>=a?1:this.f>a?1:this.f/a},startCollectors:function(){if(!this.D){this.a={loadTimeCollector:B(this,this.ma),mouseCollector:B(this,this.oa),keyboardCollector:B(this,this.la),accelerometerCollector:B(this,this.ea),touchCollector:B(this,this.qa)};if(window.addEventListener)window.addEventListener("load", +this.a.loadTimeCollector,!1),window.addEventListener("mousemove",this.a.mouseCollector,!1),window.addEventListener("keypress",this.a.keyboardCollector,!1),window.addEventListener("devicemotion",this.a.accelerometerCollector,!1),window.addEventListener("touchmove",this.a.touchCollector,!1);else if(document.attachEvent)document.attachEvent("onload",this.a.loadTimeCollector),document.attachEvent("onmousemove",this.a.mouseCollector),document.attachEvent("keypress",this.a.keyboardCollector);else throw new sjcl.exception.bug("can't attach event"); +this.D=!0}},stopCollectors:function(){this.D&&(window.removeEventListener?(window.removeEventListener("load",this.a.loadTimeCollector,!1),window.removeEventListener("mousemove",this.a.mouseCollector,!1),window.removeEventListener("keypress",this.a.keyboardCollector,!1),window.removeEventListener("devicemotion",this.a.accelerometerCollector,!1),window.removeEventListener("touchmove",this.a.touchCollector,!1)):document.detachEvent&&(document.detachEvent("onload",this.a.loadTimeCollector),document.detachEvent("onmousemove", +this.a.mouseCollector),document.detachEvent("keypress",this.a.keyboardCollector)),this.D=!1)},addEventListener:function(a,b){this.K[a][this.ga++]=b},removeEventListener:function(a,b){var c,d,e=this.K[a],f=[];for(d in e)e.hasOwnProperty(d)&&e[d]===b&&f.push(d);for(c=0;cb&&(a.h[b]=a.h[b]+1|0,!a.h[b]);b++);return a.L.encrypt(a.h)} +function B(a,b){return function(){b.apply(a,arguments)}}sjcl.random=new sjcl.prng(6); +a:try{var D,E,F,G;if(G="undefined"!==typeof module&&module.exports){var H;try{H=require("crypto")}catch(a){H=null}G=E=H}if(G&&E.randomBytes)D=E.randomBytes(128),D=new Uint32Array((new Uint8Array(D)).buffer),sjcl.random.addEntropy(D,1024,"crypto['randomBytes']");else if("undefined"!==typeof window&&"undefined"!==typeof Uint32Array){F=new Uint32Array(32);if(window.crypto&&window.crypto.getRandomValues)window.crypto.getRandomValues(F);else if(window.msCrypto&&window.msCrypto.getRandomValues)window.msCrypto.getRandomValues(F); +else break a;sjcl.random.addEntropy(F,1024,"crypto['getRandomValues']")}}catch(a){"undefined"!==typeof window&&window.console&&(console.log("There was an error collecting entropy from the browser:"),console.log(a))} +sjcl.json={defaults:{v:1,iter:1E4,ks:128,ts:64,mode:"ccm",adata:"",cipher:"aes"},ja:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json,f=e.g({iv:sjcl.random.randomWords(4,0)},e.defaults),g;e.g(f,c);c=f.adata;"string"===typeof f.salt&&(f.salt=sjcl.codec.base64.toBits(f.salt));"string"===typeof f.iv&&(f.iv=sjcl.codec.base64.toBits(f.iv));if(!sjcl.mode[f.mode]||!sjcl.cipher[f.cipher]||"string"===typeof a&&100>=f.iter||64!==f.ts&&96!==f.ts&&128!==f.ts||128!==f.ks&&192!==f.ks&&0x100!==f.ks||2>f.iv.length|| +4=b.iter||64!==b.ts&&96!==b.ts&&128!==b.ts||128!==b.ks&&192!==b.ks&&0x100!==b.ks||!b.iv||2>b.iv.length||4Contributing to TiddlyWiki5

We welcome contributions to the code and documentation of TiddlyWiki in several ways:

There are other ways to help TiddlyWiki too.

Contributor License Agreement

Like other OpenSource projects, TiddlyWiki5 needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the UnaMesa Association (the legal entity that owns TiddlyWiki on behalf of the community).

How to sign the CLA

Create a GitHub pull request to add your name to cla-individual.md or cla-entity.md, with the date in the format (YYYY/MM/DD).

step by step

  1. Navigate to licenses/CLA-individual or licenses/CLA-entity according to whether you are signing as an individual or representative of an organisation
  2. Click the "edit" button at the top-right corner (clicking this button will fork the project so you can edit the file)
  3. Add your name at the bottom
    • eg: Jeremy Ruston, @Jermolene, 2011/11/22
  4. Below the edit box for the CLA text you should see a box labelled Propose file change
  5. Enter a brief title to explain the change (eg, "Signing the CLA")
  6. Click the green button labelled Propose file change
  7. On the following screen, click the green button labelled Create pull request

The CLA documents used for this project were created using Harmony Project Templates. "HA-CLA-I-LIST Version 1.0" for "CLA-individual" and "HA-CLA-E-LIST Version 1.0" for "CLA-entity".

Remarks +

Contributing to TiddlyWiki5

We welcome contributions to the code and documentation of TiddlyWiki in several ways:

There are other ways to help TiddlyWiki too.

Contributor License Agreement

Like other OpenSource projects, TiddlyWiki5 needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the UnaMesa Association (the legal entity that owns TiddlyWiki on behalf of the community).

How to sign the CLA

Create a GitHub pull request to add your name to cla-individual.md or cla-entity.md, with the date in the format (YYYY/MM/DD).

step by step

  1. Navigate to licenses/CLA-individual or licenses/CLA-entity according to whether you are signing as an individual or representative of an organisation
  2. Click the "edit" button at the top-right corner (clicking this button will fork the project so you can edit the file)
  3. Add your name at the bottom
    • eg: Jeremy Ruston, @Jermolene, 2011/11/22
  4. Below the edit box for the CLA text you should see a box labelled Propose file change
  5. Enter a brief title to explain the change (eg, "Signing the CLA")
  6. Click the green button labelled Propose file change
  7. On the following screen, click the green button labelled Create pull request

The CLA documents used for this project were created using Harmony Project Templates. "HA-CLA-I-LIST Version 1.0" for "CLA-individual" and "HA-CLA-E-LIST Version 1.0" for "CLA-entity".

Remarks ----—

    • When not owning the copyright in the entire work of authorship**

In this case, please clearly state so, since otherwise we assume that you are the legal copyright holder of the contributed work! Please provide links and additional information that clarify under which license the rest of the code is distributed. -

This file was automatically generated by TiddlyWiki5 +

This file was automatically generated by TiddlyWiki5

\ No newline at end of file diff --git a/core/acknowledgements.tid b/core/acknowledgements.tid index 8830e8523..e7acee129 100644 --- a/core/acknowledgements.tid +++ b/core/acknowledgements.tid @@ -1,5 +1,4 @@ title: $:/Acknowledgements -type: text/vnd.tiddlywiki TiddlyWiki incorporates code from these fine OpenSource projects: diff --git a/core/copyright.tid b/core/copyright.tid index 828953895..21470e3c4 100644 --- a/core/copyright.tid +++ b/core/copyright.tid @@ -3,30 +3,31 @@ type: text/plain TiddlyWiki created by Jeremy Ruston, (jeremy [at] jermolene [dot] com) -Copyright © Jeremy Ruston 2004-2007 -Copyright © UnaMesa Association 2007-2016 +Copyright (c) 2004-2007, Jeremy Ruston +Copyright (c) 2007-2018, UnaMesa Association +All rights reserved. -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or other -materials provided with the distribution. +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. -Neither the name of the UnaMesa Association nor the names of its contributors may be -used to endorse or promote products derived from this software without specific -prior written permission. +* Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/core/images/add-comment.tid b/core/images/add-comment.tid new file mode 100644 index 000000000..3e77ed518 --- /dev/null +++ b/core/images/add-comment.tid @@ -0,0 +1,4 @@ +title: $:/core/images/add-comment +tags: $:/tags/Image + + \ No newline at end of file diff --git a/core/images/copy-clipboard.tid b/core/images/copy-clipboard.tid new file mode 100644 index 000000000..583808bd4 --- /dev/null +++ b/core/images/copy-clipboard.tid @@ -0,0 +1,15 @@ +title: $:/core/images/copy-clipboard +tags: $:/tags/Image + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/images/linkify.tid b/core/images/linkify.tid new file mode 100644 index 000000000..368d27490 --- /dev/null +++ b/core/images/linkify.tid @@ -0,0 +1,4 @@ +title: $:/core/images/linkify +tags: $:/tags/Image + + \ No newline at end of file diff --git a/core/images/list.tid b/core/images/list.tid new file mode 100644 index 000000000..c27a51647 --- /dev/null +++ b/core/images/list.tid @@ -0,0 +1,9 @@ +title: $:/core/images/list +tags: $:/tags/Image + + + + + + + \ No newline at end of file diff --git a/core/images/print-button.tid b/core/images/print-button.tid new file mode 100644 index 000000000..5e7c1d8e0 --- /dev/null +++ b/core/images/print-button.tid @@ -0,0 +1,12 @@ +title: $:/core/images/print-button +tags: $:/tags/Image + + + + + + + + + + \ No newline at end of file diff --git a/core/images/rotate-left.tid b/core/images/rotate-left.tid new file mode 100644 index 000000000..7530aedde --- /dev/null +++ b/core/images/rotate-left.tid @@ -0,0 +1,4 @@ +title: $:/core/images/rotate-left +tags: $:/tags/Image + + \ No newline at end of file diff --git a/core/images/timestamp-off.tid b/core/images/timestamp-off.tid new file mode 100644 index 000000000..132dfc127 --- /dev/null +++ b/core/images/timestamp-off.tid @@ -0,0 +1,8 @@ +title: $:/core/images/timestamp-off +tags: $:/tags/Image + + + + + + diff --git a/core/images/timestamp-on.tid b/core/images/timestamp-on.tid new file mode 100644 index 000000000..292181b49 --- /dev/null +++ b/core/images/timestamp-on.tid @@ -0,0 +1,8 @@ +title: $:/core/images/timestamp-on +tags: $:/tags/Image + + + + + + diff --git a/core/images/transcludify.tid b/core/images/transcludify.tid new file mode 100644 index 000000000..33f7e0af1 --- /dev/null +++ b/core/images/transcludify.tid @@ -0,0 +1,4 @@ +title: $:/core/images/transcludify +tags: $:/tags/Image + + diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids index 5b310f4a1..cddf68485 100644 --- a/core/language/en-GB/Buttons.multids +++ b/core/language/en-GB/Buttons.multids @@ -14,6 +14,8 @@ CloseOthers/Caption: close others CloseOthers/Hint: Close other tiddlers ControlPanel/Caption: control panel ControlPanel/Hint: Open control panel +CopyToClipboard/Caption: copy to clipboard +CopyToClipboard/Hint: Copy this text to the clipboard Delete/Caption: delete Delete/Hint: Delete this tiddler Edit/Caption: edit @@ -54,6 +56,8 @@ Home/Caption: home Home/Hint: Open the default tiddlers Language/Caption: language Language/Hint: Choose the user interface language +Manager/Caption: tiddler manager +Manager/Hint: Open tiddler manager More/Caption: more More/Hint: More actions NewHere/Caption: new here @@ -76,6 +80,8 @@ Permalink/Caption: permalink Permalink/Hint: Set browser address bar to a direct link to this tiddler Permaview/Caption: permaview Permaview/Hint: Set browser address bar to a direct link to all the tiddlers in this story +Print/Caption: print page +Print/Hint: Print the current page Refresh/Caption: refresh Refresh/Hint: Perform a full refresh of the wiki Save/Caption: ok @@ -90,6 +96,12 @@ ShowSideBar/Caption: show sidebar ShowSideBar/Hint: Show sidebar TagManager/Caption: tag manager TagManager/Hint: Open tag manager +Timestamp/Caption: timestamps +Timestamp/Hint: Choose whether modifications update timestamps +Timestamp/On/Caption: timestamps are on +Timestamp/On/Hint: Update timestamps when tiddlers are modified +Timestamp/Off/Caption: timestamps are off +Timestamp/Off/Hint: Don't update timestamps when tiddlers are modified Theme/Caption: theme Theme/Hint: Choose the display theme Bold/Caption: bold @@ -129,6 +141,8 @@ LineWidth/Caption: line width LineWidth/Hint: Set line width for painting Link/Caption: link Link/Hint: Create wikitext link +Linkify/Caption: wikilink +Linkify/Hint: Wrap selection in square brackets ListBullet/Caption: bulleted list ListBullet/Hint: Apply bulleted list formatting to lines containing selection ListNumber/Caption: numbered list @@ -149,6 +163,8 @@ PreviewType/Caption: preview type PreviewType/Hint: Choose preview type Quote/Caption: quote Quote/Hint: Apply quoted text formatting to lines containing selection +RotateLeft/Caption: rotate left +RotateLeft/Hint: Rotate image left by 90 degrees Size/Caption: image size Size/Caption/Height: Height: Size/Caption/Resize: Resize image @@ -165,5 +181,7 @@ Subscript/Caption: subscript Subscript/Hint: Apply subscript formatting to selection Superscript/Caption: superscript Superscript/Hint: Apply superscript formatting to selection +Transcludify/Caption: transclusion +Transcludify/Hint: Wrap selection in curly brackets Underline/Caption: underline Underline/Hint: Apply underline formatting to selection diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids index e414a636c..17372c418 100644 --- a/core/language/en-GB/ControlPanel.multids +++ b/core/language/en-GB/ControlPanel.multids @@ -11,7 +11,9 @@ Basics/DefaultTiddlers/Prompt: Default tiddlers: Basics/DefaultTiddlers/TopHint: Choose which tiddlers are displayed at startup: Basics/Language/Prompt: Hello! Current language: Basics/NewJournal/Title/Prompt: Title of new journal tiddlers +Basics/NewJournal/Text/Prompt: Text for new journal tiddlers Basics/NewJournal/Tags/Prompt: Tags for new journal tiddlers +Basics/NewTiddler/Title/Prompt: Title of new tiddlers Basics/OverriddenShadowTiddlers/Prompt: Number of overridden shadow tiddlers: Basics/ShadowTiddlers/Prompt: Number of shadow tiddlers: Basics/Subtitle/Prompt: Subtitle: @@ -52,7 +54,7 @@ Palette/HideEditor/Caption: hide editor Palette/Prompt: Current palette: Palette/ShowEditor/Caption: show editor Parsing/Caption: Parsing -Parsing/Hint: Here you can globally disable individual wiki parser rules. Take care as disabling some parser rules can prevent ~TiddlyWiki functioning correctly (you can restore normal operation with [[safe mode|http://tiddlywiki.com/#SafeMode]] ) +Parsing/Hint: Here you can globally disable/enable wiki parser rules. For changes to take effect, save and reload your wiki. Disabling certain parser rules can prevent <$text text="TiddlyWiki"/> from functioning correctly. Use [[safe mode|https://tiddlywiki.com/#SafeMode]] to restore normal operation. Parsing/Block/Caption: Block Parse Rules Parsing/Inline/Caption: Inline Parse Rules Parsing/Pragma/Caption: Pragma Parse Rules @@ -71,19 +73,26 @@ Plugins/Installed/Hint: Currently installed plugins: Plugins/Languages/Caption: Languages Plugins/Languages/Hint: Language pack plugins Plugins/NoInfoFound/Hint: No ''"<$text text=<>/>"'' found -Plugins/NoInformation/Hint: No information provided Plugins/NotInstalled/Hint: This plugin is not currently installed Plugins/OpenPluginLibrary: open plugin library +Plugins/ClosePluginLibrary: close plugin library Plugins/Plugins/Caption: Plugins Plugins/Plugins/Hint: Plugins Plugins/Reinstall/Caption: reinstall Plugins/Themes/Caption: Themes Plugins/Themes/Hint: Theme plugins Saving/Caption: Saving -Saving/Heading: Saving +Saving/DownloadSaver/AutoSave/Description: Permit automatic saving for the download saver +Saving/DownloadSaver/AutoSave/Hint: Enable Autosave for Download Saver +Saving/DownloadSaver/Caption: Download Saver +Saving/DownloadSaver/Hint: These settings apply to the HTML5-compatible download saver +Saving/General/Caption: General +Saving/General/Hint: These settings apply to all the loaded savers +Saving/Hint: Settings used for saving the entire TiddlyWiki as a single file via a saver module Saving/TiddlySpot/Advanced/Heading: Advanced Settings Saving/TiddlySpot/BackupDir: Backup Directory Saving/TiddlySpot/Backups: Backups +Saving/TiddlySpot/Caption: ~TiddlySpot Saver Saving/TiddlySpot/Description: These settings are only used when saving to http://tiddlyspot.com or a compatible remote server Saving/TiddlySpot/Filename: Upload Filename Saving/TiddlySpot/Heading: ~TiddlySpot @@ -95,7 +104,7 @@ Saving/TiddlySpot/UserName: Wiki Name Settings/AutoSave/Caption: Autosave Settings/AutoSave/Disabled/Description: Do not save changes automatically Settings/AutoSave/Enabled/Description: Save changes automatically -Settings/AutoSave/Hint: Automatically save changes during editing +Settings/AutoSave/Hint: Attempt to automatically save changes during editing when using a supporting saver Settings/CamelCase/Caption: Camel Case Wiki Links Settings/CamelCase/Hint: You can globally disable automatic linking of ~CamelCase phrases. Requires reload to take effect Settings/CamelCase/Description: Enable automatic ~CamelCase linking @@ -103,6 +112,10 @@ Settings/Caption: Settings Settings/EditorToolbar/Caption: Editor Toolbar Settings/EditorToolbar/Hint: Enable or disable the editor toolbar: Settings/EditorToolbar/Description: Show editor toolbar +Settings/InfoPanelMode/Caption: Tiddler Info Panel Mode +Settings/InfoPanelMode/Hint: Control when the tiddler info panel closes: +Settings/InfoPanelMode/Popup/Description: Tiddler info panel closes automatically +Settings/InfoPanelMode/Sticky/Description: Tiddler info panel stays open until explicitly closed Settings/Hint: These settings let you customise the behaviour of TiddlyWiki. Settings/NavigationAddressBar/Caption: Navigation Address Bar Settings/NavigationAddressBar/Hint: Behaviour of the browser address bar when navigating to a tiddler: @@ -127,6 +140,8 @@ Settings/ToolbarButtons/Icons/Description: Include icon Settings/ToolbarButtons/Text/Description: Include text Settings/DefaultSidebarTab/Caption: Default Sidebar Tab Settings/DefaultSidebarTab/Hint: Specify which sidebar tab is displayed by default +Settings/DefaultMoreSidebarTab/Caption: Default More Sidebar Tab +Settings/DefaultMoreSidebarTab/Hint: Specify which More sidebar tab is displayed by default Settings/LinkToBehaviour/Caption: Tiddler Opening Behaviour Settings/LinkToBehaviour/InsideRiver/Hint: Navigation from //within// the story river Settings/LinkToBehaviour/OutsideRiver/Hint: Navigation from //outside// the story river @@ -143,18 +158,22 @@ Settings/MissingLinks/Hint: Choose whether to link to tiddlers that do not exist Settings/MissingLinks/Description: Enable links to missing tiddlers StoryView/Caption: Story View StoryView/Prompt: Current view: +Stylesheets/Caption: Stylesheets +Stylesheets/Expand/Caption: Expand All +Stylesheets/Hint: This is the rendered CSS of the current stylesheet tiddlers tagged with <> +Stylesheets/Restore/Caption: Restore Theme/Caption: Theme Theme/Prompt: Current theme: TiddlerFields/Caption: Tiddler Fields TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers). Toolbars/Caption: Toolbars Toolbars/EditToolbar/Caption: Edit Toolbar -Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in edit mode +Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in edit mode. Drag and drop to change the ordering Toolbars/Hint: Select which toolbar buttons are displayed Toolbars/PageControls/Caption: Page Toolbar -Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar +Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar. Drag and drop to change the ordering Toolbars/EditorToolbar/Caption: Editor Toolbar -Toolbars/EditorToolbar/Hint: Choose which buttons are displayed in the editor toolbar. Note that some buttons will only appear when editing tiddlers of a certain type +Toolbars/EditorToolbar/Hint: Choose which buttons are displayed in the editor toolbar. Note that some buttons will only appear when editing tiddlers of a certain type. Drag and drop to change the ordering Toolbars/ViewToolbar/Caption: View Toolbar -Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode +Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode. Drag and drop to change the ordering Tools/Download/Full/Caption: Download full wiki diff --git a/core/language/en-GB/Docs/ModuleTypes.multids b/core/language/en-GB/Docs/ModuleTypes.multids index d602a6c6e..bc25645d3 100644 --- a/core/language/en-GB/Docs/ModuleTypes.multids +++ b/core/language/en-GB/Docs/ModuleTypes.multids @@ -1,17 +1,22 @@ title: $:/language/Docs/ModuleTypes/ +allfilteroperator: A sub-operator for the ''all'' filter operator. animation: Animations that may be used with the RevealWidget. +bitmapeditoroperation: A bitmap editor toolbar operation. command: Commands that can be executed under Node.js. config: Data to be inserted into `$tw.config`. filteroperator: Individual filter operator methods. global: Global data to be inserted into `$tw`. +info: Publishes system information via the [[$:/temp/info-plugin]] pseudo-plugin. isfilteroperator: Operands for the ''is'' filter operator. +library: Generic module type for general purpose JavaScript modules. macro: JavaScript macro definitions. parser: Parsers for different content types. saver: Savers handle different methods for saving files from the browser. serverroute: Server routes handle different HTTP requests when using the `--server` command. startup: Startup functions. storyview: Story views customise the animation and behaviour of list widgets. +texteditoroperation: A text editor toolbar operation. tiddlerdeserializer: Converts different content types into tiddlers. tiddlerfield: Defines the behaviour of an individual tiddler field. tiddlermethod: Adds methods to the `$tw.Tiddler` prototype. diff --git a/core/language/en-GB/EditTemplate.multids b/core/language/en-GB/EditTemplate.multids index 8d8801af9..b7b99a175 100644 --- a/core/language/en-GB/EditTemplate.multids +++ b/core/language/en-GB/EditTemplate.multids @@ -1,10 +1,12 @@ title: $:/language/EditTemplate/ -Body/External/Hint: This is an external tiddler stored outside of the main TiddlyWiki file. You can edit the tags and fields but cannot directly edit the content itself +Body/External/Hint: This tiddler shows content stored outside of the main TiddlyWiki file. You can edit the tags and fields but cannot directly edit the content itself Body/Placeholder: Type the text for this tiddler Body/Preview/Type/Output: output Field/Remove/Caption: remove field Field/Remove/Hint: Remove field +Field/Dropdown/Caption: field list +Field/Dropdown/Hint: Show field list Fields/Add/Button: add Fields/Add/Name/Placeholder: field name Fields/Add/Prompt: Add a new field: @@ -18,6 +20,8 @@ Tags/Add/Placeholder: tag name Tags/Dropdown/Caption: tag list Tags/Dropdown/Hint: Show tag list Title/BadCharacterWarning: Warning: avoid using any of the characters <> in tiddler titles +Title/Exists/Prompt: Target tiddler already exists +Title/Relink/Prompt: Update ''<$text text=<>/>'' to ''<$text text=<>/>'' in the //tags// and //list// fields of other tiddlers Type/Dropdown/Caption: content type list Type/Dropdown/Hint: Show content type list Type/Delete/Caption: delete content type diff --git a/core/language/en-GB/Fields.multids b/core/language/en-GB/Fields.multids index 683e745e6..b2ca06294 100644 --- a/core/language/en-GB/Fields.multids +++ b/core/language/en-GB/Fields.multids @@ -18,7 +18,7 @@ icon: The title of the tiddler containing the icon associated with a tiddler library: If set to "yes" indicates that a tiddler should be saved as a JavaScript library list: An ordered list of tiddler titles associated with a tiddler list-before: If set, the title of a tiddler before which this tiddler should be added to the ordered list of tiddler titles, or at the start of the list if this field is present but empty -list-after: If set, the title of the tiddler after which this tiddler should be added to the ordered list of tiddler titles +list-after: If set, the title of the tiddler after which this tiddler should be added to the ordered list of tiddler titles, or at the end of the list if this field is present but empty modified: The date and time at which a tiddler was last modified modifier: The tiddler title associated with the person who last modified a tiddler name: The human readable name associated with a plugin tiddler diff --git a/core/language/en-GB/Filters.multids b/core/language/en-GB/Filters.multids index 45f8991fc..b84818f72 100644 --- a/core/language/en-GB/Filters.multids +++ b/core/language/en-GB/Filters.multids @@ -11,4 +11,5 @@ SystemTiddlers: System tiddlers ShadowTiddlers: Shadow tiddlers OverriddenShadowTiddlers: Overridden shadow tiddlers SystemTags: System tags +StoryList: Tiddlers in the story river, excluding <$text text="$:/AdvancedSearch"/> TypedTiddlers: Non wiki-text tiddlers \ No newline at end of file diff --git a/core/language/en-GB/GettingStarted.tid b/core/language/en-GB/GettingStarted.tid index 5911f04d7..ae6e3b167 100644 --- a/core/language/en-GB/GettingStarted.tid +++ b/core/language/en-GB/GettingStarted.tid @@ -3,7 +3,7 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ Welcome to ~TiddlyWiki and the ~TiddlyWiki community -Before you start storing important information in ~TiddlyWiki it is important to make sure that you can reliably save changes. See http://tiddlywiki.com/#GettingStarted for details +Before you start storing important information in ~TiddlyWiki it is vital to make sure that you can reliably save changes. See https://tiddlywiki.com/#GettingStarted for details !! Set up this ~TiddlyWiki diff --git a/core/language/en-GB/Help/fetch.tid b/core/language/en-GB/Help/fetch.tid new file mode 100644 index 000000000..f84312126 --- /dev/null +++ b/core/language/en-GB/Help/fetch.tid @@ -0,0 +1,38 @@ +title: $:/language/Help/fetch +description: Fetch tiddlers from wiki by URL + +Fetch one or more files over HTTP/HTTPS, and import the tiddlers matching a filter, optionally transforming the incoming titles. + +``` +--fetch file +--fetch files +--fetch raw-file +--fetch raw-files +``` + +The "file" and "files" variants fetch the specified files and attempt to import the tiddlers within them (the same processing as if the files were dragged into the browser window). The "raw-file" and "raw-files" variants fetch the specified files and then store the raw file data in tiddlers, without applying the import logic. + +With the "file" and "raw-file" variants only a single file is fetched and the first parameter is the URL of the file to read. + +With the "files" and "raw-files" variants, multiple files are fetched and the first parameter is a filter yielding a list of URLs of the files to read. For example, given a set of tiddlers tagged "remote-server" that have a field "url" the filter `[tag[remote-server]get[url]]` will retrieve all the available URLs. + +For the "file" and "files" variants, the `` parameter specifies a filter determining which tiddlers are imported. It defaults to `[all[tiddlers]]` if not provided. + +For all variants, the `` parameter specifies an optional filter that transforms the titles of the imported tiddlers. For example, `[addprefix[$:/myimports/]]` would add the prefix `$:/myimports/` to each title. + +Preceding the `--fetch` command with `--verbose` will output progress information during the import. + +Note that TiddlyWiki will not fetch an older version of an already loaded plugin. + +The following example retrieves all the non-system tiddlers from https://tiddlywiki.com and saves them to a JSON file: + +``` +tiddlywiki --verbose --fetch file "https://tiddlywiki.com/" "[!is[system]]" "" --rendertiddler "$:/core/templates/exporters/JsonFile" output.json text/plain "" exportFilter "[!is[system]]" +``` + +The following example retrieves the "favicon" file from tiddlywiki.com and saves it in a file called "output.ico". Note that the intermediate tiddler "Icon Tiddler" is quoted in the "--fetch" command because it is being used as a transformation filter to replace the default title, while there are no quotes for the "--savetiddler" command because it is being used directly as a title. + +``` +tiddlywiki --verbose --fetch raw-file "https://tiddlywiki.com/favicon.ico" "[[Icon Tiddler]]" --savetiddler "Icon Tiddler" output.ico +``` + diff --git a/core/language/en-GB/Help/import.tid b/core/language/en-GB/Help/import.tid new file mode 100644 index 000000000..7d12a8557 --- /dev/null +++ b/core/language/en-GB/Help/import.tid @@ -0,0 +1,24 @@ +title: $:/language/Help/import +description: Import tiddlers from a file + +Import tiddlers from TiddlyWiki (`.html`), `.tiddler`, `.tid`, `.json` or other local files. The deserializer must be explicitly specified, unlike the `load` command which infers the deserializer from the file extension. + +``` +--import [] [<encoding>] +``` + +The deserializers in the core include: + +* application/javascript +* application/json +* application/x-tiddler +* application/x-tiddler-html-div +* application/x-tiddlers +* text/html +* text/plain + +The title of the imported tiddler defaults to the filename. + +The encoding defaults to "utf8", but can be "base64" for importing binary files. + +Note that TiddlyWiki will not import an older version of an already loaded plugin. diff --git a/core/language/en-GB/Help/load.tid b/core/language/en-GB/Help/load.tid index fb2168e24..afc8642cb 100644 --- a/core/language/en-GB/Help/load.tid +++ b/core/language/en-GB/Help/load.tid @@ -1,10 +1,11 @@ title: $:/language/Help/load description: Load tiddlers from a file -Load tiddlers from 2.x.x TiddlyWiki files (`.html`), `.tiddler`, `.tid`, `.json` or other files +Load tiddlers from TiddlyWiki (`.html`), `.tiddler`, `.tid`, `.json` or other local files. The processing applied to incoming files is determined by the file extension. Use the alternative `import` command if you need to specify the deserializer and encoding explicitly. ``` --load <filepath> +--load <dirpath> ``` To load tiddlers from an encrypted TiddlyWiki file you should first specify the password with the PasswordCommand. For example: diff --git a/core/language/en-GB/Help/render.tid b/core/language/en-GB/Help/render.tid new file mode 100644 index 000000000..9318b5cfa --- /dev/null +++ b/core/language/en-GB/Help/render.tid @@ -0,0 +1,34 @@ +title: $:/language/Help/render +description: Renders individual tiddlers to files + +Render individual tiddlers identified by a filter and save the results to the specified files. + +Optionally, the title of a template tiddler can be specified. In this case, instead of directly rendering each tiddler, the template tiddler is rendered with the "currentTiddler" variable set to the title of the tiddler that is being rendered. + +A name and value for an additional variable may optionally also be specified. + +``` +--render <tiddler-filter> [<filename-filter>] [<render-type>] [<template>] [<name>] [<value>] +``` + +* ''tiddler-filter'': A filter identifying the tiddler(s) to be rendered +* ''filename-filter'': Optional filter transforming tiddler titles into pathnames. If omitted, defaults to `[is[tiddler]addsuffix[.html]]`, which uses the unchanged tiddler title as the filename +* ''template'': Optional template through which each tiddler is rendered +* ''render-type'': Optional render type: `text/html` (the default) returns the full HTML text and `text/plain` just returns the text content (ie it ignores HTML tags and other unprintable material) +* ''name'': Name of optional variable +* ''value'': Value of optional variable + +By default, the filename is resolved relative to the `output` subdirectory of the edition directory. The `--output` command can be used to direct output to a different directory. + +Notes: + +* The output directory is not cleared of any existing files +* Any missing directories in the path to the filename are automatically created. +* When referring to a tiddler with spaces in its title, take care to use both the quotes required by your shell and also TiddlyWiki's double square brackets : `--render "[[Motovun Jack.jpg]]"` +* The filename filter is evaluated with the selected items being set to the title of the tiddler currently being rendered, allowing the title to be used as the basis for computing the filename. For example `[encodeuricomponent[]addprefix[static/]]` applies URI encoding to each title, and then adds the prefix `static/` +* The `--render` command is a more flexible replacement for both the `--rendertiddler` and `--rendertiddlers` commands, which are deprecated + +Examples: + +* `--render "[!is[system]]" "[encodeuricomponent[]addprefix[tiddlers/]addsuffix[.html]]"` -- renders all non-system tiddlers as files in the subdirectory "tiddlers" with URL-encoded titles and the extension HTML + diff --git a/core/language/en-GB/Help/rendertiddler.tid b/core/language/en-GB/Help/rendertiddler.tid index 60b3af0b9..96ddda1bf 100644 --- a/core/language/en-GB/Help/rendertiddler.tid +++ b/core/language/en-GB/Help/rendertiddler.tid @@ -1,12 +1,24 @@ title: $:/language/Help/rendertiddler description: Render an individual tiddler as a specified ContentType -Render an individual tiddler as a specified ContentType, defaulting to `text/html` and save it to the specified filename. Optionally a template can be specified, in which case the template tiddler is rendered with the "currentTiddler" variable set to the tiddler that is being rendered (the first parameter value). +(Note: The `--rendertiddler` command is deprecated in favour of the new, more flexible `--render` command) + +Render an individual tiddler as a specified ContentType, defaulting to `text/html` and save it to the specified filename. + +Optionally the title of a template tiddler can be specified, in which case the template tiddler is rendered with the "currentTiddler" variable set to the tiddler that is being rendered (the first parameter value). + +A name and value for an additional variable may optionally also be specified. ``` ---rendertiddler <title> <filename> [<type>] [<template>] +--rendertiddler <title> <filename> [<type>] [<template>] [<name>] [<value>] ``` By default, the filename is resolved relative to the `output` subdirectory of the edition directory. The `--output` command can be used to direct output to a different directory. Any missing directories in the path to the filename are automatically created. + +For example, the following command saves all tiddlers matching the filter `[tag[done]]` to a JSON file titled `output.json` by employing the core template `$:/core/templates/exporters/JsonFile`. + +``` +--rendertiddler "$:/core/templates/exporters/JsonFile" output.json text/plain "" exportFilter "[tag[done]]" +``` diff --git a/core/language/en-GB/Help/rendertiddlers.tid b/core/language/en-GB/Help/rendertiddlers.tid index 69f4e0a38..a0e76d147 100644 --- a/core/language/en-GB/Help/rendertiddlers.tid +++ b/core/language/en-GB/Help/rendertiddlers.tid @@ -1,6 +1,8 @@ title: $:/language/Help/rendertiddlers description: Render tiddlers matching a filter to a specified ContentType +(Note: The `--rendertiddlers` command is deprecated in favour of the new, more flexible `--render` command) + Render a set of tiddlers matching a filter to separate files of a specified ContentType (defaults to `text/html`) and extension (defaults to `.html`). ``` diff --git a/core/language/en-GB/Help/save.tid b/core/language/en-GB/Help/save.tid new file mode 100644 index 000000000..cb9971cf9 --- /dev/null +++ b/core/language/en-GB/Help/save.tid @@ -0,0 +1,25 @@ +title: $:/language/Help/save +description: Saves individual raw tiddlers to files + +Saves individual tiddlers identified by a filter in their raw text or binary format to the specified files. + +``` +--save <tiddler-filter> <filename-filter> +``` + +* ''tiddler-filter'': A filter identifying the tiddler(s) to be saved +* ''filename-filter'': Optional filter transforming tiddler titles into pathnames. If omitted, defaults to `[is[tiddler]]`, which uses the unchanged tiddler title as the filename + +By default, the filename is resolved relative to the `output` subdirectory of the edition directory. The `--output` command can be used to direct output to a different directory. + +Notes: + +* The output directory is not cleared of any existing files +* Any missing directories in the path to the filename are automatically created. +* When saving a tiddler with spaces in its title, take care to use both the quotes required by your shell and also TiddlyWiki's double square brackets : `--save "[[Motovun Jack.jpg]]"` +* The filename filter is evaluated with the selected items being set to the title of the tiddler currently being saved, allowing the title to be used as the basis for computing the filename. For example `[encodeuricomponent[]addprefix[static/]]` applies URI encoding to each title, and then adds the prefix `static/` +* The `--save` command is a more flexible replacement for both the `--savetiddler` and `--savetiddlers` commands, which are deprecated + +Examples: + +* `--save "[!is[system]is[image]]" "[encodeuricomponent[]addprefix[tiddlers/]]"` -- saves all non-system image tiddlers as files in the subdirectory "tiddlers" with URL-encoded titles diff --git a/core/language/en-GB/Help/savetiddler.tid b/core/language/en-GB/Help/savetiddler.tid index 643d318fd..c3d820d9a 100644 --- a/core/language/en-GB/Help/savetiddler.tid +++ b/core/language/en-GB/Help/savetiddler.tid @@ -1,6 +1,8 @@ title: $:/language/Help/savetiddler description: Saves a raw tiddler to a file +(Note: The `--savetiddler` command is deprecated in favour of the new, more flexible `--save` command) + Saves an individual tiddler in its raw text or binary format to the specified filename. ``` diff --git a/core/language/en-GB/Help/savetiddlers.tid b/core/language/en-GB/Help/savetiddlers.tid index 8cac2a950..35330c498 100644 --- a/core/language/en-GB/Help/savetiddlers.tid +++ b/core/language/en-GB/Help/savetiddlers.tid @@ -1,6 +1,8 @@ title: $:/language/Help/savetiddlers description: Saves a group of raw tiddlers to a directory +(Note: The `--savetiddlers` command is deprecated in favour of the new, more flexible `--save` command) + Saves a group of tiddlers in their raw text or binary format to the specified directory. ``` diff --git a/core/language/en-GB/Help/server.tid b/core/language/en-GB/Help/server.tid index 4e0ccf45a..3f0adbe24 100644 --- a/core/language/en-GB/Help/server.tid +++ b/core/language/en-GB/Help/server.tid @@ -11,7 +11,7 @@ At the root, it serves a rendering of a specified tiddler. Away from the root, i The parameters are: -* ''port'' - port number to serve from (defaults to "8080") +* ''port'' - port number on which to listen; non-numeric values are interpreted as a system environment variable from which the port number is extracted (defaults to "8080") * ''roottiddler'' - the tiddler to serve at the root (defaults to "$:/core/save/all") * ''rendertype'' - the content type to which the root tiddler should be rendered (defaults to "text/plain") * ''servetype'' - the content type with which the root tiddler should be served (defaults to "text/html") @@ -19,6 +19,7 @@ The parameters are: * ''password'' - optional password for basic authentication * ''host'' - optional hostname to serve from (defaults to "127.0.0.1" aka "localhost") * ''pathprefix'' - optional prefix for paths +* ''debuglevel'' - optional debug level; set to "debug" to view request details (defaults to "none") If the password parameter is specified then the browser will prompt the user for the username and password. Note that the password is transmitted in plain text so this implementation isn't suitable for general use. @@ -34,4 +35,9 @@ The username and password can be specified as empty strings if you need to set t --server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245 ``` -To run multiple TiddlyWiki servers at the same time you'll need to put each one on a different port. +To run multiple TiddlyWiki servers at the same time you'll need to put each one on a different port. It can be useful to use an environment variable to pass the port number to the Node.js process. This example references an environment variable called "MY_PORT_NUMBER": + + +``` +--server MY_PORT_NUMBER $:/core/save/all text/plain text/html MyUserName passw0rd +``` diff --git a/core/language/en-GB/Import.multids b/core/language/en-GB/Import.multids index 697d3b510..083086606 100644 --- a/core/language/en-GB/Import.multids +++ b/core/language/en-GB/Import.multids @@ -7,6 +7,12 @@ Listing/Import/Caption: Import Listing/Select/Caption: Select Listing/Status/Caption: Status Listing/Title/Caption: Title +Listing/Preview: Preview: +Listing/Preview/Text: Text +Listing/Preview/TextRaw: Text (Raw) +Listing/Preview/Fields: Fields +Listing/Preview/Diff: Diff +Listing/Preview/DiffFields: Diff (Fields) Upgrader/Plugins/Suppressed/Incompatible: Blocked incompatible or obsolete plugin Upgrader/Plugins/Suppressed/Version: Blocked plugin (due to incoming <<incoming>> being older than existing <<existing>>) Upgrader/Plugins/Upgraded: Upgraded plugin from <<incoming>> to <<upgraded>> diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids index c21b68326..0f267186e 100644 --- a/core/language/en-GB/Misc.multids +++ b/core/language/en-GB/Misc.multids @@ -1,8 +1,8 @@ title: $:/language/ -AboveStory/ClassicPlugin/Warning: It looks like you are trying to load a plugin designed for ~TiddlyWiki Classic. Please note that [[these plugins do not work with TiddlyWiki version 5.x.x|http://tiddlywiki.com/#TiddlyWikiClassic]]. ~TiddlyWiki Classic plugins detected: +AboveStory/ClassicPlugin/Warning: It looks like you are trying to load a plugin designed for ~TiddlyWiki Classic. Please note that [[these plugins do not work with TiddlyWiki version 5.x.x|https://tiddlywiki.com/#TiddlyWikiClassic]]. ~TiddlyWiki Classic plugins detected: BinaryWarning/Prompt: This tiddler contains binary data -ClassicWarning/Hint: This tiddler is written in TiddlyWiki Classic wiki text format, which is not fully compatible with TiddlyWiki version 5. See http://tiddlywiki.com/static/Upgrading.html for more details. +ClassicWarning/Hint: This tiddler is written in TiddlyWiki Classic wiki text format, which is not fully compatible with TiddlyWiki version 5. See https://tiddlywiki.com/static/Upgrading.html for more details. ClassicWarning/Upgrade/Caption: upgrade CloseAll/Button: close all ColourPicker/Recent: Recent: @@ -12,6 +12,7 @@ ConfirmOverwriteTiddler: Do you wish to overwrite the tiddler "<$text text=<<tit ConfirmEditShadowTiddler: You are about to edit a ShadowTiddler. Any changes will override the default system making future upgrades non-trivial. Are you sure you want to edit "<$text text=<<title>>/>"? Count: count DefaultNewTiddlerTitle: New Tiddler +Diffs/CountMessage: <<diff-count>> differences DropMessage: Drop here (or use the 'Escape' key to cancel) Encryption/Cancel: Cancel Encryption/ConfirmClearPassword: Do you wish to clear the password? This will remove the encryption applied when saving this wiki @@ -22,6 +23,7 @@ Encryption/RepeatPassword: Repeat password Encryption/PasswordNoMatch: Passwords do not match Encryption/SetPassword: Set password Error/Caption: Error +Error/EditConflict: File changed on server Error/Filter: Filter error Error/FilterSyntax: Syntax error in filter expression Error/IsFilterOperator: Filter Error: Unknown operand for the 'is' filter operator @@ -34,15 +36,33 @@ Error/XMLHttpRequest: XMLHttpRequest error code InternalJavaScriptError/Title: Internal JavaScript Error InternalJavaScriptError/Hint: Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser InvalidFieldName: Illegal characters in field name "<$text text=<<fieldName>>/>". Fields can only contain lowercase letters, digits and the characters underscore (`_`), hyphen (`-`) and period (`.`) -LazyLoadingWarning: <p>Loading external text from ''<$text text={{!!_canonical_uri}}/>''</p><p>If this message doesn't disappear you may be using a browser that doesn't support external text in this configuration. See http://tiddlywiki.com/#ExternalText</p> +LazyLoadingWarning: <p>Trying to load external content from ''<$text text={{!!_canonical_uri}}/>''</p><p>If this message doesn't disappear, either the tiddler content type doesn't match the type of the external content, or you may be using a browser that doesn't support external content for wikis loaded as standalone files. See https://tiddlywiki.com/#ExternalText</p> LoginToTiddlySpace: Login to TiddlySpace -MissingTiddler/Hint: Missing tiddler "<$text text=<<currentTiddler>>/>" - click {{$:/core/images/edit-button}} to create +Manager/Controls/FilterByTag/None: (none) +Manager/Controls/FilterByTag/Prompt: Filter by tag: +Manager/Controls/Order/Prompt: Reverse order +Manager/Controls/Search/Placeholder: Search +Manager/Controls/Search/Prompt: Search: +Manager/Controls/Show/Option/Tags: tags +Manager/Controls/Show/Option/Tiddlers: tiddlers +Manager/Controls/Show/Prompt: Show: +Manager/Controls/Sort/Prompt: Sort by: +Manager/Item/Colour: Colour +Manager/Item/Fields: Fields +Manager/Item/Icon/None: (none) +Manager/Item/Icon: Icon +Manager/Item/RawText: Raw text +Manager/Item/Tags: Tags +Manager/Item/Tools: Tools +Manager/Item/WikifiedText: Wikified text +MissingTiddler/Hint: Missing tiddler "<$text text=<<currentTiddler>>/>" -- click {{||$:/core/ui/Buttons/edit}} to create No: No OfficialPluginLibrary: Official ~TiddlyWiki Plugin Library OfficialPluginLibrary/Hint: The official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team. PluginReloadWarning: Please save {{$:/core/ui/Buttons/save-wiki}} and reload {{$:/core/ui/Buttons/refresh}} to allow changes to plugins to take effect RecentChanges/DateFormat: DDth MMM YYYY SystemTiddler/Tooltip: This is a system tiddler +SystemTiddlers/Include/Prompt: Include system tiddlers TagManager/Colour/Heading: Colour TagManager/Count/Heading: Count TagManager/Icon/Heading: Icon diff --git a/core/language/en-GB/Modals/Download.tid b/core/language/en-GB/Modals/Download.tid index 49ea95d59..884ad152d 100644 --- a/core/language/en-GB/Modals/Download.tid +++ b/core/language/en-GB/Modals/Download.tid @@ -1,8 +1,7 @@ title: $:/language/Modals/Download -type: text/vnd.tiddlywiki subtitle: Download changes footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html Your browser only supports manual saving. diff --git a/core/language/en-GB/Modals/SaveInstructions.tid b/core/language/en-GB/Modals/SaveInstructions.tid index 61f46dea0..45028fc45 100644 --- a/core/language/en-GB/Modals/SaveInstructions.tid +++ b/core/language/en-GB/Modals/SaveInstructions.tid @@ -1,8 +1,7 @@ title: $:/language/Modals/SaveInstructions -type: text/vnd.tiddlywiki subtitle: Save your work footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html Your changes to this wiki need to be saved as a ~TiddlyWiki HTML file. diff --git a/core/language/en-GB/NewJournal.multids b/core/language/en-GB/NewJournal.multids index ff566fabe..b7a3f5e62 100644 --- a/core/language/en-GB/NewJournal.multids +++ b/core/language/en-GB/NewJournal.multids @@ -1,4 +1,5 @@ title: $:/config/NewJournal/ Title: DDth MMM YYYY +Text: Tags: Journal diff --git a/core/language/en-GB/Notifications.multids b/core/language/en-GB/Notifications.multids index 0d9b891bd..df095b828 100644 --- a/core/language/en-GB/Notifications.multids +++ b/core/language/en-GB/Notifications.multids @@ -2,3 +2,5 @@ title: $:/language/Notifications/ Save/Done: Saved wiki Save/Starting: Starting to save wiki +CopiedToClipboard/Succeeded: Copied! +CopiedToClipboard/Failed: Failed to copy to clipboard! diff --git a/core/language/en-GB/Search.multids b/core/language/en-GB/Search.multids index fd6eadc7e..2a57a6416 100644 --- a/core/language/en-GB/Search.multids +++ b/core/language/en-GB/Search.multids @@ -2,12 +2,13 @@ title: $:/language/Search/ DefaultResults/Caption: List Filter/Caption: Filter -Filter/Hint: Search via a [[filter expression|http://tiddlywiki.com/static/Filters.html]] +Filter/Hint: Search via a [[filter expression|https://tiddlywiki.com/static/Filters.html]] Filter/Matches: //<small><<resultCount>> matches</small>// Matches: //<small><<resultCount>> matches</small>// Matches/All: All matches: Matches/Title: Title matches: Search: Search +Search/TooShort: Search text too short Shadows/Caption: Shadows Shadows/Hint: Search for shadow tiddlers Shadows/Matches: //<small><<resultCount>> matches</small>// diff --git a/core/language/en-GB/SideBar.multids b/core/language/en-GB/SideBar.multids index 1ae4439dd..b109f3a9b 100644 --- a/core/language/en-GB/SideBar.multids +++ b/core/language/en-GB/SideBar.multids @@ -3,6 +3,7 @@ title: $:/language/SideBar/ All/Caption: All Contents/Caption: Contents Drafts/Caption: Drafts +Explorer/Caption: Explorer Missing/Caption: Missing More/Caption: More Open/Caption: Open diff --git a/core/language/en-GB/ThemeTweaks.multids b/core/language/en-GB/ThemeTweaks.multids index 694d56b13..5168053c3 100644 --- a/core/language/en-GB/ThemeTweaks.multids +++ b/core/language/en-GB/ThemeTweaks.multids @@ -7,11 +7,12 @@ Options/SidebarLayout: Sidebar layout Options/SidebarLayout/Fixed-Fluid: Fixed story, fluid sidebar Options/SidebarLayout/Fluid-Fixed: Fluid story, fixed sidebar Options/StickyTitles: Sticky titles -Options/StickyTitles/Hint: Causes tiddler titles to "stick" to the top of the browser window. Caution: Does not work at all with Chrome, and causes some layout issues in Firefox +Options/StickyTitles/Hint: Causes tiddler titles to "stick" to the top of the browser window Options/CodeWrapping: Wrap long lines in code blocks Settings: Settings Settings/FontFamily: Font family Settings/CodeFontFamily: Code font family +Settings/EditorFontFamily: Editor font family Settings/BackgroundImage: Page background image Settings/BackgroundImageAttachment: Page background image attachment Settings/BackgroundImageAttachment/Scroll: Scroll with tiddlers diff --git a/core/language/en-GB/Types/application_javascript.tid b/core/language/en-GB/Types/application_javascript.tid index fda69c6e1..28ee6ddbf 100644 --- a/core/language/en-GB/Types/application_javascript.tid +++ b/core/language/en-GB/Types/application_javascript.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/application/javascript description: JavaScript code name: application/javascript group: Developer +group-sort: 2 diff --git a/core/language/en-GB/Types/application_json.tid b/core/language/en-GB/Types/application_json.tid index 27b129821..7f7575599 100644 --- a/core/language/en-GB/Types/application_json.tid +++ b/core/language/en-GB/Types/application_json.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/application/json description: JSON data name: application/json group: Developer +group-sort: 2 diff --git a/core/language/en-GB/Types/application_x_tiddler_dictionary.tid b/core/language/en-GB/Types/application_x_tiddler_dictionary.tid index 13ab6943e..76fbec0a3 100644 --- a/core/language/en-GB/Types/application_x_tiddler_dictionary.tid +++ b/core/language/en-GB/Types/application_x_tiddler_dictionary.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/application/x-tiddler-dictionary description: Data dictionary name: application/x-tiddler-dictionary group: Developer +group-sort: 2 diff --git a/core/language/en-GB/Types/image_gif.tid b/core/language/en-GB/Types/image_gif.tid index bca7d7d28..559d17f56 100644 --- a/core/language/en-GB/Types/image_gif.tid +++ b/core/language/en-GB/Types/image_gif.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/gif description: GIF image name: image/gif group: Image +group-sort: 1 diff --git a/core/language/en-GB/Types/image_jpeg.tid b/core/language/en-GB/Types/image_jpeg.tid index 943f19341..5db4dc001 100644 --- a/core/language/en-GB/Types/image_jpeg.tid +++ b/core/language/en-GB/Types/image_jpeg.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/jpeg description: JPEG image name: image/jpeg group: Image +group-sort: 1 diff --git a/core/language/en-GB/Types/image_png.tid b/core/language/en-GB/Types/image_png.tid index 59fb3f865..d9e78bf0e 100644 --- a/core/language/en-GB/Types/image_png.tid +++ b/core/language/en-GB/Types/image_png.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/png description: PNG image name: image/png group: Image +group-sort: 1 diff --git a/core/language/en-GB/Types/image_svg_xml.tid b/core/language/en-GB/Types/image_svg_xml.tid index ddb6912dd..9f7c23ba3 100644 --- a/core/language/en-GB/Types/image_svg_xml.tid +++ b/core/language/en-GB/Types/image_svg_xml.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/svg+xml description: Structured Vector Graphics image name: image/svg+xml group: Image +group-sort: 1 diff --git a/core/language/en-GB/Types/image_x-icon.tid b/core/language/en-GB/Types/image_x-icon.tid index ff8d12f81..6ae32331c 100644 --- a/core/language/en-GB/Types/image_x-icon.tid +++ b/core/language/en-GB/Types/image_x-icon.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/x-icon description: ICO format icon file name: image/x-icon group: Image +group-sort: 1 diff --git a/core/language/en-GB/Types/text_css.tid b/core/language/en-GB/Types/text_css.tid index 15785f0a0..9539e21d0 100644 --- a/core/language/en-GB/Types/text_css.tid +++ b/core/language/en-GB/Types/text_css.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/css description: Static stylesheet name: text/css group: Developer +group-sort: 2 diff --git a/core/language/en-GB/Types/text_html.tid b/core/language/en-GB/Types/text_html.tid index cd8d8221e..260f3a30b 100644 --- a/core/language/en-GB/Types/text_html.tid +++ b/core/language/en-GB/Types/text_html.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/html description: HTML markup name: text/html group: Text +group-sort: 0 diff --git a/core/language/en-GB/Types/text_plain.tid b/core/language/en-GB/Types/text_plain.tid index 83da10bc8..1511e07ff 100644 --- a/core/language/en-GB/Types/text_plain.tid +++ b/core/language/en-GB/Types/text_plain.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/plain description: Plain text name: text/plain group: Text +group-sort: 0 diff --git a/core/language/en-GB/Types/text_vnd.tiddlywiki.tid b/core/language/en-GB/Types/text_vnd.tiddlywiki.tid index e946d9a4a..9546e1aed 100644 --- a/core/language/en-GB/Types/text_vnd.tiddlywiki.tid +++ b/core/language/en-GB/Types/text_vnd.tiddlywiki.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/vnd.tiddlywiki description: TiddlyWiki 5 name: text/vnd.tiddlywiki group: Text +group-sort: 0 diff --git a/core/language/en-GB/Types/text_x-tiddlywiki.tid b/core/language/en-GB/Types/text_x-tiddlywiki.tid index e593430ee..e9c6c7097 100644 --- a/core/language/en-GB/Types/text_x-tiddlywiki.tid +++ b/core/language/en-GB/Types/text_x-tiddlywiki.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/x-tiddlywiki description: TiddlyWiki Classic name: text/x-tiddlywiki group: Text +group-sort: 0 diff --git a/core/modules/commander.js b/core/modules/commander.js index 6c4f687e7..ad7f4b5b3 100644 --- a/core/modules/commander.js +++ b/core/modules/commander.js @@ -29,6 +29,24 @@ var Commander = function(commandTokens,callback,wiki,streams) { this.outputPath = path.resolve($tw.boot.wikiPath,$tw.config.wikiOutputSubDir); }; +/* +Log a string if verbose flag is set +*/ +Commander.prototype.log = function(str) { + if(this.verbose) { + this.streams.output.write(str + "\n"); + } +}; + +/* +Write a string if verbose flag is set +*/ +Commander.prototype.write = function(str) { + if(this.verbose) { + this.streams.output.write(str); + } +}; + /* Add a string of tokens to the command queue */ diff --git a/core/modules/commands/fetch.js b/core/modules/commands/fetch.js new file mode 100644 index 000000000..8abd0b1bb --- /dev/null +++ b/core/modules/commands/fetch.js @@ -0,0 +1,175 @@ +/*\ +title: $:/core/modules/commands/fetch.js +type: application/javascript +module-type: command + +Commands to fetch external tiddlers + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +exports.info = { + name: "fetch", + synchronous: false +}; + +var Command = function(params,commander,callback) { + this.params = params; + this.commander = commander; + this.callback = callback; +}; + +Command.prototype.execute = function() { + if(this.params.length < 2) { + return "Missing subcommand and url"; + } + switch(this.params[0]) { + case "raw-file": + return this.fetchFiles({ + raw: true, + url: this.params[1], + transformFilter: this.params[2] || "", + callback: this.callback + }); + break; + case "file": + return this.fetchFiles({ + url: this.params[1], + importFilter: this.params[2], + transformFilter: this.params[3] || "", + callback: this.callback + }); + break; + case "raw-files": + return this.fetchFiles({ + raw: true, + urlFilter: this.params[1], + transformFilter: this.params[2] || "", + callback: this.callback + }); + break; + case "files": + return this.fetchFiles({ + urlFilter: this.params[1], + importFilter: this.params[2], + transformFilter: this.params[3] || "", + callback: this.callback + }); + break; + } + return null; +}; + +Command.prototype.fetchFiles = function(options) { + var self = this; + // Get the list of URLs + var urls; + if(options.url) { + urls = [options.url] + } else if(options.urlFilter) { + urls = $tw.wiki.filterTiddlers(options.urlFilter); + } else { + return "Missing URL"; + } + // Process each URL in turn + var next = 0; + var getNextFile = function(err) { + if(err) { + return options.callback(err); + } + if(next < urls.length) { + self.fetchFile(urls[next++],options,getNextFile); + } else { + options.callback(null); + } + }; + getNextFile(null); + // Success + return null; +}; + +Command.prototype.fetchFile = function(url,options,callback,redirectCount) { + if(redirectCount > 10) { + return callback("Error too many redirects retrieving " + url); + } + var self = this, + lib = url.substr(0,8) === "https://" ? require("https") : require("http"); + lib.get(url).on("response",function(response) { + var type = (response.headers["content-type"] || "").split(";")[0], + data = []; + self.commander.write("Reading " + url + ": "); + response.on("data",function(chunk) { + data.push(chunk); + self.commander.write("."); + }); + response.on("end",function() { + self.commander.write("\n"); + if(response.statusCode === 200) { + self.processBody(Buffer.concat(data),type,options,url); + callback(null); + } else { + if(response.statusCode === 302 || response.statusCode === 303 || response.statusCode === 307) { + return self.fetchFile(response.headers.location,options,callback,redirectCount + 1); + } else { + return callback("Error " + response.statusCode + " retrieving " + url) + } + } + }); + response.on("error",function(e) { + console.log("Error on GET request: " + e); + callback(e); + }); + }); + return null; +}; + +Command.prototype.processBody = function(body,type,options,url) { + var self = this; + // Collect the tiddlers in a wiki + var incomingWiki = new $tw.Wiki(); + if(options.raw) { + var typeInfo = type ? $tw.config.contentTypeInfo[type] : null, + encoding = typeInfo ? typeInfo.encoding : "utf8"; + incomingWiki.addTiddler(new $tw.Tiddler({ + title: url, + type: type, + text: body.toString(encoding) + })); + } else { + // Deserialise the file to extract the tiddlers + var tiddlers = this.commander.wiki.deserializeTiddlers(type || "text/html",body.toString("utf8"),{}); + $tw.utils.each(tiddlers,function(tiddler) { + incomingWiki.addTiddler(new $tw.Tiddler(tiddler)); + }); + } + // Filter the tiddlers to select the ones we want + var filteredTitles = incomingWiki.filterTiddlers(options.importFilter || "[all[tiddlers]]"); + // Import the selected tiddlers + var count = 0; + incomingWiki.each(function(tiddler,title) { + if(filteredTitles.indexOf(title) !== -1) { + var newTiddler; + if(options.transformFilter) { + var transformedTitle = (incomingWiki.filterTiddlers(options.transformFilter,null,self.commander.wiki.makeTiddlerIterator([title])) || [""])[0]; + if(transformedTitle) { + self.commander.log("Importing " + title + " as " + transformedTitle) + newTiddler = new $tw.Tiddler(tiddler,{title: transformedTitle}); + } + } else { + self.commander.log("Importing " + title) + newTiddler = tiddler; + } + self.commander.wiki.importTiddler(newTiddler); + count++; + } + }); + self.commander.log("Imported " + count + " tiddlers") +}; + +exports.Command = Command; + +})(); diff --git a/core/modules/commands/import.js b/core/modules/commands/import.js new file mode 100644 index 000000000..9465c3da1 --- /dev/null +++ b/core/modules/commands/import.js @@ -0,0 +1,48 @@ +/*\ +title: $:/core/modules/commands/import.js +type: application/javascript +module-type: command + +Command to import tiddlers from a file + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +exports.info = { + name: "import", + synchronous: true +}; + +var Command = function(params,commander,callback) { + this.params = params; + this.commander = commander; + this.callback = callback; +}; + +Command.prototype.execute = function() { + var self = this, + fs = require("fs"), + path = require("path"); + if(this.params.length < 2) { + return "Missing parameters"; + } + var filename = self.params[0], + deserializer = self.params[1], + title = self.params[2] || filename, + encoding = self.params[3] || "utf8", + text = fs.readFileSync(filename,encoding), + tiddlers = this.commander.wiki.deserializeTiddlers(null,text,{title: title},{deserializer: deserializer}); + $tw.utils.each(tiddlers,function(tiddler) { + self.commander.wiki.importTiddler(new $tw.Tiddler(tiddler)); + }); + this.commander.log(tiddlers.length + " tiddler(s) imported"); + return null; +}; + +exports.Command = Command; + +})(); diff --git a/core/modules/commands/load.js b/core/modules/commands/load.js index 95cee01be..230a253d5 100644 --- a/core/modules/commands/load.js +++ b/core/modules/commands/load.js @@ -3,7 +3,7 @@ title: $:/core/modules/commands/load.js type: application/javascript module-type: command -Command to load tiddlers from a file +Command to load tiddlers from a file or directory \*/ (function(){ @@ -30,24 +30,19 @@ Command.prototype.execute = function() { if(this.params.length < 1) { return "Missing filename"; } - var ext = path.extname(self.params[0]); - fs.readFile(this.params[0],$tw.utils.getTypeEncoding(ext),function(err,data) { - if (err) { - self.callback(err); - } else { - var fields = {title: self.params[0]}, - type = path.extname(self.params[0]); - var tiddlers = self.commander.wiki.deserializeTiddlers(type,data,fields); - if(!tiddlers) { - self.callback("No tiddlers found in file \"" + self.params[0] + "\""); - } else { - for(var t=0; t<tiddlers.length; t++) { - self.commander.wiki.importTiddler(new $tw.Tiddler(tiddlers[t])); - } - self.callback(null); - } - } + var tiddlers = $tw.loadTiddlersFromPath(self.params[0]), + count = 0; + $tw.utils.each(tiddlers,function(tiddlerInfo) { + $tw.utils.each(tiddlerInfo.tiddlers,function(tiddler) { + self.commander.wiki.importTiddler(new $tw.Tiddler(tiddler)); + count++; + }); }); + if(!count) { + self.callback("No tiddlers found in file \"" + self.params[0] + "\""); + } else { + self.callback(null); + } return null; }; diff --git a/core/modules/commands/render.js b/core/modules/commands/render.js new file mode 100644 index 000000000..e9321c2b0 --- /dev/null +++ b/core/modules/commands/render.js @@ -0,0 +1,65 @@ +/*\ +title: $:/core/modules/commands/render.js +type: application/javascript +module-type: command + +Render individual tiddlers and save the results to the specified files + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +var widget = require("$:/core/modules/widgets/widget.js"); + +exports.info = { + name: "render", + synchronous: true +}; + +var Command = function(params,commander,callback) { + this.params = params; + this.commander = commander; + this.callback = callback; +}; + +Command.prototype.execute = function() { + if(this.params.length < 1) { + return "Missing tiddler filter"; + } + var self = this, + fs = require("fs"), + path = require("path"), + wiki = this.commander.wiki, + tiddlerFilter = this.params[0], + filenameFilter = this.params[1] || "[is[tiddler]addsuffix[.html]]", + type = this.params[2] || "text/html", + template = this.params[3], + varName = this.params[4], + varValue = this.params[5], + tiddlers = wiki.filterTiddlers(tiddlerFilter); + $tw.utils.each(tiddlers,function(title) { + var parser = wiki.parseTiddler(template || title), + variables = {currentTiddler: title}; + if(varName) { + variables[varName] = varValue || ""; + } + var widgetNode = wiki.makeWidget(parser,{variables: variables}), + container = $tw.fakeDocument.createElement("div"); + widgetNode.render(container,null); + var text = type === "text/html" ? container.innerHTML : container.textContent, + filepath = path.resolve(self.commander.outputPath,wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]); + if(self.commander.verbose) { + console.log("Rendering \"" + title + "\" to \"" + filepath + "\""); + } + $tw.utils.createFileDirectories(filepath); + fs.writeFileSync(filepath,text,"utf8"); + }); + return null; +}; + +exports.Command = Command; + +})(); diff --git a/core/modules/commands/rendertiddler.js b/core/modules/commands/rendertiddler.js index 22f6c1ecc..1860beb7e 100755 --- a/core/modules/commands/rendertiddler.js +++ b/core/modules/commands/rendertiddler.js @@ -34,12 +34,17 @@ Command.prototype.execute = function() { filename = path.resolve(this.commander.outputPath,this.params[1]), type = this.params[2] || "text/html", template = this.params[3], + name = this.params[4], + value = this.params[5], variables = {}; $tw.utils.createFileDirectories(filename); if(template) { variables.currentTiddler = title; title = template; } + if(name && value) { + variables[name] = value; + } fs.writeFile(filename,this.commander.wiki.renderTiddler(type,title,{variables: variables}),"utf8",function(err) { self.callback(err); }); diff --git a/core/modules/commands/save.js b/core/modules/commands/save.js new file mode 100644 index 000000000..d8c44e1f3 --- /dev/null +++ b/core/modules/commands/save.js @@ -0,0 +1,53 @@ +/*\ +title: $:/core/modules/commands/save.js +type: application/javascript +module-type: command + +Saves individual tiddlers in their raw text or binary format to the specified files + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +exports.info = { + name: "save", + synchronous: true +}; + +var Command = function(params,commander,callback) { + this.params = params; + this.commander = commander; + this.callback = callback; +}; + +Command.prototype.execute = function() { + if(this.params.length < 1) { + return "Missing filename filter"; + } + var self = this, + fs = require("fs"), + path = require("path"), + wiki = this.commander.wiki, + tiddlerFilter = this.params[0], + filenameFilter = this.params[1] || "[is[tiddler]]", + tiddlers = wiki.filterTiddlers(tiddlerFilter); + $tw.utils.each(tiddlers,function(title) { + var tiddler = self.commander.wiki.getTiddler(title), + type = tiddler.fields.type || "text/vnd.tiddlywiki", + contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"}, + filepath = path.resolve(self.commander.outputPath,wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]); + if(self.commander.verbose) { + console.log("Saving \"" + title + "\" to \"" + filepath + "\""); + } + $tw.utils.createFileDirectories(filepath); + fs.writeFileSync(filepath,tiddler.fields.text,contentTypeInfo.encoding); + }); + return null; +}; + +exports.Command = Command; + +})(); diff --git a/core/modules/commands/server.js b/core/modules/commands/server.js index 3cdd81cd0..43765b21f 100644 --- a/core/modules/commands/server.js +++ b/core/modules/commands/server.js @@ -58,7 +58,7 @@ SimpleServer.prototype.findMatchingRoute = function(request,state) { match; if(pathprefix) { if(pathname.substr(0,pathprefix.length) === pathprefix) { - pathname = pathname.substr(pathprefix.length); + pathname = pathname.substr(pathprefix.length) || "/"; match = potentialRoute.path.exec(pathname); } else { match = false; @@ -91,57 +91,64 @@ SimpleServer.prototype.checkCredentials = function(request,incomingUsername,inco } }; -SimpleServer.prototype.listen = function(port,host) { +SimpleServer.prototype.requestHandler = function(request,response) { + // Compose the state object var self = this; - http.createServer(function(request,response) { - // Compose the state object - var state = {}; - state.wiki = self.wiki; - state.server = self; - state.urlInfo = url.parse(request.url); - // Find the route that matches this path - var route = self.findMatchingRoute(request,state); - // Check for the username and password if we've got one - var username = self.get("username"), - password = self.get("password"); - if(username && password) { - // Check they match - if(self.checkCredentials(request,username,password) !== "ALLOWED") { - var servername = state.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5"; - response.writeHead(401,"Authentication required",{ - "WWW-Authenticate": 'Basic realm="Please provide your username and password to login to ' + servername + '"' - }); - response.end(); - return; - } - } - // Return a 404 if we didn't find a route - if(!route) { - response.writeHead(404); + var state = {}; + state.wiki = self.wiki; + state.server = self; + state.urlInfo = url.parse(request.url); + // Optionally output debug info + if(self.get("debugLevel") !== "none") { + console.log("Request path:",JSON.stringify(state.urlInfo)); + console.log("Request headers:",JSON.stringify(request.headers)); + } + // Find the route that matches this path + var route = self.findMatchingRoute(request,state); + // Check for the username and password if we've got one + var username = self.get("username"), + password = self.get("password"); + if(username && password) { + // Check they match + if(self.checkCredentials(request,username,password) !== "ALLOWED") { + var servername = state.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5"; + response.writeHead(401,"Authentication required",{ + "WWW-Authenticate": 'Basic realm="Please provide your username and password to login to ' + servername + '"' + }); response.end(); return; } - // Set the encoding for the incoming request - // TODO: Presumably this would need tweaking if we supported PUTting binary tiddlers - request.setEncoding("utf8"); - // Dispatch the appropriate method - switch(request.method) { - case "GET": // Intentional fall-through - case "DELETE": + } + // Return a 404 if we didn't find a route + if(!route) { + response.writeHead(404); + response.end(); + return; + } + // Set the encoding for the incoming request + // TODO: Presumably this would need tweaking if we supported PUTting binary tiddlers + request.setEncoding("utf8"); + // Dispatch the appropriate method + switch(request.method) { + case "GET": // Intentional fall-through + case "DELETE": + route.handler(request,response,state); + break; + case "PUT": + var data = ""; + request.on("data",function(chunk) { + data += chunk.toString(); + }); + request.on("end",function() { + state.data = data; route.handler(request,response,state); - break; - case "PUT": - var data = ""; - request.on("data",function(chunk) { - data += chunk.toString(); - }); - request.on("end",function() { - state.data = data; - route.handler(request,response,state); - }); - break; - } - }).listen(port,host); + }); + break; + } +}; + +SimpleServer.prototype.listen = function(port,host) { + return http.createServer(this.requestHandler.bind(this)).listen(port,host); }; var Command = function(params,commander,callback) { @@ -171,22 +178,28 @@ Command.prototype.execute = function() { username = this.params[4], password = this.params[5], host = this.params[6] || "127.0.0.1", - pathprefix = this.params[7]; + pathprefix = this.params[7], + debugLevel = this.params[8] || "none"; + if(parseInt(port,10).toString() !== port) { + port = process.env[port] || 8080; + } this.server.set({ rootTiddler: rootTiddler, renderType: renderType, serveType: serveType, username: username, password: password, - pathprefix: pathprefix + pathprefix: pathprefix, + debugLevel: debugLevel }); - this.server.listen(port,host); - console.log("Serving on " + host + ":" + port); - console.log("(press ctrl-C to exit)"); + var nodeServer = this.server.listen(port,host); + $tw.utils.log("Serving on " + host + ":" + port,"brown/orange"); + $tw.utils.log("(press ctrl-C to exit)","red"); // Warn if required plugins are missing if(!$tw.wiki.getTiddler("$:/plugins/tiddlywiki/tiddlyweb") || !$tw.wiki.getTiddler("$:/plugins/tiddlywiki/filesystem")) { $tw.utils.warning("Warning: Plugins required for client-server operation (\"tiddlywiki/filesystem\" and \"tiddlywiki/tiddlyweb\") are missing from tiddlywiki.info file"); } + $tw.hooks.invokeHook('th-server-command-post-start', this.server, nodeServer); return null; }; diff --git a/core/modules/deserializers.js b/core/modules/deserializers.js index 00815f831..3139a2611 100644 --- a/core/modules/deserializers.js +++ b/core/modules/deserializers.js @@ -72,19 +72,28 @@ exports["application/x-tiddler-html-div"] = function(text,fields) { }; exports["application/json"] = function(text,fields) { - var incoming = JSON.parse(text), + var incoming, results = []; - if($tw.utils.isArray(incoming)) { - for(var t=0; t<incoming.length; t++) { - var incomingFields = incoming[t], - fields = {}; - for(var f in incomingFields) { - if(typeof incomingFields[f] === "string") { - fields[f] = incomingFields[f]; - } + try { + incoming = JSON.parse(text); + } catch(e) { + incoming = [{ + title: "JSON error: " + e, + text: "" + }] + } + if(!$tw.utils.isArray(incoming)) { + incoming = [incoming]; + } + for(var t=0; t<incoming.length; t++) { + var incomingFields = incoming[t], + fields = {}; + for(var f in incomingFields) { + if(typeof incomingFields[f] === "string") { + fields[f] = incomingFields[f]; } - results.push(fields); } + results.push(fields); } return results; }; diff --git a/core/modules/editor/engines/framed.js b/core/modules/editor/engines/framed.js index d4328c509..d3694320f 100644 --- a/core/modules/editor/engines/framed.js +++ b/core/modules/editor/engines/framed.js @@ -74,6 +74,7 @@ function FramedEngine(options) { this.copyStyles(); // Add event listeners $tw.utils.addEventListeners(this.domNode,[ + {name: "click",handlerObject: this,handlerMethod: "handleClickEvent"}, {name: "input",handlerObject: this,handlerMethod: "handleInputEvent"}, {name: "keydown",handlerObject: this.widget,handlerMethod: "handleKeydownEvent"} ]); @@ -147,6 +148,14 @@ FramedEngine.prototype.focus = function() { } }; +/* +Handle a click +*/ +FramedEngine.prototype.handleClickEvent = function(event) { + this.fixHeight(); + return true; +}; + /* Handle a dom "input" event which occurs when the text has changed */ diff --git a/core/modules/editor/engines/simple.js b/core/modules/editor/engines/simple.js index 900d95276..62bcf08b5 100644 --- a/core/modules/editor/engines/simple.js +++ b/core/modules/editor/engines/simple.js @@ -64,7 +64,7 @@ Set the text of the engine if it doesn't currently have focus */ SimpleEngine.prototype.setText = function(text,type) { if(!this.domNode.isTiddlyWikiFakeDom) { - if(this.domNode.ownerDocument.activeElement !== this.domNode) { + if(this.domNode.ownerDocument.activeElement !== this.domNode || text === "") { this.domNode.value = text; } // Fix the height if needed diff --git a/core/modules/editor/factory.js b/core/modules/editor/factory.js index baad9ef94..a4184d1b3 100644 --- a/core/modules/editor/factory.js +++ b/core/modules/editor/factory.js @@ -198,7 +198,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) { this.makeChildWidgets(); // Determine whether to show the toolbar this.editShowToolbar = this.wiki.getTiddlerText(ENABLE_TOOLBAR_TITLE,"yes"); - this.editShowToolbar = (this.editShowToolbar === "yes") && !!(this.children && this.children.length > 0); + this.editShowToolbar = (this.editShowToolbar === "yes") && !!(this.children && this.children.length > 0) && (!this.document.isTiddlyWikiFakeDom); }; /* diff --git a/core/modules/editor/operations/bitmap/rotate-left.js b/core/modules/editor/operations/bitmap/rotate-left.js new file mode 100644 index 000000000..6e1b15d3e --- /dev/null +++ b/core/modules/editor/operations/bitmap/rotate-left.js @@ -0,0 +1,24 @@ +/*\ +title: $:/core/modules/editor/operations/bitmap/rotate-left.js +type: application/javascript +module-type: bitmapeditoroperation + +Bitmap editor operation to rotate the image left by 90 degrees + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +exports["rotate-left"] = function(event) { + // Rotate the canvas left by 90 degrees + this.rotateCanvasLeft(); + // Update the input controls + this.refreshToolbar(); + // Save the image into the tiddler + this.saveChanges(); +}; + +})(); diff --git a/core/modules/filters.js b/core/modules/filters.js index 176316189..76046b828 100644 --- a/core/modules/filters.js +++ b/core/modules/filters.js @@ -20,7 +20,7 @@ Parses an operation (i.e. a run) within a filter string Returns the new start position, after the parsed operation */ function parseFilterOperation(operators,filterString,p) { - var operator, operand, bracketPos, curlyBracketPos; + var nextBracketPos, operator; // Skip the starting square bracket if(filterString.charAt(p++) !== "[") { throw "Missing [ in filter expression"; @@ -33,14 +33,14 @@ function parseFilterOperation(operators,filterString,p) { operator.prefix = filterString.charAt(p++); } // Get the operator name - var nextBracketPos = filterString.substring(p).search(/[\[\{<\/]/); + nextBracketPos = filterString.substring(p).search(/[\[\{<\/]/); if(nextBracketPos === -1) { throw "Missing [ in filter expression"; } nextBracketPos += p; var bracket = filterString.charAt(nextBracketPos); operator.operator = filterString.substring(p,nextBracketPos); - + // Any suffix? var colon = operator.operator.indexOf(':'); if(colon > -1) { @@ -79,7 +79,7 @@ console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand } break; } - + if(nextBracketPos === -1) { throw "Missing closing bracket in filter expression"; } @@ -87,7 +87,7 @@ console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand operator.operand = filterString.substring(p,nextBracketPos); } p = nextBracketPos + 1; - + // Push this operator operators.push(operator); } while(filterString.charAt(p) !== "]"); diff --git a/core/modules/filters/all/tags.js b/core/modules/filters/all/tags.js new file mode 100644 index 000000000..2aaa9dec2 --- /dev/null +++ b/core/modules/filters/all/tags.js @@ -0,0 +1,22 @@ +/*\ +title: $:/core/modules/filters/all/tags.js +type: application/javascript +module-type: allfilteroperator + +Filter function for [all[tags]] + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Export our filter function +*/ +exports.tags = function(source,prefix,options) { + return Object.keys(options.wiki.getTagMap()); +}; + +})(); diff --git a/core/modules/filters/count.js b/core/modules/filters/count.js new file mode 100644 index 000000000..638b135df --- /dev/null +++ b/core/modules/filters/count.js @@ -0,0 +1,26 @@ +/*\ +title: $:/core/modules/filters/count.js +type: application/javascript +module-type: filteroperator + +Filter operator returning the number of entries in the current list. + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Export our filter function +*/ +exports.count = function(source,operator,options) { + var count = 0; + source(function(tiddler,title) { + count++; + }); + return [count + ""]; +}; + +})(); diff --git a/core/modules/filters/each.js b/core/modules/filters/each.js index 25e852638..5c2c29077 100644 --- a/core/modules/filters/each.js +++ b/core/modules/filters/each.js @@ -18,18 +18,34 @@ Export our filter function */ exports.each = function(source,operator,options) { var results =[] , - value,values = {}, - field = operator.operand || "title"; - if(operator.suffix !== "list-item") { + value,values = {}, + field = operator.operand || "title"; + if(operator.suffix === "value" && field === "title") { source(function(tiddler,title) { - if(tiddler) { - value = (field === "title") ? title : tiddler.getFieldString(field); - if(!$tw.utils.hop(values,value)) { - values[value] = true; - results.push(title); - } + if(!$tw.utils.hop(values,title)) { + values[title] = true; + results.push(title); } }); + } else if(operator.suffix !== "list-item") { + if(field === "title") { + source(function(tiddler,title) { + if(tiddler && !$tw.utils.hop(values,title)) { + values[title] = true; + results.push(title); + } + }); + } else { + source(function(tiddler,title) { + if(tiddler) { + value = tiddler.getFieldString(field); + if(!$tw.utils.hop(values,value)) { + values[value] = true; + results.push(title); + } + } + }); + } } else { source(function(tiddler,title) { if(tiddler) { diff --git a/core/modules/filters/encodings.js b/core/modules/filters/encodings.js new file mode 100644 index 000000000..b55911cdd --- /dev/null +++ b/core/modules/filters/encodings.js @@ -0,0 +1,91 @@ +/*\ +title: $:/core/modules/filters/decodeuricomponent.js +type: application/javascript +module-type: filteroperator + +Filter operator for applying decodeURIComponent() to each item. + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Export our filter functions +*/ + +exports.decodeuricomponent = function(source,operator,options) { + var results = []; + source(function(tiddler,title) { + results.push(decodeURIComponent(title)); + }); + return results; +}; + +exports.encodeuricomponent = function(source,operator,options) { + var results = []; + source(function(tiddler,title) { + results.push(encodeURIComponent(title)); + }); + return results; +}; + +exports.decodeuri = function(source,operator,options) { + var results = []; + source(function(tiddler,title) { + results.push(decodeURI(title)); + }); + return results; +}; + +exports.encodeuri = function(source,operator,options) { + var results = []; + source(function(tiddler,title) { + results.push(encodeURI(title)); + }); + return results; +}; + +exports.decodehtml = function(source,operator,options) { + var results = []; + source(function(tiddler,title) { + results.push($tw.utils.htmlDecode(title)); + }); + return results; +}; + +exports.encodehtml = function(source,operator,options) { + var results = []; + source(function(tiddler,title) { + results.push($tw.utils.htmlEncode(title)); + }); + return results; +}; + +exports.stringify = function(source,operator,options) { + var results = []; + source(function(tiddler,title) { + results.push($tw.utils.stringify(title)); + }); + return results; +}; + +exports.jsonstringify = function(source,operator,options) { + var results = []; + source(function(tiddler,title) { + results.push($tw.utils.jsonStringify(title)); + }); + return results; +}; + +exports.escaperegexp = function(source,operator,options) { + var results = []; + source(function(tiddler,title) { + results.push($tw.utils.escapeRegExp(title)); + }); + return results; +}; + +})(); diff --git a/core/modules/filters/enlist.js b/core/modules/filters/enlist.js new file mode 100644 index 000000000..c5e67d54c --- /dev/null +++ b/core/modules/filters/enlist.js @@ -0,0 +1,33 @@ +/*\ +title: $:/core/modules/filters/enlist.js +type: application/javascript +module-type: filteroperator + +Filter operator returning its operand parsed as a list + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Export our filter function +*/ +exports.enlist = function(source,operator,options) { + var list = $tw.utils.parseStringArray(operator.operand); + if(operator.prefix === "!") { + var results = []; + source(function(tiddler,title) { + if(list.indexOf(title) === -1) { + results.push(title); + } + }); + return results; + } else { + return list; + } +}; + +})(); diff --git a/core/modules/filters/has.js b/core/modules/filters/has.js index 7a1738782..d05da4113 100644 --- a/core/modules/filters/has.js +++ b/core/modules/filters/has.js @@ -16,19 +16,37 @@ Filter operator for checking if a tiddler has the specified field Export our filter function */ exports.has = function(source,operator,options) { - var results = []; - if(operator.prefix === "!") { - source(function(tiddler,title) { - if(!tiddler || (tiddler && (!$tw.utils.hop(tiddler.fields,operator.operand) || tiddler.fields[operator.operand] === ""))) { - results.push(title); - } - }); + var results = [], + invert = operator.prefix === "!"; + + if(operator.suffix === "field") { + if(invert) { + source(function(tiddler,title) { + if(!tiddler || (tiddler && (!$tw.utils.hop(tiddler.fields,operator.operand)))) { + results.push(title); + } + }); + } else { + source(function(tiddler,title) { + if(tiddler && $tw.utils.hop(tiddler.fields,operator.operand)) { + results.push(title); + } + }); + } } else { - source(function(tiddler,title) { - if(tiddler && $tw.utils.hop(tiddler.fields,operator.operand) && !(tiddler.fields[operator.operand] === "" || tiddler.fields[operator.operand].length === 0)) { - results.push(title); - } - }); + if(invert) { + source(function(tiddler,title) { + if(!tiddler || !$tw.utils.hop(tiddler.fields,operator.operand) || (tiddler.fields[operator.operand] === "")) { + results.push(title); + } + }); + } else { + source(function(tiddler,title) { + if(tiddler && $tw.utils.hop(tiddler.fields,operator.operand) && !(tiddler.fields[operator.operand] === "" || tiddler.fields[operator.operand].length === 0)) { + results.push(title); + } + }); + } } return results; }; diff --git a/core/modules/filters/insertbefore.js b/core/modules/filters/insertbefore.js new file mode 100644 index 000000000..6fa9728f9 --- /dev/null +++ b/core/modules/filters/insertbefore.js @@ -0,0 +1,41 @@ +/*\ +title: $:/core/modules/filters/insertbefore.js +type: application/javascript +module-type: filteroperator + +Insert an item before another item in a list + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Order a list +*/ +exports.insertbefore = function(source,operator,options) { + var results = []; + source(function(tiddler,title) { + results.push(title); + }); + var target = options.widget && options.widget.getVariable(operator.suffix || "currentTiddler"); + if(target !== operator.operand) { + // Remove the entry from the list if it is present + var pos = results.indexOf(operator.operand); + if(pos !== -1) { + results.splice(pos,1); + } + // Insert the entry before the target marker + pos = results.indexOf(target); + if(pos !== -1) { + results.splice(pos,0,operator.operand); + } else { + results.push(operator.operand); + } + } + return results; +}; + +})(); diff --git a/core/modules/filters/is.js b/core/modules/filters/is.js index 0db243044..b75943786 100644 --- a/core/modules/filters/is.js +++ b/core/modules/filters/is.js @@ -28,12 +28,21 @@ Export our filter function exports.is = function(source,operator,options) { // Dispatch to the correct isfilteroperator var isFilterOperators = getIsFilterOperators(); - var isFilterOperator = isFilterOperators[operator.operand]; - if(isFilterOperator) { - return isFilterOperator(source,operator.prefix,options); + if(operator.operand) { + var isFilterOperator = isFilterOperators[operator.operand]; + if(isFilterOperator) { + return isFilterOperator(source,operator.prefix,options); + } else { + return [$tw.language.getString("Error/IsFilterOperator")]; + } } else { - return [$tw.language.getString("Error/IsFilterOperator")]; + // Return all tiddlers if the operand is missing + var results = []; + source(function(tiddler,title) { + results.push(title); + }); + return results; } }; -})(); +})(); \ No newline at end of file diff --git a/core/modules/filters/listops.js b/core/modules/filters/listops.js index 58f74f092..0c30c22e7 100644 --- a/core/modules/filters/listops.js +++ b/core/modules/filters/listops.js @@ -12,6 +12,23 @@ Filter operators for manipulating the current selection list /*global $tw: false */ "use strict"; +/* +Order a list +*/ +exports.order = function(source,operator,options) { + var results = []; + if(operator.operand.toLowerCase() === "reverse") { + source(function(tiddler,title) { + results.unshift(title); + }); + } else { + source(function(tiddler,title) { + results.push(title); + }); + } + return results; +}; + /* Reverse list */ @@ -27,7 +44,7 @@ exports.reverse = function(source,operator,options) { First entry/entries in list */ exports.first = function(source,operator,options) { - var count = parseInt(operator.operand) || 1, + var count = $tw.utils.getInt(operator.operand,1), results = []; source(function(tiddler,title) { results.push(title); @@ -39,7 +56,7 @@ exports.first = function(source,operator,options) { Last entry/entries in list */ exports.last = function(source,operator,options) { - var count = parseInt(operator.operand) || 1, + var count = $tw.utils.getInt(operator.operand,1), results = []; source(function(tiddler,title) { results.push(title); @@ -51,7 +68,7 @@ exports.last = function(source,operator,options) { All but the first entry/entries of the list */ exports.rest = function(source,operator,options) { - var count = parseInt(operator.operand) || 1, + var count = $tw.utils.getInt(operator.operand,1), results = []; source(function(tiddler,title) { results.push(title); @@ -65,7 +82,7 @@ exports.bf = exports.rest; All but the last entry/entries of the list */ exports.butlast = function(source,operator,options) { - var count = parseInt(operator.operand) || 1, + var count = $tw.utils.getInt(operator.operand,1), results = []; source(function(tiddler,title) { results.push(title); @@ -78,7 +95,7 @@ exports.bl = exports.butlast; The nth member of the list */ exports.nth = function(source,operator,options) { - var count = parseInt(operator.operand) || 1, + var count = $tw.utils.getInt(operator.operand,1), results = []; source(function(tiddler,title) { results.push(title); diff --git a/core/modules/filters/lookup.js b/core/modules/filters/lookup.js new file mode 100644 index 000000000..3ab7f42e6 --- /dev/null +++ b/core/modules/filters/lookup.js @@ -0,0 +1,30 @@ +/*\ +title: $:/core/modules/filters/lookup.js +type: application/javascript +module-type: filteroperator + +Filter operator that looks up values via a title prefix + +[lookup:<field>[<prefix>]] + +Prepends the prefix to the selected items and returns the specified field value + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Export our filter function +*/ +exports.lookup = function(source,operator,options) { + var results = []; + source(function(tiddler,title) { + results.push(options.wiki.getTiddlerText(operator.operand + title) || options.wiki.getTiddlerText(operator.operand + operator.suffix)); + }); + return results; +}; + +})(); diff --git a/core/modules/filters/minlength.js b/core/modules/filters/minlength.js new file mode 100644 index 000000000..d4e679bef --- /dev/null +++ b/core/modules/filters/minlength.js @@ -0,0 +1,29 @@ +/*\ +title: $:/core/modules/filters/minlength.js +type: application/javascript +module-type: filteroperator + +Filter operator for filtering out titles that don't meet the minimum length in the operand + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Export our filter function +*/ +exports.minlength = function(source,operator,options) { + var results = [], + minLength = parseInt(operator.operand || "",10) || 0; + source(function(tiddler,title) { + if(title.length >= minLength) { + results.push(title); + } + }); + return results; +}; + +})(); diff --git a/core/modules/filters/sameday.js b/core/modules/filters/sameday.js index e1700d11e..5dfc35128 100644 --- a/core/modules/filters/sameday.js +++ b/core/modules/filters/sameday.js @@ -20,12 +20,9 @@ exports.sameday = function(source,operator,options) { fieldName = operator.suffix || "modified", targetDate = (new Date($tw.utils.parseDate(operator.operand))).setHours(0,0,0,0); // Function to convert a date/time to a date integer - var isSameDay = function(dateField) { - return (new Date(dateField)).setHours(0,0,0,0) === targetDate; - }; source(function(tiddler,title) { - if(tiddler && tiddler.fields[fieldName]) { - if(isSameDay($tw.utils.parseDate(tiddler.fields[fieldName]))) { + if(tiddler) { + if(tiddler.getFieldDay(fieldName) === targetDate) { results.push(title); } } diff --git a/core/modules/filters/sort.js b/core/modules/filters/sort.js index f993825df..176cd4740 100644 --- a/core/modules/filters/sort.js +++ b/core/modules/filters/sort.js @@ -27,6 +27,12 @@ exports.nsort = function(source,operator,options) { return results; }; +exports.sortan = function(source, operator, options) { + var results = prepare_results(source); + options.wiki.sortTiddlers(results, operator.operand || "title", operator.prefix === "!",false,false,true); + return results; +}; + exports.sortcs = function(source,operator,options) { var results = prepare_results(source); options.wiki.sortTiddlers(results,operator.operand || "title",operator.prefix === "!",true,false); diff --git a/core/modules/filters/subtiddlerfields.js b/core/modules/filters/subtiddlerfields.js new file mode 100644 index 000000000..681dd243d --- /dev/null +++ b/core/modules/filters/subtiddlerfields.js @@ -0,0 +1,31 @@ +/*\ +title: $:/core/modules/filters/subtiddlerfields.js +type: application/javascript +module-type: filteroperator + +Filter operator for returning the names of the fields on the selected subtiddlers of the plugin named in the operand + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Export our filter function +*/ +exports.subtiddlerfields = function(source,operator,options) { + var results = []; + source(function(tiddler,title) { + var subtiddler = options.wiki.getSubTiddler(operator.operand,title); + if(subtiddler) { + for(var fieldName in subtiddler.fields) { + $tw.utils.pushTop(results,fieldName); + } + } + }); + return results; +}; + +})(); diff --git a/core/modules/filters/tag.js b/core/modules/filters/tag.js index 408d7f98f..a0093f565 100644 --- a/core/modules/filters/tag.js +++ b/core/modules/filters/tag.js @@ -17,19 +17,31 @@ Export our filter function */ exports.tag = function(source,operator,options) { var results = []; - if(operator.prefix === "!") { + if((operator.suffix || "").toLowerCase() === "strict" && !operator.operand) { + // New semantics: + // Always return copy of input if operator.operand is missing source(function(tiddler,title) { - if(tiddler && !tiddler.hasTag(operator.operand)) { - results.push(title); - } + results.push(title); }); } else { - source(function(tiddler,title) { - if(tiddler && tiddler.hasTag(operator.operand)) { - results.push(title); - } - }); - results = options.wiki.sortByList(results,operator.operand); + // Old semantics: + var tiddlers = options.wiki.getTiddlersWithTag(operator.operand); + if(operator.prefix === "!") { + // Returns a copy of the input if operator.operand is missing + source(function(tiddler,title) { + if(tiddlers.indexOf(title) === -1) { + results.push(title); + } + }); + } else { + // Returns empty results if operator.operand is missing + source(function(tiddler,title) { + if(tiddlers.indexOf(title) !== -1) { + results.push(title); + } + }); + results = options.wiki.sortByList(results,operator.operand); + } } return results; }; diff --git a/core/modules/filters/wikiparserrules.js b/core/modules/filters/wikiparserrules.js index ee57113c8..213298515 100644 --- a/core/modules/filters/wikiparserrules.js +++ b/core/modules/filters/wikiparserrules.js @@ -16,10 +16,11 @@ Filter operator for returning the names of the wiki parser rules in this wiki Export our filter function */ exports.wikiparserrules = function(source,operator,options) { - var results = []; + var results = [], + operand = operator.operand; $tw.utils.each($tw.modules.types.wikirule,function(mod) { var exp = mod.exports; - if(exp.types[operator.operand]) { + if(!operand || exp.types[operand]) { results.push(exp.name); } }); diff --git a/core/modules/filters/x-listops.js b/core/modules/filters/x-listops.js index a20fd5646..e742e3430 100644 --- a/core/modules/filters/x-listops.js +++ b/core/modules/filters/x-listops.js @@ -29,7 +29,7 @@ Extended filter operators to manipulate the current list. exports.putbefore = function (source, operator) { var results = prepare_results(source), index = results.indexOf(operator.operand), - count = parseInt(operator.suffix) || 1; + count = $tw.utils.getInt(operator.suffix,1); return (index === -1) ? results.slice(0, -1) : results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index, -count)); @@ -41,7 +41,7 @@ Extended filter operators to manipulate the current list. exports.putafter = function (source, operator) { var results = prepare_results(source), index = results.indexOf(operator.operand), - count = parseInt(operator.suffix) || 1; + count = $tw.utils.getInt(operator.suffix,1); return (index === -1) ? results.slice(0, -1) : results.slice(0, index + 1).concat(results.slice(-count)).concat(results.slice(index + 1, -count)); @@ -53,7 +53,7 @@ Extended filter operators to manipulate the current list. exports.replace = function (source, operator) { var results = prepare_results(source), index = results.indexOf(operator.operand), - count = parseInt(operator.suffix) || 1; + count = $tw.utils.getInt(operator.suffix,1); return (index === -1) ? results.slice(0, -count) : results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index + 1, -count)); @@ -64,7 +64,7 @@ Extended filter operators to manipulate the current list. */ exports.putfirst = function (source, operator) { var results = prepare_results(source), - count = parseInt(operator.suffix) || 1; + count = $tw.utils.getInt(operator.suffix,1); return results.slice(-count).concat(results.slice(0, -count)); }; @@ -73,7 +73,7 @@ Extended filter operators to manipulate the current list. */ exports.putlast = function (source, operator) { var results = prepare_results(source), - count = parseInt(operator.suffix) || 1; + count = $tw.utils.getInt(operator.suffix,1); return results.slice(count).concat(results.slice(0, count)); }; @@ -83,9 +83,10 @@ Extended filter operators to manipulate the current list. exports.move = function (source, operator) { var results = prepare_results(source), index = results.indexOf(operator.operand), - count = parseInt(operator.suffix) || 1, - marker = results.splice(index, 1); - return results.slice(0, index + count).concat(marker).concat(results.slice(index + count)); + count = $tw.utils.getInt(operator.suffix,1), + marker = results.splice(index, 1), + offset = (index + count) > 0 ? index + count : 0; + return results.slice(0, offset).concat(marker).concat(results.slice(offset)); }; /* @@ -105,7 +106,7 @@ Extended filter operators to manipulate the current list. exports.allbefore = function (source, operator) { var results = prepare_results(source), index = results.indexOf(operator.operand); - return (index <= 0) ? [] : + return (index < 0) ? [] : (operator.suffix) ? results.slice(0, index + 1) : results.slice(0, index); }; @@ -128,7 +129,7 @@ Extended filter operators to manipulate the current list. exports.prepend = function (source, operator) { var prepend = $tw.utils.parseStringArray(operator.operand, "true"), results = prepare_results(source), - count = parseInt(operator.suffix) || prepend.length; + count = $tw.utils.getInt(operator.suffix,prepend.length); return (prepend.length === 0) ? results : (operator.prefix) ? prepend.slice(-count).concat(results) : prepend.slice(0, count).concat(results); diff --git a/core/modules/info/platform.js b/core/modules/info/platform.js index 9f6097f74..ce258daea 100644 --- a/core/modules/info/platform.js +++ b/core/modules/info/platform.js @@ -18,6 +18,24 @@ exports.getInfoTiddlerFields = function() { // Basics infoTiddlerFields.push({title: "$:/info/browser", text: mapBoolean(!!$tw.browser)}); infoTiddlerFields.push({title: "$:/info/node", text: mapBoolean(!!$tw.node)}); + if($tw.browser) { + // Document location + var setLocationProperty = function(name,value) { + infoTiddlerFields.push({title: "$:/info/url/" + name, text: value}); + }, + location = document.location; + setLocationProperty("full", (location.toString()).split("#")[0]); + setLocationProperty("host", location.host); + setLocationProperty("hostname", location.hostname); + setLocationProperty("protocol", location.protocol); + setLocationProperty("port", location.port); + setLocationProperty("pathname", location.pathname); + setLocationProperty("search", location.search); + setLocationProperty("origin", location.origin); + // Screen size + infoTiddlerFields.push({title: "$:/info/browser/screen/width", text: window.screen.width.toString()}); + infoTiddlerFields.push({title: "$:/info/browser/screen/height", text: window.screen.height.toString()}); + } return infoTiddlerFields; }; diff --git a/core/modules/macros/jsontiddler.js b/core/modules/macros/jsontiddler.js new file mode 100644 index 000000000..509fd5559 --- /dev/null +++ b/core/modules/macros/jsontiddler.js @@ -0,0 +1,40 @@ +/*\ +title: $:/core/modules/macros/jsontiddler.js +type: application/javascript +module-type: macro + +Macro to output a single tiddler to JSON + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Information about this macro +*/ + +exports.name = "jsontiddler"; + +exports.params = [ + {name: "title"} +]; + +/* +Run the macro +*/ +exports.run = function(title) { + title = title || this.getVariable("currentTiddler"); + var tiddler = !!title && this.wiki.getTiddler(title), + fields = new Object(); + if(tiddler) { + for(var field in tiddler.fields) { + fields[field] = tiddler.getFieldString(field); + } + } + return JSON.stringify(fields,null,$tw.config.preferences.jsonSpaces); +}; + +})(); diff --git a/core/modules/parsers/binaryparser.js b/core/modules/parsers/binaryparser.js new file mode 100644 index 000000000..ebfd2beec --- /dev/null +++ b/core/modules/parsers/binaryparser.js @@ -0,0 +1,29 @@ +/*\ +title: $:/core/modules/parsers/binaryparser.js +type: application/javascript +module-type: parser + +The video parser parses a video tiddler into an embeddable HTML element + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +var BINARY_WARNING_MESSAGE = "$:/core/ui/BinaryWarning"; + +var BinaryParser = function(type,text,options) { + this.tree = [{ + type: "transclude", + attributes: { + tiddler: {type: "string", value: BINARY_WARNING_MESSAGE} + } + }]; +}; + +exports["application/octet-stream"] = BinaryParser; + +})(); + diff --git a/core/modules/parsers/imageparser.js b/core/modules/parsers/imageparser.js index 709c50ad9..c0bcd65a9 100644 --- a/core/modules/parsers/imageparser.js +++ b/core/modules/parsers/imageparser.js @@ -17,18 +17,11 @@ var ImageParser = function(type,text,options) { type: "element", tag: "img", attributes: {} - }, - src; + }; if(options._canonical_uri) { element.attributes.src = {type: "string", value: options._canonical_uri}; - if(type === "application/pdf" || type === ".pdf") { - element.tag = "embed"; - } } else if(text) { - if(type === "application/pdf" || type === ".pdf") { - element.attributes.src = {type: "string", value: "data:application/pdf;base64," + text}; - element.tag = "embed"; - } else if(type === "image/svg+xml" || type === ".svg") { + if(type === "image/svg+xml" || type === ".svg") { element.attributes.src = {type: "string", value: "data:image/svg+xml," + encodeURIComponent(text)}; } else { element.attributes.src = {type: "string", value: "data:" + type + ";base64," + text}; @@ -42,7 +35,6 @@ exports["image/jpg"] = ImageParser; exports["image/jpeg"] = ImageParser; exports["image/png"] = ImageParser; exports["image/gif"] = ImageParser; -exports["application/pdf"] = ImageParser; exports["image/x-icon"] = ImageParser; })(); diff --git a/core/modules/parsers/parseutils.js b/core/modules/parsers/parseutils.js index 97c994050..0d74355f7 100644 --- a/core/modules/parsers/parseutils.js +++ b/core/modules/parsers/parseutils.js @@ -218,6 +218,7 @@ exports.parseAttribute = function(source,pos) { // Define our regexps var reAttributeName = /([^\/\s>"'=]+)/g, reUnquotedAttribute = /([^\/\s<>"'=]+)/g, + reFilteredValue = /\{\{\{(.+?)\}\}\}/g, reIndirectValue = /\{\{([^\}]+)\}\}/g; // Skip whitespace pos = $tw.utils.skipWhiteSpace(source,pos); @@ -243,29 +244,37 @@ exports.parseAttribute = function(source,pos) { node.type = "string"; node.value = stringLiteral.value; } else { - // Look for an indirect value - var indirectValue = $tw.utils.parseTokenRegExp(source,pos,reIndirectValue); - if(indirectValue) { - pos = indirectValue.end; - node.type = "indirect"; - node.textReference = indirectValue.match[1]; + // Look for a filtered value + var filteredValue = $tw.utils.parseTokenRegExp(source,pos,reFilteredValue); + if(filteredValue) { + pos = filteredValue.end; + node.type = "filtered"; + node.filter = filteredValue.match[1]; } else { - // Look for a unquoted value - var unquotedValue = $tw.utils.parseTokenRegExp(source,pos,reUnquotedAttribute); - if(unquotedValue) { - pos = unquotedValue.end; - node.type = "string"; - node.value = unquotedValue.match[1]; + // Look for an indirect value + var indirectValue = $tw.utils.parseTokenRegExp(source,pos,reIndirectValue); + if(indirectValue) { + pos = indirectValue.end; + node.type = "indirect"; + node.textReference = indirectValue.match[1]; } else { - // Look for a macro invocation value - var macroInvocation = $tw.utils.parseMacroInvocation(source,pos); - if(macroInvocation) { - pos = macroInvocation.end; - node.type = "macro"; - node.value = macroInvocation; - } else { + // Look for a unquoted value + var unquotedValue = $tw.utils.parseTokenRegExp(source,pos,reUnquotedAttribute); + if(unquotedValue) { + pos = unquotedValue.end; node.type = "string"; - node.value = "true"; + node.value = unquotedValue.match[1]; + } else { + // Look for a macro invocation value + var macroInvocation = $tw.utils.parseMacroInvocation(source,pos); + if(macroInvocation) { + pos = macroInvocation.end; + node.type = "macro"; + node.value = macroInvocation; + } else { + node.type = "string"; + node.value = "true"; + } } } } diff --git a/core/modules/parsers/pdfparser.js b/core/modules/parsers/pdfparser.js new file mode 100644 index 000000000..95d74ef4b --- /dev/null +++ b/core/modules/parsers/pdfparser.js @@ -0,0 +1,33 @@ +/*\ +title: $:/core/modules/parsers/pdfparser.js +type: application/javascript +module-type: parser + +The PDF parser embeds a PDF viewer + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +var ImageParser = function(type,text,options) { + var element = { + type: "element", + tag: "embed", + attributes: {} + }, + src; + if(options._canonical_uri) { + element.attributes.src = {type: "string", value: options._canonical_uri}; + } else if(text) { + element.attributes.src = {type: "string", value: "data:application/pdf;base64," + text}; + } + this.tree = [element]; +}; + +exports["application/pdf"] = ImageParser; + +})(); + diff --git a/core/modules/parsers/videoparser.js b/core/modules/parsers/videoparser.js index aaf3170c2..c0ab2d603 100644 --- a/core/modules/parsers/videoparser.js +++ b/core/modules/parsers/videoparser.js @@ -12,7 +12,7 @@ The video parser parses a video tiddler into an embeddable HTML element /*global $tw: false */ "use strict"; -var AudioParser = function(type,text,options) { +var VideoParser = function(type,text,options) { var element = { type: "element", tag: "video", @@ -29,7 +29,8 @@ var AudioParser = function(type,text,options) { this.tree = [element]; }; -exports["video/mp4"] = AudioParser; +exports["video/mp4"] = VideoParser; +exports["video/quicktime"] = VideoParser; })(); diff --git a/core/modules/parsers/wikiparser/rules/extlink.js b/core/modules/parsers/wikiparser/rules/extlink.js index 07ddbfb88..e06f88d8d 100644 --- a/core/modules/parsers/wikiparser/rules/extlink.js +++ b/core/modules/parsers/wikiparser/rules/extlink.js @@ -6,7 +6,7 @@ module-type: wikirule Wiki text inline rule for external links. For example: ``` -An external link: http://www.tiddlywiki.com/ +An external link: https://www.tiddlywiki.com/ A suppressed external link: ~http://www.tiddlyspace.com/ ``` diff --git a/core/modules/parsers/wikiparser/rules/html.js b/core/modules/parsers/wikiparser/rules/html.js index 71cdfd5dc..b92d19a69 100644 --- a/core/modules/parsers/wikiparser/rules/html.js +++ b/core/modules/parsers/wikiparser/rules/html.js @@ -97,10 +97,17 @@ exports.parseTag = function(source,pos,options) { return null; } node.tag = token.match[1]; + if(node.tag.slice(1).indexOf("$") !== -1) { + return null; + } if(node.tag.charAt(0) === "$") { node.type = node.tag.substr(1); } pos = token.end; + // Check that the tag is terminated by a space, / or > + if(!$tw.utils.parseWhiteSpace(source,pos) && !(source.charAt(pos) === "/") && !(source.charAt(pos) === ">") ) { + return null; + } // Process attributes var attribute = $tw.utils.parseAttribute(source,pos); while(attribute) { diff --git a/core/modules/parsers/wikiparser/rules/image.js b/core/modules/parsers/wikiparser/rules/image.js index 4dd1855e3..6b379d9c5 100644 --- a/core/modules/parsers/wikiparser/rules/image.js +++ b/core/modules/parsers/wikiparser/rules/image.js @@ -6,10 +6,10 @@ module-type: wikirule Wiki text inline rule for embedding images. For example: ``` -[img[http://tiddlywiki.com/fractalveg.jpg]] -[img width=23 height=24 [http://tiddlywiki.com/fractalveg.jpg]] -[img width={{!!width}} height={{!!height}} [http://tiddlywiki.com/fractalveg.jpg]] -[img[Description of image|http://tiddlywiki.com/fractalveg.jpg]] +[img[https://tiddlywiki.com/fractalveg.jpg]] +[img width=23 height=24 [https://tiddlywiki.com/fractalveg.jpg]] +[img width={{!!width}} height={{!!height}} [https://tiddlywiki.com/fractalveg.jpg]] +[img[Description of image|https://tiddlywiki.com/fractalveg.jpg]] [img[TiddlerTitle]] [img[Description of image|TiddlerTitle]] ``` diff --git a/core/modules/parsers/wikiparser/rules/macrodef.js b/core/modules/parsers/wikiparser/rules/macrodef.js index 1a0f34e01..cc76ca7ec 100644 --- a/core/modules/parsers/wikiparser/rules/macrodef.js +++ b/core/modules/parsers/wikiparser/rules/macrodef.js @@ -61,7 +61,7 @@ exports.parse = function() { reEnd = /(\r?\n\\end[^\S\n\r]*(?:$|\r?\n))/mg; } else { // Otherwise, the end of the definition is marked by the end of the line - reEnd = /(\r?\n)/mg; + reEnd = /($|\r?\n)/mg; // Move past any whitespace this.parser.pos = $tw.utils.skipWhiteSpace(this.parser.source,this.parser.pos); } @@ -84,7 +84,8 @@ exports.parse = function() { value: {type: "string", value: text} }, children: [], - params: params + params: params, + isMacroDefinition: true }]; }; diff --git a/core/modules/parsers/wikiparser/rules/prettyextlink.js b/core/modules/parsers/wikiparser/rules/prettyextlink.js index 19b4f725b..4c497c257 100644 --- a/core/modules/parsers/wikiparser/rules/prettyextlink.js +++ b/core/modules/parsers/wikiparser/rules/prettyextlink.js @@ -6,8 +6,8 @@ module-type: wikirule Wiki text inline rule for external links. For example: ``` -[ext[http://tiddlywiki.com/fractalveg.jpg]] -[ext[Tooltip|http://tiddlywiki.com/fractalveg.jpg]] +[ext[https://tiddlywiki.com/fractalveg.jpg]] +[ext[Tooltip|https://tiddlywiki.com/fractalveg.jpg]] ``` \*/ diff --git a/core/modules/parsers/wikiparser/rules/syslink.js b/core/modules/parsers/wikiparser/rules/syslink.js index 441fe2aa5..6eb2cdcd4 100644 --- a/core/modules/parsers/wikiparser/rules/syslink.js +++ b/core/modules/parsers/wikiparser/rules/syslink.js @@ -18,7 +18,12 @@ exports.types = {inline: true}; exports.init = function(parser) { this.parser = parser; // Regexp to match - this.matchRegExp = /~?\$:\/[a-zA-Z0-9/.\-_]+/mg; + this.matchRegExp = new RegExp( + "~?\\$:\\/[" + + $tw.config.textPrimitives.anyLetter.substr(1,$tw.config.textPrimitives.anyLetter.length - 2) + + "\/._-]+", + "mg" + ); }; exports.parse = function() { diff --git a/core/modules/parsers/wikiparser/rules/whitespace.js b/core/modules/parsers/wikiparser/rules/whitespace.js new file mode 100644 index 000000000..e3b0c8e3f --- /dev/null +++ b/core/modules/parsers/wikiparser/rules/whitespace.js @@ -0,0 +1,72 @@ +/*\ +title: $:/core/modules/parsers/wikiparser/rules/whitespace.js +type: application/javascript +module-type: wikirule + +Wiki pragma rule for whitespace specifications + +``` +\whitespace trim +\whitespace notrim +``` + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +exports.name = "whitespace"; +exports.types = {pragma: true}; + +/* +Instantiate parse rule +*/ +exports.init = function(parser) { + this.parser = parser; + // Regexp to match + this.matchRegExp = /^\\whitespace[^\S\n]/mg; +}; + +/* +Parse the most recent match +*/ +exports.parse = function() { + var self = this; + // Move past the pragma invocation + this.parser.pos = this.matchRegExp.lastIndex; + // Parse whitespace delimited tokens terminated by a line break + var reMatch = /[^\S\n]*(\S+)|(\r?\n)/mg, + tokens = []; + reMatch.lastIndex = this.parser.pos; + var match = reMatch.exec(this.parser.source); + while(match && match.index === this.parser.pos) { + this.parser.pos = reMatch.lastIndex; + // Exit if we've got the line break + if(match[2]) { + break; + } + // Process the token + if(match[1]) { + tokens.push(match[1]); + } + // Match the next token + match = reMatch.exec(this.parser.source); + } + // Process the tokens + $tw.utils.each(tokens,function(token) { + switch(token) { + case "trim": + self.parser.configTrimWhiteSpace = true; + break; + case "notrim": + self.parser.configTrimWhiteSpace = false; + break; + } + }); + // No parse tree nodes to return + return []; +}; + +})(); diff --git a/core/modules/parsers/wikiparser/wikiparser.js b/core/modules/parsers/wikiparser/wikiparser.js index 2a55399dd..673176038 100644 --- a/core/modules/parsers/wikiparser/wikiparser.js +++ b/core/modules/parsers/wikiparser/wikiparser.js @@ -50,6 +50,8 @@ var WikiParser = function(type,text,options) { this.type = type || "text/vnd.tiddlywiki"; this.source = text || ""; this.sourceLength = this.source.length; + // Flag for ignoring whitespace + this.configTrimWhiteSpace = false; // Set current parse position this.pos = 0; // Instantiate the pragma parse rules @@ -285,7 +287,7 @@ WikiParser.prototype.parseInlineRunUnterminated = function(options) { while(this.pos < this.sourceLength && nextMatch) { // Process the text preceding the run rule if(nextMatch.matchIndex > this.pos) { - tree.push({type: "text", text: this.source.substring(this.pos,nextMatch.matchIndex)}); + this.pushTextWidget(tree,this.source.substring(this.pos,nextMatch.matchIndex)); this.pos = nextMatch.matchIndex; } // Process the run rule @@ -295,7 +297,7 @@ WikiParser.prototype.parseInlineRunUnterminated = function(options) { } // Process the remaining text if(this.pos < this.sourceLength) { - tree.push({type: "text", text: this.source.substr(this.pos)}); + this.pushTextWidget(tree,this.source.substr(this.pos)); } this.pos = this.sourceLength; return tree; @@ -315,7 +317,7 @@ WikiParser.prototype.parseInlineRunTerminated = function(terminatorRegExp,option if(terminatorMatch) { if(!inlineRuleMatch || inlineRuleMatch.matchIndex >= terminatorMatch.index) { if(terminatorMatch.index > this.pos) { - tree.push({type: "text", text: this.source.substring(this.pos,terminatorMatch.index)}); + this.pushTextWidget(tree,this.source.substring(this.pos,terminatorMatch.index)); } this.pos = terminatorMatch.index; if(options.eatTerminator) { @@ -328,7 +330,7 @@ WikiParser.prototype.parseInlineRunTerminated = function(terminatorRegExp,option if(inlineRuleMatch) { // Preceding text if(inlineRuleMatch.matchIndex > this.pos) { - tree.push({type: "text", text: this.source.substring(this.pos,inlineRuleMatch.matchIndex)}); + this.pushTextWidget(tree,this.source.substring(this.pos,inlineRuleMatch.matchIndex)); this.pos = inlineRuleMatch.matchIndex; } // Process the inline rule @@ -342,12 +344,24 @@ WikiParser.prototype.parseInlineRunTerminated = function(terminatorRegExp,option } // Process the remaining text if(this.pos < this.sourceLength) { - tree.push({type: "text", text: this.source.substr(this.pos)}); + this.pushTextWidget(tree,this.source.substr(this.pos)); } this.pos = this.sourceLength; return tree; }; +/* +Push a text widget onto an array, respecting the configTrimWhiteSpace setting +*/ +WikiParser.prototype.pushTextWidget = function(array,text) { + if(this.configTrimWhiteSpace) { + text = $tw.utils.trim(text); + } + if(text) { + array.push({type: "text", text: text}); + } +}; + /* Parse zero or more class specifiers `.classname` */ diff --git a/core/modules/pluginswitcher.js b/core/modules/pluginswitcher.js index 9c05d375f..ab82be933 100644 --- a/core/modules/pluginswitcher.js +++ b/core/modules/pluginswitcher.js @@ -18,12 +18,14 @@ wiki: wiki store to be used pluginType: type of plugin to be switched controllerTitle: title of tiddler used to control switching of this resource defaultPlugins: array of default plugins to be used if nominated plugin isn't found +onSwitch: callback when plugin is switched (single parameter is array of plugin titles) */ function PluginSwitcher(options) { this.wiki = options.wiki; this.pluginType = options.pluginType; this.controllerTitle = options.controllerTitle; this.defaultPlugins = options.defaultPlugins || []; + this.onSwitch = options.onSwitch; // Switch to the current plugin this.switchPlugins(); // Listen for changes to the selected plugin @@ -64,6 +66,10 @@ PluginSwitcher.prototype.switchPlugins = function() { var registeredTiddlers = $tw.wiki.registerPluginTiddlers(this.pluginType,plugins); // Unpack the current theme tiddlers $tw.wiki.unpackPluginTiddlers(); + // Call the switch handler + if(this.onSwitch) { + this.onSwitch(plugins); + } }; exports.PluginSwitcher = PluginSwitcher; diff --git a/core/modules/saver-handler.js b/core/modules/saver-handler.js index 4c938f7af..40747b8d6 100644 --- a/core/modules/saver-handler.js +++ b/core/modules/saver-handler.js @@ -37,10 +37,10 @@ function SaverHandler(options) { // Listen out for changes to tiddlers this.wiki.addEventListener("change",function(changes) { // Filter the changes so that we only count changes to tiddlers that we care about - var filteredChanges = self.filterFn.call(self.wiki,function(callback) { + var filteredChanges = self.filterFn.call(self.wiki,function(iterator) { $tw.utils.each(changes,function(change,title) { var tiddler = self.wiki.getTiddler(title); - callback(tiddler,title); + iterator(tiddler,title); }); }); // Adjust the number of changes diff --git a/core/modules/savers/beaker.js b/core/modules/savers/beaker.js new file mode 100644 index 000000000..dc24ef67f --- /dev/null +++ b/core/modules/savers/beaker.js @@ -0,0 +1,64 @@ +/*\ +title: $:/core/modules/savers/beaker.js +type: application/javascript +module-type: saver + +Saves files using the Beaker browser's (https://beakerbrowser.com) Dat protocol (https://datproject.org/) +Compatible with beaker >= V0.7.2 + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Set up the saver +*/ +var BeakerSaver = function(wiki) { + this.wiki = wiki; +}; + +BeakerSaver.prototype.save = function(text,method,callback) { + var dat = new DatArchive("" + window.location), + pathname = ("" + window.location.pathname).split("#")[0]; + dat.stat(pathname).then(function(value) { + if(value.isDirectory()) { + pathname = pathname + "/index.html"; + } + dat.writeFile(pathname,text,"utf8").then(function(value) { + callback(null); + },function(reason) { + callback("Beaker Saver Write Error: " + reason); + }); + },function(reason) { + callback("Beaker Saver Stat Error: " + reason); + }); + return true; +}; + +/* +Information about this saver +*/ +BeakerSaver.prototype.info = { + name: "beaker", + priority: 3000, + capabilities: ["save", "autosave"] +}; + +/* +Static method that returns true if this saver is capable of working +*/ +exports.canSave = function(wiki) { + return !!window.DatArchive && location.protocol==="dat:"; +}; + +/* +Create an instance of this saver +*/ +exports.create = function(wiki) { + return new BeakerSaver(wiki); +}; + +})(); diff --git a/core/modules/savers/download.js b/core/modules/savers/download.js index ea7c62f58..3f5740dcd 100644 --- a/core/modules/savers/download.js +++ b/core/modules/savers/download.js @@ -25,7 +25,8 @@ DownloadSaver.prototype.save = function(text,method,callback,options) { if(!filename) { var p = document.location.pathname.lastIndexOf("/"); if(p !== -1) { - filename = document.location.pathname.substr(p+1); + // We decode the pathname because document.location is URL encoded by the browser + filename = decodeURIComponent(document.location.pathname.substr(p+1)); } } if(!filename) { @@ -33,8 +34,6 @@ DownloadSaver.prototype.save = function(text,method,callback,options) { } // Set up the link var link = document.createElement("a"); - link.setAttribute("target","_blank"); - link.setAttribute("rel","noopener noreferrer"); if(Blob !== undefined) { var blob = new Blob([text], {type: "text/html"}); link.setAttribute("href", URL.createObjectURL(blob)); @@ -55,10 +54,19 @@ Information about this saver */ DownloadSaver.prototype.info = { name: "download", - priority: 100, - capabilities: ["save", "download"] + priority: 100 }; +Object.defineProperty(DownloadSaver.prototype.info, "capabilities", { + get: function() { + var capabilities = ["save", "download"]; + if(($tw.wiki.getTextReference("$:/config/DownloadSaver/AutoSave") || "").toLowerCase() === "yes") { + capabilities.push("autosave"); + } + return capabilities; + } +}); + /* Static method that returns true if this saver is capable of working */ diff --git a/core/modules/savers/put.js b/core/modules/savers/put.js index 39f1ca18c..771f21c0e 100644 --- a/core/modules/savers/put.js +++ b/core/modules/savers/put.js @@ -15,42 +15,95 @@ to the current URL, such as a WebDAV server. /*global $tw: false */ "use strict"; +/* +Retrieve ETag if available +*/ +var retrieveETag = function(self) { + var headers = { + Accept: "*/*;charset=UTF-8" + }; + $tw.utils.httpRequest({ + url: self.uri(), + type: "HEAD", + headers: headers, + callback: function(err,data,xhr) { + if(err) { + return; + } + var etag = xhr.getResponseHeader("ETag"); + if(!etag) { + return; + } + self.etag = etag.replace(/^W\//,""); + } + }); +}; + + /* Select the appropriate saver module and set it up */ var PutSaver = function(wiki) { this.wiki = wiki; var self = this; + var uri = this.uri(); // Async server probe. Until probe finishes, save will fail fast // See also https://github.com/Jermolene/TiddlyWiki5/issues/2276 - var req = new XMLHttpRequest(); - req.open("OPTIONS",encodeURI(document.location.protocol + "//" + document.location.hostname + ":" + document.location.port + document.location.pathname)); - req.onload = function() { - // Check DAV header http://www.webdav.org/specs/rfc2518.html#rfc.section.9.1 - self.serverAcceptsPuts = (this.status === 200 && !!this.getResponseHeader('dav')); - }; - req.send(); + $tw.utils.httpRequest({ + url: uri, + type: "OPTIONS", + callback: function(err,data,xhr) { + // Check DAV header http://www.webdav.org/specs/rfc2518.html#rfc.section.9.1 + if(!err) { + self.serverAcceptsPuts = xhr.status === 200 && !!xhr.getResponseHeader("dav"); + } + } + }); + retrieveETag(this); }; +PutSaver.prototype.uri = function() { + return document.location.toString().split("#")[0]; +}; + +// TODO: in case of edit conflict +// Prompt: Do you want to save over this? Y/N +// Merging would be ideal, and may be possible using future generic merge flow PutSaver.prototype.save = function(text,method,callback) { - if (!this.serverAcceptsPuts) { + if(!this.serverAcceptsPuts) { return false; } - var req = new XMLHttpRequest(); - // TODO: store/check ETags if supported by server, to protect against overwrites - // Prompt: Do you want to save over this? Y/N - // Merging would be ideal, and may be possible using future generic merge flow - req.onload = function() { - if (this.status === 200 || this.status === 201) { - callback(null); // success - } - else { - callback(this.responseText); // fail - } + var self = this; + var headers = { + "Content-Type": "text/html;charset=UTF-8" }; - req.open("PUT", encodeURI(window.location.href)); - req.setRequestHeader("Content-Type", "text/html;charset=UTF-8"); - req.send(text); + if(this.etag) { + headers["If-Match"] = this.etag; + } + $tw.utils.httpRequest({ + url: this.uri(), + type: "PUT", + headers: headers, + data: text, + callback: function(err,data,xhr) { + if(err) { + // response is textual: "XMLHttpRequest error code: 412" + var status = Number(err.substring(err.indexOf(':') + 2, err.length)) + if(status === 412) { // edit conflict + var message = $tw.language.getString("Error/EditConflict"); + callback(message); + } else { + callback(err); // fail + } + } else { + self.etag = xhr.getResponseHeader("ETag"); + if(self.etag == null) { + retrieveETag(self); + } + callback(null); // success + } + } + }); return true; }; @@ -60,7 +113,7 @@ Information about this saver PutSaver.prototype.info = { name: "put", priority: 2000, - capabilities: ["save", "autosave"] + capabilities: ["save","autosave"] }; /* diff --git a/core/modules/savers/tiddlyfox.js b/core/modules/savers/tiddlyfox.js index a729e26e3..3abe31afe 100644 --- a/core/modules/savers/tiddlyfox.js +++ b/core/modules/savers/tiddlyfox.js @@ -73,7 +73,7 @@ TiddlyFoxSaver.prototype.info = { Static method that returns true if this saver is capable of working */ exports.canSave = function(wiki) { - return (window.location.protocol === "file:"); + return true; }; /* diff --git a/core/modules/startup/browser-messaging.js b/core/modules/startup/browser-messaging.js index c38ba7b85..c67090464 100644 --- a/core/modules/startup/browser-messaging.js +++ b/core/modules/startup/browser-messaging.js @@ -29,16 +29,17 @@ function loadIFrame(url,callback) { callback(null,iframeInfo); } else { // Create the iframe and save it in the list - var iframe = document.createElement("iframe"), - iframeInfo = { - url: url, - status: "loading", - domNode: iframe - }; + var iframe = document.createElement("iframe"); + iframeInfo = { + url: url, + status: "loading", + domNode: iframe + }; $tw.browserMessaging.iframeInfoMap[url] = iframeInfo; saveIFrameInfoTiddler(iframeInfo); // Add the iframe to the DOM and hide it iframe.style.display = "none"; + iframe.setAttribute("library","true"); document.body.appendChild(iframe); // Set up onload iframe.onload = function() { @@ -57,6 +58,18 @@ function loadIFrame(url,callback) { } } +/* +Unload library iframe for given url +*/ +function unloadIFrame(url){ + $tw.utils.each(document.getElementsByTagName('iframe'), function(iframe) { + if(iframe.getAttribute("library") === "true" && + iframe.getAttribute("src") === url) { + iframe.parentNode.removeChild(iframe); + } + }); +} + function saveIFrameInfoTiddler(iframeInfo) { $tw.wiki.addTiddler(new $tw.Tiddler($tw.wiki.getCreationFields(),{ title: "$:/temp/ServerConnection/" + iframeInfo.url, @@ -93,6 +106,21 @@ exports.startup = function() { }); } }); + // Listen for widget messages to control unloading the plugin library + $tw.rootWidget.addEventListener("tm-unload-plugin-library",function(event) { + var paramObject = event.paramObject || {}, + url = paramObject.url; + $tw.browserMessaging.iframeInfoMap[url] = undefined; + if(url) { + unloadIFrame(url); + $tw.utils.each( + $tw.wiki.filterTiddlers("[[$:/temp/ServerConnection/" + url + "]] [prefix[$:/temp/RemoteAssetInfo/" + url + "/]]"), + function(title) { + $tw.wiki.deleteTiddler(title); + } + ); + } + }); $tw.rootWidget.addEventListener("tm-load-plugin-from-library",function(event) { var paramObject = event.paramObject || {}, url = paramObject.url, diff --git a/core/modules/startup/render.js b/core/modules/startup/render.js index e77eb1a32..effa2dc51 100644 --- a/core/modules/startup/render.js +++ b/core/modules/startup/render.js @@ -57,6 +57,7 @@ exports.startup = function() { $tw.utils.addClass($tw.pageContainer,"tc-page-container-wrapper"); document.body.insertBefore($tw.pageContainer,document.body.firstChild); $tw.pageWidgetNode.render($tw.pageContainer,null); + $tw.hooks.invokeHook("th-page-refreshed"); })(); // Prepare refresh mechanism var deferredChanges = Object.create(null), @@ -65,6 +66,7 @@ exports.startup = function() { // Process the refresh $tw.pageWidgetNode.refresh(deferredChanges); deferredChanges = Object.create(null); + $tw.hooks.invokeHook("th-page-refreshed"); } // Add the change event handler $tw.wiki.addEventListener("change",$tw.perf.report("mainRefresh",function(changes) { diff --git a/core/modules/startup/rootwidget.js b/core/modules/startup/rootwidget.js index 2b5111aff..f0c3bd450 100644 --- a/core/modules/startup/rootwidget.js +++ b/core/modules/startup/rootwidget.js @@ -30,6 +30,10 @@ exports.startup = function() { $tw.rootWidget.addEventListener("tm-notify",function(event) { $tw.notifier.display(event.param,{variables: event.paramObject}); }); + // Install the copy-to-clipboard mechanism + $tw.rootWidget.addEventListener("tm-copy-to-clipboard",function(event) { + $tw.utils.copyToClipboard(event.param); + }); // Install the scroller $tw.pageScroller = new $tw.utils.PageScroller(); $tw.rootWidget.addEventListener("tm-scroll",function(event) { @@ -38,10 +42,10 @@ exports.startup = function() { var fullscreen = $tw.utils.getFullScreenApis(); if(fullscreen) { $tw.rootWidget.addEventListener("tm-full-screen",function(event) { - if(document[fullscreen._fullscreenElement]) { - document[fullscreen._exitFullscreen](); + if(event.event.target.ownerDocument[fullscreen._fullscreenElement]) { + event.event.target.ownerDocument[fullscreen._exitFullscreen](); } else { - document.documentElement[fullscreen._requestFullscreen](Element.ALLOW_KEYBOARD_INPUT); + event.event.target.ownerDocument.documentElement[fullscreen._requestFullscreen](Element.ALLOW_KEYBOARD_INPUT); } }); } diff --git a/core/modules/startup/startup.js b/core/modules/startup/startup.js index 427e7414f..a0ecac23e 100755 --- a/core/modules/startup/startup.js +++ b/core/modules/startup/startup.js @@ -63,7 +63,17 @@ exports.startup = function() { controllerTitle: "$:/language", defaultPlugins: [ "$:/languages/en-US" - ] + ], + onSwitch: function(plugins) { + if($tw.browser) { + var pluginTiddler = $tw.wiki.getTiddler(plugins[0]); + if(pluginTiddler) { + document.documentElement.setAttribute("dir",pluginTiddler.getFieldString("text-direction") || "auto"); + } else { + document.documentElement.removeAttribute("dir"); + } + } + } }); // Kick off the theme manager $tw.themeManager = new $tw.PluginSwitcher({ @@ -77,18 +87,29 @@ exports.startup = function() { }); // Kick off the keyboard manager $tw.keyboardManager = new $tw.KeyboardManager(); + // Create a root widget for attaching event handlers. By using it as the parentWidget for another widget tree, one can reuse the event handlers + $tw.rootWidget = new widget.widget({ + type: "widget", + children: [] + },{ + wiki: $tw.wiki, + document: $tw.browser ? document : $tw.fakeDocument + }); + // Execute any startup actions + var executeStartupTiddlers = function(tag) { + $tw.utils.each($tw.wiki.filterTiddlers("[all[shadows+tiddlers]tag[" + tag + "]!has[draft.of]]"),function(title) { + $tw.rootWidget.invokeActionString($tw.wiki.getTiddlerText(title),$tw.rootWidget); + }); + }; + executeStartupTiddlers("$:/tags/StartupAction"); + if($tw.browser) { + executeStartupTiddlers("$:/tags/StartupAction/Browser"); + } + if($tw.node) { + executeStartupTiddlers("$:/tags/StartupAction/Node"); + } // Clear outstanding tiddler store change events to avoid an unnecessary refresh cycle at startup $tw.wiki.clearTiddlerEventQueue(); - // Create a root widget for attaching event handlers. By using it as the parentWidget for another widget tree, one can reuse the event handlers - if($tw.browser) { - $tw.rootWidget = new widget.widget({ - type: "widget", - children: [] - },{ - wiki: $tw.wiki, - document: document - }); - } // Find a working syncadaptor $tw.syncadaptor = undefined; $tw.modules.forEachModuleOfType("syncadaptor",function(title,module) { diff --git a/core/modules/startup/story.js b/core/modules/startup/story.js index 987bee216..8ef57076f 100644 --- a/core/modules/startup/story.js +++ b/core/modules/startup/story.js @@ -53,6 +53,10 @@ exports.startup = function() { $tw.rootWidget.addEventListener("tm-browser-refresh",function(event) { window.location.reload(true); }); + // Listen for the tm-print message + $tw.rootWidget.addEventListener("tm-print",function(event) { + (event.event.view || window).print(); + }); // Listen for the tm-home message $tw.rootWidget.addEventListener("tm-home",function(event) { window.location.hash = ""; diff --git a/core/modules/startup/windows.js b/core/modules/startup/windows.js index 9ce34f842..69966f346 100644 --- a/core/modules/startup/windows.js +++ b/core/modules/startup/windows.js @@ -49,7 +49,10 @@ exports.startup = function() { $tw.wiki.removeEventListener("change",refreshHandler); },false); // Set up the styles - var styleWidgetNode = $tw.wiki.makeTranscludeWidget("$:/core/ui/PageStylesheet",{document: $tw.fakeDocument, variables: variables}), + var styleWidgetNode = $tw.wiki.makeTranscludeWidget("$:/core/ui/PageStylesheet",{ + document: $tw.fakeDocument, + variables: variables, + importPageMacros: true}), styleContainer = $tw.fakeDocument.createElement("style"); styleWidgetNode.render(styleContainer,null); var styleElement = srcDocument.createElement("style"); diff --git a/core/modules/syncer.js b/core/modules/syncer.js index d3481f69e..94975ce80 100644 --- a/core/modules/syncer.js +++ b/core/modules/syncer.js @@ -12,6 +12,18 @@ The syncer tracks changes to the store. If a syncadaptor is used then individual /*global $tw: false */ "use strict"; +/* +Defaults +*/ +Syncer.prototype.titleIsLoggedIn = "$:/status/IsLoggedIn"; +Syncer.prototype.titleUserName = "$:/status/UserName"; +Syncer.prototype.titleSyncFilter = "$:/config/SyncFilter"; +Syncer.prototype.titleSavedNotification = "$:/language/Notifications/Save/Done"; +Syncer.prototype.taskTimerInterval = 1 * 1000; // Interval for sync timer +Syncer.prototype.throttleInterval = 1 * 1000; // Defer saving tiddlers if they've changed in the last 1s... +Syncer.prototype.fallbackInterval = 10 * 1000; // Unless the task is older than 10s +Syncer.prototype.pollTimerInterval = 60 * 1000; // Interval for polling for changes from the adaptor + /* Instantiate the syncer with the following options: syncadaptor: reference to syncadaptor to be used @@ -21,8 +33,21 @@ function Syncer(options) { var self = this; this.wiki = options.wiki; this.syncadaptor = options.syncadaptor; + this.disableUI = !!options.disableUI; + this.titleIsLoggedIn = options.titleIsLoggedIn || this.titleIsLoggedIn; + this.titleUserName = options.titleUserName || this.titleUserName; + this.titleSyncFilter = options.titleSyncFilter || this.titleSyncFilter; + this.titleSavedNotification = options.titleSavedNotification || this.titleSavedNotification; + this.taskTimerInterval = options.taskTimerInterval || this.taskTimerInterval; + this.throttleInterval = options.throttleInterval || this.throttleInterval; + this.fallbackInterval = options.fallbackInterval || this.fallbackInterval; + this.pollTimerInterval = options.pollTimerInterval || this.pollTimerInterval; + this.logging = "logging" in options ? options.logging : true; // Make a logger - this.logger = new $tw.utils.Logger("syncer" + ($tw.browser ? "-browser" : "") + ($tw.node ? "-server" : "")); + this.logger = new $tw.utils.Logger("syncer" + ($tw.browser ? "-browser" : "") + ($tw.node ? "-server" : "") + (this.syncadaptor.name ? ("-" + this.syncadaptor.name) : ""),{ + colour: "cyan", + enable: this.logging + }); // Compile the dirty tiddler filter this.filterFn = this.wiki.compileFilter(this.wiki.getTiddlerText(this.titleSyncFilter)); // Record information for known tiddlers @@ -37,7 +62,7 @@ function Syncer(options) { self.syncToServer(changes); }); // Browser event handlers - if($tw.browser) { + if($tw.browser && !this.disableUI) { // Set up our beforeunload handler $tw.addUnloadTask(function(event) { var confirmationMessage; @@ -59,9 +84,11 @@ function Syncer(options) { }); } // Listen out for lazyLoad events - this.wiki.addEventListener("lazyLoad",function(title) { - self.handleLazyLoadEvent(title); - }); + if(!this.disableUI) { + this.wiki.addEventListener("lazyLoad",function(title) { + self.handleLazyLoadEvent(title); + }); + } // Get the login status this.getStatus(function(err,isLoggedIn) { // Do a sync from the server @@ -69,19 +96,6 @@ function Syncer(options) { }); } -/* -Constants -*/ -Syncer.prototype.titleIsLoggedIn = "$:/status/IsLoggedIn"; -Syncer.prototype.titleUserName = "$:/status/UserName"; -Syncer.prototype.titleSyncFilter = "$:/config/SyncFilter"; -Syncer.prototype.titleSavedNotification = "$:/language/Notifications/Save/Done"; -Syncer.prototype.taskTimerInterval = 1 * 1000; // Interval for sync timer -Syncer.prototype.throttleInterval = 1 * 1000; // Defer saving tiddlers if they've changed in the last 1s... -Syncer.prototype.fallbackInterval = 10 * 1000; // Unless the task is older than 10s -Syncer.prototype.pollTimerInterval = 60 * 1000; // Interval for polling for changes from the adaptor - - /* Read (or re-read) the latest tiddler info from the store */ @@ -127,7 +141,7 @@ Syncer.prototype.isDirty = function() { Update the document body with the class "tc-dirty" if the wiki has unsaved/unsynced changes */ Syncer.prototype.updateDirtyStatus = function() { - if($tw.browser) { + if($tw.browser && !this.disableUI) { $tw.utils.toggleClass(document.body,"tc-dirty",this.isDirty()); } }; @@ -135,7 +149,7 @@ Syncer.prototype.updateDirtyStatus = function() { /* Save an incoming tiddler in the store, and updates the associated tiddlerInfo */ -Syncer.prototype.storeTiddler = function(tiddlerFields) { +Syncer.prototype.storeTiddler = function(tiddlerFields,hasBeenLazyLoaded) { // Save the tiddler var tiddler = new $tw.Tiddler(this.wiki.getTiddler(tiddlerFields.title),tiddlerFields); this.wiki.addTiddler(tiddler); @@ -144,7 +158,7 @@ Syncer.prototype.storeTiddler = function(tiddlerFields) { revision: tiddlerFields.revision, adaptorInfo: this.syncadaptor.getTiddlerInfo(tiddler), changeCount: this.wiki.getChangeCount(tiddlerFields.title), - hasBeenLazyLoaded: true + hasBeenLazyLoaded: hasBeenLazyLoaded !== undefined ? hasBeenLazyLoaded : true }; }; @@ -164,8 +178,6 @@ Syncer.prototype.getStatus = function(callback) { self.wiki.addTiddler({title: self.titleIsLoggedIn,text: isLoggedIn ? "yes" : "no"}); if(isLoggedIn) { self.wiki.addTiddler({title: self.titleUserName,text: username || ""}); - } else { - self.wiki.deleteTiddler(self.titleUserName); } // Invoke the callback if(callback) { @@ -218,7 +230,7 @@ Syncer.prototype.syncFromServer = function() { }); } else { // Load the skinny version of the tiddler - self.storeTiddler(tiddlerFields); + self.storeTiddler(tiddlerFields,false); } } } @@ -257,13 +269,16 @@ Syncer.prototype.handleLazyLoadEvent = function(title) { // Don't lazy load the same tiddler twice var info = this.tiddlerInfo[title]; if(!info || !info.hasBeenLazyLoaded) { - this.createTiddlerInfo(title); - this.tiddlerInfo[title].hasBeenLazyLoaded = true; - // Queue up a sync task to load this tiddler - this.enqueueSyncTask({ - type: "load", - title: title - }); + // Don't lazy load if the tiddler isn't included in the sync filter + if(this.filterFn.call(this.wiki).indexOf(title) !== -1) { + this.createTiddlerInfo(title); + this.tiddlerInfo[title].hasBeenLazyLoaded = true; + // Queue up a sync task to load this tiddler + this.enqueueSyncTask({ + type: "load", + title: title + }); + } } }; @@ -404,7 +419,7 @@ Process the task queue, performing the next task if appropriate Syncer.prototype.processTaskQueue = function() { var self = this; // Only process a task if the sync adaptor is fully initialised and we're not already performing a task. If we are already performing a task then we'll dispatch the next one when it completes - if(this.syncadaptor.isReady() && this.numTasksInProgress() === 0) { + if((!this.syncadaptor.isReady || this.syncadaptor.isReady()) && this.numTasksInProgress() === 0) { // Choose the next task to perform var task = this.chooseNextTask(); // Perform the task if we had one @@ -499,7 +514,7 @@ Syncer.prototype.dispatchTask = function(task,callback) { } // Store the tiddler if(tiddlerFields) { - self.storeTiddler(tiddlerFields); + self.storeTiddler(tiddlerFields,true); } // Invoke the callback callback(null); diff --git a/core/modules/tiddler.js b/core/modules/tiddler.js index f77b41108..e3382af4a 100644 --- a/core/modules/tiddler.js +++ b/core/modules/tiddler.js @@ -39,6 +39,24 @@ exports.getFieldString = function(field) { } }; +/* +Get all the fields as a hashmap of strings. Options: + exclude: an array of field names to exclude +*/ +exports.getFieldStrings = function(options) { + options = options || {}; + var exclude = options.exclude || []; + var fields = {}; + for(var field in this.fields) { + if($tw.utils.hop(this.fields,field)) { + if(exclude.indexOf(field) === -1) { + fields[field] = this.getFieldString(field); + } + } + } + return fields; +}; + /* Get all the fields as a name:value block. Options: exclude: an array of field names to exclude @@ -108,4 +126,17 @@ exports.isEqual = function(tiddler,excludeFields) { return differences.length === 0; }; +exports.getFieldDay = function(field) { + if(this.cache && this.cache.day && $tw.utils.hop(this.cache.day,field) ) { + return this.cache.day[field]; + } + var day = ""; + if(this.fields[field]) { + day = (new Date($tw.utils.parseDate(this.fields[field]))).setHours(0,0,0,0); + } + this.cache.day = this.cache.day || {}; + this.cache.day[field] = day; + return day; +}; + })(); diff --git a/core/modules/utils/diff-match-patch/LICENSE b/core/modules/utils/diff-match-patch/LICENSE new file mode 100755 index 000000000..d64569567 --- /dev/null +++ b/core/modules/utils/diff-match-patch/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/core/modules/utils/diff-match-patch/README.md b/core/modules/utils/diff-match-patch/README.md new file mode 100755 index 000000000..7850f0820 --- /dev/null +++ b/core/modules/utils/diff-match-patch/README.md @@ -0,0 +1,41 @@ +The Diff Match and Patch libraries offer robust algorithms to perform the +operations required for synchronizing plain text. + +1. Diff: + * Compare two blocks of plain text and efficiently return a list of differences. + * [Diff Demo](https://neil.fraser.name/software/diff_match_patch/demos/diff.html) +2. Match: + * Given a search string, find its best fuzzy match in a block of plain text. Weighted for both accuracy and location. + * [Match Demo](https://neil.fraser.name/software/diff_match_patch/demos/match.html) +3. Patch: + * Apply a list of patches onto plain text. Use best-effort to apply patch even when the underlying text doesn't match. + * [Patch Demo](https://neil.fraser.name/software/diff_match_patch/demos/patch.html) + +Originally built in 2006 to power Google Docs, this library is now available in C++, C#, Dart, Java, JavaScript, Lua, Objective C, and Python. + +### Reference + +* [API](https://github.com/google/diff-match-patch/wiki/API) - Common API across all languages. +* [Line or Word Diffs](https://github.com/google/diff-match-patch/wiki/Line-or-Word-Diffs) - Less detailed diffs. +* [Plain Text vs. Structured Content](https://github.com/google/diff-match-patch/wiki/Plain-Text-vs.-Structured-Content) - How to deal with data like XML. +* [Unidiff](https://github.com/google/diff-match-patch/wiki/Unidiff) - The patch serialization format. +* [Support](https://groups.google.com/forum/#!forum/diff-match-patch) - Newsgroup for developers. + +### Languages +Although each language port of Diff Match Patch uses the same API, there are some language-specific notes. + +* [C++](https://github.com/google/diff-match-patch/wiki/Language:-Cpp) +* [C#](https://github.com/google/diff-match-patch/wiki/Language:-C%23) +* [Dart](https://github.com/google/diff-match-patch/wiki/Language:-Dart) +* [Java](https://github.com/google/diff-match-patch/wiki/Language:-Java) +* [JavaScript](https://github.com/google/diff-match-patch/wiki/Language:-JavaScript) +* [Lua](https://github.com/google/diff-match-patch/wiki/Language:-Lua) +* [Objective-C](https://github.com/google/diff-match-patch/wiki/Language:-Objective-C) +* [Python](https://github.com/google/diff-match-patch/wiki/Language:-Python) + +A standardized speed test tracks the [relative performance of diffs](https://docs.google.com/spreadsheets/d/1zpZccuBpjMZTvL1nGDMKJc7rWL_m_drF4XKOJvB27Kc/edit#gid=0) in each language. + +### Algorithms +This library implements [Myer's diff algorithm](https://neil.fraser.name/writing/diff/myers.pdf) which is generally considered to be the best general-purpose diff. A layer of [pre-diff speedups and post-diff cleanups](https://neil.fraser.name/writing/diff/) surround the diff algorithm, improving both performance and output quality. + +This library also implements a [Bitap matching algorithm](https://neil.fraser.name/writing/patch/bitap.ps) at the heart of a [flexible matching and patching strategy](https://neil.fraser.name/writing/patch/). diff --git a/core/modules/utils/diff-match-patch/diff_match_patch.js b/core/modules/utils/diff-match-patch/diff_match_patch.js new file mode 100755 index 000000000..879bf1e8d --- /dev/null +++ b/core/modules/utils/diff-match-patch/diff_match_patch.js @@ -0,0 +1,53 @@ +function diff_match_patch(){this.Diff_Timeout=1;this.Diff_EditCost=4;this.Match_Threshold=.5;this.Match_Distance=1E3;this.Patch_DeleteThreshold=.5;this.Patch_Margin=4;this.Match_MaxBits=32}var DIFF_DELETE=-1,DIFF_INSERT=1,DIFF_EQUAL=0; +diff_match_patch.prototype.diff_main=function(a,b,c,d){"undefined"==typeof d&&(d=0>=this.Diff_Timeout?Number.MAX_VALUE:(new Date).getTime()+1E3*this.Diff_Timeout);if(null==a||null==b)throw Error("Null input. (diff_main)");if(a==b)return a?[[DIFF_EQUAL,a]]:[];"undefined"==typeof c&&(c=!0);var e=c,f=this.diff_commonPrefix(a,b);c=a.substring(0,f);a=a.substring(f);b=b.substring(f);f=this.diff_commonSuffix(a,b);var g=a.substring(a.length-f);a=a.substring(0,a.length-f);b=b.substring(0,b.length-f);a=this.diff_compute_(a, +b,e,d);c&&a.unshift([DIFF_EQUAL,c]);g&&a.push([DIFF_EQUAL,g]);this.diff_cleanupMerge(a);return a}; +diff_match_patch.prototype.diff_compute_=function(a,b,c,d){if(!a)return[[DIFF_INSERT,b]];if(!b)return[[DIFF_DELETE,a]];var e=a.length>b.length?a:b,f=a.length>b.length?b:a,g=e.indexOf(f);return-1!=g?(c=[[DIFF_INSERT,e.substring(0,g)],[DIFF_EQUAL,f],[DIFF_INSERT,e.substring(g+f.length)]],a.length>b.length&&(c[0][0]=c[2][0]=DIFF_DELETE),c):1==f.length?[[DIFF_DELETE,a],[DIFF_INSERT,b]]:(e=this.diff_halfMatch_(a,b))?(b=e[1],f=e[3],a=e[4],e=this.diff_main(e[0],e[2],c,d),c=this.diff_main(b,f,c,d),e.concat([[DIFF_EQUAL, +a]],c)):c&&100<a.length&&100<b.length?this.diff_lineMode_(a,b,d):this.diff_bisect_(a,b,d)}; +diff_match_patch.prototype.diff_lineMode_=function(a,b,c){var d=this.diff_linesToChars_(a,b);a=d.chars1;b=d.chars2;d=d.lineArray;a=this.diff_main(a,b,!1,c);this.diff_charsToLines_(a,d);this.diff_cleanupSemantic(a);a.push([DIFF_EQUAL,""]);for(var e=d=b=0,f="",g="";b<a.length;){switch(a[b][0]){case DIFF_INSERT:e++;g+=a[b][1];break;case DIFF_DELETE:d++;f+=a[b][1];break;case DIFF_EQUAL:if(1<=d&&1<=e){a.splice(b-d-e,d+e);b=b-d-e;d=this.diff_main(f,g,!1,c);for(e=d.length-1;0<=e;e--)a.splice(b,0,d[e]);b+= +d.length}d=e=0;g=f=""}b++}a.pop();return a}; +diff_match_patch.prototype.diff_bisect_=function(a,b,c){for(var d=a.length,e=b.length,f=Math.ceil((d+e)/2),g=2*f,h=Array(g),l=Array(g),k=0;k<g;k++)h[k]=-1,l[k]=-1;h[f+1]=0;l[f+1]=0;k=d-e;for(var m=0!=k%2,p=0,x=0,w=0,q=0,t=0;t<f&&!((new Date).getTime()>c);t++){for(var v=-t+p;v<=t-x;v+=2){var n=f+v;var r=v==-t||v!=t&&h[n-1]<h[n+1]?h[n+1]:h[n-1]+1;for(var y=r-v;r<d&&y<e&&a.charAt(r)==b.charAt(y);)r++,y++;h[n]=r;if(r>d)x+=2;else if(y>e)p+=2;else if(m&&(n=f+k-v,0<=n&&n<g&&-1!=l[n])){var u=d-l[n];if(r>= +u)return this.diff_bisectSplit_(a,b,r,y,c)}}for(v=-t+w;v<=t-q;v+=2){n=f+v;u=v==-t||v!=t&&l[n-1]<l[n+1]?l[n+1]:l[n-1]+1;for(r=u-v;u<d&&r<e&&a.charAt(d-u-1)==b.charAt(e-r-1);)u++,r++;l[n]=u;if(u>d)q+=2;else if(r>e)w+=2;else if(!m&&(n=f+k-v,0<=n&&n<g&&-1!=h[n]&&(r=h[n],y=f+r-n,u=d-u,r>=u)))return this.diff_bisectSplit_(a,b,r,y,c)}}return[[DIFF_DELETE,a],[DIFF_INSERT,b]]}; +diff_match_patch.prototype.diff_bisectSplit_=function(a,b,c,d,e){var f=a.substring(0,c),g=b.substring(0,d);a=a.substring(c);b=b.substring(d);f=this.diff_main(f,g,!1,e);e=this.diff_main(a,b,!1,e);return f.concat(e)}; +diff_match_patch.prototype.diff_linesToChars_=function(a,b){function c(a){for(var b="",c=0,f=-1,g=d.length;f<a.length-1;){f=a.indexOf("\n",c);-1==f&&(f=a.length-1);var h=a.substring(c,f+1);c=f+1;(e.hasOwnProperty?e.hasOwnProperty(h):void 0!==e[h])?b+=String.fromCharCode(e[h]):(b+=String.fromCharCode(g),e[h]=g,d[g++]=h)}return b}var d=[],e={};d[0]="";var f=c(a),g=c(b);return{chars1:f,chars2:g,lineArray:d}}; +diff_match_patch.prototype.diff_charsToLines_=function(a,b){for(var c=0;c<a.length;c++){for(var d=a[c][1],e=[],f=0;f<d.length;f++)e[f]=b[d.charCodeAt(f)];a[c][1]=e.join("")}};diff_match_patch.prototype.diff_commonPrefix=function(a,b){if(!a||!b||a.charAt(0)!=b.charAt(0))return 0;for(var c=0,d=Math.min(a.length,b.length),e=d,f=0;c<e;)a.substring(f,e)==b.substring(f,e)?f=c=e:d=e,e=Math.floor((d-c)/2+c);return e}; +diff_match_patch.prototype.diff_commonSuffix=function(a,b){if(!a||!b||a.charAt(a.length-1)!=b.charAt(b.length-1))return 0;for(var c=0,d=Math.min(a.length,b.length),e=d,f=0;c<e;)a.substring(a.length-e,a.length-f)==b.substring(b.length-e,b.length-f)?f=c=e:d=e,e=Math.floor((d-c)/2+c);return e}; +diff_match_patch.prototype.diff_commonOverlap_=function(a,b){var c=a.length,d=b.length;if(0==c||0==d)return 0;c>d?a=a.substring(c-d):c<d&&(b=b.substring(0,c));c=Math.min(c,d);if(a==b)return c;d=0;for(var e=1;;){var f=a.substring(c-e);f=b.indexOf(f);if(-1==f)return d;e+=f;if(0==f||a.substring(c-e)==b.substring(0,e))d=e,e++}}; +diff_match_patch.prototype.diff_halfMatch_=function(a,b){function c(a,b,c){for(var d=a.substring(c,c+Math.floor(a.length/4)),e=-1,g="",h,k,l,m;-1!=(e=b.indexOf(d,e+1));){var p=f.diff_commonPrefix(a.substring(c),b.substring(e)),u=f.diff_commonSuffix(a.substring(0,c),b.substring(0,e));g.length<u+p&&(g=b.substring(e-u,e)+b.substring(e,e+p),h=a.substring(0,c-u),k=a.substring(c+p),l=b.substring(0,e-u),m=b.substring(e+p))}return 2*g.length>=a.length?[h,k,l,m,g]:null}if(0>=this.Diff_Timeout)return null; +var d=a.length>b.length?a:b,e=a.length>b.length?b:a;if(4>d.length||2*e.length<d.length)return null;var f=this,g=c(d,e,Math.ceil(d.length/4));d=c(d,e,Math.ceil(d.length/2));if(g||d)g=d?g?g[4].length>d[4].length?g:d:d:g;else return null;if(a.length>b.length){d=g[0];e=g[1];var h=g[2];var l=g[3]}else h=g[0],l=g[1],d=g[2],e=g[3];return[d,e,h,l,g[4]]}; +diff_match_patch.prototype.diff_cleanupSemantic=function(a){for(var b=!1,c=[],d=0,e=null,f=0,g=0,h=0,l=0,k=0;f<a.length;)a[f][0]==DIFF_EQUAL?(c[d++]=f,g=l,h=k,k=l=0,e=a[f][1]):(a[f][0]==DIFF_INSERT?l+=a[f][1].length:k+=a[f][1].length,e&&e.length<=Math.max(g,h)&&e.length<=Math.max(l,k)&&(a.splice(c[d-1],0,[DIFF_DELETE,e]),a[c[d-1]+1][0]=DIFF_INSERT,d--,d--,f=0<d?c[d-1]:-1,k=l=h=g=0,e=null,b=!0)),f++;b&&this.diff_cleanupMerge(a);this.diff_cleanupSemanticLossless(a);for(f=1;f<a.length;){if(a[f-1][0]== +DIFF_DELETE&&a[f][0]==DIFF_INSERT){b=a[f-1][1];c=a[f][1];d=this.diff_commonOverlap_(b,c);e=this.diff_commonOverlap_(c,b);if(d>=e){if(d>=b.length/2||d>=c.length/2)a.splice(f,0,[DIFF_EQUAL,c.substring(0,d)]),a[f-1][1]=b.substring(0,b.length-d),a[f+1][1]=c.substring(d),f++}else if(e>=b.length/2||e>=c.length/2)a.splice(f,0,[DIFF_EQUAL,b.substring(0,e)]),a[f-1][0]=DIFF_INSERT,a[f-1][1]=c.substring(0,c.length-e),a[f+1][0]=DIFF_DELETE,a[f+1][1]=b.substring(e),f++;f++}f++}}; +diff_match_patch.prototype.diff_cleanupSemanticLossless=function(a){function b(a,b){if(!a||!b)return 6;var c=a.charAt(a.length-1),d=b.charAt(0),e=c.match(diff_match_patch.nonAlphaNumericRegex_),f=d.match(diff_match_patch.nonAlphaNumericRegex_),g=e&&c.match(diff_match_patch.whitespaceRegex_),h=f&&d.match(diff_match_patch.whitespaceRegex_);c=g&&c.match(diff_match_patch.linebreakRegex_);d=h&&d.match(diff_match_patch.linebreakRegex_);var k=c&&a.match(diff_match_patch.blanklineEndRegex_),l=d&&b.match(diff_match_patch.blanklineStartRegex_); +return k||l?5:c||d?4:e&&!g&&h?3:g||h?2:e||f?1:0}for(var c=1;c<a.length-1;){if(a[c-1][0]==DIFF_EQUAL&&a[c+1][0]==DIFF_EQUAL){var d=a[c-1][1],e=a[c][1],f=a[c+1][1],g=this.diff_commonSuffix(d,e);if(g){var h=e.substring(e.length-g);d=d.substring(0,d.length-g);e=h+e.substring(0,e.length-g);f=h+f}g=d;h=e;for(var l=f,k=b(d,e)+b(e,f);e.charAt(0)===f.charAt(0);){d+=e.charAt(0);e=e.substring(1)+f.charAt(0);f=f.substring(1);var m=b(d,e)+b(e,f);m>=k&&(k=m,g=d,h=e,l=f)}a[c-1][1]!=g&&(g?a[c-1][1]=g:(a.splice(c- +1,1),c--),a[c][1]=h,l?a[c+1][1]=l:(a.splice(c+1,1),c--))}c++}};diff_match_patch.nonAlphaNumericRegex_=/[^a-zA-Z0-9]/;diff_match_patch.whitespaceRegex_=/\s/;diff_match_patch.linebreakRegex_=/[\r\n]/;diff_match_patch.blanklineEndRegex_=/\n\r?\n$/;diff_match_patch.blanklineStartRegex_=/^\r?\n\r?\n/; +diff_match_patch.prototype.diff_cleanupEfficiency=function(a){for(var b=!1,c=[],d=0,e=null,f=0,g=!1,h=!1,l=!1,k=!1;f<a.length;)a[f][0]==DIFF_EQUAL?(a[f][1].length<this.Diff_EditCost&&(l||k)?(c[d++]=f,g=l,h=k,e=a[f][1]):(d=0,e=null),l=k=!1):(a[f][0]==DIFF_DELETE?k=!0:l=!0,e&&(g&&h&&l&&k||e.length<this.Diff_EditCost/2&&3==g+h+l+k)&&(a.splice(c[d-1],0,[DIFF_DELETE,e]),a[c[d-1]+1][0]=DIFF_INSERT,d--,e=null,g&&h?(l=k=!0,d=0):(d--,f=0<d?c[d-1]:-1,l=k=!1),b=!0)),f++;b&&this.diff_cleanupMerge(a)}; +diff_match_patch.prototype.diff_cleanupMerge=function(a){a.push([DIFF_EQUAL,""]);for(var b=0,c=0,d=0,e="",f="",g;b<a.length;)switch(a[b][0]){case DIFF_INSERT:d++;f+=a[b][1];b++;break;case DIFF_DELETE:c++;e+=a[b][1];b++;break;case DIFF_EQUAL:1<c+d?(0!==c&&0!==d&&(g=this.diff_commonPrefix(f,e),0!==g&&(0<b-c-d&&a[b-c-d-1][0]==DIFF_EQUAL?a[b-c-d-1][1]+=f.substring(0,g):(a.splice(0,0,[DIFF_EQUAL,f.substring(0,g)]),b++),f=f.substring(g),e=e.substring(g)),g=this.diff_commonSuffix(f,e),0!==g&&(a[b][1]=f.substring(f.length- +g)+a[b][1],f=f.substring(0,f.length-g),e=e.substring(0,e.length-g))),0===c?a.splice(b-d,c+d,[DIFF_INSERT,f]):0===d?a.splice(b-c,c+d,[DIFF_DELETE,e]):a.splice(b-c-d,c+d,[DIFF_DELETE,e],[DIFF_INSERT,f]),b=b-c-d+(c?1:0)+(d?1:0)+1):0!==b&&a[b-1][0]==DIFF_EQUAL?(a[b-1][1]+=a[b][1],a.splice(b,1)):b++,c=d=0,f=e=""}""===a[a.length-1][1]&&a.pop();c=!1;for(b=1;b<a.length-1;)a[b-1][0]==DIFF_EQUAL&&a[b+1][0]==DIFF_EQUAL&&(a[b][1].substring(a[b][1].length-a[b-1][1].length)==a[b-1][1]?(a[b][1]=a[b-1][1]+a[b][1].substring(0, +a[b][1].length-a[b-1][1].length),a[b+1][1]=a[b-1][1]+a[b+1][1],a.splice(b-1,1),c=!0):a[b][1].substring(0,a[b+1][1].length)==a[b+1][1]&&(a[b-1][1]+=a[b+1][1],a[b][1]=a[b][1].substring(a[b+1][1].length)+a[b+1][1],a.splice(b+1,1),c=!0)),b++;c&&this.diff_cleanupMerge(a)}; +diff_match_patch.prototype.diff_xIndex=function(a,b){var c=0,d=0,e=0,f=0,g;for(g=0;g<a.length;g++){a[g][0]!==DIFF_INSERT&&(c+=a[g][1].length);a[g][0]!==DIFF_DELETE&&(d+=a[g][1].length);if(c>b)break;e=c;f=d}return a.length!=g&&a[g][0]===DIFF_DELETE?f:f+(b-e)}; +diff_match_patch.prototype.diff_prettyHtml=function(a){for(var b=[],c=/&/g,d=/</g,e=/>/g,f=/\n/g,g=0;g<a.length;g++){var h=a[g][0],l=a[g][1].replace(c,"&").replace(d,"<").replace(e,">").replace(f,"¶<br>");switch(h){case DIFF_INSERT:b[g]='<ins style="background:#e6ffe6;">'+l+"</ins>";break;case DIFF_DELETE:b[g]='<del style="background:#ffe6e6;">'+l+"</del>";break;case DIFF_EQUAL:b[g]="<span>"+l+"</span>"}}return b.join("")}; +diff_match_patch.prototype.diff_text1=function(a){for(var b=[],c=0;c<a.length;c++)a[c][0]!==DIFF_INSERT&&(b[c]=a[c][1]);return b.join("")};diff_match_patch.prototype.diff_text2=function(a){for(var b=[],c=0;c<a.length;c++)a[c][0]!==DIFF_DELETE&&(b[c]=a[c][1]);return b.join("")}; +diff_match_patch.prototype.diff_levenshtein=function(a){for(var b=0,c=0,d=0,e=0;e<a.length;e++){var f=a[e][1];switch(a[e][0]){case DIFF_INSERT:c+=f.length;break;case DIFF_DELETE:d+=f.length;break;case DIFF_EQUAL:b+=Math.max(c,d),d=c=0}}return b+=Math.max(c,d)}; +diff_match_patch.prototype.diff_toDelta=function(a){for(var b=[],c=0;c<a.length;c++)switch(a[c][0]){case DIFF_INSERT:b[c]="+"+encodeURI(a[c][1]);break;case DIFF_DELETE:b[c]="-"+a[c][1].length;break;case DIFF_EQUAL:b[c]="="+a[c][1].length}return b.join("\t").replace(/%20/g," ")}; +diff_match_patch.prototype.diff_fromDelta=function(a,b){for(var c=[],d=0,e=0,f=b.split(/\t/g),g=0;g<f.length;g++){var h=f[g].substring(1);switch(f[g].charAt(0)){case "+":try{c[d++]=[DIFF_INSERT,decodeURI(h)]}catch(k){throw Error("Illegal escape in diff_fromDelta: "+h);}break;case "-":case "=":var l=parseInt(h,10);if(isNaN(l)||0>l)throw Error("Invalid number in diff_fromDelta: "+h);h=a.substring(e,e+=l);"="==f[g].charAt(0)?c[d++]=[DIFF_EQUAL,h]:c[d++]=[DIFF_DELETE,h];break;default:if(f[g])throw Error("Invalid diff operation in diff_fromDelta: "+ +f[g]);}}if(e!=a.length)throw Error("Delta length ("+e+") does not equal source text length ("+a.length+").");return c};diff_match_patch.prototype.match_main=function(a,b,c){if(null==a||null==b||null==c)throw Error("Null input. (match_main)");c=Math.max(0,Math.min(c,a.length));return a==b?0:a.length?a.substring(c,c+b.length)==b?c:this.match_bitap_(a,b,c):-1}; +diff_match_patch.prototype.match_bitap_=function(a,b,c){function d(a,d){var e=a/b.length,g=Math.abs(c-d);return f.Match_Distance?e+g/f.Match_Distance:g?1:e}if(b.length>this.Match_MaxBits)throw Error("Pattern too long for this browser.");var e=this.match_alphabet_(b),f=this,g=this.Match_Threshold,h=a.indexOf(b,c);-1!=h&&(g=Math.min(d(0,h),g),h=a.lastIndexOf(b,c+b.length),-1!=h&&(g=Math.min(d(0,h),g)));var l=1<<b.length-1;h=-1;for(var k,m,p=b.length+a.length,x,w=0;w<b.length;w++){k=0;for(m=p;k<m;)d(w, +c+m)<=g?k=m:p=m,m=Math.floor((p-k)/2+k);p=m;k=Math.max(1,c-m+1);var q=Math.min(c+m,a.length)+b.length;m=Array(q+2);for(m[q+1]=(1<<w)-1;q>=k;q--){var t=e[a.charAt(q-1)];m[q]=0===w?(m[q+1]<<1|1)&t:(m[q+1]<<1|1)&t|(x[q+1]|x[q])<<1|1|x[q+1];if(m[q]&l&&(t=d(w,q-1),t<=g))if(g=t,h=q-1,h>c)k=Math.max(1,2*c-h);else break}if(d(w+1,c)>g)break;x=m}return h}; +diff_match_patch.prototype.match_alphabet_=function(a){for(var b={},c=0;c<a.length;c++)b[a.charAt(c)]=0;for(c=0;c<a.length;c++)b[a.charAt(c)]|=1<<a.length-c-1;return b}; +diff_match_patch.prototype.patch_addContext_=function(a,b){if(0!=b.length){for(var c=b.substring(a.start2,a.start2+a.length1),d=0;b.indexOf(c)!=b.lastIndexOf(c)&&c.length<this.Match_MaxBits-this.Patch_Margin-this.Patch_Margin;)d+=this.Patch_Margin,c=b.substring(a.start2-d,a.start2+a.length1+d);d+=this.Patch_Margin;(c=b.substring(a.start2-d,a.start2))&&a.diffs.unshift([DIFF_EQUAL,c]);(d=b.substring(a.start2+a.length1,a.start2+a.length1+d))&&a.diffs.push([DIFF_EQUAL,d]);a.start1-=c.length;a.start2-= +c.length;a.length1+=c.length+d.length;a.length2+=c.length+d.length}}; +diff_match_patch.prototype.patch_make=function(a,b,c){if("string"==typeof a&&"string"==typeof b&&"undefined"==typeof c){var d=a;b=this.diff_main(d,b,!0);2<b.length&&(this.diff_cleanupSemantic(b),this.diff_cleanupEfficiency(b))}else if(a&&"object"==typeof a&&"undefined"==typeof b&&"undefined"==typeof c)b=a,d=this.diff_text1(b);else if("string"==typeof a&&b&&"object"==typeof b&&"undefined"==typeof c)d=a;else if("string"==typeof a&&"string"==typeof b&&c&&"object"==typeof c)d=a,b=c;else throw Error("Unknown call format to patch_make."); +if(0===b.length)return[];c=[];a=new diff_match_patch.patch_obj;for(var e=0,f=0,g=0,h=d,l=0;l<b.length;l++){var k=b[l][0],m=b[l][1];e||k===DIFF_EQUAL||(a.start1=f,a.start2=g);switch(k){case DIFF_INSERT:a.diffs[e++]=b[l];a.length2+=m.length;d=d.substring(0,g)+m+d.substring(g);break;case DIFF_DELETE:a.length1+=m.length;a.diffs[e++]=b[l];d=d.substring(0,g)+d.substring(g+m.length);break;case DIFF_EQUAL:m.length<=2*this.Patch_Margin&&e&&b.length!=l+1?(a.diffs[e++]=b[l],a.length1+=m.length,a.length2+=m.length): +m.length>=2*this.Patch_Margin&&e&&(this.patch_addContext_(a,h),c.push(a),a=new diff_match_patch.patch_obj,e=0,h=d,f=g)}k!==DIFF_INSERT&&(f+=m.length);k!==DIFF_DELETE&&(g+=m.length)}e&&(this.patch_addContext_(a,h),c.push(a));return c}; +diff_match_patch.prototype.patch_deepCopy=function(a){for(var b=[],c=0;c<a.length;c++){var d=a[c],e=new diff_match_patch.patch_obj;e.diffs=[];for(var f=0;f<d.diffs.length;f++)e.diffs[f]=d.diffs[f].slice();e.start1=d.start1;e.start2=d.start2;e.length1=d.length1;e.length2=d.length2;b[c]=e}return b}; +diff_match_patch.prototype.patch_apply=function(a,b){if(0==a.length)return[b,[]];a=this.patch_deepCopy(a);var c=this.patch_addPadding(a);b=c+b+c;this.patch_splitMax(a);for(var d=0,e=[],f=0;f<a.length;f++){var g=a[f].start2+d,h=this.diff_text1(a[f].diffs),l=-1;if(h.length>this.Match_MaxBits){var k=this.match_main(b,h.substring(0,this.Match_MaxBits),g);-1!=k&&(l=this.match_main(b,h.substring(h.length-this.Match_MaxBits),g+h.length-this.Match_MaxBits),-1==l||k>=l)&&(k=-1)}else k=this.match_main(b,h, +g);if(-1==k)e[f]=!1,d-=a[f].length2-a[f].length1;else if(e[f]=!0,d=k-g,g=-1==l?b.substring(k,k+h.length):b.substring(k,l+this.Match_MaxBits),h==g)b=b.substring(0,k)+this.diff_text2(a[f].diffs)+b.substring(k+h.length);else if(g=this.diff_main(h,g,!1),h.length>this.Match_MaxBits&&this.diff_levenshtein(g)/h.length>this.Patch_DeleteThreshold)e[f]=!1;else{this.diff_cleanupSemanticLossless(g);h=0;var m;for(l=0;l<a[f].diffs.length;l++){var p=a[f].diffs[l];p[0]!==DIFF_EQUAL&&(m=this.diff_xIndex(g,h));p[0]=== +DIFF_INSERT?b=b.substring(0,k+m)+p[1]+b.substring(k+m):p[0]===DIFF_DELETE&&(b=b.substring(0,k+m)+b.substring(k+this.diff_xIndex(g,h+p[1].length)));p[0]!==DIFF_DELETE&&(h+=p[1].length)}}}b=b.substring(c.length,b.length-c.length);return[b,e]}; +diff_match_patch.prototype.patch_addPadding=function(a){for(var b=this.Patch_Margin,c="",d=1;d<=b;d++)c+=String.fromCharCode(d);for(d=0;d<a.length;d++)a[d].start1+=b,a[d].start2+=b;d=a[0];var e=d.diffs;if(0==e.length||e[0][0]!=DIFF_EQUAL)e.unshift([DIFF_EQUAL,c]),d.start1-=b,d.start2-=b,d.length1+=b,d.length2+=b;else if(b>e[0][1].length){var f=b-e[0][1].length;e[0][1]=c.substring(e[0][1].length)+e[0][1];d.start1-=f;d.start2-=f;d.length1+=f;d.length2+=f}d=a[a.length-1];e=d.diffs;0==e.length||e[e.length- +1][0]!=DIFF_EQUAL?(e.push([DIFF_EQUAL,c]),d.length1+=b,d.length2+=b):b>e[e.length-1][1].length&&(f=b-e[e.length-1][1].length,e[e.length-1][1]+=c.substring(0,f),d.length1+=f,d.length2+=f);return c}; +diff_match_patch.prototype.patch_splitMax=function(a){for(var b=this.Match_MaxBits,c=0;c<a.length;c++)if(!(a[c].length1<=b)){var d=a[c];a.splice(c--,1);for(var e=d.start1,f=d.start2,g="";0!==d.diffs.length;){var h=new diff_match_patch.patch_obj,l=!0;h.start1=e-g.length;h.start2=f-g.length;""!==g&&(h.length1=h.length2=g.length,h.diffs.push([DIFF_EQUAL,g]));for(;0!==d.diffs.length&&h.length1<b-this.Patch_Margin;){g=d.diffs[0][0];var k=d.diffs[0][1];g===DIFF_INSERT?(h.length2+=k.length,f+=k.length,h.diffs.push(d.diffs.shift()), +l=!1):g===DIFF_DELETE&&1==h.diffs.length&&h.diffs[0][0]==DIFF_EQUAL&&k.length>2*b?(h.length1+=k.length,e+=k.length,l=!1,h.diffs.push([g,k]),d.diffs.shift()):(k=k.substring(0,b-h.length1-this.Patch_Margin),h.length1+=k.length,e+=k.length,g===DIFF_EQUAL?(h.length2+=k.length,f+=k.length):l=!1,h.diffs.push([g,k]),k==d.diffs[0][1]?d.diffs.shift():d.diffs[0][1]=d.diffs[0][1].substring(k.length))}g=this.diff_text2(h.diffs);g=g.substring(g.length-this.Patch_Margin);k=this.diff_text1(d.diffs).substring(0, +this.Patch_Margin);""!==k&&(h.length1+=k.length,h.length2+=k.length,0!==h.diffs.length&&h.diffs[h.diffs.length-1][0]===DIFF_EQUAL?h.diffs[h.diffs.length-1][1]+=k:h.diffs.push([DIFF_EQUAL,k]));l||a.splice(++c,0,h)}}};diff_match_patch.prototype.patch_toText=function(a){for(var b=[],c=0;c<a.length;c++)b[c]=a[c];return b.join("")}; +diff_match_patch.prototype.patch_fromText=function(a){var b=[];if(!a)return b;a=a.split("\n");for(var c=0,d=/^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@$/;c<a.length;){var e=a[c].match(d);if(!e)throw Error("Invalid patch string: "+a[c]);var f=new diff_match_patch.patch_obj;b.push(f);f.start1=parseInt(e[1],10);""===e[2]?(f.start1--,f.length1=1):"0"==e[2]?f.length1=0:(f.start1--,f.length1=parseInt(e[2],10));f.start2=parseInt(e[3],10);""===e[4]?(f.start2--,f.length2=1):"0"==e[4]?f.length2=0:(f.start2--,f.length2= +parseInt(e[4],10));for(c++;c<a.length;){e=a[c].charAt(0);try{var g=decodeURI(a[c].substring(1))}catch(h){throw Error("Illegal escape in patch_fromText: "+g);}if("-"==e)f.diffs.push([DIFF_DELETE,g]);else if("+"==e)f.diffs.push([DIFF_INSERT,g]);else if(" "==e)f.diffs.push([DIFF_EQUAL,g]);else if("@"==e)break;else if(""!==e)throw Error('Invalid patch mode "'+e+'" in: '+g);c++}}return b};diff_match_patch.patch_obj=function(){this.diffs=[];this.start2=this.start1=null;this.length2=this.length1=0}; +diff_match_patch.patch_obj.prototype.toString=function(){for(var a=["@@ -"+(0===this.length1?this.start1+",0":1==this.length1?this.start1+1:this.start1+1+","+this.length1)+" +"+(0===this.length2?this.start2+",0":1==this.length2?this.start2+1:this.start2+1+","+this.length2)+" @@\n"],b,c=0;c<this.diffs.length;c++){switch(this.diffs[c][0]){case DIFF_INSERT:b="+";break;case DIFF_DELETE:b="-";break;case DIFF_EQUAL:b=" "}a[c+1]=b+encodeURI(this.diffs[c][1])+"\n"}return a.join("").replace(/%20/g," ")}; +this.diff_match_patch=diff_match_patch;this.DIFF_DELETE=DIFF_DELETE;this.DIFF_INSERT=DIFF_INSERT;this.DIFF_EQUAL=DIFF_EQUAL; diff --git a/core/modules/utils/diff-match-patch/diff_match_patch_uncompressed.js b/core/modules/utils/diff-match-patch/diff_match_patch_uncompressed.js new file mode 100755 index 000000000..d56f2e7d6 --- /dev/null +++ b/core/modules/utils/diff-match-patch/diff_match_patch_uncompressed.js @@ -0,0 +1,2192 @@ +/** + * Diff Match and Patch + * Copyright 2018 The diff-match-patch Authors. + * https://github.com/google/diff-match-patch + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @fileoverview Computes the difference between two texts to create a patch. + * Applies the patch onto another text, allowing for errors. + * @author fraser@google.com (Neil Fraser) + */ + +/** + * Class containing the diff, match and patch methods. + * @constructor + */ +function diff_match_patch() { + + // Defaults. + // Redefine these in your program to override the defaults. + + // Number of seconds to map a diff before giving up (0 for infinity). + this.Diff_Timeout = 1.0; + // Cost of an empty edit operation in terms of edit characters. + this.Diff_EditCost = 4; + // At what point is no match declared (0.0 = perfection, 1.0 = very loose). + this.Match_Threshold = 0.5; + // How far to search for a match (0 = exact location, 1000+ = broad match). + // A match this many characters away from the expected location will add + // 1.0 to the score (0.0 is a perfect match). + this.Match_Distance = 1000; + // When deleting a large block of text (over ~64 characters), how close do + // the contents have to be to match the expected contents. (0.0 = perfection, + // 1.0 = very loose). Note that Match_Threshold controls how closely the + // end points of a delete need to match. + this.Patch_DeleteThreshold = 0.5; + // Chunk size for context length. + this.Patch_Margin = 4; + + // The number of bits in an int. + this.Match_MaxBits = 32; +} + + +// DIFF FUNCTIONS + + +/** + * The data structure representing a diff is an array of tuples: + * [[DIFF_DELETE, 'Hello'], [DIFF_INSERT, 'Goodbye'], [DIFF_EQUAL, ' world.']] + * which means: delete 'Hello', add 'Goodbye' and keep ' world.' + */ +var DIFF_DELETE = -1; +var DIFF_INSERT = 1; +var DIFF_EQUAL = 0; + +/** @typedef {{0: number, 1: string}} */ +diff_match_patch.Diff; + + +/** + * Find the differences between two texts. Simplifies the problem by stripping + * any common prefix or suffix off the texts before diffing. + * @param {string} text1 Old string to be diffed. + * @param {string} text2 New string to be diffed. + * @param {boolean=} opt_checklines Optional speedup flag. If present and false, + * then don't run a line-level diff first to identify the changed areas. + * Defaults to true, which does a faster, slightly less optimal diff. + * @param {number} opt_deadline Optional time when the diff should be complete + * by. Used internally for recursive calls. Users should set DiffTimeout + * instead. + * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples. + */ +diff_match_patch.prototype.diff_main = function(text1, text2, opt_checklines, + opt_deadline) { + // Set a deadline by which time the diff must be complete. + if (typeof opt_deadline == 'undefined') { + if (this.Diff_Timeout <= 0) { + opt_deadline = Number.MAX_VALUE; + } else { + opt_deadline = (new Date).getTime() + this.Diff_Timeout * 1000; + } + } + var deadline = opt_deadline; + + // Check for null inputs. + if (text1 == null || text2 == null) { + throw new Error('Null input. (diff_main)'); + } + + // Check for equality (speedup). + if (text1 == text2) { + if (text1) { + return [[DIFF_EQUAL, text1]]; + } + return []; + } + + if (typeof opt_checklines == 'undefined') { + opt_checklines = true; + } + var checklines = opt_checklines; + + // Trim off common prefix (speedup). + var commonlength = this.diff_commonPrefix(text1, text2); + var commonprefix = text1.substring(0, commonlength); + text1 = text1.substring(commonlength); + text2 = text2.substring(commonlength); + + // Trim off common suffix (speedup). + commonlength = this.diff_commonSuffix(text1, text2); + var commonsuffix = text1.substring(text1.length - commonlength); + text1 = text1.substring(0, text1.length - commonlength); + text2 = text2.substring(0, text2.length - commonlength); + + // Compute the diff on the middle block. + var diffs = this.diff_compute_(text1, text2, checklines, deadline); + + // Restore the prefix and suffix. + if (commonprefix) { + diffs.unshift([DIFF_EQUAL, commonprefix]); + } + if (commonsuffix) { + diffs.push([DIFF_EQUAL, commonsuffix]); + } + this.diff_cleanupMerge(diffs); + return diffs; +}; + + +/** + * Find the differences between two texts. Assumes that the texts do not + * have any common prefix or suffix. + * @param {string} text1 Old string to be diffed. + * @param {string} text2 New string to be diffed. + * @param {boolean} checklines Speedup flag. If false, then don't run a + * line-level diff first to identify the changed areas. + * If true, then run a faster, slightly less optimal diff. + * @param {number} deadline Time when the diff should be complete by. + * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples. + * @private + */ +diff_match_patch.prototype.diff_compute_ = function(text1, text2, checklines, + deadline) { + var diffs; + + if (!text1) { + // Just add some text (speedup). + return [[DIFF_INSERT, text2]]; + } + + if (!text2) { + // Just delete some text (speedup). + return [[DIFF_DELETE, text1]]; + } + + var longtext = text1.length > text2.length ? text1 : text2; + var shorttext = text1.length > text2.length ? text2 : text1; + var i = longtext.indexOf(shorttext); + if (i != -1) { + // Shorter text is inside the longer text (speedup). + diffs = [[DIFF_INSERT, longtext.substring(0, i)], + [DIFF_EQUAL, shorttext], + [DIFF_INSERT, longtext.substring(i + shorttext.length)]]; + // Swap insertions for deletions if diff is reversed. + if (text1.length > text2.length) { + diffs[0][0] = diffs[2][0] = DIFF_DELETE; + } + return diffs; + } + + if (shorttext.length == 1) { + // Single character string. + // After the previous speedup, the character can't be an equality. + return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]]; + } + + // Check to see if the problem can be split in two. + var hm = this.diff_halfMatch_(text1, text2); + if (hm) { + // A half-match was found, sort out the return data. + var text1_a = hm[0]; + var text1_b = hm[1]; + var text2_a = hm[2]; + var text2_b = hm[3]; + var mid_common = hm[4]; + // Send both pairs off for separate processing. + var diffs_a = this.diff_main(text1_a, text2_a, checklines, deadline); + var diffs_b = this.diff_main(text1_b, text2_b, checklines, deadline); + // Merge the results. + return diffs_a.concat([[DIFF_EQUAL, mid_common]], diffs_b); + } + + if (checklines && text1.length > 100 && text2.length > 100) { + return this.diff_lineMode_(text1, text2, deadline); + } + + return this.diff_bisect_(text1, text2, deadline); +}; + + +/** + * Do a quick line-level diff on both strings, then rediff the parts for + * greater accuracy. + * This speedup can produce non-minimal diffs. + * @param {string} text1 Old string to be diffed. + * @param {string} text2 New string to be diffed. + * @param {number} deadline Time when the diff should be complete by. + * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples. + * @private + */ +diff_match_patch.prototype.diff_lineMode_ = function(text1, text2, deadline) { + // Scan the text on a line-by-line basis first. + var a = this.diff_linesToChars_(text1, text2); + text1 = a.chars1; + text2 = a.chars2; + var linearray = a.lineArray; + + var diffs = this.diff_main(text1, text2, false, deadline); + + // Convert the diff back to original text. + this.diff_charsToLines_(diffs, linearray); + // Eliminate freak matches (e.g. blank lines) + this.diff_cleanupSemantic(diffs); + + // Rediff any replacement blocks, this time character-by-character. + // Add a dummy entry at the end. + diffs.push([DIFF_EQUAL, '']); + var pointer = 0; + var count_delete = 0; + var count_insert = 0; + var text_delete = ''; + var text_insert = ''; + while (pointer < diffs.length) { + switch (diffs[pointer][0]) { + case DIFF_INSERT: + count_insert++; + text_insert += diffs[pointer][1]; + break; + case DIFF_DELETE: + count_delete++; + text_delete += diffs[pointer][1]; + break; + case DIFF_EQUAL: + // Upon reaching an equality, check for prior redundancies. + if (count_delete >= 1 && count_insert >= 1) { + // Delete the offending records and add the merged ones. + diffs.splice(pointer - count_delete - count_insert, + count_delete + count_insert); + pointer = pointer - count_delete - count_insert; + var a = this.diff_main(text_delete, text_insert, false, deadline); + for (var j = a.length - 1; j >= 0; j--) { + diffs.splice(pointer, 0, a[j]); + } + pointer = pointer + a.length; + } + count_insert = 0; + count_delete = 0; + text_delete = ''; + text_insert = ''; + break; + } + pointer++; + } + diffs.pop(); // Remove the dummy entry at the end. + + return diffs; +}; + + +/** + * Find the 'middle snake' of a diff, split the problem in two + * and return the recursively constructed diff. + * See Myers 1986 paper: An O(ND) Difference Algorithm and Its Variations. + * @param {string} text1 Old string to be diffed. + * @param {string} text2 New string to be diffed. + * @param {number} deadline Time at which to bail if not yet complete. + * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples. + * @private + */ +diff_match_patch.prototype.diff_bisect_ = function(text1, text2, deadline) { + // Cache the text lengths to prevent multiple calls. + var text1_length = text1.length; + var text2_length = text2.length; + var max_d = Math.ceil((text1_length + text2_length) / 2); + var v_offset = max_d; + var v_length = 2 * max_d; + var v1 = new Array(v_length); + var v2 = new Array(v_length); + // Setting all elements to -1 is faster in Chrome & Firefox than mixing + // integers and undefined. + for (var x = 0; x < v_length; x++) { + v1[x] = -1; + v2[x] = -1; + } + v1[v_offset + 1] = 0; + v2[v_offset + 1] = 0; + var delta = text1_length - text2_length; + // If the total number of characters is odd, then the front path will collide + // with the reverse path. + var front = (delta % 2 != 0); + // Offsets for start and end of k loop. + // Prevents mapping of space beyond the grid. + var k1start = 0; + var k1end = 0; + var k2start = 0; + var k2end = 0; + for (var d = 0; d < max_d; d++) { + // Bail out if deadline is reached. + if ((new Date()).getTime() > deadline) { + break; + } + + // Walk the front path one step. + for (var k1 = -d + k1start; k1 <= d - k1end; k1 += 2) { + var k1_offset = v_offset + k1; + var x1; + if (k1 == -d || (k1 != d && v1[k1_offset - 1] < v1[k1_offset + 1])) { + x1 = v1[k1_offset + 1]; + } else { + x1 = v1[k1_offset - 1] + 1; + } + var y1 = x1 - k1; + while (x1 < text1_length && y1 < text2_length && + text1.charAt(x1) == text2.charAt(y1)) { + x1++; + y1++; + } + v1[k1_offset] = x1; + if (x1 > text1_length) { + // Ran off the right of the graph. + k1end += 2; + } else if (y1 > text2_length) { + // Ran off the bottom of the graph. + k1start += 2; + } else if (front) { + var k2_offset = v_offset + delta - k1; + if (k2_offset >= 0 && k2_offset < v_length && v2[k2_offset] != -1) { + // Mirror x2 onto top-left coordinate system. + var x2 = text1_length - v2[k2_offset]; + if (x1 >= x2) { + // Overlap detected. + return this.diff_bisectSplit_(text1, text2, x1, y1, deadline); + } + } + } + } + + // Walk the reverse path one step. + for (var k2 = -d + k2start; k2 <= d - k2end; k2 += 2) { + var k2_offset = v_offset + k2; + var x2; + if (k2 == -d || (k2 != d && v2[k2_offset - 1] < v2[k2_offset + 1])) { + x2 = v2[k2_offset + 1]; + } else { + x2 = v2[k2_offset - 1] + 1; + } + var y2 = x2 - k2; + while (x2 < text1_length && y2 < text2_length && + text1.charAt(text1_length - x2 - 1) == + text2.charAt(text2_length - y2 - 1)) { + x2++; + y2++; + } + v2[k2_offset] = x2; + if (x2 > text1_length) { + // Ran off the left of the graph. + k2end += 2; + } else if (y2 > text2_length) { + // Ran off the top of the graph. + k2start += 2; + } else if (!front) { + var k1_offset = v_offset + delta - k2; + if (k1_offset >= 0 && k1_offset < v_length && v1[k1_offset] != -1) { + var x1 = v1[k1_offset]; + var y1 = v_offset + x1 - k1_offset; + // Mirror x2 onto top-left coordinate system. + x2 = text1_length - x2; + if (x1 >= x2) { + // Overlap detected. + return this.diff_bisectSplit_(text1, text2, x1, y1, deadline); + } + } + } + } + } + // Diff took too long and hit the deadline or + // number of diffs equals number of characters, no commonality at all. + return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]]; +}; + + +/** + * Given the location of the 'middle snake', split the diff in two parts + * and recurse. + * @param {string} text1 Old string to be diffed. + * @param {string} text2 New string to be diffed. + * @param {number} x Index of split point in text1. + * @param {number} y Index of split point in text2. + * @param {number} deadline Time at which to bail if not yet complete. + * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples. + * @private + */ +diff_match_patch.prototype.diff_bisectSplit_ = function(text1, text2, x, y, + deadline) { + var text1a = text1.substring(0, x); + var text2a = text2.substring(0, y); + var text1b = text1.substring(x); + var text2b = text2.substring(y); + + // Compute both diffs serially. + var diffs = this.diff_main(text1a, text2a, false, deadline); + var diffsb = this.diff_main(text1b, text2b, false, deadline); + + return diffs.concat(diffsb); +}; + + +/** + * Split two texts into an array of strings. Reduce the texts to a string of + * hashes where each Unicode character represents one line. + * @param {string} text1 First string. + * @param {string} text2 Second string. + * @return {{chars1: string, chars2: string, lineArray: !Array.<string>}} + * An object containing the encoded text1, the encoded text2 and + * the array of unique strings. + * The zeroth element of the array of unique strings is intentionally blank. + * @private + */ +diff_match_patch.prototype.diff_linesToChars_ = function(text1, text2) { + var lineArray = []; // e.g. lineArray[4] == 'Hello\n' + var lineHash = {}; // e.g. lineHash['Hello\n'] == 4 + + // '\x00' is a valid character, but various debuggers don't like it. + // So we'll insert a junk entry to avoid generating a null character. + lineArray[0] = ''; + + /** + * Split a text into an array of strings. Reduce the texts to a string of + * hashes where each Unicode character represents one line. + * Modifies linearray and linehash through being a closure. + * @param {string} text String to encode. + * @return {string} Encoded string. + * @private + */ + function diff_linesToCharsMunge_(text) { + var chars = ''; + // Walk the text, pulling out a substring for each line. + // text.split('\n') would would temporarily double our memory footprint. + // Modifying text would create many large strings to garbage collect. + var lineStart = 0; + var lineEnd = -1; + // Keeping our own length variable is faster than looking it up. + var lineArrayLength = lineArray.length; + while (lineEnd < text.length - 1) { + lineEnd = text.indexOf('\n', lineStart); + if (lineEnd == -1) { + lineEnd = text.length - 1; + } + var line = text.substring(lineStart, lineEnd + 1); + lineStart = lineEnd + 1; + + if (lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) : + (lineHash[line] !== undefined)) { + chars += String.fromCharCode(lineHash[line]); + } else { + chars += String.fromCharCode(lineArrayLength); + lineHash[line] = lineArrayLength; + lineArray[lineArrayLength++] = line; + } + } + return chars; + } + + var chars1 = diff_linesToCharsMunge_(text1); + var chars2 = diff_linesToCharsMunge_(text2); + return {chars1: chars1, chars2: chars2, lineArray: lineArray}; +}; + + +/** + * Rehydrate the text in a diff from a string of line hashes to real lines of + * text. + * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples. + * @param {!Array.<string>} lineArray Array of unique strings. + * @private + */ +diff_match_patch.prototype.diff_charsToLines_ = function(diffs, lineArray) { + for (var x = 0; x < diffs.length; x++) { + var chars = diffs[x][1]; + var text = []; + for (var y = 0; y < chars.length; y++) { + text[y] = lineArray[chars.charCodeAt(y)]; + } + diffs[x][1] = text.join(''); + } +}; + + +/** + * Determine the common prefix of two strings. + * @param {string} text1 First string. + * @param {string} text2 Second string. + * @return {number} The number of characters common to the start of each + * string. + */ +diff_match_patch.prototype.diff_commonPrefix = function(text1, text2) { + // Quick check for common null cases. + if (!text1 || !text2 || text1.charAt(0) != text2.charAt(0)) { + return 0; + } + // Binary search. + // Performance analysis: http://neil.fraser.name/news/2007/10/09/ + var pointermin = 0; + var pointermax = Math.min(text1.length, text2.length); + var pointermid = pointermax; + var pointerstart = 0; + while (pointermin < pointermid) { + if (text1.substring(pointerstart, pointermid) == + text2.substring(pointerstart, pointermid)) { + pointermin = pointermid; + pointerstart = pointermin; + } else { + pointermax = pointermid; + } + pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin); + } + return pointermid; +}; + + +/** + * Determine the common suffix of two strings. + * @param {string} text1 First string. + * @param {string} text2 Second string. + * @return {number} The number of characters common to the end of each string. + */ +diff_match_patch.prototype.diff_commonSuffix = function(text1, text2) { + // Quick check for common null cases. + if (!text1 || !text2 || + text1.charAt(text1.length - 1) != text2.charAt(text2.length - 1)) { + return 0; + } + // Binary search. + // Performance analysis: http://neil.fraser.name/news/2007/10/09/ + var pointermin = 0; + var pointermax = Math.min(text1.length, text2.length); + var pointermid = pointermax; + var pointerend = 0; + while (pointermin < pointermid) { + if (text1.substring(text1.length - pointermid, text1.length - pointerend) == + text2.substring(text2.length - pointermid, text2.length - pointerend)) { + pointermin = pointermid; + pointerend = pointermin; + } else { + pointermax = pointermid; + } + pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin); + } + return pointermid; +}; + + +/** + * Determine if the suffix of one string is the prefix of another. + * @param {string} text1 First string. + * @param {string} text2 Second string. + * @return {number} The number of characters common to the end of the first + * string and the start of the second string. + * @private + */ +diff_match_patch.prototype.diff_commonOverlap_ = function(text1, text2) { + // Cache the text lengths to prevent multiple calls. + var text1_length = text1.length; + var text2_length = text2.length; + // Eliminate the null case. + if (text1_length == 0 || text2_length == 0) { + return 0; + } + // Truncate the longer string. + if (text1_length > text2_length) { + text1 = text1.substring(text1_length - text2_length); + } else if (text1_length < text2_length) { + text2 = text2.substring(0, text1_length); + } + var text_length = Math.min(text1_length, text2_length); + // Quick check for the worst case. + if (text1 == text2) { + return text_length; + } + + // Start by looking for a single character match + // and increase length until no match is found. + // Performance analysis: http://neil.fraser.name/news/2010/11/04/ + var best = 0; + var length = 1; + while (true) { + var pattern = text1.substring(text_length - length); + var found = text2.indexOf(pattern); + if (found == -1) { + return best; + } + length += found; + if (found == 0 || text1.substring(text_length - length) == + text2.substring(0, length)) { + best = length; + length++; + } + } +}; + + +/** + * Do the two texts share a substring which is at least half the length of the + * longer text? + * This speedup can produce non-minimal diffs. + * @param {string} text1 First string. + * @param {string} text2 Second string. + * @return {Array.<string>} Five element Array, containing the prefix of + * text1, the suffix of text1, the prefix of text2, the suffix of + * text2 and the common middle. Or null if there was no match. + * @private + */ +diff_match_patch.prototype.diff_halfMatch_ = function(text1, text2) { + if (this.Diff_Timeout <= 0) { + // Don't risk returning a non-optimal diff if we have unlimited time. + return null; + } + var longtext = text1.length > text2.length ? text1 : text2; + var shorttext = text1.length > text2.length ? text2 : text1; + if (longtext.length < 4 || shorttext.length * 2 < longtext.length) { + return null; // Pointless. + } + var dmp = this; // 'this' becomes 'window' in a closure. + + /** + * Does a substring of shorttext exist within longtext such that the substring + * is at least half the length of longtext? + * Closure, but does not reference any external variables. + * @param {string} longtext Longer string. + * @param {string} shorttext Shorter string. + * @param {number} i Start index of quarter length substring within longtext. + * @return {Array.<string>} Five element Array, containing the prefix of + * longtext, the suffix of longtext, the prefix of shorttext, the suffix + * of shorttext and the common middle. Or null if there was no match. + * @private + */ + function diff_halfMatchI_(longtext, shorttext, i) { + // Start with a 1/4 length substring at position i as a seed. + var seed = longtext.substring(i, i + Math.floor(longtext.length / 4)); + var j = -1; + var best_common = ''; + var best_longtext_a, best_longtext_b, best_shorttext_a, best_shorttext_b; + while ((j = shorttext.indexOf(seed, j + 1)) != -1) { + var prefixLength = dmp.diff_commonPrefix(longtext.substring(i), + shorttext.substring(j)); + var suffixLength = dmp.diff_commonSuffix(longtext.substring(0, i), + shorttext.substring(0, j)); + if (best_common.length < suffixLength + prefixLength) { + best_common = shorttext.substring(j - suffixLength, j) + + shorttext.substring(j, j + prefixLength); + best_longtext_a = longtext.substring(0, i - suffixLength); + best_longtext_b = longtext.substring(i + prefixLength); + best_shorttext_a = shorttext.substring(0, j - suffixLength); + best_shorttext_b = shorttext.substring(j + prefixLength); + } + } + if (best_common.length * 2 >= longtext.length) { + return [best_longtext_a, best_longtext_b, + best_shorttext_a, best_shorttext_b, best_common]; + } else { + return null; + } + } + + // First check if the second quarter is the seed for a half-match. + var hm1 = diff_halfMatchI_(longtext, shorttext, + Math.ceil(longtext.length / 4)); + // Check again based on the third quarter. + var hm2 = diff_halfMatchI_(longtext, shorttext, + Math.ceil(longtext.length / 2)); + var hm; + if (!hm1 && !hm2) { + return null; + } else if (!hm2) { + hm = hm1; + } else if (!hm1) { + hm = hm2; + } else { + // Both matched. Select the longest. + hm = hm1[4].length > hm2[4].length ? hm1 : hm2; + } + + // A half-match was found, sort out the return data. + var text1_a, text1_b, text2_a, text2_b; + if (text1.length > text2.length) { + text1_a = hm[0]; + text1_b = hm[1]; + text2_a = hm[2]; + text2_b = hm[3]; + } else { + text2_a = hm[0]; + text2_b = hm[1]; + text1_a = hm[2]; + text1_b = hm[3]; + } + var mid_common = hm[4]; + return [text1_a, text1_b, text2_a, text2_b, mid_common]; +}; + + +/** + * Reduce the number of edits by eliminating semantically trivial equalities. + * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples. + */ +diff_match_patch.prototype.diff_cleanupSemantic = function(diffs) { + var changes = false; + var equalities = []; // Stack of indices where equalities are found. + var equalitiesLength = 0; // Keeping our own length var is faster in JS. + /** @type {?string} */ + var lastequality = null; + // Always equal to diffs[equalities[equalitiesLength - 1]][1] + var pointer = 0; // Index of current position. + // Number of characters that changed prior to the equality. + var length_insertions1 = 0; + var length_deletions1 = 0; + // Number of characters that changed after the equality. + var length_insertions2 = 0; + var length_deletions2 = 0; + while (pointer < diffs.length) { + if (diffs[pointer][0] == DIFF_EQUAL) { // Equality found. + equalities[equalitiesLength++] = pointer; + length_insertions1 = length_insertions2; + length_deletions1 = length_deletions2; + length_insertions2 = 0; + length_deletions2 = 0; + lastequality = diffs[pointer][1]; + } else { // An insertion or deletion. + if (diffs[pointer][0] == DIFF_INSERT) { + length_insertions2 += diffs[pointer][1].length; + } else { + length_deletions2 += diffs[pointer][1].length; + } + // Eliminate an equality that is smaller or equal to the edits on both + // sides of it. + if (lastequality && (lastequality.length <= + Math.max(length_insertions1, length_deletions1)) && + (lastequality.length <= Math.max(length_insertions2, + length_deletions2))) { + // Duplicate record. + diffs.splice(equalities[equalitiesLength - 1], 0, + [DIFF_DELETE, lastequality]); + // Change second copy to insert. + diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT; + // Throw away the equality we just deleted. + equalitiesLength--; + // Throw away the previous equality (it needs to be reevaluated). + equalitiesLength--; + pointer = equalitiesLength > 0 ? equalities[equalitiesLength - 1] : -1; + length_insertions1 = 0; // Reset the counters. + length_deletions1 = 0; + length_insertions2 = 0; + length_deletions2 = 0; + lastequality = null; + changes = true; + } + } + pointer++; + } + + // Normalize the diff. + if (changes) { + this.diff_cleanupMerge(diffs); + } + this.diff_cleanupSemanticLossless(diffs); + + // Find any overlaps between deletions and insertions. + // e.g: <del>abcxxx</del><ins>xxxdef</ins> + // -> <del>abc</del>xxx<ins>def</ins> + // e.g: <del>xxxabc</del><ins>defxxx</ins> + // -> <ins>def</ins>xxx<del>abc</del> + // Only extract an overlap if it is as big as the edit ahead or behind it. + pointer = 1; + while (pointer < diffs.length) { + if (diffs[pointer - 1][0] == DIFF_DELETE && + diffs[pointer][0] == DIFF_INSERT) { + var deletion = diffs[pointer - 1][1]; + var insertion = diffs[pointer][1]; + var overlap_length1 = this.diff_commonOverlap_(deletion, insertion); + var overlap_length2 = this.diff_commonOverlap_(insertion, deletion); + if (overlap_length1 >= overlap_length2) { + if (overlap_length1 >= deletion.length / 2 || + overlap_length1 >= insertion.length / 2) { + // Overlap found. Insert an equality and trim the surrounding edits. + diffs.splice(pointer, 0, + [DIFF_EQUAL, insertion.substring(0, overlap_length1)]); + diffs[pointer - 1][1] = + deletion.substring(0, deletion.length - overlap_length1); + diffs[pointer + 1][1] = insertion.substring(overlap_length1); + pointer++; + } + } else { + if (overlap_length2 >= deletion.length / 2 || + overlap_length2 >= insertion.length / 2) { + // Reverse overlap found. + // Insert an equality and swap and trim the surrounding edits. + diffs.splice(pointer, 0, + [DIFF_EQUAL, deletion.substring(0, overlap_length2)]); + diffs[pointer - 1][0] = DIFF_INSERT; + diffs[pointer - 1][1] = + insertion.substring(0, insertion.length - overlap_length2); + diffs[pointer + 1][0] = DIFF_DELETE; + diffs[pointer + 1][1] = + deletion.substring(overlap_length2); + pointer++; + } + } + pointer++; + } + pointer++; + } +}; + + +/** + * Look for single edits surrounded on both sides by equalities + * which can be shifted sideways to align the edit to a word boundary. + * e.g: The c<ins>at c</ins>ame. -> The <ins>cat </ins>came. + * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples. + */ +diff_match_patch.prototype.diff_cleanupSemanticLossless = function(diffs) { + /** + * Given two strings, compute a score representing whether the internal + * boundary falls on logical boundaries. + * Scores range from 6 (best) to 0 (worst). + * Closure, but does not reference any external variables. + * @param {string} one First string. + * @param {string} two Second string. + * @return {number} The score. + * @private + */ + function diff_cleanupSemanticScore_(one, two) { + if (!one || !two) { + // Edges are the best. + return 6; + } + + // Each port of this function behaves slightly differently due to + // subtle differences in each language's definition of things like + // 'whitespace'. Since this function's purpose is largely cosmetic, + // the choice has been made to use each language's native features + // rather than force total conformity. + var char1 = one.charAt(one.length - 1); + var char2 = two.charAt(0); + var nonAlphaNumeric1 = char1.match(diff_match_patch.nonAlphaNumericRegex_); + var nonAlphaNumeric2 = char2.match(diff_match_patch.nonAlphaNumericRegex_); + var whitespace1 = nonAlphaNumeric1 && + char1.match(diff_match_patch.whitespaceRegex_); + var whitespace2 = nonAlphaNumeric2 && + char2.match(diff_match_patch.whitespaceRegex_); + var lineBreak1 = whitespace1 && + char1.match(diff_match_patch.linebreakRegex_); + var lineBreak2 = whitespace2 && + char2.match(diff_match_patch.linebreakRegex_); + var blankLine1 = lineBreak1 && + one.match(diff_match_patch.blanklineEndRegex_); + var blankLine2 = lineBreak2 && + two.match(diff_match_patch.blanklineStartRegex_); + + if (blankLine1 || blankLine2) { + // Five points for blank lines. + return 5; + } else if (lineBreak1 || lineBreak2) { + // Four points for line breaks. + return 4; + } else if (nonAlphaNumeric1 && !whitespace1 && whitespace2) { + // Three points for end of sentences. + return 3; + } else if (whitespace1 || whitespace2) { + // Two points for whitespace. + return 2; + } else if (nonAlphaNumeric1 || nonAlphaNumeric2) { + // One point for non-alphanumeric. + return 1; + } + return 0; + } + + var pointer = 1; + // Intentionally ignore the first and last element (don't need checking). + while (pointer < diffs.length - 1) { + if (diffs[pointer - 1][0] == DIFF_EQUAL && + diffs[pointer + 1][0] == DIFF_EQUAL) { + // This is a single edit surrounded by equalities. + var equality1 = diffs[pointer - 1][1]; + var edit = diffs[pointer][1]; + var equality2 = diffs[pointer + 1][1]; + + // First, shift the edit as far left as possible. + var commonOffset = this.diff_commonSuffix(equality1, edit); + if (commonOffset) { + var commonString = edit.substring(edit.length - commonOffset); + equality1 = equality1.substring(0, equality1.length - commonOffset); + edit = commonString + edit.substring(0, edit.length - commonOffset); + equality2 = commonString + equality2; + } + + // Second, step character by character right, looking for the best fit. + var bestEquality1 = equality1; + var bestEdit = edit; + var bestEquality2 = equality2; + var bestScore = diff_cleanupSemanticScore_(equality1, edit) + + diff_cleanupSemanticScore_(edit, equality2); + while (edit.charAt(0) === equality2.charAt(0)) { + equality1 += edit.charAt(0); + edit = edit.substring(1) + equality2.charAt(0); + equality2 = equality2.substring(1); + var score = diff_cleanupSemanticScore_(equality1, edit) + + diff_cleanupSemanticScore_(edit, equality2); + // The >= encourages trailing rather than leading whitespace on edits. + if (score >= bestScore) { + bestScore = score; + bestEquality1 = equality1; + bestEdit = edit; + bestEquality2 = equality2; + } + } + + if (diffs[pointer - 1][1] != bestEquality1) { + // We have an improvement, save it back to the diff. + if (bestEquality1) { + diffs[pointer - 1][1] = bestEquality1; + } else { + diffs.splice(pointer - 1, 1); + pointer--; + } + diffs[pointer][1] = bestEdit; + if (bestEquality2) { + diffs[pointer + 1][1] = bestEquality2; + } else { + diffs.splice(pointer + 1, 1); + pointer--; + } + } + } + pointer++; + } +}; + +// Define some regex patterns for matching boundaries. +diff_match_patch.nonAlphaNumericRegex_ = /[^a-zA-Z0-9]/; +diff_match_patch.whitespaceRegex_ = /\s/; +diff_match_patch.linebreakRegex_ = /[\r\n]/; +diff_match_patch.blanklineEndRegex_ = /\n\r?\n$/; +diff_match_patch.blanklineStartRegex_ = /^\r?\n\r?\n/; + +/** + * Reduce the number of edits by eliminating operationally trivial equalities. + * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples. + */ +diff_match_patch.prototype.diff_cleanupEfficiency = function(diffs) { + var changes = false; + var equalities = []; // Stack of indices where equalities are found. + var equalitiesLength = 0; // Keeping our own length var is faster in JS. + /** @type {?string} */ + var lastequality = null; + // Always equal to diffs[equalities[equalitiesLength - 1]][1] + var pointer = 0; // Index of current position. + // Is there an insertion operation before the last equality. + var pre_ins = false; + // Is there a deletion operation before the last equality. + var pre_del = false; + // Is there an insertion operation after the last equality. + var post_ins = false; + // Is there a deletion operation after the last equality. + var post_del = false; + while (pointer < diffs.length) { + if (diffs[pointer][0] == DIFF_EQUAL) { // Equality found. + if (diffs[pointer][1].length < this.Diff_EditCost && + (post_ins || post_del)) { + // Candidate found. + equalities[equalitiesLength++] = pointer; + pre_ins = post_ins; + pre_del = post_del; + lastequality = diffs[pointer][1]; + } else { + // Not a candidate, and can never become one. + equalitiesLength = 0; + lastequality = null; + } + post_ins = post_del = false; + } else { // An insertion or deletion. + if (diffs[pointer][0] == DIFF_DELETE) { + post_del = true; + } else { + post_ins = true; + } + /* + * Five types to be split: + * <ins>A</ins><del>B</del>XY<ins>C</ins><del>D</del> + * <ins>A</ins>X<ins>C</ins><del>D</del> + * <ins>A</ins><del>B</del>X<ins>C</ins> + * <ins>A</del>X<ins>C</ins><del>D</del> + * <ins>A</ins><del>B</del>X<del>C</del> + */ + if (lastequality && ((pre_ins && pre_del && post_ins && post_del) || + ((lastequality.length < this.Diff_EditCost / 2) && + (pre_ins + pre_del + post_ins + post_del) == 3))) { + // Duplicate record. + diffs.splice(equalities[equalitiesLength - 1], 0, + [DIFF_DELETE, lastequality]); + // Change second copy to insert. + diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT; + equalitiesLength--; // Throw away the equality we just deleted; + lastequality = null; + if (pre_ins && pre_del) { + // No changes made which could affect previous entry, keep going. + post_ins = post_del = true; + equalitiesLength = 0; + } else { + equalitiesLength--; // Throw away the previous equality. + pointer = equalitiesLength > 0 ? + equalities[equalitiesLength - 1] : -1; + post_ins = post_del = false; + } + changes = true; + } + } + pointer++; + } + + if (changes) { + this.diff_cleanupMerge(diffs); + } +}; + + +/** + * Reorder and merge like edit sections. Merge equalities. + * Any edit section can move as long as it doesn't cross an equality. + * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples. + */ +diff_match_patch.prototype.diff_cleanupMerge = function(diffs) { + diffs.push([DIFF_EQUAL, '']); // Add a dummy entry at the end. + var pointer = 0; + var count_delete = 0; + var count_insert = 0; + var text_delete = ''; + var text_insert = ''; + var commonlength; + while (pointer < diffs.length) { + switch (diffs[pointer][0]) { + case DIFF_INSERT: + count_insert++; + text_insert += diffs[pointer][1]; + pointer++; + break; + case DIFF_DELETE: + count_delete++; + text_delete += diffs[pointer][1]; + pointer++; + break; + case DIFF_EQUAL: + // Upon reaching an equality, check for prior redundancies. + if (count_delete + count_insert > 1) { + if (count_delete !== 0 && count_insert !== 0) { + // Factor out any common prefixies. + commonlength = this.diff_commonPrefix(text_insert, text_delete); + if (commonlength !== 0) { + if ((pointer - count_delete - count_insert) > 0 && + diffs[pointer - count_delete - count_insert - 1][0] == + DIFF_EQUAL) { + diffs[pointer - count_delete - count_insert - 1][1] += + text_insert.substring(0, commonlength); + } else { + diffs.splice(0, 0, [DIFF_EQUAL, + text_insert.substring(0, commonlength)]); + pointer++; + } + text_insert = text_insert.substring(commonlength); + text_delete = text_delete.substring(commonlength); + } + // Factor out any common suffixies. + commonlength = this.diff_commonSuffix(text_insert, text_delete); + if (commonlength !== 0) { + diffs[pointer][1] = text_insert.substring(text_insert.length - + commonlength) + diffs[pointer][1]; + text_insert = text_insert.substring(0, text_insert.length - + commonlength); + text_delete = text_delete.substring(0, text_delete.length - + commonlength); + } + } + // Delete the offending records and add the merged ones. + if (count_delete === 0) { + diffs.splice(pointer - count_insert, + count_delete + count_insert, [DIFF_INSERT, text_insert]); + } else if (count_insert === 0) { + diffs.splice(pointer - count_delete, + count_delete + count_insert, [DIFF_DELETE, text_delete]); + } else { + diffs.splice(pointer - count_delete - count_insert, + count_delete + count_insert, [DIFF_DELETE, text_delete], + [DIFF_INSERT, text_insert]); + } + pointer = pointer - count_delete - count_insert + + (count_delete ? 1 : 0) + (count_insert ? 1 : 0) + 1; + } else if (pointer !== 0 && diffs[pointer - 1][0] == DIFF_EQUAL) { + // Merge this equality with the previous one. + diffs[pointer - 1][1] += diffs[pointer][1]; + diffs.splice(pointer, 1); + } else { + pointer++; + } + count_insert = 0; + count_delete = 0; + text_delete = ''; + text_insert = ''; + break; + } + } + if (diffs[diffs.length - 1][1] === '') { + diffs.pop(); // Remove the dummy entry at the end. + } + + // Second pass: look for single edits surrounded on both sides by equalities + // which can be shifted sideways to eliminate an equality. + // e.g: A<ins>BA</ins>C -> <ins>AB</ins>AC + var changes = false; + pointer = 1; + // Intentionally ignore the first and last element (don't need checking). + while (pointer < diffs.length - 1) { + if (diffs[pointer - 1][0] == DIFF_EQUAL && + diffs[pointer + 1][0] == DIFF_EQUAL) { + // This is a single edit surrounded by equalities. + if (diffs[pointer][1].substring(diffs[pointer][1].length - + diffs[pointer - 1][1].length) == diffs[pointer - 1][1]) { + // Shift the edit over the previous equality. + diffs[pointer][1] = diffs[pointer - 1][1] + + diffs[pointer][1].substring(0, diffs[pointer][1].length - + diffs[pointer - 1][1].length); + diffs[pointer + 1][1] = diffs[pointer - 1][1] + diffs[pointer + 1][1]; + diffs.splice(pointer - 1, 1); + changes = true; + } else if (diffs[pointer][1].substring(0, diffs[pointer + 1][1].length) == + diffs[pointer + 1][1]) { + // Shift the edit over the next equality. + diffs[pointer - 1][1] += diffs[pointer + 1][1]; + diffs[pointer][1] = + diffs[pointer][1].substring(diffs[pointer + 1][1].length) + + diffs[pointer + 1][1]; + diffs.splice(pointer + 1, 1); + changes = true; + } + } + pointer++; + } + // If shifts were made, the diff needs reordering and another shift sweep. + if (changes) { + this.diff_cleanupMerge(diffs); + } +}; + + +/** + * loc is a location in text1, compute and return the equivalent location in + * text2. + * e.g. 'The cat' vs 'The big cat', 1->1, 5->8 + * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples. + * @param {number} loc Location within text1. + * @return {number} Location within text2. + */ +diff_match_patch.prototype.diff_xIndex = function(diffs, loc) { + var chars1 = 0; + var chars2 = 0; + var last_chars1 = 0; + var last_chars2 = 0; + var x; + for (x = 0; x < diffs.length; x++) { + if (diffs[x][0] !== DIFF_INSERT) { // Equality or deletion. + chars1 += diffs[x][1].length; + } + if (diffs[x][0] !== DIFF_DELETE) { // Equality or insertion. + chars2 += diffs[x][1].length; + } + if (chars1 > loc) { // Overshot the location. + break; + } + last_chars1 = chars1; + last_chars2 = chars2; + } + // Was the location was deleted? + if (diffs.length != x && diffs[x][0] === DIFF_DELETE) { + return last_chars2; + } + // Add the remaining character length. + return last_chars2 + (loc - last_chars1); +}; + + +/** + * Convert a diff array into a pretty HTML report. + * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples. + * @return {string} HTML representation. + */ +diff_match_patch.prototype.diff_prettyHtml = function(diffs) { + var html = []; + var pattern_amp = /&/g; + var pattern_lt = /</g; + var pattern_gt = />/g; + var pattern_para = /\n/g; + for (var x = 0; x < diffs.length; x++) { + var op = diffs[x][0]; // Operation (insert, delete, equal) + var data = diffs[x][1]; // Text of change. + var text = data.replace(pattern_amp, '&').replace(pattern_lt, '<') + .replace(pattern_gt, '>').replace(pattern_para, '¶<br>'); + switch (op) { + case DIFF_INSERT: + html[x] = '<ins style="background:#e6ffe6;">' + text + '</ins>'; + break; + case DIFF_DELETE: + html[x] = '<del style="background:#ffe6e6;">' + text + '</del>'; + break; + case DIFF_EQUAL: + html[x] = '<span>' + text + '</span>'; + break; + } + } + return html.join(''); +}; + + +/** + * Compute and return the source text (all equalities and deletions). + * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples. + * @return {string} Source text. + */ +diff_match_patch.prototype.diff_text1 = function(diffs) { + var text = []; + for (var x = 0; x < diffs.length; x++) { + if (diffs[x][0] !== DIFF_INSERT) { + text[x] = diffs[x][1]; + } + } + return text.join(''); +}; + + +/** + * Compute and return the destination text (all equalities and insertions). + * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples. + * @return {string} Destination text. + */ +diff_match_patch.prototype.diff_text2 = function(diffs) { + var text = []; + for (var x = 0; x < diffs.length; x++) { + if (diffs[x][0] !== DIFF_DELETE) { + text[x] = diffs[x][1]; + } + } + return text.join(''); +}; + + +/** + * Compute the Levenshtein distance; the number of inserted, deleted or + * substituted characters. + * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples. + * @return {number} Number of changes. + */ +diff_match_patch.prototype.diff_levenshtein = function(diffs) { + var levenshtein = 0; + var insertions = 0; + var deletions = 0; + for (var x = 0; x < diffs.length; x++) { + var op = diffs[x][0]; + var data = diffs[x][1]; + switch (op) { + case DIFF_INSERT: + insertions += data.length; + break; + case DIFF_DELETE: + deletions += data.length; + break; + case DIFF_EQUAL: + // A deletion and an insertion is one substitution. + levenshtein += Math.max(insertions, deletions); + insertions = 0; + deletions = 0; + break; + } + } + levenshtein += Math.max(insertions, deletions); + return levenshtein; +}; + + +/** + * Crush the diff into an encoded string which describes the operations + * required to transform text1 into text2. + * E.g. =3\t-2\t+ing -> Keep 3 chars, delete 2 chars, insert 'ing'. + * Operations are tab-separated. Inserted text is escaped using %xx notation. + * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples. + * @return {string} Delta text. + */ +diff_match_patch.prototype.diff_toDelta = function(diffs) { + var text = []; + for (var x = 0; x < diffs.length; x++) { + switch (diffs[x][0]) { + case DIFF_INSERT: + text[x] = '+' + encodeURI(diffs[x][1]); + break; + case DIFF_DELETE: + text[x] = '-' + diffs[x][1].length; + break; + case DIFF_EQUAL: + text[x] = '=' + diffs[x][1].length; + break; + } + } + return text.join('\t').replace(/%20/g, ' '); +}; + + +/** + * Given the original text1, and an encoded string which describes the + * operations required to transform text1 into text2, compute the full diff. + * @param {string} text1 Source string for the diff. + * @param {string} delta Delta text. + * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples. + * @throws {!Error} If invalid input. + */ +diff_match_patch.prototype.diff_fromDelta = function(text1, delta) { + var diffs = []; + var diffsLength = 0; // Keeping our own length var is faster in JS. + var pointer = 0; // Cursor in text1 + var tokens = delta.split(/\t/g); + for (var x = 0; x < tokens.length; x++) { + // Each token begins with a one character parameter which specifies the + // operation of this token (delete, insert, equality). + var param = tokens[x].substring(1); + switch (tokens[x].charAt(0)) { + case '+': + try { + diffs[diffsLength++] = [DIFF_INSERT, decodeURI(param)]; + } catch (ex) { + // Malformed URI sequence. + throw new Error('Illegal escape in diff_fromDelta: ' + param); + } + break; + case '-': + // Fall through. + case '=': + var n = parseInt(param, 10); + if (isNaN(n) || n < 0) { + throw new Error('Invalid number in diff_fromDelta: ' + param); + } + var text = text1.substring(pointer, pointer += n); + if (tokens[x].charAt(0) == '=') { + diffs[diffsLength++] = [DIFF_EQUAL, text]; + } else { + diffs[diffsLength++] = [DIFF_DELETE, text]; + } + break; + default: + // Blank tokens are ok (from a trailing \t). + // Anything else is an error. + if (tokens[x]) { + throw new Error('Invalid diff operation in diff_fromDelta: ' + + tokens[x]); + } + } + } + if (pointer != text1.length) { + throw new Error('Delta length (' + pointer + + ') does not equal source text length (' + text1.length + ').'); + } + return diffs; +}; + + +// MATCH FUNCTIONS + + +/** + * Locate the best instance of 'pattern' in 'text' near 'loc'. + * @param {string} text The text to search. + * @param {string} pattern The pattern to search for. + * @param {number} loc The location to search around. + * @return {number} Best match index or -1. + */ +diff_match_patch.prototype.match_main = function(text, pattern, loc) { + // Check for null inputs. + if (text == null || pattern == null || loc == null) { + throw new Error('Null input. (match_main)'); + } + + loc = Math.max(0, Math.min(loc, text.length)); + if (text == pattern) { + // Shortcut (potentially not guaranteed by the algorithm) + return 0; + } else if (!text.length) { + // Nothing to match. + return -1; + } else if (text.substring(loc, loc + pattern.length) == pattern) { + // Perfect match at the perfect spot! (Includes case of null pattern) + return loc; + } else { + // Do a fuzzy compare. + return this.match_bitap_(text, pattern, loc); + } +}; + + +/** + * Locate the best instance of 'pattern' in 'text' near 'loc' using the + * Bitap algorithm. + * @param {string} text The text to search. + * @param {string} pattern The pattern to search for. + * @param {number} loc The location to search around. + * @return {number} Best match index or -1. + * @private + */ +diff_match_patch.prototype.match_bitap_ = function(text, pattern, loc) { + if (pattern.length > this.Match_MaxBits) { + throw new Error('Pattern too long for this browser.'); + } + + // Initialise the alphabet. + var s = this.match_alphabet_(pattern); + + var dmp = this; // 'this' becomes 'window' in a closure. + + /** + * Compute and return the score for a match with e errors and x location. + * Accesses loc and pattern through being a closure. + * @param {number} e Number of errors in match. + * @param {number} x Location of match. + * @return {number} Overall score for match (0.0 = good, 1.0 = bad). + * @private + */ + function match_bitapScore_(e, x) { + var accuracy = e / pattern.length; + var proximity = Math.abs(loc - x); + if (!dmp.Match_Distance) { + // Dodge divide by zero error. + return proximity ? 1.0 : accuracy; + } + return accuracy + (proximity / dmp.Match_Distance); + } + + // Highest score beyond which we give up. + var score_threshold = this.Match_Threshold; + // Is there a nearby exact match? (speedup) + var best_loc = text.indexOf(pattern, loc); + if (best_loc != -1) { + score_threshold = Math.min(match_bitapScore_(0, best_loc), score_threshold); + // What about in the other direction? (speedup) + best_loc = text.lastIndexOf(pattern, loc + pattern.length); + if (best_loc != -1) { + score_threshold = + Math.min(match_bitapScore_(0, best_loc), score_threshold); + } + } + + // Initialise the bit arrays. + var matchmask = 1 << (pattern.length - 1); + best_loc = -1; + + var bin_min, bin_mid; + var bin_max = pattern.length + text.length; + var last_rd; + for (var d = 0; d < pattern.length; d++) { + // Scan for the best match; each iteration allows for one more error. + // Run a binary search to determine how far from 'loc' we can stray at this + // error level. + bin_min = 0; + bin_mid = bin_max; + while (bin_min < bin_mid) { + if (match_bitapScore_(d, loc + bin_mid) <= score_threshold) { + bin_min = bin_mid; + } else { + bin_max = bin_mid; + } + bin_mid = Math.floor((bin_max - bin_min) / 2 + bin_min); + } + // Use the result from this iteration as the maximum for the next. + bin_max = bin_mid; + var start = Math.max(1, loc - bin_mid + 1); + var finish = Math.min(loc + bin_mid, text.length) + pattern.length; + + var rd = Array(finish + 2); + rd[finish + 1] = (1 << d) - 1; + for (var j = finish; j >= start; j--) { + // The alphabet (s) is a sparse hash, so the following line generates + // warnings. + var charMatch = s[text.charAt(j - 1)]; + if (d === 0) { // First pass: exact match. + rd[j] = ((rd[j + 1] << 1) | 1) & charMatch; + } else { // Subsequent passes: fuzzy match. + rd[j] = (((rd[j + 1] << 1) | 1) & charMatch) | + (((last_rd[j + 1] | last_rd[j]) << 1) | 1) | + last_rd[j + 1]; + } + if (rd[j] & matchmask) { + var score = match_bitapScore_(d, j - 1); + // This match will almost certainly be better than any existing match. + // But check anyway. + if (score <= score_threshold) { + // Told you so. + score_threshold = score; + best_loc = j - 1; + if (best_loc > loc) { + // When passing loc, don't exceed our current distance from loc. + start = Math.max(1, 2 * loc - best_loc); + } else { + // Already passed loc, downhill from here on in. + break; + } + } + } + } + // No hope for a (better) match at greater error levels. + if (match_bitapScore_(d + 1, loc) > score_threshold) { + break; + } + last_rd = rd; + } + return best_loc; +}; + + +/** + * Initialise the alphabet for the Bitap algorithm. + * @param {string} pattern The text to encode. + * @return {!Object} Hash of character locations. + * @private + */ +diff_match_patch.prototype.match_alphabet_ = function(pattern) { + var s = {}; + for (var i = 0; i < pattern.length; i++) { + s[pattern.charAt(i)] = 0; + } + for (var i = 0; i < pattern.length; i++) { + s[pattern.charAt(i)] |= 1 << (pattern.length - i - 1); + } + return s; +}; + + +// PATCH FUNCTIONS + + +/** + * Increase the context until it is unique, + * but don't let the pattern expand beyond Match_MaxBits. + * @param {!diff_match_patch.patch_obj} patch The patch to grow. + * @param {string} text Source text. + * @private + */ +diff_match_patch.prototype.patch_addContext_ = function(patch, text) { + if (text.length == 0) { + return; + } + var pattern = text.substring(patch.start2, patch.start2 + patch.length1); + var padding = 0; + + // Look for the first and last matches of pattern in text. If two different + // matches are found, increase the pattern length. + while (text.indexOf(pattern) != text.lastIndexOf(pattern) && + pattern.length < this.Match_MaxBits - this.Patch_Margin - + this.Patch_Margin) { + padding += this.Patch_Margin; + pattern = text.substring(patch.start2 - padding, + patch.start2 + patch.length1 + padding); + } + // Add one chunk for good luck. + padding += this.Patch_Margin; + + // Add the prefix. + var prefix = text.substring(patch.start2 - padding, patch.start2); + if (prefix) { + patch.diffs.unshift([DIFF_EQUAL, prefix]); + } + // Add the suffix. + var suffix = text.substring(patch.start2 + patch.length1, + patch.start2 + patch.length1 + padding); + if (suffix) { + patch.diffs.push([DIFF_EQUAL, suffix]); + } + + // Roll back the start points. + patch.start1 -= prefix.length; + patch.start2 -= prefix.length; + // Extend the lengths. + patch.length1 += prefix.length + suffix.length; + patch.length2 += prefix.length + suffix.length; +}; + + +/** + * Compute a list of patches to turn text1 into text2. + * Use diffs if provided, otherwise compute it ourselves. + * There are four ways to call this function, depending on what data is + * available to the caller: + * Method 1: + * a = text1, b = text2 + * Method 2: + * a = diffs + * Method 3 (optimal): + * a = text1, b = diffs + * Method 4 (deprecated, use method 3): + * a = text1, b = text2, c = diffs + * + * @param {string|!Array.<!diff_match_patch.Diff>} a text1 (methods 1,3,4) or + * Array of diff tuples for text1 to text2 (method 2). + * @param {string|!Array.<!diff_match_patch.Diff>} opt_b text2 (methods 1,4) or + * Array of diff tuples for text1 to text2 (method 3) or undefined (method 2). + * @param {string|!Array.<!diff_match_patch.Diff>} opt_c Array of diff tuples + * for text1 to text2 (method 4) or undefined (methods 1,2,3). + * @return {!Array.<!diff_match_patch.patch_obj>} Array of Patch objects. + */ +diff_match_patch.prototype.patch_make = function(a, opt_b, opt_c) { + var text1, diffs; + if (typeof a == 'string' && typeof opt_b == 'string' && + typeof opt_c == 'undefined') { + // Method 1: text1, text2 + // Compute diffs from text1 and text2. + text1 = /** @type {string} */(a); + diffs = this.diff_main(text1, /** @type {string} */(opt_b), true); + if (diffs.length > 2) { + this.diff_cleanupSemantic(diffs); + this.diff_cleanupEfficiency(diffs); + } + } else if (a && typeof a == 'object' && typeof opt_b == 'undefined' && + typeof opt_c == 'undefined') { + // Method 2: diffs + // Compute text1 from diffs. + diffs = /** @type {!Array.<!diff_match_patch.Diff>} */(a); + text1 = this.diff_text1(diffs); + } else if (typeof a == 'string' && opt_b && typeof opt_b == 'object' && + typeof opt_c == 'undefined') { + // Method 3: text1, diffs + text1 = /** @type {string} */(a); + diffs = /** @type {!Array.<!diff_match_patch.Diff>} */(opt_b); + } else if (typeof a == 'string' && typeof opt_b == 'string' && + opt_c && typeof opt_c == 'object') { + // Method 4: text1, text2, diffs + // text2 is not used. + text1 = /** @type {string} */(a); + diffs = /** @type {!Array.<!diff_match_patch.Diff>} */(opt_c); + } else { + throw new Error('Unknown call format to patch_make.'); + } + + if (diffs.length === 0) { + return []; // Get rid of the null case. + } + var patches = []; + var patch = new diff_match_patch.patch_obj(); + var patchDiffLength = 0; // Keeping our own length var is faster in JS. + var char_count1 = 0; // Number of characters into the text1 string. + var char_count2 = 0; // Number of characters into the text2 string. + // Start with text1 (prepatch_text) and apply the diffs until we arrive at + // text2 (postpatch_text). We recreate the patches one by one to determine + // context info. + var prepatch_text = text1; + var postpatch_text = text1; + for (var x = 0; x < diffs.length; x++) { + var diff_type = diffs[x][0]; + var diff_text = diffs[x][1]; + + if (!patchDiffLength && diff_type !== DIFF_EQUAL) { + // A new patch starts here. + patch.start1 = char_count1; + patch.start2 = char_count2; + } + + switch (diff_type) { + case DIFF_INSERT: + patch.diffs[patchDiffLength++] = diffs[x]; + patch.length2 += diff_text.length; + postpatch_text = postpatch_text.substring(0, char_count2) + diff_text + + postpatch_text.substring(char_count2); + break; + case DIFF_DELETE: + patch.length1 += diff_text.length; + patch.diffs[patchDiffLength++] = diffs[x]; + postpatch_text = postpatch_text.substring(0, char_count2) + + postpatch_text.substring(char_count2 + + diff_text.length); + break; + case DIFF_EQUAL: + if (diff_text.length <= 2 * this.Patch_Margin && + patchDiffLength && diffs.length != x + 1) { + // Small equality inside a patch. + patch.diffs[patchDiffLength++] = diffs[x]; + patch.length1 += diff_text.length; + patch.length2 += diff_text.length; + } else if (diff_text.length >= 2 * this.Patch_Margin) { + // Time for a new patch. + if (patchDiffLength) { + this.patch_addContext_(patch, prepatch_text); + patches.push(patch); + patch = new diff_match_patch.patch_obj(); + patchDiffLength = 0; + // Unlike Unidiff, our patch lists have a rolling context. + // http://code.google.com/p/google-diff-match-patch/wiki/Unidiff + // Update prepatch text & pos to reflect the application of the + // just completed patch. + prepatch_text = postpatch_text; + char_count1 = char_count2; + } + } + break; + } + + // Update the current character count. + if (diff_type !== DIFF_INSERT) { + char_count1 += diff_text.length; + } + if (diff_type !== DIFF_DELETE) { + char_count2 += diff_text.length; + } + } + // Pick up the leftover patch if not empty. + if (patchDiffLength) { + this.patch_addContext_(patch, prepatch_text); + patches.push(patch); + } + + return patches; +}; + + +/** + * Given an array of patches, return another array that is identical. + * @param {!Array.<!diff_match_patch.patch_obj>} patches Array of Patch objects. + * @return {!Array.<!diff_match_patch.patch_obj>} Array of Patch objects. + */ +diff_match_patch.prototype.patch_deepCopy = function(patches) { + // Making deep copies is hard in JavaScript. + var patchesCopy = []; + for (var x = 0; x < patches.length; x++) { + var patch = patches[x]; + var patchCopy = new diff_match_patch.patch_obj(); + patchCopy.diffs = []; + for (var y = 0; y < patch.diffs.length; y++) { + patchCopy.diffs[y] = patch.diffs[y].slice(); + } + patchCopy.start1 = patch.start1; + patchCopy.start2 = patch.start2; + patchCopy.length1 = patch.length1; + patchCopy.length2 = patch.length2; + patchesCopy[x] = patchCopy; + } + return patchesCopy; +}; + + +/** + * Merge a set of patches onto the text. Return a patched text, as well + * as a list of true/false values indicating which patches were applied. + * @param {!Array.<!diff_match_patch.patch_obj>} patches Array of Patch objects. + * @param {string} text Old text. + * @return {!Array.<string|!Array.<boolean>>} Two element Array, containing the + * new text and an array of boolean values. + */ +diff_match_patch.prototype.patch_apply = function(patches, text) { + if (patches.length == 0) { + return [text, []]; + } + + // Deep copy the patches so that no changes are made to originals. + patches = this.patch_deepCopy(patches); + + var nullPadding = this.patch_addPadding(patches); + text = nullPadding + text + nullPadding; + + this.patch_splitMax(patches); + // delta keeps track of the offset between the expected and actual location + // of the previous patch. If there are patches expected at positions 10 and + // 20, but the first patch was found at 12, delta is 2 and the second patch + // has an effective expected position of 22. + var delta = 0; + var results = []; + for (var x = 0; x < patches.length; x++) { + var expected_loc = patches[x].start2 + delta; + var text1 = this.diff_text1(patches[x].diffs); + var start_loc; + var end_loc = -1; + if (text1.length > this.Match_MaxBits) { + // patch_splitMax will only provide an oversized pattern in the case of + // a monster delete. + start_loc = this.match_main(text, text1.substring(0, this.Match_MaxBits), + expected_loc); + if (start_loc != -1) { + end_loc = this.match_main(text, + text1.substring(text1.length - this.Match_MaxBits), + expected_loc + text1.length - this.Match_MaxBits); + if (end_loc == -1 || start_loc >= end_loc) { + // Can't find valid trailing context. Drop this patch. + start_loc = -1; + } + } + } else { + start_loc = this.match_main(text, text1, expected_loc); + } + if (start_loc == -1) { + // No match found. :( + results[x] = false; + // Subtract the delta for this failed patch from subsequent patches. + delta -= patches[x].length2 - patches[x].length1; + } else { + // Found a match. :) + results[x] = true; + delta = start_loc - expected_loc; + var text2; + if (end_loc == -1) { + text2 = text.substring(start_loc, start_loc + text1.length); + } else { + text2 = text.substring(start_loc, end_loc + this.Match_MaxBits); + } + if (text1 == text2) { + // Perfect match, just shove the replacement text in. + text = text.substring(0, start_loc) + + this.diff_text2(patches[x].diffs) + + text.substring(start_loc + text1.length); + } else { + // Imperfect match. Run a diff to get a framework of equivalent + // indices. + var diffs = this.diff_main(text1, text2, false); + if (text1.length > this.Match_MaxBits && + this.diff_levenshtein(diffs) / text1.length > + this.Patch_DeleteThreshold) { + // The end points match, but the content is unacceptably bad. + results[x] = false; + } else { + this.diff_cleanupSemanticLossless(diffs); + var index1 = 0; + var index2; + for (var y = 0; y < patches[x].diffs.length; y++) { + var mod = patches[x].diffs[y]; + if (mod[0] !== DIFF_EQUAL) { + index2 = this.diff_xIndex(diffs, index1); + } + if (mod[0] === DIFF_INSERT) { // Insertion + text = text.substring(0, start_loc + index2) + mod[1] + + text.substring(start_loc + index2); + } else if (mod[0] === DIFF_DELETE) { // Deletion + text = text.substring(0, start_loc + index2) + + text.substring(start_loc + this.diff_xIndex(diffs, + index1 + mod[1].length)); + } + if (mod[0] !== DIFF_DELETE) { + index1 += mod[1].length; + } + } + } + } + } + } + // Strip the padding off. + text = text.substring(nullPadding.length, text.length - nullPadding.length); + return [text, results]; +}; + + +/** + * Add some padding on text start and end so that edges can match something. + * Intended to be called only from within patch_apply. + * @param {!Array.<!diff_match_patch.patch_obj>} patches Array of Patch objects. + * @return {string} The padding string added to each side. + */ +diff_match_patch.prototype.patch_addPadding = function(patches) { + var paddingLength = this.Patch_Margin; + var nullPadding = ''; + for (var x = 1; x <= paddingLength; x++) { + nullPadding += String.fromCharCode(x); + } + + // Bump all the patches forward. + for (var x = 0; x < patches.length; x++) { + patches[x].start1 += paddingLength; + patches[x].start2 += paddingLength; + } + + // Add some padding on start of first diff. + var patch = patches[0]; + var diffs = patch.diffs; + if (diffs.length == 0 || diffs[0][0] != DIFF_EQUAL) { + // Add nullPadding equality. + diffs.unshift([DIFF_EQUAL, nullPadding]); + patch.start1 -= paddingLength; // Should be 0. + patch.start2 -= paddingLength; // Should be 0. + patch.length1 += paddingLength; + patch.length2 += paddingLength; + } else if (paddingLength > diffs[0][1].length) { + // Grow first equality. + var extraLength = paddingLength - diffs[0][1].length; + diffs[0][1] = nullPadding.substring(diffs[0][1].length) + diffs[0][1]; + patch.start1 -= extraLength; + patch.start2 -= extraLength; + patch.length1 += extraLength; + patch.length2 += extraLength; + } + + // Add some padding on end of last diff. + patch = patches[patches.length - 1]; + diffs = patch.diffs; + if (diffs.length == 0 || diffs[diffs.length - 1][0] != DIFF_EQUAL) { + // Add nullPadding equality. + diffs.push([DIFF_EQUAL, nullPadding]); + patch.length1 += paddingLength; + patch.length2 += paddingLength; + } else if (paddingLength > diffs[diffs.length - 1][1].length) { + // Grow last equality. + var extraLength = paddingLength - diffs[diffs.length - 1][1].length; + diffs[diffs.length - 1][1] += nullPadding.substring(0, extraLength); + patch.length1 += extraLength; + patch.length2 += extraLength; + } + + return nullPadding; +}; + + +/** + * Look through the patches and break up any which are longer than the maximum + * limit of the match algorithm. + * Intended to be called only from within patch_apply. + * @param {!Array.<!diff_match_patch.patch_obj>} patches Array of Patch objects. + */ +diff_match_patch.prototype.patch_splitMax = function(patches) { + var patch_size = this.Match_MaxBits; + for (var x = 0; x < patches.length; x++) { + if (patches[x].length1 <= patch_size) { + continue; + } + var bigpatch = patches[x]; + // Remove the big old patch. + patches.splice(x--, 1); + var start1 = bigpatch.start1; + var start2 = bigpatch.start2; + var precontext = ''; + while (bigpatch.diffs.length !== 0) { + // Create one of several smaller patches. + var patch = new diff_match_patch.patch_obj(); + var empty = true; + patch.start1 = start1 - precontext.length; + patch.start2 = start2 - precontext.length; + if (precontext !== '') { + patch.length1 = patch.length2 = precontext.length; + patch.diffs.push([DIFF_EQUAL, precontext]); + } + while (bigpatch.diffs.length !== 0 && + patch.length1 < patch_size - this.Patch_Margin) { + var diff_type = bigpatch.diffs[0][0]; + var diff_text = bigpatch.diffs[0][1]; + if (diff_type === DIFF_INSERT) { + // Insertions are harmless. + patch.length2 += diff_text.length; + start2 += diff_text.length; + patch.diffs.push(bigpatch.diffs.shift()); + empty = false; + } else if (diff_type === DIFF_DELETE && patch.diffs.length == 1 && + patch.diffs[0][0] == DIFF_EQUAL && + diff_text.length > 2 * patch_size) { + // This is a large deletion. Let it pass in one chunk. + patch.length1 += diff_text.length; + start1 += diff_text.length; + empty = false; + patch.diffs.push([diff_type, diff_text]); + bigpatch.diffs.shift(); + } else { + // Deletion or equality. Only take as much as we can stomach. + diff_text = diff_text.substring(0, + patch_size - patch.length1 - this.Patch_Margin); + patch.length1 += diff_text.length; + start1 += diff_text.length; + if (diff_type === DIFF_EQUAL) { + patch.length2 += diff_text.length; + start2 += diff_text.length; + } else { + empty = false; + } + patch.diffs.push([diff_type, diff_text]); + if (diff_text == bigpatch.diffs[0][1]) { + bigpatch.diffs.shift(); + } else { + bigpatch.diffs[0][1] = + bigpatch.diffs[0][1].substring(diff_text.length); + } + } + } + // Compute the head context for the next patch. + precontext = this.diff_text2(patch.diffs); + precontext = + precontext.substring(precontext.length - this.Patch_Margin); + // Append the end context for this patch. + var postcontext = this.diff_text1(bigpatch.diffs) + .substring(0, this.Patch_Margin); + if (postcontext !== '') { + patch.length1 += postcontext.length; + patch.length2 += postcontext.length; + if (patch.diffs.length !== 0 && + patch.diffs[patch.diffs.length - 1][0] === DIFF_EQUAL) { + patch.diffs[patch.diffs.length - 1][1] += postcontext; + } else { + patch.diffs.push([DIFF_EQUAL, postcontext]); + } + } + if (!empty) { + patches.splice(++x, 0, patch); + } + } + } +}; + + +/** + * Take a list of patches and return a textual representation. + * @param {!Array.<!diff_match_patch.patch_obj>} patches Array of Patch objects. + * @return {string} Text representation of patches. + */ +diff_match_patch.prototype.patch_toText = function(patches) { + var text = []; + for (var x = 0; x < patches.length; x++) { + text[x] = patches[x]; + } + return text.join(''); +}; + + +/** + * Parse a textual representation of patches and return a list of Patch objects. + * @param {string} textline Text representation of patches. + * @return {!Array.<!diff_match_patch.patch_obj>} Array of Patch objects. + * @throws {!Error} If invalid input. + */ +diff_match_patch.prototype.patch_fromText = function(textline) { + var patches = []; + if (!textline) { + return patches; + } + var text = textline.split('\n'); + var textPointer = 0; + var patchHeader = /^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@$/; + while (textPointer < text.length) { + var m = text[textPointer].match(patchHeader); + if (!m) { + throw new Error('Invalid patch string: ' + text[textPointer]); + } + var patch = new diff_match_patch.patch_obj(); + patches.push(patch); + patch.start1 = parseInt(m[1], 10); + if (m[2] === '') { + patch.start1--; + patch.length1 = 1; + } else if (m[2] == '0') { + patch.length1 = 0; + } else { + patch.start1--; + patch.length1 = parseInt(m[2], 10); + } + + patch.start2 = parseInt(m[3], 10); + if (m[4] === '') { + patch.start2--; + patch.length2 = 1; + } else if (m[4] == '0') { + patch.length2 = 0; + } else { + patch.start2--; + patch.length2 = parseInt(m[4], 10); + } + textPointer++; + + while (textPointer < text.length) { + var sign = text[textPointer].charAt(0); + try { + var line = decodeURI(text[textPointer].substring(1)); + } catch (ex) { + // Malformed URI sequence. + throw new Error('Illegal escape in patch_fromText: ' + line); + } + if (sign == '-') { + // Deletion. + patch.diffs.push([DIFF_DELETE, line]); + } else if (sign == '+') { + // Insertion. + patch.diffs.push([DIFF_INSERT, line]); + } else if (sign == ' ') { + // Minor equality. + patch.diffs.push([DIFF_EQUAL, line]); + } else if (sign == '@') { + // Start of next patch. + break; + } else if (sign === '') { + // Blank line? Whatever. + } else { + // WTF? + throw new Error('Invalid patch mode "' + sign + '" in: ' + line); + } + textPointer++; + } + } + return patches; +}; + + +/** + * Class representing one patch operation. + * @constructor + */ +diff_match_patch.patch_obj = function() { + /** @type {!Array.<!diff_match_patch.Diff>} */ + this.diffs = []; + /** @type {?number} */ + this.start1 = null; + /** @type {?number} */ + this.start2 = null; + /** @type {number} */ + this.length1 = 0; + /** @type {number} */ + this.length2 = 0; +}; + + +/** + * Emmulate GNU diff's format. + * Header: @@ -382,8 +481,9 @@ + * Indicies are printed as 1-based, not 0-based. + * @return {string} The GNU diff string. + */ +diff_match_patch.patch_obj.prototype.toString = function() { + var coords1, coords2; + if (this.length1 === 0) { + coords1 = this.start1 + ',0'; + } else if (this.length1 == 1) { + coords1 = this.start1 + 1; + } else { + coords1 = (this.start1 + 1) + ',' + this.length1; + } + if (this.length2 === 0) { + coords2 = this.start2 + ',0'; + } else if (this.length2 == 1) { + coords2 = this.start2 + 1; + } else { + coords2 = (this.start2 + 1) + ',' + this.length2; + } + var text = ['@@ -' + coords1 + ' +' + coords2 + ' @@\n']; + var op; + // Escape the body of the patch with %xx notation. + for (var x = 0; x < this.diffs.length; x++) { + switch (this.diffs[x][0]) { + case DIFF_INSERT: + op = '+'; + break; + case DIFF_DELETE: + op = '-'; + break; + case DIFF_EQUAL: + op = ' '; + break; + } + text[x + 1] = op + encodeURI(this.diffs[x][1]) + '\n'; + } + return text.join('').replace(/%20/g, ' '); +}; + + +// Export these global variables so that they survive Google's JS compiler. +// In a browser, 'this' will be 'window'. +// Users of node.js should 'require' the uncompressed version since Google's +// JS compiler may break the following exports for non-browser environments. +this['diff_match_patch'] = diff_match_patch; +this['DIFF_DELETE'] = DIFF_DELETE; +this['DIFF_INSERT'] = DIFF_INSERT; +this['DIFF_EQUAL'] = DIFF_EQUAL; diff --git a/core/modules/utils/diff-match-patch/tiddlywiki.files b/core/modules/utils/diff-match-patch/tiddlywiki.files new file mode 100644 index 000000000..acfbc865f --- /dev/null +++ b/core/modules/utils/diff-match-patch/tiddlywiki.files @@ -0,0 +1,14 @@ +{ + "tiddlers": [ + { + "file": "diff_match_patch.js", + "fields": { + "type": "application/javascript", + "title": "$:/core/modules/utils/diff-match-patch/diff_match_patch.js", + "module-type": "library" + }, + "prefix": "(function(){", + "suffix": "}).call(exports);" + } + ] +} diff --git a/core/modules/utils/dom/dom.js b/core/modules/utils/dom/dom.js index 118498bc3..a418197af 100644 --- a/core/modules/utils/dom/dom.js +++ b/core/modules/utils/dom/dom.js @@ -99,7 +99,7 @@ exports.resizeTextAreaToFit = function(domNode,minHeight) { scrollTop = container.scrollTop; // Measure the specified minimum height domNode.style.height = minHeight; - var measuredHeight = domNode.offsetHeight; + var measuredHeight = domNode.offsetHeight || parseInt(minHeight,10); // Set its height to auto so that it snaps to the correct height domNode.style.height = "auto"; // Calculate the revised height @@ -231,4 +231,36 @@ exports.copyStyles = function(srcDomNode,dstDomNode) { $tw.utils.setStyles(dstDomNode,$tw.utils.getComputedStyles(srcDomNode)); }; +/* +Copy plain text to the clipboard on browsers that support it +*/ +exports.copyToClipboard = function(text,options) { + options = options || {}; + var textArea = document.createElement("textarea"); + textArea.style.position = "fixed"; + textArea.style.top = 0; + textArea.style.left = 0; + textArea.style.fontSize = "12pt"; + textArea.style.width = "2em"; + textArea.style.height = "2em"; + textArea.style.padding = 0; + textArea.style.border = "none"; + textArea.style.outline = "none"; + textArea.style.boxShadow = "none"; + textArea.style.background = "transparent"; + textArea.value = text; + document.body.appendChild(textArea); + textArea.select(); + textArea.setSelectionRange(0,text.length); + var succeeded = false; + try { + succeeded = document.execCommand("copy"); + } catch (err) { + } + if(!options.doNotNotify) { + $tw.notifier.display(succeeded ? "$:/language/Notifications/CopiedToClipboard/Succeeded" : "$:/language/Notifications/CopiedToClipboard/Failed"); + } + document.body.removeChild(textArea); +}; + })(); diff --git a/core/modules/utils/dom/dragndrop.js b/core/modules/utils/dom/dragndrop.js new file mode 100644 index 000000000..5ab3831a4 --- /dev/null +++ b/core/modules/utils/dom/dragndrop.js @@ -0,0 +1,202 @@ +/*\ +title: $:/core/modules/utils/dom/dragndrop.js +type: application/javascript +module-type: utils + +Browser data transfer utilities, used with the clipboard and drag and drop + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Options: + +domNode: dom node to make draggable +dragImageType: "pill" or "dom" +dragTiddlerFn: optional function to retrieve the title of tiddler to drag +dragFilterFn: optional function to retreive the filter defining a list of tiddlers to drag +widget: widget to use as the contect for the filter +*/ +exports.makeDraggable = function(options) { + var dragImageType = options.dragImageType || "dom", + dragImage, + domNode = options.domNode; + // Make the dom node draggable (not necessary for anchor tags) + if((domNode.tagName || "").toLowerCase() !== "a") { + domNode.setAttribute("draggable","true"); + } + // Add event handlers + $tw.utils.addEventListeners(domNode,[ + {name: "dragstart", handlerFunction: function(event) { + if(event.dataTransfer === undefined) { + return false; + } + // Collect the tiddlers being dragged + var dragTiddler = options.dragTiddlerFn && options.dragTiddlerFn(), + dragFilter = options.dragFilterFn && options.dragFilterFn(), + titles = dragTiddler ? [dragTiddler] : [], + startActions = options.startActions; + if(dragFilter) { + titles.push.apply(titles,options.widget.wiki.filterTiddlers(dragFilter,options.widget)); + } + var titleString = $tw.utils.stringifyList(titles); + // Check that we've something to drag + if(titles.length > 0 && event.target === domNode) { + // Mark the drag in progress + $tw.dragInProgress = domNode; + // Set the dragging class on the element being dragged + $tw.utils.addClass(event.target,"tc-dragging"); + // Invoke drag-start actions if given + if(startActions !== undefined) { + options.widget.invokeActionString(startActions,options.widget,event,{actionTiddler: titleString}); + } + // Create the drag image elements + dragImage = options.widget.document.createElement("div"); + dragImage.className = "tc-tiddler-dragger"; + var inner = options.widget.document.createElement("div"); + inner.className = "tc-tiddler-dragger-inner"; + inner.appendChild(options.widget.document.createTextNode( + titles.length === 1 ? + titles[0] : + titles.length + " tiddlers" + )); + dragImage.appendChild(inner); + options.widget.document.body.appendChild(dragImage); + // Set the data transfer properties + var dataTransfer = event.dataTransfer; + // Set up the image + dataTransfer.effectAllowed = "all"; + if(dataTransfer.setDragImage) { + if(dragImageType === "pill") { + dataTransfer.setDragImage(dragImage.firstChild,-16,-16); + } else { + var r = domNode.getBoundingClientRect(); + dataTransfer.setDragImage(domNode,event.clientX-r.left,event.clientY-r.top); + } + } + // Set up the data transfer + if(dataTransfer.clearData) { + dataTransfer.clearData(); + } + var jsonData = []; + if(titles.length > 1) { + titles.forEach(function(title) { + jsonData.push(options.widget.wiki.getTiddlerAsJson(title)); + }); + jsonData = "[" + jsonData.join(",") + "]"; + } else { + jsonData = options.widget.wiki.getTiddlerAsJson(titles[0]); + } + // IE doesn't like these content types + if(!$tw.browser.isIE) { + dataTransfer.setData("text/vnd.tiddler",jsonData); + dataTransfer.setData("text/plain",titleString); + dataTransfer.setData("text/x-moz-url","data:text/vnd.tiddler," + encodeURIComponent(jsonData)); + } + dataTransfer.setData("URL","data:text/vnd.tiddler," + encodeURIComponent(jsonData)); + dataTransfer.setData("Text",titleString); + event.stopPropagation(); + } + return false; + }}, + {name: "dragend", handlerFunction: function(event) { + if(event.target === domNode) { + // Collect the tiddlers being dragged + var dragTiddler = options.dragTiddlerFn && options.dragTiddlerFn(), + dragFilter = options.dragFilterFn && options.dragFilterFn(), + titles = dragTiddler ? [dragTiddler] : [], + endActions = options.endActions; + if(dragFilter) { + titles.push.apply(titles,options.widget.wiki.filterTiddlers(dragFilter,options.widget)); + } + var titleString = $tw.utils.stringifyList(titles); + $tw.dragInProgress = null; + // Invoke drag-end actions if given + if(endActions !== undefined) { + options.widget.invokeActionString(endActions,options.widget,event,{actionTiddler: titleString}); + } + // Remove the dragging class on the element being dragged + $tw.utils.removeClass(event.target,"tc-dragging"); + // Delete the drag image element + if(dragImage) { + dragImage.parentNode.removeChild(dragImage); + dragImage = null; + } + } + return false; + }} + ]); +}; + +exports.importDataTransfer = function(dataTransfer,fallbackTitle,callback) { + // Try each provided data type in turn + for(var t=0; t<importDataTypes.length; t++) { + if(!$tw.browser.isIE || importDataTypes[t].IECompatible) { + // Get the data + var dataType = importDataTypes[t]; + var data = dataTransfer.getData(dataType.type); + // Import the tiddlers in the data + if(data !== "" && data !== null) { + if($tw.log.IMPORT) { + console.log("Importing data type '" + dataType.type + "', data: '" + data + "'") + } + var tiddlerFields = dataType.toTiddlerFieldsArray(data,fallbackTitle); + callback(tiddlerFields); + return; + } + } + } +}; + +var importDataTypes = [ + {type: "text/vnd.tiddler", IECompatible: false, toTiddlerFieldsArray: function(data,fallbackTitle) { + return parseJSONTiddlers(data,fallbackTitle); + }}, + {type: "URL", IECompatible: true, toTiddlerFieldsArray: function(data,fallbackTitle) { + // Check for tiddler data URI + var match = decodeURIComponent(data).match(/^data\:text\/vnd\.tiddler,(.*)/i); + if(match) { + return parseJSONTiddlers(match[1],fallbackTitle); + } else { + return [{title: fallbackTitle, text: data}]; // As URL string + } + }}, + {type: "text/x-moz-url", IECompatible: false, toTiddlerFieldsArray: function(data,fallbackTitle) { + // Check for tiddler data URI + var match = decodeURIComponent(data).match(/^data\:text\/vnd\.tiddler,(.*)/i); + if(match) { + return parseJSONTiddlers(match[1],fallbackTitle); + } else { + return [{title: fallbackTitle, text: data}]; // As URL string + } + }}, + {type: "text/html", IECompatible: false, toTiddlerFieldsArray: function(data,fallbackTitle) { + return [{title: fallbackTitle, text: data}]; + }}, + {type: "text/plain", IECompatible: false, toTiddlerFieldsArray: function(data,fallbackTitle) { + return [{title: fallbackTitle, text: data}]; + }}, + {type: "Text", IECompatible: true, toTiddlerFieldsArray: function(data,fallbackTitle) { + return [{title: fallbackTitle, text: data}]; + }}, + {type: "text/uri-list", IECompatible: false, toTiddlerFieldsArray: function(data,fallbackTitle) { + return [{title: fallbackTitle, text: data}]; + }} +]; + +function parseJSONTiddlers(json,fallbackTitle) { + var data = JSON.parse(json); + if(!$tw.utils.isArray(data)) { + data = [data]; + } + data.forEach(function(fields) { + fields.title = fields.title || fallbackTitle; + }); + return data; +}; + +})(); diff --git a/core/modules/utils/dom/http.js b/core/modules/utils/dom/http.js index 990109249..0004a2fbd 100644 --- a/core/modules/utils/dom/http.js +++ b/core/modules/utils/dom/http.js @@ -17,10 +17,12 @@ A quick and dirty HTTP function; to be refactored later. Options are: url: URL to retrieve type: GET, PUT, POST etc callback: function invoked with (err,data) + returnProp: string name of the property to return as first argument of callback */ exports.httpRequest = function(options) { var type = options.type || "GET", headers = options.headers || {accept: "application/json"}, + returnProp = options.returnProp || "responseText", request = new XMLHttpRequest(), data = "", f,results; @@ -41,7 +43,7 @@ exports.httpRequest = function(options) { if(this.readyState === 4) { if(this.status === 200 || this.status === 201 || this.status === 204) { // Success! - options.callback(null,this.responseText,this); + options.callback(null,this[returnProp],this); return; } // Something went wrong diff --git a/core/modules/utils/dom/modal.js b/core/modules/utils/dom/modal.js index 2286d31cb..74fceb1ba 100644 --- a/core/modules/utils/dom/modal.js +++ b/core/modules/utils/dom/modal.js @@ -81,14 +81,16 @@ Modal.prototype.display = function(title,options) { }}}], parentWidget: $tw.rootWidget, document: document, - variables: variables + variables: variables, + importPageMacros: true }); headerWidgetNode.render(headerTitle,null); // Render the body of the message var bodyWidgetNode = this.wiki.makeTranscludeWidget(title,{ parentWidget: $tw.rootWidget, document: document, - variables: variables + variables: variables, + importPageMacros: true }); bodyWidgetNode.render(modalBody,null); // Setup the link if present @@ -128,7 +130,8 @@ Modal.prototype.display = function(title,options) { ]}], parentWidget: $tw.rootWidget, document: document, - variables: variables + variables: variables, + importPageMacros: true }); footerWidgetNode.render(modalFooterButtons,null); // Set up the refresh handler diff --git a/core/modules/utils/dom/notifier.js b/core/modules/utils/dom/notifier.js index ca8e54ad7..3897b0e52 100644 --- a/core/modules/utils/dom/notifier.js +++ b/core/modules/utils/dom/notifier.js @@ -41,7 +41,11 @@ Notifier.prototype.display = function(title,options) { // Create the variables var variables = $tw.utils.extend({currentTiddler: title},options.variables); // Render the body of the notification - var widgetNode = this.wiki.makeTranscludeWidget(title,{parentWidget: $tw.rootWidget, document: document, variables: variables}); + var widgetNode = this.wiki.makeTranscludeWidget(title,{ + parentWidget: $tw.rootWidget, + document: document, + variables: variables, + importPageMacros: true}); widgetNode.render(notification,null); refreshHandler = function(changes) { widgetNode.refresh(changes,notification,null); diff --git a/core/modules/utils/dom/scroller.js b/core/modules/utils/dom/scroller.js index 96ec24e6d..4da7c1cba 100644 --- a/core/modules/utils/dom/scroller.js +++ b/core/modules/utils/dom/scroller.js @@ -54,51 +54,35 @@ PageScroller.prototype.handleEvent = function(event) { Handle a scroll event hitting the page document */ PageScroller.prototype.scrollIntoView = function(element) { - var duration = $tw.utils.getAnimationDuration(); + var self = this, + duration = $tw.utils.getAnimationDuration(); // Now get ready to scroll the body this.cancelScroll(); this.startTime = Date.now(); - var scrollPosition = $tw.utils.getScrollPosition(); // Get the client bounds of the element and adjust by the scroll position - var clientBounds = element.getBoundingClientRect(), - bounds = { - left: clientBounds.left + scrollPosition.x, - top: clientBounds.top + scrollPosition.y, - width: clientBounds.width, - height: clientBounds.height - }; - // We'll consider the horizontal and vertical scroll directions separately via this function - // targetPos/targetSize - position and size of the target element - // currentPos/currentSize - position and size of the current scroll viewport - // returns: new position of the scroll viewport - var getEndPos = function(targetPos,targetSize,currentPos,currentSize) { - var newPos = currentPos; - // If the target is above/left of the current view, then scroll to it's top/left - if(targetPos <= currentPos) { - newPos = targetPos; - // If the target is smaller than the window and the scroll position is too far up, then scroll till the target is at the bottom of the window - } else if(targetSize < currentSize && currentPos < (targetPos + targetSize - currentSize)) { - newPos = targetPos + targetSize - currentSize; - // If the target is big, then just scroll to the top - } else if(currentPos < targetPos) { - newPos = targetPos; - // Otherwise, stay where we are - } else { - newPos = currentPos; - } + var getBounds = function() { + var clientBounds = element.getBoundingClientRect(), + scrollPosition = $tw.utils.getScrollPosition(); + return { + left: clientBounds.left + scrollPosition.x, + top: clientBounds.top + scrollPosition.y, + width: clientBounds.width, + height: clientBounds.height + }; + }, + // We'll consider the horizontal and vertical scroll directions separately via this function + // targetPos/targetSize - position and size of the target element + // currentPos/currentSize - position and size of the current scroll viewport + // returns: new position of the scroll viewport + getEndPos = function(targetPos,targetSize,currentPos,currentSize) { + var newPos = targetPos; // If we are scrolling within 50 pixels of the top/left then snap to zero if(newPos < 50) { newPos = 0; } return newPos; }, - endX = getEndPos(bounds.left,bounds.width,scrollPosition.x,window.innerWidth), - endY = getEndPos(bounds.top,bounds.height,scrollPosition.y,window.innerHeight); - // Only scroll if the position has changed - if(endX !== scrollPosition.x || endY !== scrollPosition.y) { - var self = this, - drawFrame; - drawFrame = function () { + drawFrame = function drawFrame() { var t; if(duration <= 0) { t = 1; @@ -110,13 +94,16 @@ PageScroller.prototype.scrollIntoView = function(element) { t = 1; } t = $tw.utils.slowInSlowOut(t); + var scrollPosition = $tw.utils.getScrollPosition(), + bounds = getBounds(), + endX = getEndPos(bounds.left,bounds.width,scrollPosition.x,window.innerWidth), + endY = getEndPos(bounds.top,bounds.height,scrollPosition.y,window.innerHeight); window.scrollTo(scrollPosition.x + (endX - scrollPosition.x) * t,scrollPosition.y + (endY - scrollPosition.y) * t); if(t < 1) { self.idRequestFrame = self.requestAnimationFrame.call(window,drawFrame); } }; - drawFrame(); - } + drawFrame(); }; exports.PageScroller = PageScroller; diff --git a/core/modules/utils/fakedom.js b/core/modules/utils/fakedom.js index 85f57a503..4a756f43d 100755 --- a/core/modules/utils/fakedom.js +++ b/core/modules/utils/fakedom.js @@ -23,7 +23,7 @@ var bumpSequenceNumber = function(object) { var TW_TextNode = function(text) { bumpSequenceNumber(this); - this.textContent = text; + this.textContent = text + ""; }; Object.defineProperty(TW_TextNode.prototype, "nodeType", { @@ -66,7 +66,7 @@ TW_Element.prototype.setAttribute = function(name,value) { if(this.isRaw) { throw "Cannot setAttribute on a raw TW_Element"; } - this.attributes[name] = value; + this.attributes[name] = value + ""; }; TW_Element.prototype.setAttributeNS = function(namespace,name,value) { @@ -139,7 +139,7 @@ Object.defineProperty(TW_Element.prototype, "className", { return this.attributes["class"] || ""; }, set: function(value) { - this.attributes["class"] = value; + this.attributes["class"] = value + ""; } }); @@ -148,7 +148,7 @@ Object.defineProperty(TW_Element.prototype, "value", { return this.attributes.value || ""; }, set: function(value) { - this.attributes.value = value; + this.attributes.value = value + ""; } }); @@ -206,13 +206,28 @@ Object.defineProperty(TW_Element.prototype, "innerHTML", { set: function(value) { this.isRaw = true; this.rawHTML = value; + this.rawTextContent = null; + } +}); + +Object.defineProperty(TW_Element.prototype, "textInnerHTML", { + set: function(value) { + if(this.isRaw) { + this.rawTextContent = value; + } else { + throw "Cannot set textInnerHTML of a non-raw TW_Element"; + } } }); Object.defineProperty(TW_Element.prototype, "textContent", { get: function() { if(this.isRaw) { - throw "Cannot get textContent on a raw TW_Element"; + if(this.rawTextContent === null) { + return ""; + } else { + return this.rawTextContent; + } } else { var b = []; $tw.utils.each(this.children,function(node) { @@ -229,7 +244,7 @@ Object.defineProperty(TW_Element.prototype, "textContent", { Object.defineProperty(TW_Element.prototype, "formattedTextContent", { get: function() { if(this.isRaw) { - throw "Cannot get formattedTextContent on a raw TW_Element"; + return ""; } else { var b = [], isBlock = $tw.config.htmlBlockElements.indexOf(this.tag) !== -1; diff --git a/core/modules/utils/filesystem.js b/core/modules/utils/filesystem.js index 7ffe07ee7..57e916108 100644 --- a/core/modules/utils/filesystem.js +++ b/core/modules/utils/filesystem.js @@ -57,7 +57,7 @@ var FILE_BUFFER_LENGTH = 64 * 1024, exports.copyFile = function(srcPath,dstPath) { // Create buffer if required if(!fileBuffer) { - fileBuffer = new Buffer(FILE_BUFFER_LENGTH); + fileBuffer = Buffer.alloc(FILE_BUFFER_LENGTH); } // Create any directories in the destination $tw.utils.createDirectory(path.dirname(dstPath)); diff --git a/core/modules/utils/logger.js b/core/modules/utils/logger.js index babb322b5..ee14c5b2b 100644 --- a/core/modules/utils/logger.js +++ b/core/modules/utils/logger.js @@ -17,16 +17,19 @@ var ALERT_TAG = "$:/tags/Alert"; /* Make a new logger */ -function Logger(componentName) { +function Logger(componentName,options) { + options = options || {}; this.componentName = componentName || ""; + this.colour = options.colour || "white"; + this.enable = "enable" in options ? options.enable : true; } /* Log a message */ Logger.prototype.log = function(/* args */) { - if(console !== undefined && console.log !== undefined) { - return Function.apply.call(console.log, console, [this.componentName + ":"].concat(Array.prototype.slice.call(arguments,0))); + if(this.enable && console !== undefined && console.log !== undefined) { + return Function.apply.call(console.log, console, [$tw.utils.terminalColour(this.colour),this.componentName + ":"].concat(Array.prototype.slice.call(arguments,0)).concat($tw.utils.terminalColour())); } }; @@ -34,44 +37,46 @@ Logger.prototype.log = function(/* args */) { Alert a message */ Logger.prototype.alert = function(/* args */) { - // Prepare the text of the alert - var text = Array.prototype.join.call(arguments," "); - // Create alert tiddlers in the browser - if($tw.browser) { - // Check if there is an existing alert with the same text and the same component - var existingAlerts = $tw.wiki.getTiddlersWithTag(ALERT_TAG), - alertFields, - existingCount, - self = this; - $tw.utils.each(existingAlerts,function(title) { - var tiddler = $tw.wiki.getTiddler(title); - if(tiddler.fields.text === text && tiddler.fields.component === self.componentName && tiddler.fields.modified && (!alertFields || tiddler.fields.modified < alertFields.modified)) { - alertFields = $tw.utils.extend({},tiddler.fields); + if(this.enable) { + // Prepare the text of the alert + var text = Array.prototype.join.call(arguments," "); + // Create alert tiddlers in the browser + if($tw.browser) { + // Check if there is an existing alert with the same text and the same component + var existingAlerts = $tw.wiki.getTiddlersWithTag(ALERT_TAG), + alertFields, + existingCount, + self = this; + $tw.utils.each(existingAlerts,function(title) { + var tiddler = $tw.wiki.getTiddler(title); + if(tiddler.fields.text === text && tiddler.fields.component === self.componentName && tiddler.fields.modified && (!alertFields || tiddler.fields.modified < alertFields.modified)) { + alertFields = $tw.utils.extend({},tiddler.fields); + } + }); + if(alertFields) { + existingCount = alertFields.count || 1; + } else { + alertFields = { + title: $tw.wiki.generateNewTitle("$:/temp/alerts/alert",{prefix: ""}), + text: text, + tags: [ALERT_TAG], + component: this.componentName + }; + existingCount = 0; } - }); - if(alertFields) { - existingCount = alertFields.count || 1; + alertFields.modified = new Date(); + if(++existingCount > 1) { + alertFields.count = existingCount; + } else { + alertFields.count = undefined; + } + $tw.wiki.addTiddler(new $tw.Tiddler(alertFields)); + // Log the alert as well + this.log.apply(this,Array.prototype.slice.call(arguments,0)); } else { - alertFields = { - title: $tw.wiki.generateNewTitle("$:/temp/alerts/alert",{prefix: ""}), - text: text, - tags: [ALERT_TAG], - component: this.componentName - }; - existingCount = 0; - } - alertFields.modified = new Date(); - if(++existingCount > 1) { - alertFields.count = existingCount; - } else { - alertFields.count = undefined; - } - $tw.wiki.addTiddler(new $tw.Tiddler(alertFields)); - // Log the alert as well - this.log.apply(this,Array.prototype.slice.call(arguments,0)); - } else { - // Print an orange message to the console if not in the browser - console.error("\x1b[1;33m" + text + "\x1b[0m"); + // Print an orange message to the console if not in the browser + console.error("\x1b[1;33m" + text + "\x1b[0m"); + } } }; diff --git a/core/modules/utils/transliterate.js b/core/modules/utils/transliterate.js new file mode 100644 index 000000000..e69d9293f --- /dev/null +++ b/core/modules/utils/transliterate.js @@ -0,0 +1,919 @@ +/*\ +title: $:/core/modules/utils/transliterate.js +type: application/javascript +module-type: utils + +Transliteration static utility functions. + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Transliterate string to ASCII + +(Some pairs taken from http://semplicewebsites.com/removing-accents-javascript) +*/ +exports.transliterationPairs = { + "Á":"A", + "Ă":"A", + "Ắ":"A", + "Ặ":"A", + "Ằ":"A", + "Ẳ":"A", + "Ẵ":"A", + "Ǎ":"A", + "Â":"A", + "Ấ":"A", + "Ậ":"A", + "Ầ":"A", + "Ẩ":"A", + "Ẫ":"A", + "Ä":"A", + "Ǟ":"A", + "Ȧ":"A", + "Ǡ":"A", + "Ạ":"A", + "Ȁ":"A", + "À":"A", + "Ả":"A", + "Ȃ":"A", + "Ā":"A", + "Ą":"A", + "Å":"A", + "Ǻ":"A", + "Ḁ":"A", + "Ⱥ":"A", + "Ã":"A", + "Ꜳ":"AA", + "Æ":"AE", + "Ǽ":"AE", + "Ǣ":"AE", + "Ꜵ":"AO", + "Ꜷ":"AU", + "Ꜹ":"AV", + "Ꜻ":"AV", + "Ꜽ":"AY", + "Ḃ":"B", + "Ḅ":"B", + "Ɓ":"B", + "Ḇ":"B", + "Ƀ":"B", + "Ƃ":"B", + "Ć":"C", + "Č":"C", + "Ç":"C", + "Ḉ":"C", + "Ĉ":"C", + "Ċ":"C", + "Ƈ":"C", + "Ȼ":"C", + "Ď":"D", + "Ḑ":"D", + "Ḓ":"D", + "Ḋ":"D", + "Ḍ":"D", + "Ɗ":"D", + "Ḏ":"D", + "Dz":"D", + "Dž":"D", + "Đ":"D", + "Ƌ":"D", + "DZ":"DZ", + "DŽ":"DZ", + "É":"E", + "Ĕ":"E", + "Ě":"E", + "Ȩ":"E", + "Ḝ":"E", + "Ê":"E", + "Ế":"E", + "Ệ":"E", + "Ề":"E", + "Ể":"E", + "Ễ":"E", + "Ḙ":"E", + "Ë":"E", + "Ė":"E", + "Ẹ":"E", + "Ȅ":"E", + "È":"E", + "Ẻ":"E", + "Ȇ":"E", + "Ē":"E", + "Ḗ":"E", + "Ḕ":"E", + "Ę":"E", + "Ɇ":"E", + "Ẽ":"E", + "Ḛ":"E", + "Ꝫ":"ET", + "Ḟ":"F", + "Ƒ":"F", + "Ǵ":"G", + "Ğ":"G", + "Ǧ":"G", + "Ģ":"G", + "Ĝ":"G", + "Ġ":"G", + "Ɠ":"G", + "Ḡ":"G", + "Ǥ":"G", + "Ḫ":"H", + "Ȟ":"H", + "Ḩ":"H", + "Ĥ":"H", + "Ⱨ":"H", + "Ḧ":"H", + "Ḣ":"H", + "Ḥ":"H", + "Ħ":"H", + "Í":"I", + "Ĭ":"I", + "Ǐ":"I", + "Î":"I", + "Ï":"I", + "Ḯ":"I", + "İ":"I", + "Ị":"I", + "Ȉ":"I", + "Ì":"I", + "Ỉ":"I", + "Ȋ":"I", + "Ī":"I", + "Į":"I", + "Ɨ":"I", + "Ĩ":"I", + "Ḭ":"I", + "Ꝺ":"D", + "Ꝼ":"F", + "Ᵹ":"G", + "Ꞃ":"R", + "Ꞅ":"S", + "Ꞇ":"T", + "Ꝭ":"IS", + "Ĵ":"J", + "Ɉ":"J", + "Ḱ":"K", + "Ǩ":"K", + "Ķ":"K", + "Ⱪ":"K", + "Ꝃ":"K", + "Ḳ":"K", + "Ƙ":"K", + "Ḵ":"K", + "Ꝁ":"K", + "Ꝅ":"K", + "Ĺ":"L", + "Ƚ":"L", + "Ľ":"L", + "Ļ":"L", + "Ḽ":"L", + "Ḷ":"L", + "Ḹ":"L", + "Ⱡ":"L", + "Ꝉ":"L", + "Ḻ":"L", + "Ŀ":"L", + "Ɫ":"L", + "Lj":"L", + "Ł":"L", + "LJ":"LJ", + "Ḿ":"M", + "Ṁ":"M", + "Ṃ":"M", + "Ɱ":"M", + "Ń":"N", + "Ň":"N", + "Ņ":"N", + "Ṋ":"N", + "Ṅ":"N", + "Ṇ":"N", + "Ǹ":"N", + "Ɲ":"N", + "Ṉ":"N", + "Ƞ":"N", + "Nj":"N", + "Ñ":"N", + "NJ":"NJ", + "Ó":"O", + "Ŏ":"O", + "Ǒ":"O", + "Ô":"O", + "Ố":"O", + "Ộ":"O", + "Ồ":"O", + "Ổ":"O", + "Ỗ":"O", + "Ö":"O", + "Ȫ":"O", + "Ȯ":"O", + "Ȱ":"O", + "Ọ":"O", + "Ő":"O", + "Ȍ":"O", + "Ò":"O", + "Ỏ":"O", + "Ơ":"O", + "Ớ":"O", + "Ợ":"O", + "Ờ":"O", + "Ở":"O", + "Ỡ":"O", + "Ȏ":"O", + "Ꝋ":"O", + "Ꝍ":"O", + "Ō":"O", + "Ṓ":"O", + "Ṑ":"O", + "Ɵ":"O", + "Ǫ":"O", + "Ǭ":"O", + "Ø":"O", + "Ǿ":"O", + "Õ":"O", + "Ṍ":"O", + "Ṏ":"O", + "Ȭ":"O", + "Ƣ":"OI", + "Ꝏ":"OO", + "Ɛ":"E", + "Ɔ":"O", + "Ȣ":"OU", + "Ṕ":"P", + "Ṗ":"P", + "Ꝓ":"P", + "Ƥ":"P", + "Ꝕ":"P", + "Ᵽ":"P", + "Ꝑ":"P", + "Ꝙ":"Q", + "Ꝗ":"Q", + "Ŕ":"R", + "Ř":"R", + "Ŗ":"R", + "Ṙ":"R", + "Ṛ":"R", + "Ṝ":"R", + "Ȑ":"R", + "Ȓ":"R", + "Ṟ":"R", + "Ɍ":"R", + "Ɽ":"R", + "Ꜿ":"C", + "Ǝ":"E", + "Ś":"S", + "Ṥ":"S", + "Š":"S", + "Ṧ":"S", + "Ş":"S", + "Ŝ":"S", + "Ș":"S", + "Ṡ":"S", + "Ṣ":"S", + "Ṩ":"S", + "Ť":"T", + "Ţ":"T", + "Ṱ":"T", + "Ț":"T", + "Ⱦ":"T", + "Ṫ":"T", + "Ṭ":"T", + "Ƭ":"T", + "Ṯ":"T", + "Ʈ":"T", + "Ŧ":"T", + "Ɐ":"A", + "Ꞁ":"L", + "Ɯ":"M", + "Ʌ":"V", + "Ꜩ":"TZ", + "Ú":"U", + "Ŭ":"U", + "Ǔ":"U", + "Û":"U", + "Ṷ":"U", + "Ü":"U", + "Ǘ":"U", + "Ǚ":"U", + "Ǜ":"U", + "Ǖ":"U", + "Ṳ":"U", + "Ụ":"U", + "Ű":"U", + "Ȕ":"U", + "Ù":"U", + "Ủ":"U", + "Ư":"U", + "Ứ":"U", + "Ự":"U", + "Ừ":"U", + "Ử":"U", + "Ữ":"U", + "Ȗ":"U", + "Ū":"U", + "Ṻ":"U", + "Ų":"U", + "Ů":"U", + "Ũ":"U", + "Ṹ":"U", + "Ṵ":"U", + "Ꝟ":"V", + "Ṿ":"V", + "Ʋ":"V", + "Ṽ":"V", + "Ꝡ":"VY", + "Ẃ":"W", + "Ŵ":"W", + "Ẅ":"W", + "Ẇ":"W", + "Ẉ":"W", + "Ẁ":"W", + "Ⱳ":"W", + "Ẍ":"X", + "Ẋ":"X", + "Ý":"Y", + "Ŷ":"Y", + "Ÿ":"Y", + "Ẏ":"Y", + "Ỵ":"Y", + "Ỳ":"Y", + "Ƴ":"Y", + "Ỷ":"Y", + "Ỿ":"Y", + "Ȳ":"Y", + "Ɏ":"Y", + "Ỹ":"Y", + "Ź":"Z", + "Ž":"Z", + "Ẑ":"Z", + "Ⱬ":"Z", + "Ż":"Z", + "Ẓ":"Z", + "Ȥ":"Z", + "Ẕ":"Z", + "Ƶ":"Z", + "IJ":"IJ", + "Œ":"OE", + "ᴀ":"A", + "ᴁ":"AE", + "ʙ":"B", + "ᴃ":"B", + "ᴄ":"C", + "ᴅ":"D", + "ᴇ":"E", + "ꜰ":"F", + "ɢ":"G", + "ʛ":"G", + "ʜ":"H", + "ɪ":"I", + "ʁ":"R", + "ᴊ":"J", + "ᴋ":"K", + "ʟ":"L", + "ᴌ":"L", + "ᴍ":"M", + "ɴ":"N", + "ᴏ":"O", + "ɶ":"OE", + "ᴐ":"O", + "ᴕ":"OU", + "ᴘ":"P", + "ʀ":"R", + "ᴎ":"N", + "ᴙ":"R", + "ꜱ":"S", + "ᴛ":"T", + "ⱻ":"E", + "ᴚ":"R", + "ᴜ":"U", + "ᴠ":"V", + "ᴡ":"W", + "ʏ":"Y", + "ᴢ":"Z", + "á":"a", + "ă":"a", + "ắ":"a", + "ặ":"a", + "ằ":"a", + "ẳ":"a", + "ẵ":"a", + "ǎ":"a", + "â":"a", + "ấ":"a", + "ậ":"a", + "ầ":"a", + "ẩ":"a", + "ẫ":"a", + "ä":"a", + "ǟ":"a", + "ȧ":"a", + "ǡ":"a", + "ạ":"a", + "ȁ":"a", + "à":"a", + "ả":"a", + "ȃ":"a", + "ā":"a", + "ą":"a", + "ᶏ":"a", + "ẚ":"a", + "å":"a", + "ǻ":"a", + "ḁ":"a", + "ⱥ":"a", + "ã":"a", + "ꜳ":"aa", + "æ":"ae", + "ǽ":"ae", + "ǣ":"ae", + "ꜵ":"ao", + "ꜷ":"au", + "ꜹ":"av", + "ꜻ":"av", + "ꜽ":"ay", + "ḃ":"b", + "ḅ":"b", + "ɓ":"b", + "ḇ":"b", + "ᵬ":"b", + "ᶀ":"b", + "ƀ":"b", + "ƃ":"b", + "ɵ":"o", + "ć":"c", + "č":"c", + "ç":"c", + "ḉ":"c", + "ĉ":"c", + "ɕ":"c", + "ċ":"c", + "ƈ":"c", + "ȼ":"c", + "ď":"d", + "ḑ":"d", + "ḓ":"d", + "ȡ":"d", + "ḋ":"d", + "ḍ":"d", + "ɗ":"d", + "ᶑ":"d", + "ḏ":"d", + "ᵭ":"d", + "ᶁ":"d", + "đ":"d", + "ɖ":"d", + "ƌ":"d", + "ı":"i", + "ȷ":"j", + "ɟ":"j", + "ʄ":"j", + "dz":"dz", + "dž":"dz", + "é":"e", + "ĕ":"e", + "ě":"e", + "ȩ":"e", + "ḝ":"e", + "ê":"e", + "ế":"e", + "ệ":"e", + "ề":"e", + "ể":"e", + "ễ":"e", + "ḙ":"e", + "ë":"e", + "ė":"e", + "ẹ":"e", + "ȅ":"e", + "è":"e", + "ẻ":"e", + "ȇ":"e", + "ē":"e", + "ḗ":"e", + "ḕ":"e", + "ⱸ":"e", + "ę":"e", + "ᶒ":"e", + "ɇ":"e", + "ẽ":"e", + "ḛ":"e", + "ꝫ":"et", + "ḟ":"f", + "ƒ":"f", + "ᵮ":"f", + "ᶂ":"f", + "ǵ":"g", + "ğ":"g", + "ǧ":"g", + "ģ":"g", + "ĝ":"g", + "ġ":"g", + "ɠ":"g", + "ḡ":"g", + "ᶃ":"g", + "ǥ":"g", + "ḫ":"h", + "ȟ":"h", + "ḩ":"h", + "ĥ":"h", + "ⱨ":"h", + "ḧ":"h", + "ḣ":"h", + "ḥ":"h", + "ɦ":"h", + "ẖ":"h", + "ħ":"h", + "ƕ":"hv", + "í":"i", + "ĭ":"i", + "ǐ":"i", + "î":"i", + "ï":"i", + "ḯ":"i", + "ị":"i", + "ȉ":"i", + "ì":"i", + "ỉ":"i", + "ȋ":"i", + "ī":"i", + "į":"i", + "ᶖ":"i", + "ɨ":"i", + "ĩ":"i", + "ḭ":"i", + "ꝺ":"d", + "ꝼ":"f", + "ᵹ":"g", + "ꞃ":"r", + "ꞅ":"s", + "ꞇ":"t", + "ꝭ":"is", + "ǰ":"j", + "ĵ":"j", + "ʝ":"j", + "ɉ":"j", + "ḱ":"k", + "ǩ":"k", + "ķ":"k", + "ⱪ":"k", + "ꝃ":"k", + "ḳ":"k", + "ƙ":"k", + "ḵ":"k", + "ᶄ":"k", + "ꝁ":"k", + "ꝅ":"k", + "ĺ":"l", + "ƚ":"l", + "ɬ":"l", + "ľ":"l", + "ļ":"l", + "ḽ":"l", + "ȴ":"l", + "ḷ":"l", + "ḹ":"l", + "ⱡ":"l", + "ꝉ":"l", + "ḻ":"l", + "ŀ":"l", + "ɫ":"l", + "ᶅ":"l", + "ɭ":"l", + "ł":"l", + "lj":"lj", + "ſ":"s", + "ẜ":"s", + "ẛ":"s", + "ẝ":"s", + "ḿ":"m", + "ṁ":"m", + "ṃ":"m", + "ɱ":"m", + "ᵯ":"m", + "ᶆ":"m", + "ń":"n", + "ň":"n", + "ņ":"n", + "ṋ":"n", + "ȵ":"n", + "ṅ":"n", + "ṇ":"n", + "ǹ":"n", + "ɲ":"n", + "ṉ":"n", + "ƞ":"n", + "ᵰ":"n", + "ᶇ":"n", + "ɳ":"n", + "ñ":"n", + "nj":"nj", + "ó":"o", + "ŏ":"o", + "ǒ":"o", + "ô":"o", + "ố":"o", + "ộ":"o", + "ồ":"o", + "ổ":"o", + "ỗ":"o", + "ö":"o", + "ȫ":"o", + "ȯ":"o", + "ȱ":"o", + "ọ":"o", + "ő":"o", + "ȍ":"o", + "ò":"o", + "ỏ":"o", + "ơ":"o", + "ớ":"o", + "ợ":"o", + "ờ":"o", + "ở":"o", + "ỡ":"o", + "ȏ":"o", + "ꝋ":"o", + "ꝍ":"o", + "ⱺ":"o", + "ō":"o", + "ṓ":"o", + "ṑ":"o", + "ǫ":"o", + "ǭ":"o", + "ø":"o", + "ǿ":"o", + "õ":"o", + "ṍ":"o", + "ṏ":"o", + "ȭ":"o", + "ƣ":"oi", + "ꝏ":"oo", + "ɛ":"e", + "ᶓ":"e", + "ɔ":"o", + "ᶗ":"o", + "ȣ":"ou", + "ṕ":"p", + "ṗ":"p", + "ꝓ":"p", + "ƥ":"p", + "ᵱ":"p", + "ᶈ":"p", + "ꝕ":"p", + "ᵽ":"p", + "ꝑ":"p", + "ꝙ":"q", + "ʠ":"q", + "ɋ":"q", + "ꝗ":"q", + "ŕ":"r", + "ř":"r", + "ŗ":"r", + "ṙ":"r", + "ṛ":"r", + "ṝ":"r", + "ȑ":"r", + "ɾ":"r", + "ᵳ":"r", + "ȓ":"r", + "ṟ":"r", + "ɼ":"r", + "ᵲ":"r", + "ᶉ":"r", + "ɍ":"r", + "ɽ":"r", + "ↄ":"c", + "ꜿ":"c", + "ɘ":"e", + "ɿ":"r", + "ś":"s", + "ṥ":"s", + "š":"s", + "ṧ":"s", + "ş":"s", + "ŝ":"s", + "ș":"s", + "ṡ":"s", + "ṣ":"s", + "ṩ":"s", + "ʂ":"s", + "ᵴ":"s", + "ᶊ":"s", + "ȿ":"s", + "ɡ":"g", + "ᴑ":"o", + "ᴓ":"o", + "ᴝ":"u", + "ť":"t", + "ţ":"t", + "ṱ":"t", + "ț":"t", + "ȶ":"t", + "ẗ":"t", + "ⱦ":"t", + "ṫ":"t", + "ṭ":"t", + "ƭ":"t", + "ṯ":"t", + "ᵵ":"t", + "ƫ":"t", + "ʈ":"t", + "ŧ":"t", + "ᵺ":"th", + "ɐ":"a", + "ᴂ":"ae", + "ǝ":"e", + "ᵷ":"g", + "ɥ":"h", + "ʮ":"h", + "ʯ":"h", + "ᴉ":"i", + "ʞ":"k", + "ꞁ":"l", + "ɯ":"m", + "ɰ":"m", + "ᴔ":"oe", + "ɹ":"r", + "ɻ":"r", + "ɺ":"r", + "ⱹ":"r", + "ʇ":"t", + "ʌ":"v", + "ʍ":"w", + "ʎ":"y", + "ꜩ":"tz", + "ú":"u", + "ŭ":"u", + "ǔ":"u", + "û":"u", + "ṷ":"u", + "ü":"u", + "ǘ":"u", + "ǚ":"u", + "ǜ":"u", + "ǖ":"u", + "ṳ":"u", + "ụ":"u", + "ű":"u", + "ȕ":"u", + "ù":"u", + "ủ":"u", + "ư":"u", + "ứ":"u", + "ự":"u", + "ừ":"u", + "ử":"u", + "ữ":"u", + "ȗ":"u", + "ū":"u", + "ṻ":"u", + "ų":"u", + "ᶙ":"u", + "ů":"u", + "ũ":"u", + "ṹ":"u", + "ṵ":"u", + "ᵫ":"ue", + "ꝸ":"um", + "ⱴ":"v", + "ꝟ":"v", + "ṿ":"v", + "ʋ":"v", + "ᶌ":"v", + "ⱱ":"v", + "ṽ":"v", + "ꝡ":"vy", + "ẃ":"w", + "ŵ":"w", + "ẅ":"w", + "ẇ":"w", + "ẉ":"w", + "ẁ":"w", + "ⱳ":"w", + "ẘ":"w", + "ẍ":"x", + "ẋ":"x", + "ᶍ":"x", + "ý":"y", + "ŷ":"y", + "ÿ":"y", + "ẏ":"y", + "ỵ":"y", + "ỳ":"y", + "ƴ":"y", + "ỷ":"y", + "ỿ":"y", + "ȳ":"y", + "ẙ":"y", + "ɏ":"y", + "ỹ":"y", + "ź":"z", + "ž":"z", + "ẑ":"z", + "ʑ":"z", + "ⱬ":"z", + "ż":"z", + "ẓ":"z", + "ȥ":"z", + "ẕ":"z", + "ᵶ":"z", + "ᶎ":"z", + "ʐ":"z", + "ƶ":"z", + "ɀ":"z", + "ff":"ff", + "ffi":"ffi", + "ffl":"ffl", + "fi":"fi", + "fl":"fl", + "ij":"ij", + "œ":"oe", + "st":"st", + "ₐ":"a", + "ₑ":"e", + "ᵢ":"i", + "ⱼ":"j", + "ₒ":"o", + "ᵣ":"r", + "ᵤ":"u", + "ᵥ":"v", + "ₓ":"x", + "Ё":"YO", + "Й":"I", + "Ц":"TS", + "У":"U", + "К":"K", + "Е":"E", + "Н":"N", + "Г":"G", + "Ш":"SH", + "Щ":"SCH", + "З":"Z", + "Х":"H", + "Ъ":"'", + "ё":"yo", + "й":"i", + "ц":"ts", + "у":"u", + "к":"k", + "е":"e", + "н":"n", + "г":"g", + "ш":"sh", + "щ":"sch", + "з":"z", + "х":"h", + "ъ":"'", + "Ф":"F", + "Ы":"I", + "В":"V", + "А":"a", + "П":"P", + "Р":"R", + "О":"O", + "Л":"L", + "Д":"D", + "Ж":"ZH", + "Э":"E", + "ф":"f", + "ы":"i", + "в":"v", + "а":"a", + "п":"p", + "р":"r", + "о":"o", + "л":"l", + "д":"d", + "ж":"zh", + "э":"e", + "Я":"Ya", + "Ч":"CH", + "С":"S", + "М":"M", + "И":"I", + "Т":"T", + "Ь":"'", + "Б":"B", + "Ю":"YU", + "я":"ya", + "ч":"ch", + "с":"s", + "м":"m", + "и":"i", + "т":"t", + "ь":"'", + "б":"b", + "ю":"yu" +}; + +exports.transliterate = function(str) { + return str.replace(/[^A-Za-z0-9\[\] ]/g,function(ch) { + return exports.transliterationPairs[ch] || ch + }); +}; + +})(); diff --git a/core/modules/utils/utils.js b/core/modules/utils/utils.js index e322811d9..2c06cd5c3 100644 --- a/core/modules/utils/utils.js +++ b/core/modules/utils/utils.js @@ -12,11 +12,61 @@ Various static utility functions. /*global $tw: false */ "use strict"; +/* +Display a message, in colour if we're on a terminal +*/ +exports.log = function(text,colour) { + console.log($tw.node ? exports.terminalColour(colour) + text + exports.terminalColour() : text); +}; + +exports.terminalColour = function(colour) { + if(!$tw.browser && $tw.node && process.stdout.isTTY) { + if(colour) { + var code = exports.terminalColourLookup[colour]; + if(code) { + return "\x1b[" + code + "m"; + } + } else { + return "\x1b[0m"; // Cancel colour + } + } + return ""; +}; + +exports.terminalColourLookup = { + "black": "0;30", + "red": "0;31", + "green": "0;32", + "brown/orange": "0;33", + "blue": "0;34", + "purple": "0;35", + "cyan": "0;36", + "light gray": "0;37" +}; + /* Display a warning, in colour if we're on a terminal */ exports.warning = function(text) { - console.log($tw.node ? "\x1b[1;33m" + text + "\x1b[0m" : text); + exports.log(text,"brown/orange"); +}; + +/* +Return the integer represented by the str (string). +Return the dflt (default) parameter if str is not a base-10 number. +*/ +exports.getInt = function(str,deflt) { + var i = parseInt(str,10); + return isNaN(i) ? deflt : i; +} + +/* +Repeatedly replaces a substring within a string. Like String.prototype.replace, but without any of the default special handling of $ sequences in the replace string +*/ +exports.replaceString = function(text,search,replace) { + return text.replace(search,function() { + return replace; + }); }; /* @@ -215,11 +265,13 @@ exports.extendDeepCopy = function(object,extendedProperties) { exports.deepFreeze = function deepFreeze(object) { var property, key; - Object.freeze(object); - for(key in object) { - property = object[key]; - if($tw.utils.hop(object,key) && (typeof property === "object") && !Object.isFrozen(property)) { - deepFreeze(property); + if(object) { + Object.freeze(object); + for(key in object) { + property = object[key]; + if($tw.utils.hop(object,key) && (typeof property === "object") && !Object.isFrozen(property)) { + deepFreeze(property); + } } } }; @@ -256,6 +308,9 @@ exports.formatDateString = function(date,template) { [/^0ss/, function() { return $tw.utils.pad(date.getSeconds()); }], + [/^0XXX/, function() { + return $tw.utils.pad(date.getMilliseconds()); + }], [/^0DD/, function() { return $tw.utils.pad(date.getDate()); }], @@ -297,6 +352,9 @@ exports.formatDateString = function(date,template) { [/^ss/, function() { return date.getSeconds(); }], + [/^XXX/, function() { + return date.getMilliseconds(); + }], [/^[AP]M/, function() { return $tw.utils.getAmPm(date).toUpperCase(); }], @@ -313,6 +371,16 @@ exports.formatDateString = function(date,template) { return $tw.utils.pad(date.getFullYear() - 2000); }] ]; + // If the user wants everything in UTC, shift the datestamp + // Optimize for format string that essentially means + // 'return raw UTC (tiddlywiki style) date string.' + if(t.indexOf("[UTC]") == 0 ) { + if(t == "[UTC]YYYY0MM0DD0hh0mm0ssXXX") + return $tw.utils.stringifyDate(new Date()); + var offset = date.getTimezoneOffset() ; // in minutes + date = new Date(date.getTime()+offset*60*1000) ; + t = t.substr(5) ; + } while(t.length){ var matchString = ""; $tw.utils.each(matches, function(m) { @@ -349,7 +417,8 @@ exports.getWeek = function(date) { d = 7; // JavaScript Sun=0, ISO Sun=7 } dt.setTime(dt.getTime() + (4 - d) * 86400000);// shift day to Thurs of same week to calculate weekNo - var n = Math.floor((dt.getTime()-new Date(dt.getFullYear(),0,1) + 3600000) / 86400000); + var x = new Date(dt.getFullYear(),0,1); + var n = Math.floor((dt.getTime() - x.getTime()) / 86400000); return Math.floor(n / 7) + 1; }; @@ -431,7 +500,7 @@ exports.entityDecode = function(s) { e = s.substr(1,s.length-2); // Strip the & and the ; if(e.charAt(0) === "#") { if(e.charAt(1) === "x" || e.charAt(1) === "X") { - return converter(parseInt(e.substr(2),16)); + return converter(parseInt(e.substr(2),16)); } else { return converter(parseInt(e.substr(1),10)); } @@ -483,7 +552,24 @@ exports.stringify = function(s) { .replace(/'/g, "\\'") // single quote character .replace(/\r/g, '\\r') // carriage return .replace(/\n/g, '\\n') // line feed - .replace(/[\x80-\uFFFF]/g, exports.escape); // non-ASCII characters + .replace(/[\x00-\x1f\x80-\uFFFF]/g, exports.escape); // non-ASCII characters +}; + +// Turns a string into a legal JSON string +// Derived from peg.js, thanks to David Majda +exports.jsonStringify = function(s) { + // See http://www.json.org/ + return (s || "") + .replace(/\\/g, '\\\\') // backslash + .replace(/"/g, '\\"') // double quote character + .replace(/\r/g, '\\r') // carriage return + .replace(/\n/g, '\\n') // line feed + .replace(/\x08/g, '\\b') // backspace + .replace(/\x0c/g, '\\f') // formfeed + .replace(/\t/g, '\\t') // tab + .replace(/[\x00-\x1f\x80-\uFFFF]/g,function(s) { + return '\\u' + $tw.utils.pad(s.charCodeAt(0).toString(16).toUpperCase(),4); + }); // non-ASCII characters }; /* @@ -626,7 +712,7 @@ exports.base64Decode = function(string64) { // TODO throw "$tw.utils.base64Decode() doesn't work in the browser"; } else { - return (new Buffer(string64,"base64")).toString(); + return Buffer.from(string64,"base64").toString(); } }; @@ -647,7 +733,7 @@ High resolution microsecond timer for profiling exports.timer = function(base) { var m; if($tw.node) { - var r = process.hrtime(); + var r = process.hrtime(); m = r[0] * 1e3 + (r[1] / 1e6); } else if(window.performance) { m = performance.now(); @@ -687,7 +773,6 @@ exports.tagToCssSelector = function(tagName) { }); }; - /* IE does not have sign function */ @@ -709,7 +794,7 @@ exports.strEndsWith = function(str,ending,position) { if (typeof position !== 'number' || !isFinite(position) || Math.floor(position) !== position || position > str.length) { position = str.length; } - position -= str.length; + position -= ending.length; var lastIndex = str.indexOf(ending, position); return lastIndex !== -1 && lastIndex === position; } diff --git a/core/modules/widgets/action-createtiddler.js b/core/modules/widgets/action-createtiddler.js new file mode 100644 index 000000000..01010b940 --- /dev/null +++ b/core/modules/widgets/action-createtiddler.js @@ -0,0 +1,81 @@ +/*\ +title: $:/core/modules/widgets/action-createtiddler.js +type: application/javascript +module-type: widget + +Action widget to create a new tiddler with a unique name and specified fields. + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +var Widget = require("$:/core/modules/widgets/widget.js").widget; + +var CreateTiddlerWidget = function(parseTreeNode,options) { + this.initialise(parseTreeNode,options); +}; + +/* +Inherit from the base widget class +*/ +CreateTiddlerWidget.prototype = new Widget(); + +/* +Render this widget into the DOM +*/ +CreateTiddlerWidget.prototype.render = function(parent,nextSibling) { + this.computeAttributes(); + this.execute(); +}; + +/* +Compute the internal state of the widget +*/ +CreateTiddlerWidget.prototype.execute = function() { + this.actionBaseTitle = this.getAttribute("$basetitle"); + this.actionSaveTitle = this.getAttribute("$savetitle"); + this.actionTimestamp = this.getAttribute("$timestamp","yes") === "yes"; +}; + +/* +Refresh the widget by ensuring our attributes are up to date +*/ +CreateTiddlerWidget.prototype.refresh = function(changedTiddlers) { + var changedAttributes = this.computeAttributes(); + if($tw.utils.count(changedAttributes) > 0) { + this.refreshSelf(); + return true; + } + return this.refreshChildren(changedTiddlers); +}; + +/* +Invoke the action associated with this widget +*/ +CreateTiddlerWidget.prototype.invokeAction = function(triggeringWidget,event) { + var title = this.wiki.generateNewTitle(this.actionBaseTitle), + fields = {}, + creationFields, + modificationFields; + $tw.utils.each(this.attributes,function(attribute,name) { + if(name.charAt(0) !== "$") { + fields[name] = attribute; + } + }); + if(this.actionTimestamp) { + creationFields = this.wiki.getCreationFields(); + modificationFields = this.wiki.getModificationFields(); + } + var tiddler = this.wiki.addTiddler(new $tw.Tiddler(creationFields,fields,modificationFields,{title: title})); + if(this.actionSaveTitle) { + this.wiki.setTextReference(this.actionSaveTitle,title,this.getVariable("currentTiddler")); + } + return true; // Action was invoked +}; + +exports["action-createtiddler"] = CreateTiddlerWidget; + +})(); diff --git a/core/modules/widgets/action-deletefield.js b/core/modules/widgets/action-deletefield.js index 8e9080f91..ffe4ef5d0 100644 --- a/core/modules/widgets/action-deletefield.js +++ b/core/modules/widgets/action-deletefield.js @@ -57,17 +57,24 @@ Invoke the action associated with this widget DeleteFieldWidget.prototype.invokeAction = function(triggeringWidget,event) { var self = this, tiddler = this.wiki.getTiddler(self.actionTiddler), - removeFields = {}; + removeFields = {}, + hasChanged = false; if(this.actionField) { removeFields[this.actionField] = undefined; + if(this.actionField in tiddler.fields) { + hasChanged = true; + } } if(tiddler) { $tw.utils.each(this.attributes,function(attribute,name) { if(name.charAt(0) !== "$" && name !== "title") { removeFields[name] = undefined; + hasChanged = true; } }); - this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getModificationFields(),tiddler,removeFields,this.wiki.getCreationFields())); + if(hasChanged) { + this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getCreationFields(),tiddler,removeFields,this.wiki.getModificationFields())); + } } return true; // Action was invoked }; diff --git a/core/modules/widgets/action-listops.js b/core/modules/widgets/action-listops.js index a6b0d4f62..6da84a3e5 100644 --- a/core/modules/widgets/action-listops.js +++ b/core/modules/widgets/action-listops.js @@ -80,9 +80,13 @@ ActionListopsWidget.prototype.invokeAction = function(triggeringWidget, .filterTiddlers(subfilter, this))); } if(this.filtertags) { - var tagfilter = "[list[" + this.target + "!!tags]] " + this.filtertags; - this.wiki.setText(this.target, "tags", undefined, $tw.utils.stringifyList( - this.wiki.filterTiddlers(tagfilter, this))); + var tiddler = this.wiki.getTiddler(this.target), + oldtags = tiddler ? (tiddler.fields.tags || []).slice(0) : [], + tagfilter = "[list[" + this.target + "!!tags]] " + this.filtertags, + newtags = this.wiki.filterTiddlers(tagfilter,this); + if($tw.utils.stringifyList(oldtags.sort()) !== $tw.utils.stringifyList(newtags.sort())) { + this.wiki.setText(this.target,"tags",undefined,$tw.utils.stringifyList(newtags)); + } } return true; // Action was invoked }; diff --git a/core/modules/widgets/action-sendmessage.js b/core/modules/widgets/action-sendmessage.js index 2f1b9cae4..c53314b2d 100644 --- a/core/modules/widgets/action-sendmessage.js +++ b/core/modules/widgets/action-sendmessage.js @@ -78,7 +78,8 @@ SendMessageWidget.prototype.invokeAction = function(triggeringWidget,event) { param: param, paramObject: paramObject, tiddlerTitle: this.getVariable("currentTiddler"), - navigateFromTitle: this.getVariable("storyTiddler") + navigateFromTitle: this.getVariable("storyTiddler"), + event: event }); return true; // Action was invoked }; diff --git a/core/modules/widgets/browse.js b/core/modules/widgets/browse.js index fca8e7467..ed57e4c33 100644 --- a/core/modules/widgets/browse.js +++ b/core/modules/widgets/browse.js @@ -46,17 +46,23 @@ BrowseWidget.prototype.render = function(parent,nextSibling) { if(this.nwsaveas) { domNode.setAttribute("nwsaveas",this.nwsaveas); } - // Nw.js supports "webkitdirectory" to allow a directory to be selected + // Nw.js supports "webkitdirectory" and "nwdirectory" to allow a directory to be selected if(this.webkitdirectory) { domNode.setAttribute("webkitdirectory",this.webkitdirectory); } + if(this.nwdirectory) { + domNode.setAttribute("nwdirectory",this.nwdirectory); + } // Add a click event handler domNode.addEventListener("change",function (event) { if(self.message) { self.dispatchEvent({type: self.message, param: self.param, files: event.target.files}); } else { - self.wiki.readFiles(event.target.files,function(tiddlerFieldsArray) { - self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray)}); + self.wiki.readFiles(event.target.files,{ + callback: function(tiddlerFieldsArray) { + self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray)}); + }, + deserializer: self.deserializer }); } return false; @@ -72,11 +78,13 @@ Compute the internal state of the widget */ BrowseWidget.prototype.execute = function() { this.browseMultiple = this.getAttribute("multiple"); + this.deserializer = this.getAttribute("deserializer"); this.message = this.getAttribute("message"); this.param = this.getAttribute("param"); this.tooltip = this.getAttribute("tooltip"); this.nwsaveas = this.getAttribute("nwsaveas"); this.webkitdirectory = this.getAttribute("webkitdirectory"); + this.nwdirectory = this.getAttribute("nwdirectory"); }; /* diff --git a/core/modules/widgets/button.js b/core/modules/widgets/button.js index b53ca2e15..fdcf33caa 100644 --- a/core/modules/widgets/button.js +++ b/core/modules/widgets/button.js @@ -67,7 +67,7 @@ ButtonWidget.prototype.render = function(parent,nextSibling) { // Add a click event handler domNode.addEventListener("click",function (event) { var handled = false; - if(self.invokeActions(this,event)) { + if(self.invokeActions(self,event)) { handled = true; } if(self.to) { @@ -95,6 +95,15 @@ ButtonWidget.prototype.render = function(parent,nextSibling) { } return handled; },false); + // Make it draggable if required + if(this.dragTiddler || this.dragFilter) { + $tw.utils.makeDraggable({ + domNode: domNode, + dragTiddlerFn: function() {return self.dragTiddler;}, + dragFilterFn: function() {return self.dragFilter;}, + widget: this + }); + } // Insert element parent.insertBefore(domNode,nextSibling); this.renderChildren(domNode,null); @@ -131,12 +140,13 @@ ButtonWidget.prototype.navigateTo = function(event) { navigateFromNode: this, navigateFromClientRect: { top: bounds.top, left: bounds.left, width: bounds.width, right: bounds.right, bottom: bounds.bottom, height: bounds.height }, - navigateSuppressNavigation: event.metaKey || event.ctrlKey || (event.button === 1) + navigateSuppressNavigation: event.metaKey || event.ctrlKey || (event.button === 1), + event: event }); }; ButtonWidget.prototype.dispatchMessage = function(event) { - this.dispatchEvent({type: this.message, param: this.param, tiddlerTitle: this.getVariable("currentTiddler")}); + this.dispatchEvent({type: this.message, param: this.param, tiddlerTitle: this.getVariable("currentTiddler"), event: event}); }; ButtonWidget.prototype.triggerPopup = function(event) { @@ -171,6 +181,8 @@ ButtonWidget.prototype.execute = function() { this.selectedClass = this.getAttribute("selectedClass"); this.defaultSetValue = this.getAttribute("default",""); this.buttonTag = this.getAttribute("tag"); + this.dragTiddler = this.getAttribute("dragTiddler"); + this.dragFilter = this.getAttribute("dragFilter"); // Make child widgets this.makeChildWidgets(); }; @@ -180,7 +192,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of */ ButtonWidget.prototype.refresh = function(changedTiddlers) { var changedAttributes = this.computeAttributes(); - if(changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes["class"] || changedAttributes.selectedClass || changedAttributes.style || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup])) { + if(changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes["class"] || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup])) { this.refreshSelf(); return true; } diff --git a/core/modules/widgets/checkbox.js b/core/modules/widgets/checkbox.js index 6ec2b0372..9fa1c4889 100644 --- a/core/modules/widgets/checkbox.js +++ b/core/modules/widgets/checkbox.js @@ -65,7 +65,21 @@ CheckboxWidget.prototype.getValue = function() { } } if(this.checkboxField) { - var value = tiddler.fields[this.checkboxField] || this.checkboxDefault || ""; + var value; + if($tw.utils.hop(tiddler.fields,this.checkboxField)) { + value = tiddler.fields[this.checkboxField] || ""; + } else { + value = this.checkboxDefault || ""; + } + if(value === this.checkboxChecked) { + return true; + } + if(value === this.checkboxUnchecked) { + return false; + } + } + if(this.checkboxIndex) { + var value = this.wiki.extractTiddlerDataItem(tiddler,this.checkboxIndex,this.checkboxDefault || ""); if(value === this.checkboxChecked) { return true; } @@ -96,7 +110,8 @@ CheckboxWidget.prototype.handleChangeEvent = function(event) { newFields = {title: this.checkboxTitle}, hasChanged = false, tagCheck = false, - hasTag = tiddler && tiddler.hasTag(this.checkboxTag); + hasTag = tiddler && tiddler.hasTag(this.checkboxTag), + value = checked ? this.checkboxChecked : this.checkboxUnchecked; if(this.checkboxTag && this.checkboxInvertTag === "yes") { tagCheck = hasTag === checked; } else { @@ -118,14 +133,31 @@ CheckboxWidget.prototype.handleChangeEvent = function(event) { } // Set the field if specified if(this.checkboxField) { - var value = checked ? this.checkboxChecked : this.checkboxUnchecked; if(!tiddler || tiddler.fields[this.checkboxField] !== value) { newFields[this.checkboxField] = value; hasChanged = true; } } + // Set the index if specified + if(this.checkboxIndex) { + var indexValue = this.wiki.extractTiddlerDataItem(this.checkboxTitle,this.checkboxIndex); + if(!tiddler || indexValue !== value) { + hasChanged = true; + } + } if(hasChanged) { - this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getCreationFields(),fallbackFields,tiddler,newFields,this.wiki.getModificationFields())); + if(this.checkboxIndex) { + this.wiki.setText(this.checkboxTitle,"",this.checkboxIndex,value); + } else { + this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getCreationFields(),fallbackFields,tiddler,newFields,this.wiki.getModificationFields())); + } + } + // Trigger actions + if(this.checkboxActions) { + this.invokeActionString(this.checkboxActions,this,event); + } + if(this.checkboxUncheckActions && !checked) { + this.invokeActionString(this.checkboxUncheckActions,this,event); } }; @@ -134,9 +166,12 @@ Compute the internal state of the widget */ CheckboxWidget.prototype.execute = function() { // Get the parameters from the attributes + this.checkboxActions = this.getAttribute("actions"); + this.checkboxUncheckActions = this.getAttribute("uncheckactions"); this.checkboxTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler")); this.checkboxTag = this.getAttribute("tag"); this.checkboxField = this.getAttribute("field"); + this.checkboxIndex = this.getAttribute("index"); this.checkboxChecked = this.getAttribute("checked"); this.checkboxUnchecked = this.getAttribute("unchecked"); this.checkboxDefault = this.getAttribute("default"); @@ -151,7 +186,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of */ CheckboxWidget.prototype.refresh = function(changedTiddlers) { var changedAttributes = this.computeAttributes(); - if(changedAttributes.tiddler || changedAttributes.tag || changedAttributes.invertTag || changedAttributes.field || changedAttributes.checked || changedAttributes.unchecked || changedAttributes["default"] || changedAttributes["class"]) { + if(changedAttributes.tiddler || changedAttributes.tag || changedAttributes.invertTag || changedAttributes.field || changedAttributes.index || changedAttributes.checked || changedAttributes.unchecked || changedAttributes["default"] || changedAttributes["class"]) { this.refreshSelf(); return true; } else { @@ -166,4 +201,4 @@ CheckboxWidget.prototype.refresh = function(changedTiddlers) { exports.checkbox = CheckboxWidget; -})(); \ No newline at end of file +})(); diff --git a/core/modules/widgets/diff-text.js b/core/modules/widgets/diff-text.js new file mode 100644 index 000000000..0dca1042c --- /dev/null +++ b/core/modules/widgets/diff-text.js @@ -0,0 +1,148 @@ +/*\ +title: $:/core/modules/widgets/diff-text.js +type: application/javascript +module-type: widget + +Widget to display a diff between two texts + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +var Widget = require("$:/core/modules/widgets/widget.js").widget, + dmp = require("$:/core/modules/utils/diff-match-patch/diff_match_patch.js"); + +var DiffTextWidget = function(parseTreeNode,options) { + this.initialise(parseTreeNode,options); +}; + +/* +Inherit from the base widget class +*/ +DiffTextWidget.prototype = new Widget(); + +DiffTextWidget.prototype.invisibleCharacters = { + "\n": "↩︎\n", + "\r": "⇠", + "\t": "⇥\t" +}; + +/* +Render this widget into the DOM +*/ +DiffTextWidget.prototype.render = function(parent,nextSibling) { + this.parentDomNode = parent; + this.computeAttributes(); + this.execute(); + // Create the diff + var dmpObject = new dmp.diff_match_patch(), + diffs = dmpObject.diff_main(this.getAttribute("source"),this.getAttribute("dest")); + // Apply required cleanup + switch(this.getAttribute("cleanup","semantic")) { + case "none": + // No cleanup + break; + case "efficiency": + dmpObject.diff_cleanupEfficiency(diffs); + break; + default: // case "semantic" + dmpObject.diff_cleanupSemantic(diffs); + break; + } + // Create the elements + var domContainer = this.document.createElement("div"), + domDiff = this.createDiffDom(diffs); + parent.insertBefore(domContainer,nextSibling); + // Set variables + this.setVariable("diff-count",diffs.reduce(function(acc,diff) { + if(diff[0] !== dmp.DIFF_EQUAL) { + acc++; + } + return acc; + },0).toString()); + // Render child widgets + this.renderChildren(domContainer,null); + // Render the diff + domContainer.appendChild(domDiff); + // Save our container + this.domNodes.push(domContainer); +}; + +/* +Create DOM elements representing a list of diffs +*/ +DiffTextWidget.prototype.createDiffDom = function(diffs) { + var self = this; + // Create the element and assign the attributes + var domPre = this.document.createElement("pre"), + domCode = this.document.createElement("code"); + $tw.utils.each(diffs,function(diff) { + var tag = diff[0] === dmp.DIFF_INSERT ? "ins" : (diff[0] === dmp.DIFF_DELETE ? "del" : "span"), + className = diff[0] === dmp.DIFF_INSERT ? "tc-diff-insert" : (diff[0] === dmp.DIFF_DELETE ? "tc-diff-delete" : "tc-diff-equal"), + dom = self.document.createElement(tag), + text = diff[1], + currPos = 0, + re = /([\x00-\x1F])/mg, + match = re.exec(text), + span, + printable; + dom.className = className; + while(match) { + if(currPos < match.index) { + dom.appendChild(self.document.createTextNode(text.slice(currPos,match.index))); + } + span = self.document.createElement("span"); + span.className = "tc-diff-invisible"; + printable = self.invisibleCharacters[match[0]] || ("[0x" + match[0].charCodeAt(0).toString(16) + "]"); + span.appendChild(self.document.createTextNode(printable)); + dom.appendChild(span); + currPos = match.index + match[0].length; + match = re.exec(text); + } + if(currPos < text.length) { + dom.appendChild(self.document.createTextNode(text.slice(currPos))); + } + domCode.appendChild(dom); + }); + domPre.appendChild(domCode); + return domPre; +}; + +/* +Compute the internal state of the widget +*/ +DiffTextWidget.prototype.execute = function() { + // Make child widgets + var parseTreeNodes; + if(this.parseTreeNode && this.parseTreeNode.children && this.parseTreeNode.children.length > 0) { + parseTreeNodes = this.parseTreeNode.children; + } else { + parseTreeNodes = [{ + type: "transclude", + attributes: { + tiddler: {type: "string", value: "$:/language/Diffs/CountMessage"} + } + }]; + } + this.makeChildWidgets(parseTreeNodes); +}; + +/* +Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering +*/ +DiffTextWidget.prototype.refresh = function(changedTiddlers) { + var changedAttributes = this.computeAttributes(); + if(changedAttributes.source || changedAttributes.dest || changedAttributes.cleanup) { + this.refreshSelf(); + return true; + } else { + return this.refreshChildren(changedTiddlers); + } +}; + +exports["diff-text"] = DiffTextWidget; + +})(); diff --git a/core/modules/widgets/draggable.js b/core/modules/widgets/draggable.js new file mode 100644 index 000000000..d1bdf2a16 --- /dev/null +++ b/core/modules/widgets/draggable.js @@ -0,0 +1,92 @@ +/*\ +title: $:/core/modules/widgets/draggable.js +type: application/javascript +module-type: widget + +Draggable widget + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +var Widget = require("$:/core/modules/widgets/widget.js").widget; + +var DraggableWidget = function(parseTreeNode,options) { + this.initialise(parseTreeNode,options); +}; + +/* +Inherit from the base widget class +*/ +DraggableWidget.prototype = new Widget(); + +/* +Render this widget into the DOM +*/ +DraggableWidget.prototype.render = function(parent,nextSibling) { + var self = this; + // Save the parent dom node + this.parentDomNode = parent; + // Compute our attributes + this.computeAttributes(); + // Execute our logic + this.execute(); + // Sanitise the specified tag + var tag = this.draggableTag; + if($tw.config.htmlUnsafeElements.indexOf(tag) !== -1) { + tag = "div"; + } + // Create our element + var domNode = this.document.createElement(tag); + // Assign classes + var classes = ["tc-draggable"]; + if(this.draggableClasses) { + classes.push(this.draggableClasses); + } + domNode.setAttribute("class",classes.join(" ")); + // Add event handlers + $tw.utils.makeDraggable({ + domNode: domNode, + dragTiddlerFn: function() {return self.getAttribute("tiddler");}, + dragFilterFn: function() {return self.getAttribute("filter");}, + startActions: self.startActions, + endActions: self.endActions, + widget: this + }); + // Insert the link into the DOM and render any children + parent.insertBefore(domNode,nextSibling); + this.renderChildren(domNode,null); + this.domNodes.push(domNode); +}; + +/* +Compute the internal state of the widget +*/ +DraggableWidget.prototype.execute = function() { + // Pick up our attributes + this.draggableTag = this.getAttribute("tag","div"); + this.draggableClasses = this.getAttribute("class"); + this.startActions = this.getAttribute("startactions"); + this.endActions = this.getAttribute("endactions"); + // Make the child widgets + this.makeChildWidgets(); +}; + +/* +Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering +*/ +DraggableWidget.prototype.refresh = function(changedTiddlers) { + var changedAttributes = this.computeAttributes(); + if(changedTiddlers.tag || changedTiddlers["class"]) { + this.refreshSelf(); + return true; + } + return this.refreshChildren(changedTiddlers); +}; + +exports.draggable = DraggableWidget; + +})(); diff --git a/core/modules/widgets/droppable.js b/core/modules/widgets/droppable.js new file mode 100644 index 000000000..dabb4c259 --- /dev/null +++ b/core/modules/widgets/droppable.js @@ -0,0 +1,163 @@ +/*\ +title: $:/core/modules/widgets/droppable.js +type: application/javascript +module-type: widget + +Droppable widget + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +var Widget = require("$:/core/modules/widgets/widget.js").widget; + +var DroppableWidget = function(parseTreeNode,options) { + this.initialise(parseTreeNode,options); +}; + +/* +Inherit from the base widget class +*/ +DroppableWidget.prototype = new Widget(); + +/* +Render this widget into the DOM +*/ +DroppableWidget.prototype.render = function(parent,nextSibling) { + var self = this; + // Remember parent + this.parentDomNode = parent; + // Compute attributes and execute state + this.computeAttributes(); + this.execute(); + var tag = this.parseTreeNode.isBlock ? "div" : "span"; + if(this.droppableTag && $tw.config.htmlUnsafeElements.indexOf(this.droppableTag) === -1) { + tag = this.droppableTag; + } + // Create element and assign classes + var domNode = this.document.createElement(tag), + classes = (this["class"] || "").split(" "); + classes.push("tc-droppable"); + domNode.className = classes.join(" "); + // Add event handlers + $tw.utils.addEventListeners(domNode,[ + {name: "dragenter", handlerObject: this, handlerMethod: "handleDragEnterEvent"}, + {name: "dragover", handlerObject: this, handlerMethod: "handleDragOverEvent"}, + {name: "dragleave", handlerObject: this, handlerMethod: "handleDragLeaveEvent"}, + {name: "drop", handlerObject: this, handlerMethod: "handleDropEvent"} + ]); + // Insert element + parent.insertBefore(domNode,nextSibling); + this.renderChildren(domNode,null); + this.domNodes.push(domNode); + // Stack of outstanding enter/leave events + this.currentlyEntered = []; +}; + +DroppableWidget.prototype.enterDrag = function(event) { + if(this.currentlyEntered.indexOf(event.target) === -1) { + this.currentlyEntered.push(event.target); + } + // If we're entering for the first time we need to apply highlighting + $tw.utils.addClass(this.domNodes[0],"tc-dragover"); +}; + +DroppableWidget.prototype.leaveDrag = function(event) { + var pos = this.currentlyEntered.indexOf(event.target); + if(pos !== -1) { + this.currentlyEntered.splice(pos,1); + } + // Remove highlighting if we're leaving externally. The hacky second condition is to resolve a problem with Firefox whereby there is an erroneous dragenter event if the node being dragged is within the dropzone + if(this.currentlyEntered.length === 0 || (this.currentlyEntered.length === 1 && this.currentlyEntered[0] === $tw.dragInProgress)) { + this.currentlyEntered = []; + $tw.utils.removeClass(this.domNodes[0],"tc-dragover"); + } +}; + +DroppableWidget.prototype.handleDragEnterEvent = function(event) { + this.enterDrag(event); + // Tell the browser that we're ready to handle the drop + event.preventDefault(); + // Tell the browser not to ripple the drag up to any parent drop handlers + event.stopPropagation(); + return false; +}; + +DroppableWidget.prototype.handleDragOverEvent = function(event) { + // Check for being over a TEXTAREA or INPUT + if(["TEXTAREA","INPUT"].indexOf(event.target.tagName) !== -1) { + return false; + } + // Tell the browser that we're still interested in the drop + event.preventDefault(); + // Set the drop effect + event.dataTransfer.dropEffect = this.droppableEffect; + return false; +}; + +DroppableWidget.prototype.handleDragLeaveEvent = function(event) { + this.leaveDrag(event); + return false; +}; + +DroppableWidget.prototype.handleDropEvent = function(event) { + var self = this; + this.leaveDrag(event); + // Check for being over a TEXTAREA or INPUT + if(["TEXTAREA","INPUT"].indexOf(event.target.tagName) !== -1) { + return false; + } + var dataTransfer = event.dataTransfer; + // Remove highlighting + $tw.utils.removeClass(this.domNodes[0],"tc-dragover"); + // Try to import the various data types we understand + $tw.utils.importDataTransfer(dataTransfer,null,function(fieldsArray) { + fieldsArray.forEach(function(fields) { + self.performActions(fields.title || fields.text,event); + }); + }); + // Tell the browser that we handled the drop + event.preventDefault(); + // Stop the drop ripple up to any parent handlers + event.stopPropagation(); + return false; +}; + +DroppableWidget.prototype.performActions = function(title,event) { + if(this.droppableActions) { + var modifierKey = event.ctrlKey && ! event.shiftKey ? "ctrl" : event.shiftKey && !event.ctrlKey ? "shift" : + event.ctrlKey && event.shiftKey ? "ctrl-shift" : "normal" ; + this.invokeActionString(this.droppableActions,this,event,{actionTiddler: title, modifier: modifierKey}); + } +}; + +/* +Compute the internal state of the widget +*/ +DroppableWidget.prototype.execute = function() { + this.droppableActions = this.getAttribute("actions"); + this.droppableEffect = this.getAttribute("effect","copy"); + this.droppableTag = this.getAttribute("tag"); + this.droppableClass = this.getAttribute("class"); + // Make child widgets + this.makeChildWidgets(); +}; + +/* +Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering +*/ +DroppableWidget.prototype.refresh = function(changedTiddlers) { + var changedAttributes = this.computeAttributes(); + if(changedAttributes["class"] || changedAttributes.tag) { + this.refreshSelf(); + return true; + } + return this.refreshChildren(changedTiddlers); +}; + +exports.droppable = DroppableWidget; + +})(); diff --git a/core/modules/widgets/dropzone.js b/core/modules/widgets/dropzone.js index 4ac8e78f4..d732fb97d 100644 --- a/core/modules/widgets/dropzone.js +++ b/core/modules/widgets/dropzone.js @@ -50,32 +50,35 @@ DropZoneWidget.prototype.render = function(parent,nextSibling) { parent.insertBefore(domNode,nextSibling); this.renderChildren(domNode,null); this.domNodes.push(domNode); + // Stack of outstanding enter/leave events + this.currentlyEntered = []; }; -DropZoneWidget.prototype.enterDrag = function() { - // Check for this window being the source of the drag - if($tw.dragInProgress) { - return false; +DropZoneWidget.prototype.enterDrag = function(event) { + if(this.currentlyEntered.indexOf(event.target) === -1) { + this.currentlyEntered.push(event.target); } - // We count enter/leave events - this.dragEnterCount = (this.dragEnterCount || 0) + 1; // If we're entering for the first time we need to apply highlighting - if(this.dragEnterCount === 1) { - $tw.utils.addClass(this.domNodes[0],"tc-dragover"); - } + $tw.utils.addClass(this.domNodes[0],"tc-dragover"); }; -DropZoneWidget.prototype.leaveDrag = function() { - // Reduce the enter count - this.dragEnterCount = (this.dragEnterCount || 0) - 1; +DropZoneWidget.prototype.leaveDrag = function(event) { + var pos = this.currentlyEntered.indexOf(event.target); + if(pos !== -1) { + this.currentlyEntered.splice(pos,1); + } // Remove highlighting if we're leaving externally - if(this.dragEnterCount <= 0) { + if(this.currentlyEntered.length === 0) { $tw.utils.removeClass(this.domNodes[0],"tc-dragover"); } }; DropZoneWidget.prototype.handleDragEnterEvent = function(event) { - this.enterDrag(); + // Check for this window being the source of the drag + if($tw.dragInProgress) { + return false; + } + this.enterDrag(event); // Tell the browser that we're ready to handle the drop event.preventDefault(); // Tell the browser not to ripple the drag up to any parent drop handlers @@ -97,11 +100,15 @@ DropZoneWidget.prototype.handleDragOverEvent = function(event) { }; DropZoneWidget.prototype.handleDragLeaveEvent = function(event) { - this.leaveDrag(); + this.leaveDrag(event); }; DropZoneWidget.prototype.handleDropEvent = function(event) { - this.leaveDrag(); + var self = this, + readFileCallback = function(tiddlerFieldsArray) { + self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray)}); + }; + this.leaveDrag(event); // Check for being over a TEXTAREA or INPUT if(["TEXTAREA","INPUT"].indexOf(event.target.tagName) !== -1) { return false; @@ -112,17 +119,19 @@ DropZoneWidget.prototype.handleDropEvent = function(event) { } var self = this, dataTransfer = event.dataTransfer; - // Reset the enter count - this.dragEnterCount = 0; // Remove highlighting $tw.utils.removeClass(this.domNodes[0],"tc-dragover"); // Import any files in the drop - var numFiles = this.wiki.readFiles(dataTransfer.files,function(tiddlerFieldsArray) { - self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray)}); - }); + var numFiles = 0; + if(dataTransfer.files) { + numFiles = this.wiki.readFiles(dataTransfer.files,{ + callback: readFileCallback, + deserializer: this.dropzoneDeserializer + }); + } // Try to import the various data types we understand if(numFiles === 0) { - this.importData(dataTransfer); + $tw.utils.importDataTransfer(dataTransfer,this.wiki.generateNewTitle("Untitled"),readFileCallback); } // Tell the browser that we handled the drop event.preventDefault(); @@ -130,78 +139,11 @@ DropZoneWidget.prototype.handleDropEvent = function(event) { event.stopPropagation(); }; -DropZoneWidget.prototype.importData = function(dataTransfer) { - // Try each provided data type in turn - for(var t=0; t<this.importDataTypes.length; t++) { - if(!$tw.browser.isIE || this.importDataTypes[t].IECompatible) { - // Get the data - var dataType = this.importDataTypes[t]; - var data = dataTransfer.getData(dataType.type); - // Import the tiddlers in the data - if(data !== "" && data !== null) { - if($tw.log.IMPORT) { - console.log("Importing data type '" + dataType.type + "', data: '" + data + "'") - } - var tiddlerFields = dataType.convertToFields(data); - if(!tiddlerFields.title) { - tiddlerFields.title = this.wiki.generateNewTitle("Untitled"); - } - this.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify([tiddlerFields])}); - return; - } - } - } -}; - -DropZoneWidget.prototype.importDataTypes = [ - {type: "text/vnd.tiddler", IECompatible: false, convertToFields: function(data) { - return JSON.parse(data); - }}, - {type: "URL", IECompatible: true, convertToFields: function(data) { - // Check for tiddler data URI - var match = decodeURIComponent(data).match(/^data\:text\/vnd\.tiddler,(.*)/i); - if(match) { - return JSON.parse(match[1]); - } else { - return { // As URL string - text: data - }; - } - }}, - {type: "text/x-moz-url", IECompatible: false, convertToFields: function(data) { - // Check for tiddler data URI - var match = decodeURIComponent(data).match(/^data\:text\/vnd\.tiddler,(.*)/i); - if(match) { - return JSON.parse(match[1]); - } else { - return { // As URL string - text: data - }; - } - }}, - {type: "text/html", IECompatible: false, convertToFields: function(data) { - return { - text: data - }; - }}, - {type: "text/plain", IECompatible: false, convertToFields: function(data) { - return { - text: data - }; - }}, - {type: "Text", IECompatible: true, convertToFields: function(data) { - return { - text: data - }; - }}, - {type: "text/uri-list", IECompatible: false, convertToFields: function(data) { - return { - text: data - }; - }} -]; - DropZoneWidget.prototype.handlePasteEvent = function(event) { + var self = this, + readFileCallback = function(tiddlerFieldsArray) { + self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray)}); + }; // Let the browser handle it if we're in a textarea or input box if(["TEXTAREA","INPUT"].indexOf(event.target.tagName) == -1) { var self = this, @@ -211,8 +153,9 @@ DropZoneWidget.prototype.handlePasteEvent = function(event) { var item = items[t]; if(item.kind === "file") { // Import any files - this.wiki.readFile(item.getAsFile(),function(tiddlerFieldsArray) { - self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray)}); + this.wiki.readFile(item.getAsFile(),{ + callback: readFileCallback, + deserializer: this.dropzoneDeserializer }); } else if(item.kind === "string") { // Create tiddlers from string items @@ -240,6 +183,7 @@ DropZoneWidget.prototype.handlePasteEvent = function(event) { Compute the internal state of the widget */ DropZoneWidget.prototype.execute = function() { + this.dropzoneDeserializer = this.getAttribute("deserializer"); // Make child widgets this.makeChildWidgets(); }; diff --git a/core/modules/widgets/edit-bitmap.js b/core/modules/widgets/edit-bitmap.js index f094d9464..0a7ecd0ef 100644 --- a/core/modules/widgets/edit-bitmap.js +++ b/core/modules/widgets/edit-bitmap.js @@ -189,6 +189,35 @@ EditBitmapWidget.prototype.changeCanvasSize = function(newWidth,newHeight) { ctx.drawImage(this.currCanvas,0,0); }; +/* +** Rotate the canvas left by 90 degrees +*/ +EditBitmapWidget.prototype.rotateCanvasLeft = function() { + // Get the current size of the image + var origWidth = this.currCanvas.width, + origHeight = this.currCanvas.height; + // Create and size a new canvas + var newCanvas = this.document.createElement("canvas"), + newWidth = origHeight, + newHeight = origWidth; + this.initCanvas(newCanvas,newWidth,newHeight); + // Copy the old image + var ctx = newCanvas.getContext("2d"); + ctx.save(); + ctx.translate(newWidth / 2,newHeight / 2); + ctx.rotate(-Math.PI / 2); + ctx.drawImage(this.currCanvas,-origWidth / 2,-origHeight / 2); + ctx.restore(); + // Set the new canvas as the current one + this.currCanvas = newCanvas; + // Set the size of the onscreen canvas + this.canvasDomNode.width = newWidth; + this.canvasDomNode.height = newHeight; + // Paint the onscreen canvas with the offscreen canvas + ctx = this.canvasDomNode.getContext("2d"); + ctx.drawImage(this.currCanvas,0,0); +}; + EditBitmapWidget.prototype.handleTouchStartEvent = function(event) { this.brushDown = true; this.strokeStart(event.touches[0].clientX,event.touches[0].clientY); diff --git a/core/modules/widgets/element.js b/core/modules/widgets/element.js index 4bfbe53ad..b76e37b00 100755 --- a/core/modules/widgets/element.js +++ b/core/modules/widgets/element.js @@ -35,6 +35,14 @@ ElementWidget.prototype.render = function(parent,nextSibling) { if($tw.config.htmlUnsafeElements.indexOf(tag) !== -1) { tag = "safe-" + tag; } + // Adjust headings by the current base level + var headingLevel = ["h1","h2","h3","h4","h5","h6"].indexOf(tag); + if(headingLevel !== -1) { + var baseLevel = parseInt(this.getVariable("tv-adjust-heading-level","0"),10) || 0; + headingLevel = Math.min(Math.max(headingLevel + 1 + baseLevel,1),6); + tag = "h" + headingLevel; + } + // Create the DOM node var domNode = this.document.createElementNS(this.namespace,tag); this.assignAttributes(domNode,{excludeEventAttributes: true}); parent.insertBefore(domNode,nextSibling); diff --git a/core/modules/widgets/fieldmangler.js b/core/modules/widgets/fieldmangler.js index a829b77e3..ca0b4f0f4 100644 --- a/core/modules/widgets/fieldmangler.js +++ b/core/modules/widgets/fieldmangler.js @@ -109,28 +109,28 @@ FieldManglerWidget.prototype.handleAddFieldEvent = function(event) { }; FieldManglerWidget.prototype.handleRemoveTagEvent = function(event) { - var tiddler = this.wiki.getTiddler(this.mangleTitle); + var tiddler = this.wiki.getTiddler(this.mangleTitle), + modification = this.wiki.getModificationFields(); if(tiddler && tiddler.fields.tags) { var p = tiddler.fields.tags.indexOf(event.param); if(p !== -1) { - var modification = this.wiki.getModificationFields(); modification.tags = (tiddler.fields.tags || []).slice(0); modification.tags.splice(p,1); if(modification.tags.length === 0) { modification.tags = undefined; } - this.wiki.addTiddler(new $tw.Tiddler(tiddler,modification)); + this.wiki.addTiddler(new $tw.Tiddler(tiddler,modification)); } } return true; }; FieldManglerWidget.prototype.handleAddTagEvent = function(event) { - var tiddler = this.wiki.getTiddler(this.mangleTitle); + var tiddler = this.wiki.getTiddler(this.mangleTitle), + modification = this.wiki.getModificationFields(); if(tiddler && typeof event.param === "string") { var tag = event.param.trim(); if(tag !== "") { - var modification = this.wiki.getModificationFields(); modification.tags = (tiddler.fields.tags || []).slice(0); $tw.utils.pushTop(modification.tags,tag); this.wiki.addTiddler(new $tw.Tiddler(tiddler,modification)); @@ -138,7 +138,7 @@ FieldManglerWidget.prototype.handleAddTagEvent = function(event) { } else if(typeof event.param === "string" && event.param.trim() !== "" && this.mangleTitle.trim() !== "") { var tag = []; tag.push(event.param.trim()); - this.wiki.addTiddler({title: this.mangleTitle, tags: tag}); + this.wiki.addTiddler(new $tw.Tiddler({title: this.mangleTitle, tags: tag},modification)); } return true; }; diff --git a/core/modules/widgets/fields.js b/core/modules/widgets/fields.js index 511b6f7d5..d75a3b6e9 100755 --- a/core/modules/widgets/fields.js +++ b/core/modules/widgets/fields.js @@ -75,9 +75,9 @@ FieldsWidget.prototype.execute = function() { value = reMatch[1]; } } - row = row.replace("$name$",fieldName); - row = row.replace("$value$",value); - row = row.replace("$encoded_value$",$tw.utils.htmlEncode(value)); + row = $tw.utils.replaceString(row,"$name$",fieldName); + row = $tw.utils.replaceString(row,"$value$",value); + row = $tw.utils.replaceString(row,"$encoded_value$",$tw.utils.htmlEncode(value)); text.push(row); } } diff --git a/core/modules/widgets/importvariables.js b/core/modules/widgets/importvariables.js index 774f8c7aa..cdb351f8d 100644 --- a/core/modules/widgets/importvariables.js +++ b/core/modules/widgets/importvariables.js @@ -63,7 +63,8 @@ ImportVariablesWidget.prototype.execute = function(tiddlerList) { addWidgetNode({ type: "set", attributes: parseTreeNode.attributes, - params: parseTreeNode.params + params: parseTreeNode.params, + isMacroDefinition: parseTreeNode.isMacroDefinition }); parseTreeNode = parseTreeNode.children[0]; } diff --git a/core/modules/widgets/keyboard.js b/core/modules/widgets/keyboard.js index 8d2c105a7..f253d864a 100644 --- a/core/modules/widgets/keyboard.js +++ b/core/modules/widgets/keyboard.js @@ -33,8 +33,12 @@ KeyboardWidget.prototype.render = function(parent,nextSibling) { // Compute attributes and execute state this.computeAttributes(); this.execute(); + var tag = this.parseTreeNode.isBlock ? "div" : "span"; + if(this.tag && $tw.config.htmlUnsafeElements.indexOf(this.tag) === -1) { + tag = this.tag; + } // Create element - var domNode = this.document.createElement("div"); + var domNode = this.document.createElement(tag); // Assign classes var classes = (this["class"] || "").split(" "); classes.push("tc-keyboard"); @@ -72,6 +76,7 @@ KeyboardWidget.prototype.execute = function() { this.message = this.getAttribute("message"); this.param = this.getAttribute("param"); this.key = this.getAttribute("key"); + this.tag = this.getAttribute("tag"); this.keyInfoArray = $tw.keyboardManager.parseKeyDescriptors(this.key); this["class"] = this.getAttribute("class"); // Make child widgets @@ -83,7 +88,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of */ KeyboardWidget.prototype.refresh = function(changedTiddlers) { var changedAttributes = this.computeAttributes(); - if(changedAttributes.message || changedAttributes.param || changedAttributes.key || changedAttributes["class"]) { + if(changedAttributes.message || changedAttributes.param || changedAttributes.key || changedAttributes["class"] || changedAttributes.tag) { this.refreshSelf(); return true; } diff --git a/core/modules/widgets/link.js b/core/modules/widgets/link.js index b0deb4e51..4525d036c 100755 --- a/core/modules/widgets/link.js +++ b/core/modules/widgets/link.js @@ -64,30 +64,48 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) { var domNode = this.document.createElement(tag); // Assign classes var classes = []; - if(this.linkClasses) { - classes.push(this.linkClasses); - } - classes.push("tc-tiddlylink"); - if(this.isShadow) { - classes.push("tc-tiddlylink-shadow"); - } - if(this.isMissing && !this.isShadow) { - classes.push("tc-tiddlylink-missing"); - } else { - if(!this.isMissing) { - classes.push("tc-tiddlylink-resolves"); + if(this.overrideClasses === undefined) { + classes.push("tc-tiddlylink"); + if(this.isShadow) { + classes.push("tc-tiddlylink-shadow"); } + if(this.isMissing && !this.isShadow) { + classes.push("tc-tiddlylink-missing"); + } else { + if(!this.isMissing) { + classes.push("tc-tiddlylink-resolves"); + } + } + if(this.linkClasses) { + classes.push(this.linkClasses); + } + } else if(this.overrideClasses !== "") { + classes.push(this.overrideClasses) + } + if(classes.length > 0) { + domNode.setAttribute("class",classes.join(" ")); } - domNode.setAttribute("class",classes.join(" ")); // Set an href - var wikiLinkTemplateMacro = this.getVariable("tv-wikilink-template"), - wikiLinkTemplate = wikiLinkTemplateMacro ? wikiLinkTemplateMacro.trim() : "#$uri_encoded$", - wikiLinkText = wikiLinkTemplate.replace("$uri_encoded$",encodeURIComponent(this.to)); - wikiLinkText = wikiLinkText.replace("$uri_doubleencoded$",encodeURIComponent(encodeURIComponent(this.to))); + var wikilinkTransformFilter = this.getVariable("tv-filter-export-link"), + wikiLinkText; + if(wikilinkTransformFilter) { + // Use the filter to construct the href + wikiLinkText = this.wiki.filterTiddlers(wikilinkTransformFilter,this,function(iterator) { + iterator(self.wiki.getTiddler(self.to),self.to) + })[0]; + } else { + // Expand the tv-wikilink-template variable to construct the href + var wikiLinkTemplateMacro = this.getVariable("tv-wikilink-template"), + wikiLinkTemplate = wikiLinkTemplateMacro ? wikiLinkTemplateMacro.trim() : "#$uri_encoded$"; + wikiLinkText = $tw.utils.replaceString(wikiLinkTemplate,"$uri_encoded$",encodeURIComponent(this.to)); + wikiLinkText = $tw.utils.replaceString(wikiLinkText,"$uri_doubleencoded$",encodeURIComponent(encodeURIComponent(this.to))); + } + // Override with the value of tv-get-export-link if defined wikiLinkText = this.getVariable("tv-get-export-link",{params: [{name: "to",value: this.to}],defaultValue: wikiLinkText}); if(tag === "a") { domNode.setAttribute("href",wikiLinkText); } + // Set the tabindex if(this.tabIndex) { domNode.setAttribute("tabindex",this.tabIndex); } @@ -111,11 +129,13 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) { $tw.utils.addEventListeners(domNode,[ {name: "click", handlerObject: this, handlerMethod: "handleClickEvent"}, ]); + // Make the link draggable if required if(this.draggable === "yes") { - $tw.utils.addEventListeners(domNode,[ - {name: "dragstart", handlerObject: this, handlerMethod: "handleDragStartEvent"}, - {name: "dragend", handlerObject: this, handlerMethod: "handleDragEndEvent"} - ]); + $tw.utils.makeDraggable({ + domNode: domNode, + dragTiddlerFn: function() {return self.to;}, + widget: this + }); } // Insert the link into the DOM and render any children parent.insertBefore(domNode,nextSibling); @@ -133,7 +153,11 @@ LinkWidget.prototype.handleClickEvent = function(event) { navigateFromNode: this, navigateFromClientRect: { top: bounds.top, left: bounds.left, width: bounds.width, right: bounds.right, bottom: bounds.bottom, height: bounds.height }, - navigateSuppressNavigation: event.metaKey || event.ctrlKey || (event.button === 1) + navigateSuppressNavigation: event.metaKey || event.ctrlKey || (event.button === 1), + metaKey: event.metaKey, + ctrlKey: event.ctrlKey, + altKey: event.altKey, + shiftKey: event.shiftKey }); if(this.domNodes[0].hasAttribute("href")) { event.preventDefault(); @@ -142,67 +166,6 @@ LinkWidget.prototype.handleClickEvent = function(event) { return false; }; -LinkWidget.prototype.handleDragStartEvent = function(event) { - if(event.target === this.domNodes[0]) { - if(this.to) { - $tw.dragInProgress = true; - // Set the dragging class on the element being dragged - $tw.utils.addClass(event.target,"tc-tiddlylink-dragging"); - // Create the drag image elements - this.dragImage = this.document.createElement("div"); - this.dragImage.className = "tc-tiddler-dragger"; - var inner = this.document.createElement("div"); - inner.className = "tc-tiddler-dragger-inner"; - inner.appendChild(this.document.createTextNode(this.to)); - this.dragImage.appendChild(inner); - this.document.body.appendChild(this.dragImage); - // Astoundingly, we need to cover the dragger up: http://www.kryogenix.org/code/browser/custom-drag-image.html - var cover = this.document.createElement("div"); - cover.className = "tc-tiddler-dragger-cover"; - cover.style.left = (inner.offsetLeft - 16) + "px"; - cover.style.top = (inner.offsetTop - 16) + "px"; - cover.style.width = (inner.offsetWidth + 32) + "px"; - cover.style.height = (inner.offsetHeight + 32) + "px"; - this.dragImage.appendChild(cover); - // Set the data transfer properties - var dataTransfer = event.dataTransfer; - // First the image - dataTransfer.effectAllowed = "copy"; - if(dataTransfer.setDragImage) { - dataTransfer.setDragImage(this.dragImage.firstChild,-16,-16); - } - // Then the data - dataTransfer.clearData(); - var jsonData = this.wiki.getTiddlerAsJson(this.to), - textData = this.wiki.getTiddlerText(this.to,""), - title = (new RegExp("^" + $tw.config.textPrimitives.wikiLink + "$","mg")).exec(this.to) ? this.to : "[[" + this.to + "]]"; - // IE doesn't like these content types - if(!$tw.browser.isIE) { - dataTransfer.setData("text/vnd.tiddler",jsonData); - dataTransfer.setData("text/plain",title); - dataTransfer.setData("text/x-moz-url","data:text/vnd.tiddler," + encodeURIComponent(jsonData)); - } - dataTransfer.setData("URL","data:text/vnd.tiddler," + encodeURIComponent(jsonData)); - dataTransfer.setData("Text",title); - event.stopPropagation(); - } else { - event.preventDefault(); - } - } -}; - -LinkWidget.prototype.handleDragEndEvent = function(event) { - if(event.target === this.domNodes[0]) { - $tw.dragInProgress = false; - // Remove the dragging class on the element being dragged - $tw.utils.removeClass(event.target,"tc-tiddlylink-dragging"); - // Delete the drag image element - if(this.dragImage) { - this.dragImage.parentNode.removeChild(this.dragImage); - } - } -}; - /* Compute the internal state of the widget */ @@ -212,6 +175,7 @@ LinkWidget.prototype.execute = function() { this.tooltip = this.getAttribute("tooltip"); this["aria-label"] = this.getAttribute("aria-label"); this.linkClasses = this.getAttribute("class"); + this.overrideClasses = this.getAttribute("overrideClass"); this.tabIndex = this.getAttribute("tabindex"); this.draggable = this.getAttribute("draggable","yes"); this.linkTag = this.getAttribute("tag","a"); diff --git a/core/modules/widgets/linkcatcher.js b/core/modules/widgets/linkcatcher.js index d279140c0..ea0629d6e 100644 --- a/core/modules/widgets/linkcatcher.js +++ b/core/modules/widgets/linkcatcher.js @@ -48,6 +48,8 @@ LinkCatcherWidget.prototype.execute = function() { this.catchActions = this.getAttribute("actions"); // Construct the child widgets this.makeChildWidgets(); + // When executing actions we avoid trapping navigate events, so that we don't trigger ourselves recursively + this.executingActions = false; }; /* @@ -67,23 +69,35 @@ LinkCatcherWidget.prototype.refresh = function(changedTiddlers) { Handle a tm-navigate event */ LinkCatcherWidget.prototype.handleNavigateEvent = function(event) { - if(this.catchTo) { - this.wiki.setTextReference(this.catchTo,event.navigateTo,this.getVariable("currentTiddler")); - } - if(this.catchMessage && this.parentWidget) { + if(!this.executingActions) { + // Execute the actions + if(this.catchTo) { + this.wiki.setTextReference(this.catchTo,event.navigateTo,this.getVariable("currentTiddler")); + } + if(this.catchMessage && this.parentWidget) { + this.parentWidget.dispatchEvent({ + type: this.catchMessage, + param: event.navigateTo, + navigateTo: event.navigateTo + }); + } + if(this.catchSet) { + var tiddler = this.wiki.getTiddler(this.catchSet); + this.wiki.addTiddler(new $tw.Tiddler(tiddler,{title: this.catchSet, text: this.catchSetTo})); + } + if(this.catchActions) { + this.executingActions = true; + this.invokeActionString(this.catchActions,this,event,{navigateTo: event.navigateTo}); + this.executingActions = false; + } + } else { + // This is a navigate event generated by the actions of this linkcatcher, so we don't trap it again, but just pass it to the parent this.parentWidget.dispatchEvent({ - type: this.catchMessage, + type: "tm-navigate", param: event.navigateTo, navigateTo: event.navigateTo }); } - if(this.catchSet) { - var tiddler = this.wiki.getTiddler(this.catchSet); - this.wiki.addTiddler(new $tw.Tiddler(tiddler,{title: this.catchSet, text: this.catchSetTo})); - } - if(this.catchActions) { - this.invokeActionString(this.catchActions,this); - } return false; }; diff --git a/core/modules/widgets/list.js b/core/modules/widgets/list.js index 4c5b265f2..f4981df33 100755 --- a/core/modules/widgets/list.js +++ b/core/modules/widgets/list.js @@ -43,6 +43,9 @@ ListWidget.prototype.render = function(parent,nextSibling) { this.renderChildren(parent,nextSibling); // Construct the storyview var StoryView = this.storyViews[this.storyViewName]; + if(this.storyViewName && !StoryView) { + StoryView = this.storyViews["classic"]; + } if(StoryView && !this.document.isTiddlyWikiFakeDom) { this.storyview = new StoryView(this); } else { diff --git a/core/modules/widgets/macrocall.js b/core/modules/widgets/macrocall.js index 02bc8cce5..23522629b 100644 --- a/core/modules/widgets/macrocall.js +++ b/core/modules/widgets/macrocall.js @@ -48,7 +48,9 @@ MacroCallWidget.prototype.execute = function() { } }); // Get the macro value - var text = this.getVariable(this.parseTreeNode.name || this.getAttribute("$name"),{params: params}), + var macroName = this.parseTreeNode.name || this.getAttribute("$name"), + variableInfo = this.getVariableInfo(macroName,{params: params}), + text = variableInfo.text, parseTreeNodes; // Are we rendering to HTML? if(this.renderOutput === "text/html") { @@ -56,6 +58,21 @@ MacroCallWidget.prototype.execute = function() { var parser = this.wiki.parseText(this.parseType,text, {parseAsInline: !this.parseTreeNode.isBlock}); parseTreeNodes = parser ? parser.tree : []; + // Wrap the parse tree in a vars widget assigning the parameters to variables named "__paramname__" + var attributes = {}; + $tw.utils.each(variableInfo.params,function(param) { + var name = "__" + param.name + "__"; + attributes[name] = { + name: name, + type: "string", + value: param.value + }; + }); + parseTreeNodes = [{ + type: "vars", + attributes: attributes, + children: parseTreeNodes + }]; } else { // Otherwise, we'll render the text var plainText = this.wiki.renderText("text/plain",this.parseType,text,{parentWidget: this}); diff --git a/core/modules/widgets/navigator.js b/core/modules/widgets/navigator.js index 152800402..59ccfdd60 100755 --- a/core/modules/widgets/navigator.js +++ b/core/modules/widgets/navigator.js @@ -60,6 +60,8 @@ NavigatorWidget.prototype.execute = function() { // Get our parameters this.storyTitle = this.getAttribute("story"); this.historyTitle = this.getAttribute("history"); + this.setVariable("tv-story-list",this.storyTitle); + this.setVariable("tv-history-list",this.historyTitle); // Construct the child widgets this.makeChildWidgets(); }; @@ -73,7 +75,7 @@ NavigatorWidget.prototype.refresh = function(changedTiddlers) { this.refreshSelf(); return true; } else { - return this.refreshChildren(changedTiddlers); + return this.refreshChildren(changedTiddlers); } }; @@ -174,6 +176,7 @@ NavigatorWidget.prototype.addToHistory = function(title,fromPageRect) { Handle a tm-navigate event */ NavigatorWidget.prototype.handleNavigateEvent = function(event) { + event = $tw.hooks.invokeHook("th-navigating",event); if(event.navigateTo) { this.addToStory(event.navigateTo,event.navigateFromTitle); if(!event.navigateSuppressNavigation) { @@ -208,6 +211,10 @@ NavigatorWidget.prototype.handleCloseOtherTiddlersEvent = function(event) { // Place a tiddler in edit mode NavigatorWidget.prototype.handleEditTiddlerEvent = function(event) { + var editTiddler = $tw.hooks.invokeHook("th-editing-tiddler",event); + if(!editTiddler) { + return false; + } var self = this; function isUnmodifiedShadow(title) { return self.wiki.isShadowTiddler(title) && !self.wiki.tiddlerExists(title); @@ -245,6 +252,7 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) { tiddler = this.wiki.getTiddler(title), storyList = this.getStoryList(), originalTitle = tiddler ? tiddler.fields["draft.of"] : "", + originalTiddler = originalTitle ? this.wiki.getTiddler(originalTitle) : undefined, confirmationTitle; if(!tiddler) { return false; @@ -268,10 +276,14 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) { } // Delete the original tiddler if(originalTitle) { + if(originalTiddler) { + $tw.hooks.invokeHook("th-deleting-tiddler",originalTiddler); + } this.wiki.deleteTiddler(originalTitle); this.removeTitleFromStory(storyList,originalTitle); } - // Delete this tiddler + // Invoke the hook function and delete this tiddler + $tw.hooks.invokeHook("th-deleting-tiddler",tiddler); this.wiki.deleteTiddler(title); // Remove the closed tiddler from the story this.removeTitleFromStory(storyList,title); @@ -349,12 +361,21 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) { },this.wiki.getModificationFields()); newTiddler = $tw.hooks.invokeHook("th-saving-tiddler",newTiddler); this.wiki.addTiddler(newTiddler); + // If enabled, relink references to renamed tiddler + var shouldRelink = this.getAttribute("relinkOnRename","no").toLowerCase().trim() === "yes"; + if(isRename && shouldRelink && this.wiki.tiddlerExists(draftOf)) { +console.log("Relinking '" + draftOf + "' to '" + draftTitle + "'"); + this.wiki.relinkTiddler(draftOf,draftTitle); + } // Remove the draft tiddler this.wiki.deleteTiddler(title); // Remove the original tiddler if we're renaming it if(isRename) { this.wiki.deleteTiddler(draftOf); } + // #2381 always remove new title & old + this.removeTitleFromStory(storyList,draftTitle); + this.removeTitleFromStory(storyList,draftOf); if(!event.paramObject || event.paramObject.suppressNavigation !== "yes") { // Replace the draft in the story with the original this.replaceFirstTitleInStory(storyList,title,draftTitle); @@ -373,6 +394,7 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) { // Take a tiddler out of edit mode without saving the changes NavigatorWidget.prototype.handleCancelTiddlerEvent = function(event) { + event = $tw.hooks.invokeHook("th-cancelling-tiddler", event); // Flip the specified tiddler from draft back to the original var draftTitle = event.param || event.tiddlerTitle, draftTiddler = this.wiki.getTiddler(draftTitle), @@ -417,6 +439,7 @@ NavigatorWidget.prototype.handleCancelTiddlerEvent = function(event) { // // If a draft of the target tiddler already exists then it is reused NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) { + event = $tw.hooks.invokeHook("th-new-tiddler", event); // Get the story details var storyList = this.getStoryList(), templateTiddler, additionalFields, title, draftTitle, existingTiddler; @@ -437,6 +460,13 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) { if(additionalFields && additionalFields.title) { title = additionalFields.title; } + // Make a copy of the additional fields excluding any blank ones + var filteredAdditionalFields = $tw.utils.extend({},additionalFields); + Object.keys(filteredAdditionalFields).forEach(function(fieldName) { + if(filteredAdditionalFields[fieldName] === "") { + delete filteredAdditionalFields[fieldName]; + } + }); // Generate a title if we don't have one title = title || this.wiki.generateNewTitle($tw.language.getString("DefaultNewTiddlerTitle")); // Find any existing draft for this tiddler @@ -451,7 +481,7 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) { // Merge the tags var mergedTags = []; if(existingTiddler && existingTiddler.fields.tags) { - $tw.utils.pushTop(mergedTags,existingTiddler.fields.tags) + $tw.utils.pushTop(mergedTags,existingTiddler.fields.tags); } if(additionalFields && additionalFields.tags) { // Merge tags @@ -467,8 +497,9 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) { "draft.title": title }, templateTiddler, - existingTiddler, additionalFields, + existingTiddler, + filteredAdditionalFields, this.wiki.getCreationFields(), { title: draftTitle, @@ -482,7 +513,7 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) { storyList.splice(slot + 1,0,draftTitle); } if(storyList.indexOf(title) !== -1) { - storyList.splice(storyList.indexOf(title),1); + storyList.splice(storyList.indexOf(title),1); } this.saveStoryList(storyList); // Add a new record to the top of the history stack @@ -492,11 +523,10 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) { // Import JSON tiddlers into a pending import tiddler NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) { - var self = this; // Get the tiddlers var tiddlers = []; try { - tiddlers = JSON.parse(event.param); + tiddlers = JSON.parse(event.param); } catch(e) { } // Get the current $:/Import tiddler @@ -512,6 +542,7 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) { // Process each tiddler importData.tiddlers = importData.tiddlers || {}; $tw.utils.each(tiddlers,function(tiddlerFields) { + tiddlerFields.title = $tw.utils.trim(tiddlerFields.title); var title = tiddlerFields.title; if(title) { incomingTiddlers.push(title); @@ -544,12 +575,12 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) { history.push(IMPORT_TITLE); // Save the updated story and history this.saveStoryList(storyList); - this.addToHistory(history); + this.addToHistory(history); } return false; }; -// +// NavigatorWidget.prototype.handlePerformImportEvent = function(event) { var self = this, importTiddler = this.wiki.getTiddler(event.param), @@ -560,7 +591,9 @@ NavigatorWidget.prototype.handlePerformImportEvent = function(event) { $tw.utils.each(importData.tiddlers,function(tiddlerFields) { var title = tiddlerFields.title; if(title && importTiddler && importTiddler.fields["selection-" + title] !== "unchecked") { - self.wiki.addTiddler(new $tw.Tiddler(tiddlerFields)); + var tiddler = new $tw.Tiddler(tiddlerFields); + tiddler = $tw.hooks.invokeHook("th-importing-tiddler",tiddler); + self.wiki.addTiddler(tiddler); importReport.push("# [[" + tiddlerFields.title + "]]"); } }); @@ -577,8 +610,7 @@ NavigatorWidget.prototype.handlePerformImportEvent = function(event) { }; NavigatorWidget.prototype.handleFoldTiddlerEvent = function(event) { - var self = this, - paramObject = event.paramObject || {}; + var paramObject = event.paramObject || {}; if(paramObject.foldedState) { var foldedState = this.wiki.getTiddlerText(paramObject.foldedState,"show") === "show" ? "hide" : "show"; this.wiki.setText(paramObject.foldedState,"text",null,foldedState); @@ -613,8 +645,8 @@ NavigatorWidget.prototype.handleUnfoldAllTiddlersEvent = function(event) { }; NavigatorWidget.prototype.handleRenameTiddlerEvent = function(event) { - var self = this, - paramObject = event.paramObject || {}, + event = $tw.hooks.invokeHook("th-renaming-tiddler", event); + var paramObject = event.paramObject || {}, from = paramObject.from || event.tiddlerTitle, to = paramObject.to; $tw.wiki.renameTiddler(from,to); diff --git a/core/modules/widgets/radio.js b/core/modules/widgets/radio.js index 09a053c5b..90eca6bfd 100644 --- a/core/modules/widgets/radio.js +++ b/core/modules/widgets/radio.js @@ -3,22 +3,7 @@ title: $:/core/modules/widgets/radio.js type: application/javascript module-type: widget -Radio widget - -Will set a field to the selected value: - -``` - <$radio field="myfield" value="check 1">one</$radio> - <$radio field="myfield" value="check 2">two</$radio> - <$radio field="myfield" value="check 3">three</$radio> -``` - -|Parameter |Description |h -|tiddler |Name of the tiddler in which the field should be set. Defaults to current tiddler | -|field |The name of the field to be set | -|value |The value to set | -|class |Optional class name(s) | - +Set a field or index at a given tiddler via radio buttons \*/ (function(){ @@ -48,12 +33,15 @@ RadioWidget.prototype.render = function(parent,nextSibling) { this.computeAttributes(); // Execute our logic this.execute(); + var isChecked = this.getValue() === this.radioValue; // Create our elements this.labelDomNode = this.document.createElement("label"); - this.labelDomNode.setAttribute("class",this.radioClass); + this.labelDomNode.setAttribute("class", + "tc-radio " + this.radioClass + (isChecked ? " tc-radio-selected" : "") + ); this.inputDomNode = this.document.createElement("input"); this.inputDomNode.setAttribute("type","radio"); - if(this.getValue() == this.radioValue) { + if(isChecked) { this.inputDomNode.setAttribute("checked","true"); } this.labelDomNode.appendChild(this.inputDomNode); @@ -70,12 +58,20 @@ RadioWidget.prototype.render = function(parent,nextSibling) { }; RadioWidget.prototype.getValue = function() { - var tiddler = this.wiki.getTiddler(this.radioTitle); - return tiddler && tiddler.getFieldString(this.radioField); + var value, + tiddler = this.wiki.getTiddler(this.radioTitle); + if (this.radioIndex) { + value = this.wiki.extractTiddlerDataItem(this.radioTitle,this.radioIndex); + } else { + value = tiddler && tiddler.getFieldString(this.radioField); + } + return value; }; RadioWidget.prototype.setValue = function() { - if(this.radioField) { + if(this.radioIndex) { + this.wiki.setText(this.radioTitle,"",this.radioIndex,this.radioValue); + } else { var tiddler = this.wiki.getTiddler(this.radioTitle), addition = {}; addition[this.radioField] = this.radioValue; @@ -96,12 +92,9 @@ RadioWidget.prototype.execute = function() { // Get the parameters from the attributes this.radioTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler")); this.radioField = this.getAttribute("field","text"); + this.radioIndex = this.getAttribute("index"); this.radioValue = this.getAttribute("value"); this.radioClass = this.getAttribute("class",""); - if(this.radioClass !== "") { - this.radioClass += " "; - } - this.radioClass += "tc-radio"; // Make the child widgets this.makeChildWidgets(); }; @@ -111,7 +104,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of */ RadioWidget.prototype.refresh = function(changedTiddlers) { var changedAttributes = this.computeAttributes(); - if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.value || changedAttributes["class"]) { + if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.value || changedAttributes["class"]) { this.refreshSelf(); return true; } else { diff --git a/core/modules/widgets/range.js b/core/modules/widgets/range.js new file mode 100644 index 000000000..591dab482 --- /dev/null +++ b/core/modules/widgets/range.js @@ -0,0 +1,114 @@ +/*\ +title: $:/core/modules/widgets/range.js +type: application/javascript +module-type: widget + +Range widget + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +var Widget = require("$:/core/modules/widgets/widget.js").widget; + +var RangeWidget = function(parseTreeNode,options) { + this.initialise(parseTreeNode,options); +}; + +/* +Inherit from the base widget class +*/ +RangeWidget.prototype = new Widget(); + +/* +Render this widget into the DOM +*/ +RangeWidget.prototype.render = function(parent,nextSibling) { + // Save the parent dom node + this.parentDomNode = parent; + // Compute our attributes + this.computeAttributes(); + // Execute our logic + this.execute(); + // Create our elements + this.inputDomNode = this.document.createElement("input"); + this.inputDomNode.setAttribute("type","range"); + this.inputDomNode.setAttribute("class",this.elementClass); + if(this.minValue){ + this.inputDomNode.setAttribute("min", this.minValue); + } + if(this.maxValue){ + this.inputDomNode.setAttribute("max", this.maxValue); + } + if(this.increment){ + this.inputDomNode.setAttribute("step", this.increment); + } + this.inputDomNode.value = this.getValue(); + + + // Add a click event handler + $tw.utils.addEventListeners(this.inputDomNode,[ + {name: "input", handlerObject: this, handlerMethod: "handleChangeEvent"} + ]); + // Insert the label into the DOM and render any children + parent.insertBefore(this.inputDomNode,nextSibling); + this.domNodes.push(this.inputDomNode); +}; + +RangeWidget.prototype.getValue = function() { + var tiddler = this.wiki.getTiddler(this.tiddlerTitle), + value = this.defaultValue; + if(tiddler) { + if($tw.utils.hop(tiddler.fields,this.tiddlerField)) { + value = tiddler.fields[this.tiddlerField] || ""; + } else { + value = this.defaultValue || ""; + } + } + return value; +}; + +RangeWidget.prototype.handleChangeEvent = function(event) { + this.wiki.setText(this.tiddlerTitle ,this.tiddlerField, null,this.inputDomNode.value); +}; + +/* +Compute the internal state of the widget +*/ +RangeWidget.prototype.execute = function() { + // Get the parameters from the attributes + this.tiddlerTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler")); + this.tiddlerField = this.getAttribute("field"); + this.minValue = this.getAttribute("min"); + this.maxValue = this.getAttribute("max"); + this.increment = this.getAttribute("increment"); + this.defaultValue = this.getAttribute("default"); + this.elementClass = this.getAttribute("class",""); + // Make the child widgets + this.makeChildWidgets(); +}; + +/* +Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering +*/ +RangeWidget.prototype.refresh = function(changedTiddlers) { + var changedAttributes = this.computeAttributes(); + if(changedAttributes.tiddler || changedAttributes.field || changedAttributes['min'] || changedAttributes['max'] || changedAttributes['increment'] || changedAttributes["default"] || changedAttributes["class"]) { + this.refreshSelf(); + return true; + } else { + var refreshed = false; + if(changedTiddlers[this.tiddlerTitle]) { + this.inputDomNode.checked = this.getValue(); + refreshed = true; + } + return this.refreshChildren(changedTiddlers) || refreshed; + } +}; + +exports.range = RangeWidget; + +})(); diff --git a/core/modules/widgets/reveal.js b/core/modules/widgets/reveal.js index 4eec55ad3..a3bc8075b 100755 --- a/core/modules/widgets/reveal.js +++ b/core/modules/widgets/reveal.js @@ -121,17 +121,28 @@ RevealWidget.prototype.readState = function() { this.readPopupState(state); break; case "match": - this.readMatchState(state); + this.isOpen = !!(this.compareStateText(state) == 0); break; case "nomatch": - this.readMatchState(state); - this.isOpen = !this.isOpen; + this.isOpen = !(this.compareStateText(state) == 0); + break; + case "lt": + this.isOpen = !!(this.compareStateText(state) < 0); + break; + case "gt": + this.isOpen = !!(this.compareStateText(state) > 0); + break; + case "lteq": + this.isOpen = !(this.compareStateText(state) > 0); + break; + case "gteq": + this.isOpen = !(this.compareStateText(state) < 0); break; } }; -RevealWidget.prototype.readMatchState = function(state) { - this.isOpen = state === this.text; +RevealWidget.prototype.compareStateText = function(state) { + return state.localeCompare(this.text,undefined,{numeric: true,sensitivity: "case"}); }; RevealWidget.prototype.readPopupState = function(state) { @@ -182,6 +193,7 @@ RevealWidget.prototype.refresh = function(changedTiddlers) { Called by refresh() to dynamically show or hide the content */ RevealWidget.prototype.updateState = function() { + var self = this; // Read the current state this.readState(); // Construct the child nodes if needed @@ -202,8 +214,12 @@ RevealWidget.prototype.updateState = function() { $tw.anim.perform(this.openAnimation,domNode); } else { $tw.anim.perform(this.closeAnimation,domNode,{callback: function() { - domNode.setAttribute("hidden","true"); - }}); + //make sure that the state hasn't changed during the close animation + self.readState() + if(!self.isOpen) { + domNode.setAttribute("hidden","true"); + } + }}); } }; diff --git a/core/modules/widgets/select.js b/core/modules/widgets/select.js index 4d1111730..cf094687b 100644 --- a/core/modules/widgets/select.js +++ b/core/modules/widgets/select.js @@ -72,7 +72,7 @@ SelectWidget.prototype.setSelectValue = function() { var value = this.selectDefault; // Get the value if(this.selectIndex) { - value = this.wiki.extractTiddlerDataItem(this.selectTitle,this.selectIndex); + value = this.wiki.extractTiddlerDataItem(this.selectTitle,this.selectIndex,value); } else { var tiddler = this.wiki.getTiddler(this.selectTitle); if(tiddler) { diff --git a/core/modules/widgets/setvariable.js b/core/modules/widgets/setvariable.js index f75fa2c98..40dbadf16 100755 --- a/core/modules/widgets/setvariable.js +++ b/core/modules/widgets/setvariable.js @@ -40,10 +40,15 @@ SetWidget.prototype.execute = function() { // Get our parameters this.setName = this.getAttribute("name","currentTiddler"); this.setFilter = this.getAttribute("filter"); + this.setSelect = this.getAttribute("select"); + this.setTiddler = this.getAttribute("tiddler"); + this.setSubTiddler = this.getAttribute("subtiddler"); + this.setField = this.getAttribute("field"); + this.setIndex = this.getAttribute("index"); this.setValue = this.getAttribute("value"); this.setEmptyValue = this.getAttribute("emptyValue"); // Set context variable - this.setVariable(this.setName,this.getValue(),this.parseTreeNode.params); + this.setVariable(this.setName,this.getValue(),this.parseTreeNode.params,!!this.parseTreeNode.isMacroDefinition); // Construct the child widgets this.makeChildWidgets(); }; @@ -53,10 +58,34 @@ Get the value to be assigned */ SetWidget.prototype.getValue = function() { var value = this.setValue; - if(this.setFilter) { + if(this.setTiddler) { + var tiddler; + if(this.setSubTiddler) { + tiddler = this.wiki.getSubTiddler(this.setTiddler,this.setSubTiddler); + } else { + tiddler = this.wiki.getTiddler(this.setTiddler); + } + if(!tiddler) { + value = this.setEmptyValue; + } else if(this.setField) { + value = tiddler.getFieldString(this.setField) || this.setEmptyValue; + } else if(this.setIndex) { + value = this.wiki.extractTiddlerDataItem(this.setTiddler,this.setIndex,this.setEmptyValue); + } else { + value = tiddler.fields.text || this.setEmptyValue ; + } + } else if(this.setFilter) { var results = this.wiki.filterTiddlers(this.setFilter,this); - if(!this.setValue) { - value = $tw.utils.stringifyList(results); + if(this.setValue == null) { + var select; + if(this.setSelect) { + select = parseInt(this.setSelect,10); + } + if(select !== undefined) { + value = results[select] || ""; + } else { + value = $tw.utils.stringifyList(results); + } } if(results.length === 0 && this.setEmptyValue !== undefined) { value = this.setEmptyValue; @@ -64,7 +93,7 @@ SetWidget.prototype.getValue = function() { } else if(!value && this.setEmptyValue) { value = this.setEmptyValue; } - return value; + return value || ""; }; /* @@ -72,7 +101,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of */ SetWidget.prototype.refresh = function(changedTiddlers) { var changedAttributes = this.computeAttributes(); - if(changedAttributes.name || changedAttributes.filter || changedAttributes.value || changedAttributes.emptyValue || + if(changedAttributes.name || changedAttributes.filter || changedAttributes.select || changedAttributes.tiddler || (this.setTiddler && changedTiddlers[this.setTiddler]) || changedAttributes.field || changedAttributes.index || changedAttributes.value || changedAttributes.emptyValue || (this.setFilter && this.getValue() != this.variables[this.setName].value)) { this.refreshSelf(); return true; diff --git a/core/modules/widgets/view.js b/core/modules/widgets/view.js index bbe9106be..30da34147 100755 --- a/core/modules/widgets/view.js +++ b/core/modules/widgets/view.js @@ -51,15 +51,16 @@ ViewWidget.prototype.execute = function() { this.viewIndex = this.getAttribute("index"); this.viewFormat = this.getAttribute("format","text"); this.viewTemplate = this.getAttribute("template",""); + this.viewMode = this.getAttribute("mode","block"); switch(this.viewFormat) { case "htmlwikified": - this.text = this.getValueAsHtmlWikified(); + this.text = this.getValueAsHtmlWikified(this.viewMode); break; case "plainwikified": - this.text = this.getValueAsPlainWikified(); + this.text = this.getValueAsPlainWikified(this.viewMode); break; case "htmlencodedplainwikified": - this.text = this.getValueAsHtmlEncodedPlainWikified(); + this.text = this.getValueAsHtmlEncodedPlainWikified(this.viewMode); break; case "htmlencoded": this.text = this.getValueAsHtmlEncoded(); @@ -134,16 +135,25 @@ ViewWidget.prototype.getValueAsText = function() { return this.getValue({asString: true}); }; -ViewWidget.prototype.getValueAsHtmlWikified = function() { - return this.wiki.renderText("text/html","text/vnd.tiddlywiki",this.getValueAsText(),{parentWidget: this}); +ViewWidget.prototype.getValueAsHtmlWikified = function(mode) { + return this.wiki.renderText("text/html","text/vnd.tiddlywiki",this.getValueAsText(),{ + parseAsInline: mode !== "block", + parentWidget: this + }); }; -ViewWidget.prototype.getValueAsPlainWikified = function() { - return this.wiki.renderText("text/plain","text/vnd.tiddlywiki",this.getValueAsText(),{parentWidget: this}); +ViewWidget.prototype.getValueAsPlainWikified = function(mode) { + return this.wiki.renderText("text/plain","text/vnd.tiddlywiki",this.getValueAsText(),{ + parseAsInline: mode !== "block", + parentWidget: this + }); }; -ViewWidget.prototype.getValueAsHtmlEncodedPlainWikified = function() { - return $tw.utils.htmlEncode(this.wiki.renderText("text/plain","text/vnd.tiddlywiki",this.getValueAsText(),{parentWidget: this})); +ViewWidget.prototype.getValueAsHtmlEncodedPlainWikified = function(mode) { + return $tw.utils.htmlEncode(this.wiki.renderText("text/plain","text/vnd.tiddlywiki",this.getValueAsText(),{ + parseAsInline: mode !== "block", + parentWidget: this + })); }; ViewWidget.prototype.getValueAsHtmlEncoded = function() { diff --git a/core/modules/widgets/widget.js b/core/modules/widgets/widget.js index cf51fcbe4..28b9f4e35 100755 --- a/core/modules/widgets/widget.js +++ b/core/modules/widgets/widget.js @@ -71,9 +71,10 @@ Set the value of a context variable name: name of the variable value: value of the variable params: array of {name:, default:} for each parameter +isMacroDefinition: true if the variable is set via a \define macro pragma (and hence should have variable substitution performed) */ -Widget.prototype.setVariable = function(name,value,params) { - this.variables[name] = {value: value, params: params}; +Widget.prototype.setVariable = function(name,value,params,isMacroDefinition) { + this.variables[name] = {value: value, params: params, isMacroDefinition: !!isMacroDefinition}; }; /* @@ -83,52 +84,76 @@ options: see below Options include params: array of {name:, value:} for each parameter defaultValue: default value if the variable is not defined + +Returns an object with the following fields: + +params: array of {name:,value:} of parameters passed to wikitext variables +text: text of variable, with parameters properly substituted */ -Widget.prototype.getVariable = function(name,options) { +Widget.prototype.getVariableInfo = function(name,options) { options = options || {}; var actualParams = options.params || [], parentWidget = this.parentWidget; // Check for the variable defined in the parent widget (or an ancestor in the prototype chain) if(parentWidget && name in parentWidget.variables) { var variable = parentWidget.variables[name], - value = variable.value; + value = variable.value, + params = this.resolveVariableParameters(variable.params,actualParams); // Substitute any parameters specified in the definition - value = this.substituteVariableParameters(value,variable.params,actualParams); - value = this.substituteVariableReferences(value); - return value; + $tw.utils.each(params,function(param) { + value = $tw.utils.replaceString(value,new RegExp("\\$" + $tw.utils.escapeRegExp(param.name) + "\\$","mg"),param.value); + }); + // Only substitute variable references if this variable was defined with the \define pragma + if(variable.isMacroDefinition) { + value = this.substituteVariableReferences(value); + } + return { + text: value, + params: params + }; } // If the variable doesn't exist in the parent widget then look for a macro module - return this.evaluateMacroModule(name,actualParams,options.defaultValue); + return { + text: this.evaluateMacroModule(name,actualParams,options.defaultValue) + }; }; -Widget.prototype.substituteVariableParameters = function(text,formalParams,actualParams) { - if(formalParams) { - var nextAnonParameter = 0, // Next candidate anonymous parameter in macro call - paramInfo, paramValue; - // Step through each of the parameters in the macro definition - for(var p=0; p<formalParams.length; p++) { - // Check if we've got a macro call parameter with the same name - paramInfo = formalParams[p]; - paramValue = undefined; - for(var m=0; m<actualParams.length; m++) { - if(actualParams[m].name === paramInfo.name) { - paramValue = actualParams[m].value; - } +/* +Simplified version of getVariableInfo() that just returns the text +*/ +Widget.prototype.getVariable = function(name,options) { + return this.getVariableInfo(name,options).text; +}; + +Widget.prototype.resolveVariableParameters = function(formalParams,actualParams) { + formalParams = formalParams || []; + actualParams = actualParams || []; + var nextAnonParameter = 0, // Next candidate anonymous parameter in macro call + paramInfo, paramValue, + results = []; + // Step through each of the parameters in the macro definition + for(var p=0; p<formalParams.length; p++) { + // Check if we've got a macro call parameter with the same name + paramInfo = formalParams[p]; + paramValue = undefined; + for(var m=0; m<actualParams.length; m++) { + if(actualParams[m].name === paramInfo.name) { + paramValue = actualParams[m].value; } - // If not, use the next available anonymous macro call parameter - while(nextAnonParameter < actualParams.length && actualParams[nextAnonParameter].name) { - nextAnonParameter++; - } - if(paramValue === undefined && nextAnonParameter < actualParams.length) { - paramValue = actualParams[nextAnonParameter++].value; - } - // If we've still not got a value, use the default, if any - paramValue = paramValue || paramInfo["default"] || ""; - // Replace any instances of this parameter - text = text.replace(new RegExp("\\$" + $tw.utils.escapeRegExp(paramInfo.name) + "\\$","mg"),paramValue); } + // If not, use the next available anonymous macro call parameter + while(nextAnonParameter < actualParams.length && actualParams[nextAnonParameter].name) { + nextAnonParameter++; + } + if(paramValue === undefined && nextAnonParameter < actualParams.length) { + paramValue = actualParams[nextAnonParameter++].value; + } + // If we've still not got a value, use the default, if any + paramValue = paramValue || paramInfo["default"] || ""; + // Store the parameter name and value + results.push({name: paramInfo.name, value: paramValue}); } - return text; + return results; }; Widget.prototype.substituteVariableReferences = function(text) { @@ -222,7 +247,9 @@ Widget.prototype.computeAttributes = function() { self = this, value; $tw.utils.each(this.parseTreeNode.attributes,function(attribute,name) { - if(attribute.type === "indirect") { + if(attribute.type === "filtered") { + value = self.wiki.filterTiddlers(attribute.filter,self)[0] || ""; + } else if(attribute.type === "indirect") { value = self.wiki.getTextReference(attribute.textReference,"",self.getVariable("currentTiddler")); } else if(attribute.type === "macro") { value = self.getVariable(attribute.value.name,{params: attribute.value.params}); @@ -493,8 +520,11 @@ Widget.prototype.invokeActions = function(triggeringWidget,event) { for(var t=0; t<this.children.length; t++) { var child = this.children[t]; // Invoke the child if it is an action widget - if(child.invokeAction && child.invokeAction(triggeringWidget,event)) { - handled = true; + if(child.invokeAction) { + child.refreshSelf(); + if(child.invokeAction(triggeringWidget,event)) { + handled = true; + } } // Propagate through through the child if it permits it if(child.allowActionPropagation() && child.invokeActions(triggeringWidget,event)) { @@ -507,7 +537,7 @@ Widget.prototype.invokeActions = function(triggeringWidget,event) { /* Invoke the action widgets defined in a string */ -Widget.prototype.invokeActionString = function(actions,triggeringWidget,event) { +Widget.prototype.invokeActionString = function(actions,triggeringWidget,event,variables) { actions = actions || ""; var parser = this.wiki.parseText("text/vnd.tiddlywiki",actions,{ parentWidget: this, @@ -515,7 +545,8 @@ Widget.prototype.invokeActionString = function(actions,triggeringWidget,event) { }), widgetNode = this.wiki.makeWidget(parser,{ parentWidget: this, - document: this.document + document: this.document, + variables: variables }); var container = this.document.createElement("div"); widgetNode.render(container,null); diff --git a/core/modules/widgets/wikify.js b/core/modules/widgets/wikify.js index 3c99c8e5c..853ebff1b 100644 --- a/core/modules/widgets/wikify.js +++ b/core/modules/widgets/wikify.js @@ -71,6 +71,9 @@ WikifyWidget.prototype.getResult = function() { case "text": result = this.wikifyContainer.textContent; break; + case "formattedtext": + result = this.wikifyContainer.formattedTextContent; + break; case "html": result = this.wikifyContainer.innerHTML; break; diff --git a/core/modules/wiki-bulkops.js b/core/modules/wiki-bulkops.js index ce72f1c99..fa2acbe19 100644 --- a/core/modules/wiki-bulkops.js +++ b/core/modules/wiki-bulkops.js @@ -15,39 +15,69 @@ Bulk tiddler operations such as rename. /* Rename a tiddler, and relink any tags or lists that reference it. */ -exports.renameTiddler = function(fromTitle,toTitle) { - var self = this; +function renameTiddler(fromTitle,toTitle,options) { fromTitle = (fromTitle || "").trim(); toTitle = (toTitle || "").trim(); + options = options || {}; if(fromTitle && toTitle && fromTitle !== toTitle) { // Rename the tiddler itself - var tiddler = this.getTiddler(fromTitle); - this.addTiddler(new $tw.Tiddler(tiddler,{title: toTitle},this.getModificationFields())); + var oldTiddler = this.getTiddler(fromTitle), + newTiddler = new $tw.Tiddler(oldTiddler,{title: toTitle},this.getModificationFields()); + newTiddler = $tw.hooks.invokeHook("th-renaming-tiddler",newTiddler,oldTiddler); + this.addTiddler(newTiddler); this.deleteTiddler(fromTitle); // Rename any tags or lists that reference it - this.each(function(tiddler,title) { - var tags = (tiddler.fields.tags || []).slice(0), - list = (tiddler.fields.list || []).slice(0), - isModified = false; - // Rename tags - $tw.utils.each(tags,function (title,index) { - if(title === fromTitle) { - tags[index] = toTitle; - isModified = true; - } - }); - // Rename lists - $tw.utils.each(list,function (title,index) { - if(title === fromTitle) { - list[index] = toTitle; - isModified = true; - } - }); - if(isModified) { - self.addTiddler(new $tw.Tiddler(tiddler,{tags: tags, list: list},self.getModificationFields())); - } - }); + this.relinkTiddler(fromTitle,toTitle,options) } } +/* +Relink any tags or lists that reference a given tiddler +*/ +function relinkTiddler(fromTitle,toTitle,options) { + var self = this; + fromTitle = (fromTitle || "").trim(); + toTitle = (toTitle || "").trim(); + options = options || {}; + if(fromTitle && toTitle && fromTitle !== toTitle) { + this.each(function(tiddler,title) { + var type = tiddler.fields.type || ""; + // Don't touch plugins or JavaScript modules + if(!tiddler.fields["plugin-type"] && type !== "application/javascript") { + var tags = (tiddler.fields.tags || []).slice(0), + list = (tiddler.fields.list || []).slice(0), + isModified = false; + if(!options.dontRenameInTags) { + // Rename tags + $tw.utils.each(tags,function (title,index) { + if(title === fromTitle) { +console.log("Renaming tag '" + tags[index] + "' to '" + toTitle + "' of tiddler '" + tiddler.fields.title + "'"); + tags[index] = toTitle; + isModified = true; + } + }); + } + if(!options.dontRenameInLists) { + // Rename lists + $tw.utils.each(list,function (title,index) { + if(title === fromTitle) { +console.log("Renaming list item '" + list[index] + "' to '" + toTitle + "' of tiddler '" + tiddler.fields.title + "'"); + list[index] = toTitle; + isModified = true; + } + }); + } + if(isModified) { + var newTiddler = new $tw.Tiddler(tiddler,{tags: tags, list: list},self.getModificationFields()) + newTiddler = $tw.hooks.invokeHook("th-relinking-tiddler",newTiddler,tiddler); + self.addTiddler(newTiddler); + } + } + }); + } +}; + +exports.renameTiddler = renameTiddler; +exports.relinkTiddler = relinkTiddler; + })(); diff --git a/core/modules/wiki.js b/core/modules/wiki.js index 22f2aafbc..e73ed8362 100755 --- a/core/modules/wiki.js +++ b/core/modules/wiki.js @@ -24,7 +24,8 @@ Adds the following properties to the wiki object: var widget = require("$:/core/modules/widgets/widget.js"); -var USER_NAME_TITLE = "$:/status/UserName"; +var USER_NAME_TITLE = "$:/status/UserName", + TIMESTAMP_DISABLE_TITLE = "$:/config/TimestampDisable"; /* Get the value of a text reference. Text references can have any of these forms: @@ -231,27 +232,35 @@ exports.importTiddler = function(tiddler) { Return a hashmap of the fields that should be set when a tiddler is created */ exports.getCreationFields = function() { - var fields = { - created: new Date() - }, - creator = this.getTiddlerText(USER_NAME_TITLE); - if(creator) { - fields.creator = creator; + if(this.getTiddlerText(TIMESTAMP_DISABLE_TITLE,"").toLowerCase() !== "yes") { + var fields = { + created: new Date() + }, + creator = this.getTiddlerText(USER_NAME_TITLE); + if(creator) { + fields.creator = creator; + } + return fields; + } else { + return {}; } - return fields; }; /* Return a hashmap of the fields that should be set when a tiddler is modified */ exports.getModificationFields = function() { - var fields = Object.create(null), - modifier = this.getTiddlerText(USER_NAME_TITLE); - fields.modified = new Date(); - if(modifier) { - fields.modifier = modifier; + if(this.getTiddlerText(TIMESTAMP_DISABLE_TITLE,"").toLowerCase() !== "yes") { + var fields = Object.create(null), + modifier = this.getTiddlerText(USER_NAME_TITLE); + fields.modified = new Date(); + if(modifier) { + fields.modifier = modifier; + } + return fields; + } else { + return {}; } - return fields; }; /* @@ -320,7 +329,7 @@ Sort an array of tiddler titles by a specified field isDescending: true if the sort should be descending isCaseSensitive: true if the sort should consider upper and lower case letters to be different */ -exports.sortTiddlers = function(titles,sortField,isDescending,isCaseSensitive,isNumeric) { +exports.sortTiddlers = function(titles,sortField,isDescending,isCaseSensitive,isNumeric,isAlphaNumeric) { var self = this; titles.sort(function(a,b) { var x,y, @@ -328,7 +337,7 @@ exports.sortTiddlers = function(titles,sortField,isDescending,isCaseSensitive,is var result = isNaN(x) && !isNaN(y) ? (isDescending ? -1 : 1) : !isNaN(x) && isNaN(y) ? (isDescending ? 1 : -1) : - (isDescending ? y - x : x - y); + (isDescending ? y - x : x - y); return result; }; if(sortField !== "title") { @@ -349,6 +358,8 @@ exports.sortTiddlers = function(titles,sortField,isDescending,isCaseSensitive,is y = Number(b); if(isNumeric && (!isNaN(x) || !isNaN(y))) { return compareNumbers(x,y); + } else if(isAlphaNumeric) { + return isDescending ? b.localeCompare(a,undefined,{numeric: true,sensitivity: "base"}) : a.localeCompare(b,undefined,{numeric: true,sensitivity: "base"}); } else if($tw.utils.isDate(a) && $tw.utils.isDate(b)) { return isDescending ? b - a : a - b; } else { @@ -558,6 +569,8 @@ exports.sortByList = function(array,listTitle) { afterTitle = tiddler.fields["list-after"]; if(beforeTitle === "") { newPos = 0; + } else if(afterTitle === "") { + newPos = titles.length; } else if(beforeTitle) { newPos = titles.indexOf(beforeTitle); } else if(afterTitle) { @@ -632,10 +645,10 @@ exports.getTiddlerDataCached = function(titleOrTiddler,defaultData) { if(tiddler) { return this.getCacheForTiddler(tiddler.fields.title,"data",function() { // Return the frozen value - var value = self.getTiddlerData(tiddler.fields.title,defaultData); + var value = self.getTiddlerData(tiddler.fields.title,undefined); $tw.utils.deepFreeze(value); return value; - }); + }) || defaultData; } else { return defaultData; } @@ -671,7 +684,7 @@ exports.getTiddlerData = function(titleOrTiddler,defaultData) { Extract an indexed field from within a data tiddler */ exports.extractTiddlerDataItem = function(titleOrTiddler,index,defaultText) { - var data = this.getTiddlerData(titleOrTiddler,Object.create(null)), + var data = this.getTiddlerDataCached(titleOrTiddler,Object.create(null)), text; if(data && $tw.utils.hop(data,index)) { text = data[index]; @@ -772,6 +785,14 @@ exports.initParsers = function(moduleType) { } } }); + // Use the generic binary parser for any binary types not registered so far + if($tw.Wiki.parsers["application/octet-stream"]) { + Object.keys($tw.config.contentTypeInfo).forEach(function(type) { + if(!$tw.utils.hop($tw.Wiki.parsers,type) && $tw.config.contentTypeInfo[type].encoding === "base64") { + $tw.Wiki.parsers[type] = $tw.Wiki.parsers["application/octet-stream"]; + } + }); + } }; /* @@ -834,7 +855,7 @@ exports.parseTextReference = function(title,field,index,options) { } if(field === "text" || (!field && !index)) { if(tiddler && tiddler.fields) { - return this.parseText(tiddler.fields.type || "text/vnd.tiddlywiki",tiddler.fields.text,options); + return this.parseText(tiddler.fields.type,tiddler.fields.text,options); } else { return null; } @@ -904,31 +925,54 @@ options: as for wiki.makeWidget() plus: options.field: optional field to transclude (defaults to "text") options.mode: transclusion mode "inline" or "block" options.children: optional array of children for the transclude widget +options.importVariables: optional importvariables filter string for macros to be included +options.importPageMacros: optional boolean; if true, equivalent to passing "[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]" to options.importVariables */ exports.makeTranscludeWidget = function(title,options) { options = options || {}; - var parseTree = {tree: [{ + var parseTreeDiv = {tree: [{ type: "element", tag: "div", - children: [{ - type: "transclude", - attributes: { - tiddler: { - name: "tiddler", - type: "string", - value: title}}, - isBlock: !options.parseAsInline}]} - ]}; + children: []}]}, + parseTreeImportVariables = { + type: "importvariables", + attributes: { + filter: { + name: "filter", + type: "string" + } + }, + isBlock: false, + children: []}, + parseTreeTransclude = { + type: "transclude", + attributes: { + tiddler: { + name: "tiddler", + type: "string", + value: title}}, + isBlock: !options.parseAsInline}; + if(options.importVariables || options.importPageMacros) { + if(options.importVariables) { + parseTreeImportVariables.attributes.filter.value = options.importVariables; + } else if(options.importPageMacros) { + parseTreeImportVariables.attributes.filter.value = "[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"; + } + parseTreeDiv.tree[0].children.push(parseTreeImportVariables); + parseTreeImportVariables.children.push(parseTreeTransclude); + } else { + parseTreeDiv.tree[0].children.push(parseTreeTransclude); + } if(options.field) { - parseTree.tree[0].children[0].attributes.field = {type: "string", value: options.field}; + parseTreeTransclude.attributes.field = {type: "string", value: options.field}; } if(options.mode) { - parseTree.tree[0].children[0].attributes.mode = {type: "string", value: options.mode}; + parseTreeTransclude.attributes.mode = {type: "string", value: options.mode}; } if(options.children) { - parseTree.tree[0].children[0].children = options.children; + parseTreeTransclude.children = options.children; } - return $tw.wiki.makeWidget(parseTree,options); + return $tw.wiki.makeWidget(parseTreeDiv,options); }; /* @@ -1074,19 +1118,43 @@ exports.getTiddlerText = function(title,defaultText) { } }; +/* +Check whether the text of a tiddler matches a given value. By default, the comparison is case insensitive, and any spaces at either end of the tiddler text is trimmed +*/ +exports.checkTiddlerText = function(title,targetText,options) { + options = options || {}; + var text = this.getTiddlerText(title,""); + if(!options.noTrim) { + text = text.trim(); + } + if(!options.caseSensitive) { + text = text.toLowerCase(); + targetText = targetText.toLowerCase(); + } + return text === targetText; +} + /* Read an array of browser File objects, invoking callback(tiddlerFieldsArray) once they're all read */ -exports.readFiles = function(files,callback) { +exports.readFiles = function(files,options) { + var callback; + if(typeof options === "function") { + callback = options; + options = {}; + } else { + callback = options.callback; + } var result = [], - outstanding = files.length; - for(var f=0; f<files.length; f++) { - this.readFile(files[f],function(tiddlerFieldsArray) { + outstanding = files.length, + readFileCallback = function(tiddlerFieldsArray) { result.push.apply(result,tiddlerFieldsArray); if(--outstanding === 0) { callback(result); } - }); + }; + for(var f=0; f<files.length; f++) { + this.readFile(files[f],Object.assign({},options,{callback: readFileCallback})); } return files.length; }; @@ -1094,7 +1162,14 @@ exports.readFiles = function(files,callback) { /* Read a browser File object, invoking callback(tiddlerFieldsArray) with an array of tiddler fields objects */ -exports.readFile = function(file,callback) { +exports.readFile = function(file,options) { + var callback; + if(typeof options === "function") { + callback = options; + options = {}; + } else { + callback = options.callback; + } // Get the type, falling back to the filename extension var self = this, type = file.type; @@ -1114,33 +1189,44 @@ exports.readFile = function(file,callback) { if($tw.log.IMPORT) { console.log("Importing file '" + file.name + "', type: '" + type + "', isBinary: " + isBinary); } + // Give the hook a chance to process the drag + if($tw.hooks.invokeHook("th-importing-file",{ + file: file, + type: type, + isBinary: isBinary, + callback: callback + }) !== true) { + this.readFileContent(file,type,isBinary,options.deserializer,callback); + } +}; + +/* +Lower level utility to read the content of a browser File object, invoking callback(tiddlerFieldsArray) with an array of tiddler fields objects +*/ +exports.readFileContent = function(file,type,isBinary,deserializer,callback) { + var self = this; // Create the FileReader var reader = new FileReader(); // Onload reader.onload = function(event) { - // Deserialise the file contents var text = event.target.result, tiddlerFields = {title: file.name || "Untitled", type: type}; - // Are we binary? if(isBinary) { - // The base64 section starts after the first comma in the data URI var commaPos = text.indexOf(","); if(commaPos !== -1) { - tiddlerFields.text = text.substr(commaPos+1); - callback([tiddlerFields]); + text = text.substr(commaPos + 1); } + } + // Check whether this is an encrypted TiddlyWiki file + var encryptedJson = $tw.utils.extractEncryptedStoreArea(text); + if(encryptedJson) { + // If so, attempt to decrypt it with the current password + $tw.utils.decryptStoreAreaInteractive(encryptedJson,function(tiddlers) { + callback(tiddlers); + }); } else { - // Check whether this is an encrypted TiddlyWiki file - var encryptedJson = $tw.utils.extractEncryptedStoreArea(text); - if(encryptedJson) { - // If so, attempt to decrypt it with the current password - $tw.utils.decryptStoreAreaInteractive(encryptedJson,function(tiddlers) { - callback(tiddlers); - }); - } else { - // Otherwise, just try to deserialise any tiddlers in the file - callback(self.deserializeTiddlers(type,text,tiddlerFields)); - } + // Otherwise, just try to deserialise any tiddlers in the file + callback(self.deserializeTiddlers(type,text,tiddlerFields,{deserializer: deserializer})); } }; // Kick off the read @@ -1219,3 +1305,4 @@ exports.invokeUpgraders = function(titles,tiddlers) { }; })(); + diff --git a/core/palettes/Vanilla.tid b/core/palettes/Vanilla.tid index df86fe5ae..1b26e9fa7 100644 --- a/core/palettes/Vanilla.tid +++ b/core/palettes/Vanilla.tid @@ -16,6 +16,14 @@ button-border: code-background: #f7f7f9 code-border: #e1e1e8 code-foreground: #dd1144 +diff-delete-background: #ffc9c9 +diff-delete-foreground: <<colour foreground>> +diff-equal-background: +diff-equal-foreground: <<colour foreground>> +diff-insert-background: #aaefad +diff-insert-foreground: <<colour foreground>> +diff-invisible-background: +diff-invisible-foreground: <<colour muted-foreground>> dirty-indicator: #ff0000 download-background: #34c734 download-foreground: <<colour background>> diff --git a/core/sjcl-license.tid b/core/sjcl-license.tid new file mode 100755 index 000000000..be9751832 --- /dev/null +++ b/core/sjcl-license.tid @@ -0,0 +1,61 @@ +title: $:/library/sjcl.js/license +type: text/plain + +SJCL is open. You can use, modify and redistribute it under a BSD +license or under the GNU GPL, version 2.0. + +--------------------------------------------------------------------- + +http://opensource.org/licenses/BSD-2-Clause + +Copyright (c) 2009-2015, Emily Stark, Mike Hamburg and Dan Boneh at +Stanford University. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +1. Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +--------------------------------------------------------------------- + +http://opensource.org/licenses/GPL-2.0 + +The Stanford Javascript Crypto Library (hosted here on GitHub) is a +project by the Stanford Computer Security Lab to build a secure, +powerful, fast, small, easy-to-use, cross-browser library for +cryptography in Javascript. + +Copyright (c) 2009-2015, Emily Stark, Mike Hamburg and Dan Boneh at +Stanford University. + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +59 Temple Place, Suite 330, Boston, MA 02111-1307 USA \ No newline at end of file diff --git a/core/templates/MOTW.html.tid b/core/templates/MOTW.html.tid index 0a16bb790..b50357ee3 100644 --- a/core/templates/MOTW.html.tid +++ b/core/templates/MOTW.html.tid @@ -2,4 +2,4 @@ title: $:/core/templates/MOTW.html \rules only filteredtranscludeinline transcludeinline entity <!-- The following comment is called a MOTW comment and is necessary for the TiddlyIE Internet Explorer extension --> -<!-- saved from url=(0021)http://tiddlywiki.com --> \ No newline at end of file +<!-- saved from url=(0021)https://tiddlywiki.com --> \ No newline at end of file diff --git a/core/templates/canonical-uri-external-raw.tid b/core/templates/canonical-uri-external-raw.tid new file mode 100644 index 000000000..564da18c7 --- /dev/null +++ b/core/templates/canonical-uri-external-raw.tid @@ -0,0 +1,8 @@ +title: $:/core/templates/canonical-uri-external-raw + +<!-- + +This template is used to assign the ''_canonical_uri'' field to external raw files that are stored in the same directory + +--> +<$view field="title" format="doubleurlencoded"/> \ No newline at end of file diff --git a/core/templates/json-tiddler.tid b/core/templates/json-tiddler.tid new file mode 100644 index 000000000..c9b9262bf --- /dev/null +++ b/core/templates/json-tiddler.tid @@ -0,0 +1,7 @@ +title: $:/core/templates/json-tiddler + +<!-- + +This template is used for saving tiddlers as raw JSON + +--><$text text=<<jsontiddler>>/> \ No newline at end of file diff --git a/core/templates/static.content.tid b/core/templates/static.content.tid index 5be6cf953..2de15874b 100644 --- a/core/templates/static.content.tid +++ b/core/templates/static.content.tid @@ -1,8 +1,7 @@ title: $:/core/templates/static.content -type: text/vnd.tiddlywiki <!-- For Google, and people without JavaScript--> -This [[TiddlyWiki|http://tiddlywiki.com]] contains the following tiddlers: +This [[TiddlyWiki|https://tiddlywiki.com]] contains the following tiddlers: <ul> <$list filter=<<saveTiddlerFilter>>> diff --git a/core/templates/tiddlywiki5.html.tid b/core/templates/tiddlywiki5.html.tid index 160d5040b..a2c23c267 100644 --- a/core/templates/tiddlywiki5.html.tid +++ b/core/templates/tiddlywiki5.html.tid @@ -4,7 +4,7 @@ title: $:/core/templates/tiddlywiki5.html <!doctype html> {{$:/core/templates/MOTW.html}}<html> <head> -<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <!-- Force IE standards mode for Intranet and HTA - should be the first meta --> +<meta http-equiv="X-UA-Compatible" content="IE=Edge"> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta name="application-name" content="TiddlyWiki" /> <meta name="generator" content="TiddlyWiki" /> @@ -21,6 +21,7 @@ title: $:/core/templates/tiddlywiki5.html <!--~~ Raw markup ~~--> {{{ [all[shadows+tiddlers]tag[$:/core/wiki/rawmarkup]] [all[shadows+tiddlers]tag[$:/tags/RawMarkup]] ||$:/core/templates/plain-text-tiddler}}} +{{{ [all[shadows+tiddlers]tag[$:/tags/RawMarkupWikified]] ||$:/core/templates/raw-static-tiddler}}} </head> <body class="tc-body"> <!--~~ Static styles ~~--> diff --git a/core/ui/AboveStory/tw2-plugin-check.tid b/core/ui/AboveStory/tw2-plugin-check.tid index cce2deb9c..6c3687ad2 100644 --- a/core/ui/AboveStory/tw2-plugin-check.tid +++ b/core/ui/AboveStory/tw2-plugin-check.tid @@ -10,7 +10,7 @@ tags: $:/tags/AboveStory <ul> -<$list filter="[all[system+tiddlers]tag[systemConfig]limit[1]]"> +<$list filter="[all[system+tiddlers]tag[systemConfig]]"> <li> diff --git a/core/ui/AdvancedSearch/Shadows.tid b/core/ui/AdvancedSearch/Shadows.tid index cd4a6cd38..b2455bfbb 100644 --- a/core/ui/AdvancedSearch/Shadows.tid +++ b/core/ui/AdvancedSearch/Shadows.tid @@ -21,6 +21,8 @@ caption: {{$:/language/Search/Shadows/Caption}} <$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> +<$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem"> + <$set name="resultCount" value="""<$count filter="[all[shadows]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]]"/>"""> <div class="tc-search-results"> @@ -33,6 +35,8 @@ caption: {{$:/language/Search/Shadows/Caption}} </$set> +</$list> + </$reveal> <$reveal state="$:/temp/advancedsearch" type="match" text=""> diff --git a/core/ui/AdvancedSearch/Standard.tid b/core/ui/AdvancedSearch/Standard.tid index 174e6b24a..2342cb5b7 100644 --- a/core/ui/AdvancedSearch/Standard.tid +++ b/core/ui/AdvancedSearch/Standard.tid @@ -20,6 +20,7 @@ caption: {{$:/language/Search/Standard/Caption}} </$linkcatcher> <$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> +<$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem"> <$set name="searchTiddler" value="$:/temp/advancedsearch"> <$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]" emptyMessage=""" <$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"> @@ -29,4 +30,5 @@ caption: {{$:/language/Search/Standard/Caption}} <$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]" default={{$:/config/SearchResults/Default}}/> </$list> </$set> +</$list> </$reveal> diff --git a/core/ui/AdvancedSearch/System.tid b/core/ui/AdvancedSearch/System.tid index 19cdfa86e..6de9d0786 100644 --- a/core/ui/AdvancedSearch/System.tid +++ b/core/ui/AdvancedSearch/System.tid @@ -21,6 +21,8 @@ caption: {{$:/language/Search/System/Caption}} <$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> +<$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem"> + <$set name="resultCount" value="""<$count filter="[is[system]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]]"/>"""> <div class="tc-search-results"> @@ -33,6 +35,8 @@ caption: {{$:/language/Search/System/Caption}} </$set> +</$list> + </$reveal> <$reveal state="$:/temp/advancedsearch" type="match" text=""> diff --git a/core/ui/Components/plugin-info.tid b/core/ui/Components/plugin-info.tid new file mode 100644 index 000000000..7f548e1aa --- /dev/null +++ b/core/ui/Components/plugin-info.tid @@ -0,0 +1,90 @@ +title: $:/core/ui/Components/plugin-info + +\define lingo-base() $:/language/ControlPanel/Plugins/ + +\define popup-state-macro() +$(qualified-state)$-$(currentTiddler)$ +\end + +\define tabs-state-macro() +$(popup-state)$-$(pluginInfoType)$ +\end + +\define plugin-icon-title() +$(currentTiddler)$/icon +\end + +\define plugin-disable-title() +$:/config/Plugins/Disabled/$(currentTiddler)$ +\end + +\define plugin-table-body(type,disabledMessage,default-popup-state) +<div class="tc-plugin-info-chunk tc-small-icon"> +<$reveal type="nomatch" state=<<popup-state>> text="yes" default="""$default-popup-state$"""> +<$button class="tc-btn-invisible tc-btn-dropdown" set=<<popup-state>> setTo="yes"> +{{$:/core/images/right-arrow}} +</$button> +</$reveal> +<$reveal type="match" state=<<popup-state>> text="yes" default="""$default-popup-state$"""> +<$button class="tc-btn-invisible tc-btn-dropdown" set=<<popup-state>> setTo="no"> +{{$:/core/images/down-arrow}} +</$button> +</$reveal> +</div> +<div class="tc-plugin-info-chunk"> +<$transclude tiddler=<<currentTiddler>> subtiddler=<<plugin-icon-title>>> +<$transclude tiddler="$:/core/images/plugin-generic-$type$"/> +</$transclude> +</div> +<div class="tc-plugin-info-chunk"> +<h1> +''<$view field="description"><$view field="title"/></$view>'' $disabledMessage$ +</h1> +<h2> +<$view field="title"/> +</h2> +<h2> +<div><em><$view field="version"/></em></div> +</h2> +</div> +\end + +\define plugin-info(type,default-popup-state) +<$set name="popup-state" value=<<popup-state-macro>>> +<$reveal type="nomatch" state=<<plugin-disable-title>> text="yes"> +<$link to={{!!title}} class="tc-plugin-info"> +<<plugin-table-body type:"$type$" default-popup-state:"""$default-popup-state$""">> +</$link> +</$reveal> +<$reveal type="match" state=<<plugin-disable-title>> text="yes"> +<$link to={{!!title}} class="tc-plugin-info tc-plugin-info-disabled"> +<<plugin-table-body type:"$type$" default-popup-state:"""$default-popup-state$""" disabledMessage:"<$macrocall $name='lingo' title='Disabled/Status'/>">> +</$link> +</$reveal> +<$reveal type="match" text="yes" state=<<popup-state>> default="""$default-popup-state$"""> +<div class="tc-plugin-info-dropdown"> +<div class="tc-plugin-info-dropdown-body"> +<$list filter="[all[current]] -[[$:/core]]"> +<div style="float:right;"> +<$reveal type="nomatch" state=<<plugin-disable-title>> text="yes"> +<$button set=<<plugin-disable-title>> setTo="yes" tooltip={{$:/language/ControlPanel/Plugins/Disable/Hint}} aria-label={{$:/language/ControlPanel/Plugins/Disable/Caption}}> +<<lingo Disable/Caption>> +</$button> +</$reveal> +<$reveal type="match" state=<<plugin-disable-title>> text="yes"> +<$button set=<<plugin-disable-title>> setTo="no" tooltip={{$:/language/ControlPanel/Plugins/Enable/Hint}} aria-label={{$:/language/ControlPanel/Plugins/Enable/Caption}}> +<<lingo Enable/Caption>> +</$button> +</$reveal> +</div> +</$list> +<$set name="tabsList" filter="[<currentTiddler>list[]] contents"> +<$macrocall $name="tabs" state=<<tabs-state-macro>> tabsList=<<tabsList>> default={{{ [enlist<tabsList>] }}} template="$:/core/ui/PluginInfo"/> +</$set> +</div> +</div> +</$reveal> +</$set> +\end + +<$macrocall $name="plugin-info" type=<<plugin-type>> default-popup-state=<<default-popup-state>>/> diff --git a/core/ui/ControlPanel/Basics.tid b/core/ui/ControlPanel/Basics.tid index 52ff077c3..11563a3bc 100644 --- a/core/ui/ControlPanel/Basics.tid +++ b/core/ui/ControlPanel/Basics.tid @@ -20,7 +20,9 @@ caption: {{$:/language/ControlPanel/Basics/Caption}} |<$link to="$:/status/UserName"><<lingo Username/Prompt>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> | |<$link to="$:/config/AnimationDuration"><<lingo AnimDuration/Prompt>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> | |<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers" class="tc-edit-texteditor"/><br>//<<lingo DefaultTiddlers/BottomHint>>// | +|<$link to="$:/language/DefaultNewTiddlerTitle"><<lingo NewTiddler/Title/Prompt>></$link> |<$edit-text tiddler="$:/language/DefaultNewTiddlerTitle" default="" tag="input"/> | |<$link to="$:/config/NewJournal/Title"><<lingo NewJournal/Title/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Title" default="" tag="input"/> | +|<$link to="$:/config/NewJournal/Text"><<lingo NewJournal/Text/Prompt>></$link> |<$edit tiddler="$:/config/NewJournal/Text" tag="textarea" class="tc-edit-texteditor" default=""/> | |<$link to="$:/config/NewJournal/Tags"><<lingo NewJournal/Tags/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Tags" default="" tag="input"/> | |<<lingo Language/Prompt>> |{{$:/snippets/minilanguageswitcher}} | |<<lingo Tiddlers/Prompt>> |<<show-filter-count "[!is[system]sort[title]]">> | diff --git a/core/ui/ControlPanel/Modals/AddPlugins.tid b/core/ui/ControlPanel/Modals/AddPlugins.tid index 76305e4ed..b86f5351f 100644 --- a/core/ui/ControlPanel/Modals/AddPlugins.tid +++ b/core/ui/ControlPanel/Modals/AddPlugins.tid @@ -90,6 +90,16 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$ </$list> \end +\define close-library-button() +<$reveal type='nomatch' state='$:/temp/ServerConnection/$(PluginLibraryURL)$' text=''> +<$button class='tc-btn-big-green'> +<$action-sendmessage $message="tm-unload-plugin-library" url={{!!url}}/> +{{$:/core/images/chevron-left}} {{$:/language/ControlPanel/Plugins/ClosePluginLibrary}} +<$action-deletetiddler $filter="[prefix[$:/temp/ServerConnection/$(PluginLibraryURL)$]][prefix[$:/temp/RemoteAssetInfo/$(PluginLibraryURL)$]]"/> +</$button> +</$reveal> +\end + \define plugin-library-listing() <$list filter="[all[tiddlers+shadows]tag[$:/tags/PluginLibrary]]"> <div class="tc-plugin-library"> @@ -100,6 +110,10 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$ <$transclude/> +<$set name=PluginLibraryURL value={{!!url}}> +<<close-library-button>> +</$set> + <<display-server-connection>> </div> </$list> diff --git a/core/ui/ControlPanel/Parsing.tid b/core/ui/ControlPanel/Parsing.tid index de027f9c3..4ba0f0ae1 100644 --- a/core/ui/ControlPanel/Parsing.tid +++ b/core/ui/ControlPanel/Parsing.tid @@ -4,30 +4,30 @@ caption: {{$:/language/ControlPanel/Parsing/Caption}} \define lingo-base() $:/language/ControlPanel/Parsing/ -\define parsing-inner(typeCap) -<li> -<$checkbox tiddler="""$:/config/WikiParserRules/$typeCap$/$(currentTiddler)$""" field="text" checked="enable" unchecked="disable" default="enable"> ''<$text text=<<currentTiddler>>/>'': </$checkbox> -</li> +\define toggle(Type) +<$checkbox +tiddler="""$:/config/WikiParserRules/$Type$/$(rule)$""" +field="text" +checked="enable" +unchecked="disable" +default="enable"> +<<rule>> +</$checkbox> \end -\define parsing-outer(typeLower,typeCap) -<ul> -<$list filter="[wikiparserrules[$typeLower$]]"> -<<parsing-inner typeCap:"$typeCap$">> +\define rules(type,Type) +<$list filter="[wikiparserrules[$type$]]" variable="rule"> +<dd><<toggle $Type$>></dd> </$list> -</ul> \end <<lingo Hint>> -! <<lingo Pragma/Caption>> - -<<parsing-outer typeLower:"pragma" typeCap:"Pragma">> - -! <<lingo Inline/Caption>> - -<<parsing-outer typeLower:"inline" typeCap:"Inline">> - -! <<lingo Block/Caption>> - -<<parsing-outer typeLower:"block" typeCap:"Block">> +<dl> +<dt><<lingo Pragma/Caption>></dt> +<<rules pragma Pragma>> +<dt><<lingo Inline/Caption>></dt> +<<rules inline Inline>> +<dt><<lingo Block/Caption>></dt> +<<rules block Block>> +</dl> \ No newline at end of file diff --git a/core/ui/ControlPanel/Plugins.tid b/core/ui/ControlPanel/Plugins.tid index d0bec764c..49ff58e5e 100644 --- a/core/ui/ControlPanel/Plugins.tid +++ b/core/ui/ControlPanel/Plugins.tid @@ -4,95 +4,11 @@ caption: {{$:/language/ControlPanel/Plugins/Caption}} \define lingo-base() $:/language/ControlPanel/Plugins/ -\define popup-state-macro() -$(qualified-state)$-$(currentTiddler)$ -\end - -\define tabs-state-macro() -$(popup-state)$-$(pluginInfoType)$ -\end - -\define plugin-icon-title() -$(currentTiddler)$/icon -\end - -\define plugin-disable-title() -$:/config/Plugins/Disabled/$(currentTiddler)$ -\end - -\define plugin-table-body(type,disabledMessage) -<div class="tc-plugin-info-chunk tc-small-icon"> -<$reveal type="nomatch" state=<<popup-state>> text="yes"> -<$button class="tc-btn-invisible tc-btn-dropdown" set=<<popup-state>> setTo="yes"> -{{$:/core/images/right-arrow}} -</$button> -</$reveal> -<$reveal type="match" state=<<popup-state>> text="yes"> -<$button class="tc-btn-invisible tc-btn-dropdown" set=<<popup-state>> setTo="no"> -{{$:/core/images/down-arrow}} -</$button> -</$reveal> -</div> -<div class="tc-plugin-info-chunk"> -<$transclude tiddler=<<currentTiddler>> subtiddler=<<plugin-icon-title>>> -<$transclude tiddler="$:/core/images/plugin-generic-$type$"/> -</$transclude> -</div> -<div class="tc-plugin-info-chunk"> -<h1> -''<$view field="description"><$view field="title"/></$view>'' $disabledMessage$ -</h1> -<h2> -<$view field="title"/> -</h2> -<h2> -<div><em><$view field="version"/></em></div> -</h2> -</div> -\end - \define plugin-table(type) +<$set name="plugin-type" value="""$type$"""> <$set name="qualified-state" value=<<qualify "$:/state/plugin-info">>> -<$list filter="[!has[draft.of]plugin-type[$type$]sort[description]]" emptyMessage=<<lingo "Empty/Hint">>> -<$set name="popup-state" value=<<popup-state-macro>>> -<$reveal type="nomatch" state=<<plugin-disable-title>> text="yes"> -<$link to={{!!title}} class="tc-plugin-info"> -<<plugin-table-body type:"$type$">> -</$link> -</$reveal> -<$reveal type="match" state=<<plugin-disable-title>> text="yes"> -<$link to={{!!title}} class="tc-plugin-info tc-plugin-info-disabled"> -<<plugin-table-body type:"$type$" disabledMessage:"<$macrocall $name='lingo' title='Disabled/Status'/>">> -</$link> -</$reveal> -<$reveal type="match" text="yes" state=<<popup-state>>> -<div class="tc-plugin-info-dropdown"> -<div class="tc-plugin-info-dropdown-body"> -<$list filter="[all[current]] -[[$:/core]]"> -<div style="float:right;"> -<$reveal type="nomatch" state=<<plugin-disable-title>> text="yes"> -<$button set=<<plugin-disable-title>> setTo="yes" tooltip={{$:/language/ControlPanel/Plugins/Disable/Hint}} aria-label={{$:/language/ControlPanel/Plugins/Disable/Caption}}> -<<lingo Disable/Caption>> -</$button> -</$reveal> -<$reveal type="match" state=<<plugin-disable-title>> text="yes"> -<$button set=<<plugin-disable-title>> setTo="no" tooltip={{$:/language/ControlPanel/Plugins/Enable/Hint}} aria-label={{$:/language/ControlPanel/Plugins/Enable/Caption}}> -<<lingo Enable/Caption>> -</$button> -</$reveal> -</div> -</$list> -<$reveal type="nomatch" text="" state="!!list"> -<$macrocall $name="tabs" state=<<tabs-state-macro>> tabsList={{!!list}} default="readme" template="$:/core/ui/PluginInfo"/> -</$reveal> -<$reveal type="match" text="" state="!!list"> -<<lingo NoInformation/Hint>> -</$reveal> -</div> -</div> -</$reveal> +<$list filter="[!has[draft.of]plugin-type[$type$]sort[description]]" emptyMessage=<<lingo "Empty/Hint">> template="$:/core/ui/Components/plugin-info"/> </$set> -</$list> </$set> \end diff --git a/core/ui/ControlPanel/Saving.tid b/core/ui/ControlPanel/Saving.tid index 5c54b37df..ae1d82f63 100644 --- a/core/ui/ControlPanel/Saving.tid +++ b/core/ui/ControlPanel/Saving.tid @@ -2,35 +2,8 @@ title: $:/core/ui/ControlPanel/Saving tags: $:/tags/ControlPanel caption: {{$:/language/ControlPanel/Saving/Caption}} -\define lingo-base() $:/language/ControlPanel/Saving/ -\define backupURL() -http://$(userName)$.tiddlyspot.com/backup/ -\end -\define backupLink() -<$reveal type="nomatch" state="$:/UploadName" text=""> -<$set name="userName" value={{$:/UploadName}}> -<$reveal type="match" state="$:/UploadURL" text=""> -<<backupURL>> -</$reveal> -<$reveal type="nomatch" state="$:/UploadURL" text=""> -<$macrocall $name=resolvePath source={{$:/UploadBackupDir}} root={{$:/UploadURL}}>> -</$reveal> -</$set> -</$reveal> -\end -! <<lingo TiddlySpot/Heading>> +{{$:/language/ControlPanel/Saving/Hint}} -<<lingo TiddlySpot/Description>> - -|<<lingo TiddlySpot/UserName>> |<$edit-text tiddler="$:/UploadName" default="" tag="input"/> | -|<<lingo TiddlySpot/Password>> |<$password name="upload"/> | -|<<lingo TiddlySpot/Backups>> |<<backupLink>> | - -''<<lingo TiddlySpot/Advanced/Heading>>'' - -|<<lingo TiddlySpot/ServerURL>> |<$edit-text tiddler="$:/UploadURL" default="" tag="input"/> | -|<<lingo TiddlySpot/Filename>> |<$edit-text tiddler="$:/UploadFilename" default="index.html" tag="input"/> | -|<<lingo TiddlySpot/UploadDir>> |<$edit-text tiddler="$:/UploadDir" default="." tag="input"/> | -|<<lingo TiddlySpot/BackupDir>> |<$edit-text tiddler="$:/UploadBackupDir" default="." tag="input"/> | - -<<lingo TiddlySpot/Hint>> \ No newline at end of file +<div class="tc-control-panel"> +<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Saving]!has[draft.of]]" "$:/core/ui/ControlPanel/Saving/General">> +</div> diff --git a/core/ui/ControlPanel/Saving/DownloadSaver.tid b/core/ui/ControlPanel/Saving/DownloadSaver.tid new file mode 100644 index 000000000..42e4dc3a9 --- /dev/null +++ b/core/ui/ControlPanel/Saving/DownloadSaver.tid @@ -0,0 +1,11 @@ +title: $:/core/ui/ControlPanel/Saving/DownloadSaver +tags: $:/tags/ControlPanel/Saving +caption: {{$:/language/ControlPanel/Saving/DownloadSaver/Caption}} + +\define lingo-base() $:/language/ControlPanel/Saving/DownloadSaver/ + +<<lingo Hint>> + +!! <$link to="$:/config/DownloadSaver/AutoSave"><<lingo AutoSave/Hint>></$link> + +<$checkbox tiddler="$:/config/DownloadSaver/AutoSave" field="text" checked="yes" unchecked="no" default="no"> <<lingo AutoSave/Description>> </$checkbox> diff --git a/core/ui/ControlPanel/Saving/General.tid b/core/ui/ControlPanel/Saving/General.tid new file mode 100644 index 000000000..d1b096281 --- /dev/null +++ b/core/ui/ControlPanel/Saving/General.tid @@ -0,0 +1,16 @@ +title: $:/core/ui/ControlPanel/Saving/General +tags: $:/tags/ControlPanel/Saving +caption: {{$:/language/ControlPanel/Saving/General/Caption}} +list-before: + +\define lingo-base() $:/language/ControlPanel/Settings/ + +{{$:/language/ControlPanel/Saving/General/Hint}} + +!! <$link to="$:/config/AutoSave"><<lingo AutoSave/Caption>></$link> + +<<lingo AutoSave/Hint>> + +<$radio tiddler="$:/config/AutoSave" value="yes"> <<lingo AutoSave/Enabled/Description>> </$radio> + +<$radio tiddler="$:/config/AutoSave" value="no"> <<lingo AutoSave/Disabled/Description>> </$radio> diff --git a/core/ui/ControlPanel/Saving/TiddlySpot.tid b/core/ui/ControlPanel/Saving/TiddlySpot.tid new file mode 100644 index 000000000..0832b92cd --- /dev/null +++ b/core/ui/ControlPanel/Saving/TiddlySpot.tid @@ -0,0 +1,36 @@ +title: $:/core/ui/ControlPanel/Saving/TiddlySpot +tags: $:/tags/ControlPanel/Saving +caption: {{$:/language/ControlPanel/Saving/TiddlySpot/Caption}} + +\define lingo-base() $:/language/ControlPanel/Saving/TiddlySpot/ + +\define backupURL() +http://$(userName)$.tiddlyspot.com/backup/ +\end +\define backupLink() +<$reveal type="nomatch" state="$:/UploadName" text=""> +<$set name="userName" value={{$:/UploadName}}> +<$reveal type="match" state="$:/UploadURL" text=""> +<<backupURL>> +</$reveal> +<$reveal type="nomatch" state="$:/UploadURL" text=""> +<$macrocall $name=resolvePath source={{$:/UploadBackupDir}} root={{$:/UploadURL}}>> +</$reveal> +</$set> +</$reveal> +\end + +<<lingo Description>> + +|<<lingo UserName>> |<$edit-text tiddler="$:/UploadName" default="" tag="input"/> | +|<<lingo Password>> |<$password name="upload"/> | +|<<lingo Backups>> |<<backupLink>> | + +''<<lingo Advanced/Heading>>'' + +|<<lingo ServerURL>> |<$edit-text tiddler="$:/UploadURL" default="" tag="input"/> | +|<<lingo Filename>> |<$edit-text tiddler="$:/UploadFilename" default="index.html" tag="input"/> | +|<<lingo UploadDir>> |<$edit-text tiddler="$:/UploadDir" default="." tag="input"/> | +|<<lingo BackupDir>> |<$edit-text tiddler="$:/UploadBackupDir" default="." tag="input"/> | + +<<lingo TiddlySpot/Hint>> \ No newline at end of file diff --git a/core/ui/ControlPanel/Settings/AutoSave.tid b/core/ui/ControlPanel/Settings/AutoSave.tid deleted file mode 100644 index 70d00b8e1..000000000 --- a/core/ui/ControlPanel/Settings/AutoSave.tid +++ /dev/null @@ -1,11 +0,0 @@ -title: $:/core/ui/ControlPanel/Settings/AutoSave -tags: $:/tags/ControlPanel/Settings -caption: {{$:/language/ControlPanel/Settings/AutoSave/Caption}} - -\define lingo-base() $:/language/ControlPanel/Settings/AutoSave/ - -<$link to="$:/config/AutoSave"><<lingo Hint>></$link> - -<$radio tiddler="$:/config/AutoSave" value="yes"> <<lingo Enabled/Description>> </$radio> - -<$radio tiddler="$:/config/AutoSave" value="no"> <<lingo Disabled/Description>> </$radio> diff --git a/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid b/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid new file mode 100644 index 000000000..e6077f2a2 --- /dev/null +++ b/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid @@ -0,0 +1,13 @@ +caption: {{$:/language/ControlPanel/Settings/DefaultMoreSidebarTab/Caption}} +tags: $:/tags/ControlPanel/Settings +title: $:/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab + +\define lingo-base() $:/language/ControlPanel/Settings/DefaultMoreSidebarTab/ + +<$link to="$:/config/DefaultMoreSidebarTab"><<lingo Hint>></$link> + +<$select tiddler="$:/config/DefaultMoreSidebarTab"> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]"> +<option value=<<currentTiddler>>><$transclude field="caption"><$text text=<<currentTiddler>>/></$transclude></option> +</$list> +</$select> diff --git a/core/ui/ControlPanel/Settings/InfoPanelMode.tid b/core/ui/ControlPanel/Settings/InfoPanelMode.tid new file mode 100644 index 000000000..371b6d61b --- /dev/null +++ b/core/ui/ControlPanel/Settings/InfoPanelMode.tid @@ -0,0 +1,10 @@ +title: $:/core/ui/ControlPanel/Settings/InfoPanelMode +tags: $:/tags/ControlPanel/Settings +caption: {{$:/language/ControlPanel/Settings/InfoPanelMode/Caption}} + +\define lingo-base() $:/language/ControlPanel/Settings/InfoPanelMode/ +<$link to="$:/config/TiddlerInfo/Mode"><<lingo Hint>></$link> + +<$radio tiddler="$:/config/TiddlerInfo/Mode" value="popup"> <<lingo Popup/Description>> </$radio> + +<$radio tiddler="$:/config/TiddlerInfo/Mode" value="sticky"> <<lingo Sticky/Description>> </$radio> diff --git a/core/ui/ControlPanel/Stylesheets.tid b/core/ui/ControlPanel/Stylesheets.tid new file mode 100644 index 000000000..20163753f --- /dev/null +++ b/core/ui/ControlPanel/Stylesheets.tid @@ -0,0 +1,9 @@ +title: $:/core/ui/ControlPanel/Stylesheets +tags: $:/tags/ControlPanel/Advanced +caption: {{$:/language/ControlPanel/Stylesheets/Caption}} + +\define lingo-base() $:/language/ControlPanel/ + +<<lingo Stylesheets/Hint>> + +{{$:/snippets/peek-stylesheets}} diff --git a/core/ui/ControlPanel/Toolbars/EditToolbar.tid b/core/ui/ControlPanel/Toolbars/EditToolbar.tid index 68d78f854..1688c18b4 100644 --- a/core/ui/ControlPanel/Toolbars/EditToolbar.tid +++ b/core/ui/ControlPanel/Toolbars/EditToolbar.tid @@ -3,9 +3,8 @@ tags: $:/tags/ControlPanel/Toolbars caption: {{$:/language/ControlPanel/Toolbars/EditToolbar/Caption}} \define lingo-base() $:/language/TiddlerInfo/ -\define config-title() -$:/config/EditToolbarButtons/Visibility/$(listItem)$ -\end + +\define config-base() $:/config/EditToolbarButtons/Visibility/ {{$:/language/ControlPanel/Toolbars/EditToolbar/Hint}} @@ -13,12 +12,8 @@ $:/config/EditToolbarButtons/Visibility/$(listItem)$ <$set name="tv-config-toolbar-text" value="yes"> -<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"> - -<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i> - -</$list> +<$macrocall $name="list-tagged-draggable" tag="$:/tags/EditToolbar" itemTemplate="$:/core/ui/ControlPanel/Toolbars/ItemTemplate"/> </$set> -</$set> +</$set> \ No newline at end of file diff --git a/core/ui/ControlPanel/Toolbars/EditorItemTemplate.tid b/core/ui/ControlPanel/Toolbars/EditorItemTemplate.tid new file mode 100644 index 000000000..e417e766c --- /dev/null +++ b/core/ui/ControlPanel/Toolbars/EditorItemTemplate.tid @@ -0,0 +1,9 @@ +title: $:/core/ui/ControlPanel/Toolbars/EditorItemTemplate + +\define config-title() +$(config-base)$$(currentTiddler)$ +\end + +<$draggable tiddler=<<currentTiddler>>> +<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <span class="tc-icon-wrapper"><$transclude tiddler={{!!icon}}/></span> <$transclude field="caption"/> -- <i class="tc-muted"><$transclude field="description"/></i> +</$draggable> diff --git a/core/ui/ControlPanel/Toolbars/EditorToolbar.tid b/core/ui/ControlPanel/Toolbars/EditorToolbar.tid index ce700fa98..66c30de3f 100644 --- a/core/ui/ControlPanel/Toolbars/EditorToolbar.tid +++ b/core/ui/ControlPanel/Toolbars/EditorToolbar.tid @@ -4,18 +4,8 @@ caption: {{$:/language/ControlPanel/Toolbars/EditorToolbar/Caption}} \define lingo-base() $:/language/TiddlerInfo/ -\define config-title() -$:/config/EditorToolbarButtons/Visibility/$(listItem)$ -\end - -\define toolbar-button() -<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler={{$(listItem)$!!icon}}/> <$transclude tiddler=<<listItem>> field="caption"/> -- <i class="tc-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox> -\end +\define config-base() $:/config/EditorToolbarButtons/Visibility/ {{$:/language/ControlPanel/Toolbars/EditorToolbar/Hint}} -<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditorToolbar]!has[draft.of]]" variable="listItem"> - -<<toolbar-button>> - -</$list> +<$macrocall $name="list-tagged-draggable" tag="$:/tags/EditorToolbar" itemTemplate="$:/core/ui/ControlPanel/Toolbars/EditorItemTemplate"/> diff --git a/core/ui/ControlPanel/Toolbars/ItemTemplate.tid b/core/ui/ControlPanel/Toolbars/ItemTemplate.tid new file mode 100644 index 000000000..6b92d8189 --- /dev/null +++ b/core/ui/ControlPanel/Toolbars/ItemTemplate.tid @@ -0,0 +1,9 @@ +title: $:/core/ui/ControlPanel/Toolbars/ItemTemplate + +\define config-title() +$(config-base)$$(currentTiddler)$ +\end + +<$draggable tiddler=<<currentTiddler>>> +<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <span class="tc-icon-wrapper"> <$transclude field="caption"/> <i class="tc-muted">-- <$transclude field="description"/></i></span> +</$draggable> diff --git a/core/ui/ControlPanel/Toolbars/PageControls.tid b/core/ui/ControlPanel/Toolbars/PageControls.tid index 981b6be27..6eadd8b22 100644 --- a/core/ui/ControlPanel/Toolbars/PageControls.tid +++ b/core/ui/ControlPanel/Toolbars/PageControls.tid @@ -3,9 +3,8 @@ tags: $:/tags/ControlPanel/Toolbars caption: {{$:/language/ControlPanel/Toolbars/PageControls/Caption}} \define lingo-base() $:/language/TiddlerInfo/ -\define config-title() -$:/config/PageControlButtons/Visibility/$(listItem)$ -\end + +\define config-base() $:/config/PageControlButtons/Visibility/ {{$:/language/ControlPanel/Toolbars/PageControls/Hint}} @@ -13,11 +12,7 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ <$set name="tv-config-toolbar-text" value="yes"> -<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem"> - -<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i> - -</$list> +<$macrocall $name="list-tagged-draggable" tag="$:/tags/PageControls" itemTemplate="$:/core/ui/ControlPanel/Toolbars/ItemTemplate"/> </$set> diff --git a/core/ui/ControlPanel/Toolbars/ViewToolbar.tid b/core/ui/ControlPanel/Toolbars/ViewToolbar.tid index 071fb206c..edabdd56f 100644 --- a/core/ui/ControlPanel/Toolbars/ViewToolbar.tid +++ b/core/ui/ControlPanel/Toolbars/ViewToolbar.tid @@ -3,9 +3,8 @@ tags: $:/tags/ControlPanel/Toolbars caption: {{$:/language/ControlPanel/Toolbars/ViewToolbar/Caption}} \define lingo-base() $:/language/TiddlerInfo/ -\define config-title() -$:/config/ViewToolbarButtons/Visibility/$(listItem)$ -\end + +\define config-base() $:/config/ViewToolbarButtons/Visibility/ {{$:/language/ControlPanel/Toolbars/ViewToolbar/Hint}} @@ -13,11 +12,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$ <$set name="tv-config-toolbar-text" value="yes"> -<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"> - -<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i> - -</$list> +<$macrocall $name="list-tagged-draggable" tag="$:/tags/ViewToolbar" itemTemplate="$:/core/ui/ControlPanel/Toolbars/ItemTemplate"/> </$set> diff --git a/core/ui/EditTemplate.tid b/core/ui/EditTemplate.tid index ffea3283a..273f06c0e 100644 --- a/core/ui/EditTemplate.tid +++ b/core/ui/EditTemplate.tid @@ -1,16 +1,28 @@ title: $:/core/ui/EditTemplate +\define actions() +<$action-sendmessage $message="tm-add-tag" $param={{$:/temp/NewTagName}}/> +<$action-deletetiddler $tiddler="$:/temp/NewTagName"/> +<$action-sendmessage $message="tm-add-field" $name={{$:/temp/newfieldname}} $value={{$:/temp/newfieldvalue}}/> +<$action-deletetiddler $tiddler="$:/temp/newfieldname"/> +<$action-deletetiddler $tiddler="$:/temp/newfieldvalue"/> +<$action-sendmessage $message="tm-save-tiddler"/> +\end \define frame-classes() tc-tiddler-frame tc-tiddler-edit-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$ \end -<div class=<<frame-classes>>> +<div class=<<frame-classes>> data-tiddler-title=<<currentTiddler>>> +<$fieldmangler> <$set name="storyTiddler" value=<<currentTiddler>>> <$keyboard key="((cancel-edit-tiddler))" message="tm-cancel-tiddler"> -<$keyboard key="((save-tiddler))" message="tm-save-tiddler"> +<$keyboard key="((save-tiddler))" actions=<<actions>>> <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditTemplate]!has[draft.of]]" variable="listItem"> +<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]"> <$transclude tiddler=<<listItem>>/> +</$set> </$list> </$keyboard> </$keyboard> </$set> +</$fieldmangler> </div> diff --git a/core/ui/EditTemplate/Preview/diffs-current.tid b/core/ui/EditTemplate/Preview/diffs-current.tid new file mode 100644 index 000000000..07a6ef647 --- /dev/null +++ b/core/ui/EditTemplate/Preview/diffs-current.tid @@ -0,0 +1,11 @@ +title: $:/core/ui/EditTemplate/body/preview/diffs-current +tags: $:/tags/EditPreview +caption: differences from current +list-after: $:/core/ui/EditTemplate/body/preview/output + +<$list filter="[<currentTiddler>!is[image]]" emptyMessage={{$:/core/ui/EditTemplate/body/preview/output}}> + +<$macrocall $name="compareTiddlerText" sourceTiddlerTitle={{!!draft.of}} destTiddlerTitle=<<currentTiddler>>/> + +</$list> + diff --git a/core/ui/EditTemplate/Preview/diffs-shadow.tid b/core/ui/EditTemplate/Preview/diffs-shadow.tid new file mode 100644 index 000000000..7abfd3952 --- /dev/null +++ b/core/ui/EditTemplate/Preview/diffs-shadow.tid @@ -0,0 +1,11 @@ +title: $:/core/ui/EditTemplate/body/preview/diffs-shadow +tags: $:/tags/EditPreview +caption: differences from shadow (if any) +list-after: $:/core/ui/EditTemplate/body/preview/output + +<$list filter="[<currentTiddler>!is[image]]" emptyMessage={{$:/core/ui/EditTemplate/body/preview/output}}> + +<$macrocall $name="compareTiddlerText" sourceTiddlerTitle={{{ [{!!draft.of}shadowsource[]] }}} sourceSubTiddlerTitle={{!!draft.of}} destTiddlerTitle=<<currentTiddler>>/> + +</$list> + diff --git a/core/ui/EditTemplate/Preview/showeditpreview.tid b/core/ui/EditTemplate/Preview/showeditpreview.tid new file mode 100644 index 000000000..129d27925 --- /dev/null +++ b/core/ui/EditTemplate/Preview/showeditpreview.tid @@ -0,0 +1,2 @@ +title: $:/state/showeditpreview +text: no \ No newline at end of file diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid index fbd02e9ce..31339733d 100644 --- a/core/ui/EditTemplate/fields.tid +++ b/core/ui/EditTemplate/fields.tid @@ -10,10 +10,13 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$ [[hide]] -[title{$(config-title)$}] \end -\define new-field-inner() +\define new-field() +<$vars name={{$:/temp/newfieldname}}> <$reveal type="nomatch" text="" default=<<name>>> <$button> -<$action-sendmessage $message="tm-add-field" $name=<<name>> $value=<<value>>/> +<$action-sendmessage $message="tm-add-field" +$name=<<name>> +$value={{$:/temp/newfieldvalue}}/> <$action-deletetiddler $tiddler="$:/temp/newfieldname"/> <$action-deletetiddler $tiddler="$:/temp/newfieldvalue"/> <<lingo Fields/Add/Button>> @@ -24,14 +27,7 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$ <<lingo Fields/Add/Button>> </$button> </$reveal> -\end - -\define new-field() -<$set name="name" value={{$:/temp/newfieldname}}> -<$set name="value" value={{$:/temp/newfieldvalue}}> -<<new-field-inner>> -</$set> -</$set> +</$vars> \end <div class="tc-edit-fields"> @@ -73,7 +69,7 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$ <div class="tc-dropdown-item"> <<lingo Fields/Add/Dropdown/User>> </div> -<$list filter="[!is[shadow]!is[system]fields[]sort[]] -created -creator -draft.of -draft.title -modified -modifier -tags -text -title -type" variable="currentField"> +<$list filter="[!is[shadow]!is[system]fields[]search:title{$:/temp/newfieldname}sort[]] -created -creator -draft.of -draft.title -modified -modifier -tags -text -title -type" variable="currentField"> <$link to=<<currentField>>> <<currentField>> </$link> @@ -81,7 +77,7 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$ <div class="tc-dropdown-item"> <<lingo Fields/Add/Dropdown/System>> </div> -<$list filter="[fields[]sort[]] -[!is[shadow]!is[system]fields[]]" variable="currentField"> +<$list filter="[fields[]search:title{$:/temp/newfieldname}sort[]] -[!is[shadow]!is[system]fields[]]" variable="currentField"> <$link to=<<currentField>>> <<currentField>> </$link> @@ -97,4 +93,3 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$ </span> </div> </$fieldmangler> - diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid index e806fd90c..557d1ebdf 100644 --- a/core/ui/EditTemplate/tags.tid +++ b/core/ui/EditTemplate/tags.tid @@ -2,11 +2,13 @@ title: $:/core/ui/EditTemplate/tags tags: $:/tags/EditTemplate \define lingo-base() $:/language/EditTemplate/ + \define tag-styles() background-color:$(backgroundColor)$; fill:$(foregroundColor)$; color:$(foregroundColor)$; \end + \define tag-body-inner(colour,fallbackTarget,colourA,colourB) <$vars foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">> backgroundColor="""$colour$"""> <span style=<<tag-styles>> class="tc-tag-label"> @@ -15,39 +17,24 @@ color:$(foregroundColor)$; </span> </$vars> \end + \define tag-body(colour,palette) <$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}}/> \end + +\define tag-picker-actions() +<$action-listops + $tiddler=<<currentTiddler>> + $field="tags" + $subfilter="[<tag>] [all[current]tags[]]" +/> +\end + <div class="tc-edit-tags"> <$fieldmangler> <$list filter="[all[current]tags[]sort[title]]" storyview="pop"> <$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}}/> </$list> - -<div class="tc-edit-add-tag"> -<span class="tc-add-tag-name"> -<$edit-text tiddler="$:/temp/NewTagName" tag="input" default="" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}} focusPopup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-edit-texteditor tc-popup-handle"/> -</span> <$button popup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button> <span class="tc-add-tag-button"> -<$button message="tm-add-tag" param={{$:/temp/NewTagName}} set="$:/temp/NewTagName" setTo="" class=""> -<<lingo Tags/Add/Button>> -</$button> -</span> -</div> - -<div class="tc-block-dropdown-wrapper"> -<$reveal state=<<qualify "$:/state/popup/tags-auto-complete">> type="nomatch" text="" default=""> -<div class="tc-block-dropdown"> -<$linkcatcher set="$:/temp/NewTagName" setTo="" message="tm-add-tag"> -<$list filter="[tags[]!is[system]search:title{$:/temp/NewTagName}sort[]]"> -{{||$:/core/ui/Components/tag-link}} -</$list> -<hr> -<$list filter="[tags[]is[system]search:title{$:/temp/NewTagName}sort[]]"> -{{||$:/core/ui/Components/tag-link}} -</$list> -</$linkcatcher> -</div> -</$reveal> -</div> </$fieldmangler> -</div> \ No newline at end of file +<$macrocall $name="tag-picker" actions=<<tag-picker-actions>>/> +</div> diff --git a/core/ui/EditTemplate/title.tid b/core/ui/EditTemplate/title.tid index 0eda4218d..f7963f2bb 100644 --- a/core/ui/EditTemplate/title.tid +++ b/core/ui/EditTemplate/title.tid @@ -1,13 +1,15 @@ title: $:/core/ui/EditTemplate/title tags: $:/tags/EditTemplate +<$edit-text field="draft.title" class="tc-titlebar tc-edit-texteditor" focus="true"/> + <$vars pattern="""[\|\[\]{}]""" bad-chars="""`| [ ] { }`"""> <$list filter="[is[current]regexp:draft.title<pattern>]" variable="listItem"> <div class="tc-message-box"> -{{$:/language/EditTemplate/Title/BadCharacterWarning}} +{{$:/core/images/warning}} {{$:/language/EditTemplate/Title/BadCharacterWarning}} </div> @@ -15,4 +17,28 @@ tags: $:/tags/EditTemplate </$vars> -<$edit-text field="draft.title" class="tc-titlebar tc-edit-texteditor" focus="true"/> +<$reveal state="!!draft.title" type="nomatch" text={{!!draft.of}} tag="div"> + +<$list filter="[{!!draft.title}!is[missing]]" variable="listItem"> + +<div class="tc-message-box"> + +{{$:/core/images/warning}} {{$:/language/EditTemplate/Title/Exists/Prompt}} + +</div> + +</$list> + +<$list filter="[{!!draft.of}!is[missing]]" variable="listItem"> + +<$vars fromTitle={{!!draft.of}} toTitle={{!!draft.title}}> + +<$checkbox tiddler="$:/config/RelinkOnRename" field="text" checked="yes" unchecked="no" default="no"> {{$:/language/EditTemplate/Title/Relink/Prompt}}</$checkbox> + +</$vars> + +</$list> + +</$reveal> + + diff --git a/core/ui/EditTemplate/type.tid b/core/ui/EditTemplate/type.tid index a357972b4..be57f7264 100644 --- a/core/ui/EditTemplate/type.tid +++ b/core/ui/EditTemplate/type.tid @@ -10,7 +10,7 @@ tags: $:/tags/EditTemplate <$reveal state=<<qualify "$:/state/popup/type-dropdown">> type="nomatch" text="" default=""> <div class="tc-block-dropdown tc-edit-type-dropdown"> <$linkcatcher to="!!type"> -<$list filter='[all[shadows+tiddlers]prefix[$:/language/Docs/Types/]each[group]sort[group]]'> +<$list filter='[all[shadows+tiddlers]prefix[$:/language/Docs/Types/]each[group]sort[group-sort]]'> <div class="tc-dropdown-item"> <$text text={{!!group}}/> </div> diff --git a/core/ui/EditToolbar/save.tid b/core/ui/EditToolbar/save.tid index 38dd224ea..6b94691bf 100644 --- a/core/ui/EditToolbar/save.tid +++ b/core/ui/EditToolbar/save.tid @@ -16,5 +16,4 @@ description: {{$:/language/Buttons/Save/Hint}} <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> <span class="tc-btn-text"><$text text={{$:/language/Buttons/Save/Caption}}/></span> </$list> -</$button> -</$fieldmangler> +</$button></$fieldmangler> diff --git a/core/ui/EditorToolbar/editor-height.tid b/core/ui/EditorToolbar/editor-height.tid index c6c45775f..a8bb2ca13 100644 --- a/core/ui/EditorToolbar/editor-height.tid +++ b/core/ui/EditorToolbar/editor-height.tid @@ -4,7 +4,7 @@ icon: $:/core/images/fixed-height custom-icon: yes caption: {{$:/language/Buttons/EditorHeight/Caption}} description: {{$:/language/Buttons/EditorHeight/Hint}} -condition: [<targetTiddler>!is[image]] +condition: [<targetTiddler>type[]] [<targetTiddler>get[type]prefix[text/]] +[first[]] dropdown: $:/core/ui/EditorToolbar/editor-height-dropdown <$reveal tag="span" state="$:/config/TextEditor/EditorHeight/Mode" type="match" text="fixed"> diff --git a/core/ui/EditorToolbar/excise-dropdown.tid b/core/ui/EditorToolbar/excise-dropdown.tid index 224ae0bfe..47aa27c8b 100644 --- a/core/ui/EditorToolbar/excise-dropdown.tid +++ b/core/ui/EditorToolbar/excise-dropdown.tid @@ -37,7 +37,7 @@ title: $:/core/ui/EditorToolbar/excise-dropdown tagnew={{$config-title$/tagnew}} /> <$action-deletetiddler - $tiddler=<<qualify "$:/state/Excise/NewTitle">> + $tiddler="$config-title$/new-title" /> <$action-deletetiddler $tiddler=<<dropdown-state>> diff --git a/core/ui/EditorToolbar/excise.tid b/core/ui/EditorToolbar/excise.tid index dc2b34d3b..7eb505c23 100644 --- a/core/ui/EditorToolbar/excise.tid +++ b/core/ui/EditorToolbar/excise.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/excise caption: {{$:/language/Buttons/Excise/Caption}} description: {{$:/language/Buttons/Excise/Hint}} -condition: [<targetTiddler>!is[image]] +condition: [<targetTiddler>type[]] [<targetTiddler>type[text/vnc.tiddlywiki]] +[first[]] shortcuts: ((excise)) dropdown: $:/core/ui/EditorToolbar/excise-dropdown diff --git a/core/ui/EditorToolbar/link-dropdown.tid b/core/ui/EditorToolbar/link-dropdown.tid index ad0464956..c9c1989b6 100644 --- a/core/ui/EditorToolbar/link-dropdown.tid +++ b/core/ui/EditorToolbar/link-dropdown.tid @@ -2,42 +2,40 @@ title: $:/core/ui/EditorToolbar/link-dropdown \define lingo-base() $:/language/Buttons/Link/ -\define link-actions() -<$action-sendmessage - $message="tm-edit-text-operation" - $param="make-link" - text={{$(linkTiddler)$}} -/> +\define add-link-actions() +<$action-sendmessage $message="tm-edit-text-operation" $param="make-link" text={{$(linkTiddler)$}} /> +<$action-deletetiddler $tiddler=<<dropdown-state>> /> +<$action-deletetiddler $tiddler=<<searchTiddler>> /> +<$action-deletetiddler $tiddler=<<linkTiddler>> /> +\end -<$action-deletetiddler - $tiddler=<<dropdown-state>> -/> - -<$action-deletetiddler - $tiddler=<<searchTiddler>> -/> - -<$action-deletetiddler - $tiddler=<<linkTiddler>> -/> +\define external-link() +<$button class="tc-btn-invisible" style="width: auto; display: inline-block; background-colour: inherit;" actions=<<add-link-actions>>> +{{$:/core/images/chevron-right}} +</$button> \end \define body(config-title) ''<<lingo Hint>>'' -<$vars searchTiddler="""$config-title$/search""" linkTiddler="""$config-title$/link"""> +<$vars searchTiddler="""$config-title$/search""" linkTiddler="""$config-title$/link""" linktext="" > +<$vars linkTiddler=<<searchTiddler>>> +<$keyboard key="ENTER" actions=<<add-link-actions>>> <$edit-text tiddler=<<searchTiddler>> type="search" tag="input" focus="true" placeholder={{$:/language/Search/Search}} default=""/> <$reveal tag="span" state=<<searchTiddler>> type="nomatch" text=""> +<<external-link>> <$button class="tc-btn-invisible" style="width: auto; display: inline-block; background-colour: inherit;"> <$action-setfield $tiddler=<<searchTiddler>> text="" /> {{$:/core/images/close-button}} </$button> </$reveal> +</$keyboard> +</$vars> <$reveal tag="div" state=<<searchTiddler>> type="nomatch" text=""> -<$linkcatcher actions=<<link-actions>> to=<<linkTiddler>>> +<$linkcatcher actions=<<add-link-actions>> to=<<linkTiddler>>> {{$:/core/ui/SearchResults}} @@ -49,4 +47,4 @@ title: $:/core/ui/EditorToolbar/link-dropdown \end -<$macrocall $name="body" config-title=<<qualify "$:/state/Link/">>/> +<$macrocall $name="body" config-title=<<qualify "$:/state/Link/">>/> \ No newline at end of file diff --git a/core/ui/EditorToolbar/linkify.tid b/core/ui/EditorToolbar/linkify.tid new file mode 100644 index 000000000..68a45857e --- /dev/null +++ b/core/ui/EditorToolbar/linkify.tid @@ -0,0 +1,15 @@ +caption: {{$:/language/Buttons/Linkify/Caption}} +condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]] +description: {{$:/language/Buttons/Linkify/Hint}} +icon: $:/core/images/linkify +list-before: $:/core/ui/EditorToolbar/mono-block +shortcuts: ((linkify)) +title: $:/core/ui/EditorToolbar/linkify +tags: $:/tags/EditorToolbar + +<$action-sendmessage + $message="tm-edit-text-operation" + $param="wrap-selection" + prefix="[[" + suffix="]]" +/> diff --git a/core/ui/EditorToolbar/rotate-left.tid b/core/ui/EditorToolbar/rotate-left.tid new file mode 100644 index 000000000..04f70f9a4 --- /dev/null +++ b/core/ui/EditorToolbar/rotate-left.tid @@ -0,0 +1,11 @@ +title: $:/core/ui/EditorToolbar/rotate-left +tags: $:/tags/EditorToolbar +icon: $:/core/images/rotate-left +caption: {{$:/language/Buttons/RotateLeft/Caption}} +description: {{$:/language/Buttons/RotateLeft/Hint}} +condition: [<targetTiddler>is[image]] + +<$action-sendmessage + $message="tm-edit-bitmap-operation" + $param="rotate-left" +/> diff --git a/core/ui/EditorToolbar/stamp.tid b/core/ui/EditorToolbar/stamp.tid index bd83a2928..af57feb4b 100644 --- a/core/ui/EditorToolbar/stamp.tid +++ b/core/ui/EditorToolbar/stamp.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/stamp caption: {{$:/language/Buttons/Stamp/Caption}} description: {{$:/language/Buttons/Stamp/Hint}} -condition: [<targetTiddler>!is[image]] +condition: [<targetTiddler>type[]] [<targetTiddler>get[type]prefix[text/]] +[first[]] shortcuts: ((stamp)) dropdown: $:/core/ui/EditorToolbar/stamp-dropdown text: diff --git a/core/ui/EditorToolbar/transcludify.tid b/core/ui/EditorToolbar/transcludify.tid new file mode 100644 index 000000000..dbc008d56 --- /dev/null +++ b/core/ui/EditorToolbar/transcludify.tid @@ -0,0 +1,15 @@ +caption: {{$:/language/Buttons/Transcludify/Caption}} +condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]] +description: {{$:/language/Buttons/Transcludify/Hint}} +icon: $:/core/images/transcludify +list-before: $:/core/ui/EditorToolbar/mono-block +shortcuts: ((transcludify)) +title: $:/core/ui/EditorToolbar/transcludify +tags: $:/tags/EditorToolbar + +<$action-sendmessage + $message="tm-edit-text-operation" + $param="wrap-selection" + prefix="{{" + suffix="}}" +/> diff --git a/core/ui/Filters/StoryList.tid b/core/ui/Filters/StoryList.tid new file mode 100644 index 000000000..c1dfae358 --- /dev/null +++ b/core/ui/Filters/StoryList.tid @@ -0,0 +1,5 @@ +title: $:/core/Filters/StoryList +tags: $:/tags/Filter +filter: [list[$:/StoryList]] -$:/AdvancedSearch +description: {{$:/language/Filters/StoryList}} + diff --git a/core/ui/ImportListing.tid b/core/ui/ImportListing.tid index d57ca6244..ddf49a8ce 100644 --- a/core/ui/ImportListing.tid +++ b/core/ui/ImportListing.tid @@ -1,20 +1,32 @@ title: $:/core/ui/ImportListing \define lingo-base() $:/language/Import/ + \define messageField() message-$(payloadTiddler)$ \end + \define selectionField() selection-$(payloadTiddler)$ \end + \define previewPopupState() $(currentTiddler)$!!popup-$(payloadTiddler)$ \end + +\define select-all-actions() +<$list filter="[all[current]plugintiddlers[]sort[title]]" variable="payloadTiddler"> +<$action-setfield $field={{{ [<payloadTiddler>addprefix[selection-]] }}} $value={{$:/state/import/select-all}}/> +</$list> +\end + <table> <tbody> <tr> <th> +<$checkbox tiddler="$:/state/import/select-all" field="text" checked="checked" unchecked="unchecked" default="checked" actions=<<select-all-actions>>> <<lingo Listing/Select/Caption>> +</$checkbox> </th> <th> <<lingo Listing/Title/Caption>> @@ -29,12 +41,12 @@ $(currentTiddler)$!!popup-$(payloadTiddler)$ <$checkbox field=<<selectionField>> checked="checked" unchecked="unchecked" default="checked"/> </td> <td> -<$reveal type="nomatch" state=<<previewPopupState>> text="yes"> +<$reveal type="nomatch" state=<<previewPopupState>> text="yes" tag="div"> <$button class="tc-btn-invisible tc-btn-dropdown" set=<<previewPopupState>> setTo="yes"> {{$:/core/images/right-arrow}} <$text text=<<payloadTiddler>>/> </$button> </$reveal> -<$reveal type="match" state=<<previewPopupState>> text="yes"> +<$reveal type="match" state=<<previewPopupState>> text="yes" tag="div"> <$button class="tc-btn-invisible tc-btn-dropdown" set=<<previewPopupState>> setTo="no"> {{$:/core/images/down-arrow}} <$text text=<<payloadTiddler>>/> </$button> @@ -46,8 +58,10 @@ $(currentTiddler)$!!popup-$(payloadTiddler)$ </tr> <tr> <td colspan="3"> -<$reveal type="match" text="yes" state=<<previewPopupState>>> -<$transclude subtiddler=<<payloadTiddler>> mode="block"/> +<$reveal type="match" text="yes" state=<<previewPopupState>> tag="div"> +<$list filter="[{$:/state/importpreviewtype}has[text]]" variable="listItem" emptyMessage={{$:/core/ui/ImportPreviews/Text}}> +<$transclude tiddler={{$:/state/importpreviewtype}}/> +</$list> </$reveal> </td> </tr> diff --git a/core/ui/ImportPreviews/Diff.tid b/core/ui/ImportPreviews/Diff.tid new file mode 100644 index 000000000..18c367b99 --- /dev/null +++ b/core/ui/ImportPreviews/Diff.tid @@ -0,0 +1,5 @@ +title: $:/core/ui/ImportPreviews/Diff +tags: $:/tags/ImportPreview +caption: {{$:/language/Import/Listing/Preview/Diff}} + +<$macrocall $name="compareTiddlerText" sourceTiddlerTitle=<<payloadTiddler>> destTiddlerTitle=<<currentTiddler>> destSubTiddlerTitle=<<payloadTiddler>>/> diff --git a/core/ui/ImportPreviews/DiffFields.tid b/core/ui/ImportPreviews/DiffFields.tid new file mode 100644 index 000000000..d02db4fb4 --- /dev/null +++ b/core/ui/ImportPreviews/DiffFields.tid @@ -0,0 +1,5 @@ +title: $:/core/ui/ImportPreviews/DiffFields +tags: $:/tags/ImportPreview +caption: {{$:/language/Import/Listing/Preview/DiffFields}} + +<$macrocall $name="compareTiddlers" sourceTiddlerTitle=<<payloadTiddler>> destTiddlerTitle=<<currentTiddler>> destSubTiddlerTitle=<<payloadTiddler>> exclude="text"/> diff --git a/core/ui/ImportPreviews/Fields.tid b/core/ui/ImportPreviews/Fields.tid new file mode 100644 index 000000000..58c167acb --- /dev/null +++ b/core/ui/ImportPreviews/Fields.tid @@ -0,0 +1,18 @@ +title: $:/core/ui/ImportPreviews/Fields +tags: $:/tags/ImportPreview +caption: {{$:/language/Import/Listing/Preview/Fields}} + +<table class="tc-view-field-table"> +<tbody> +<$list filter="[<payloadTiddler>subtiddlerfields<currentTiddler>sort[]] -text" variable="fieldName"> +<tr class="tc-view-field"> +<td class="tc-view-field-name"> +<$text text=<<fieldName>>/> +</td> +<td class="tc-view-field-value"> +<$view field=<<fieldName>> tiddler=<<currentTiddler>> subtiddler=<<payloadTiddler>>/> +</td> +</tr> +</$list> +</tbody> +</table> diff --git a/core/ui/ImportPreviews/Text.tid b/core/ui/ImportPreviews/Text.tid new file mode 100644 index 000000000..7832eb8b8 --- /dev/null +++ b/core/ui/ImportPreviews/Text.tid @@ -0,0 +1,5 @@ +title: $:/core/ui/ImportPreviews/Text +tags: $:/tags/ImportPreview +caption: {{$:/language/Import/Listing/Preview/Text}} + +<$transclude tiddler=<<currentTiddler>> subtiddler=<<payloadTiddler>> mode="block"/> diff --git a/core/ui/ImportPreviews/TextRaw.tid b/core/ui/ImportPreviews/TextRaw.tid new file mode 100644 index 000000000..ef4576d78 --- /dev/null +++ b/core/ui/ImportPreviews/TextRaw.tid @@ -0,0 +1,5 @@ +title: $:/core/ui/ImportPreviews/TextRaw +tags: $:/tags/ImportPreview +caption: {{$:/language/Import/Listing/Preview/TextRaw}} + +<pre><code><$view tiddler=<<currentTiddler>> subtiddler=<<payloadTiddler>> /></code></pre> \ No newline at end of file diff --git a/core/ui/Manager.tid b/core/ui/Manager.tid new file mode 100644 index 000000000..b0a08ee64 --- /dev/null +++ b/core/ui/Manager.tid @@ -0,0 +1,92 @@ +title: $:/Manager +icon: $:/core/images/list +color: #bbb + +\define lingo-base() $:/language/Manager/ + +\define list-item-content-item() +<div class="tc-manager-list-item-content-item"> + <$vars state-title="""$:/state/popup/manager/item/$(listItem)$"""> + <$reveal state=<<state-title>> type="match" text="show" default="show" tag="div"> + <$button set=<<state-title>> setTo="hide" class="tc-btn-invisible tc-manager-list-item-content-item-heading"> + {{$:/core/images/down-arrow}} <$transclude tiddler=<<listItem>> field="caption"/> + </$button> + </$reveal> + <$reveal state=<<state-title>> type="nomatch" text="show" default="show" tag="div"> + <$button set=<<state-title>> setTo="show" class="tc-btn-invisible tc-manager-list-item-content-item-heading"> + {{$:/core/images/right-arrow}} <$transclude tiddler=<<listItem>> field="caption"/> + </$button> + </$reveal> + <$reveal state=<<state-title>> type="match" text="show" default="show" tag="div" class="tc-manager-list-item-content-item-body"> + <$transclude tiddler=<<listItem>>/> + </$reveal> + </$vars> +</div> +\end + +<div class="tc-manager-wrapper"> + <div class="tc-manager-controls"> + <div class="tc-manager-control"> + <<lingo Controls/Show/Prompt>> <$select tiddler="$:/config/Manager/Show" default="tiddlers"> + <option value="tiddlers"><<lingo Controls/Show/Option/Tiddlers>></option> + <option value="tags"><<lingo Controls/Show/Option/Tags>></option> + </$select> + </div> + <div class="tc-manager-control"> + <<lingo Controls/Search/Prompt>> <$edit-text tiddler="$:/config/Manager/Filter" tag="input" default="" placeholder={{$:/language/Manager/Controls/Search/Placeholder}}/> + </div> + <div class="tc-manager-control"> + <<lingo Controls/FilterByTag/Prompt>> <$select tiddler="$:/config/Manager/Tag" default=""> + <option value=""><<lingo Controls/FilterByTag/None>></option> + <$list filter="[!is{$:/config/Manager/System}tags[]!is[system]sort[title]]" variable="tag"> + <option value=<<tag>>><$text text=<<tag>>/></option> + </$list> + </$select> + </div> + <div class="tc-manager-control"> + <<lingo Controls/Sort/Prompt>> <$select tiddler="$:/config/Manager/Sort" default="title"> + <optgroup label="Common"> + <$list filter="title modified modifier created creator created" variable="field"> + <option value=<<field>>><$text text=<<field>>/></option> + </$list> + </optgroup> + <optgroup label="All"> + <$list filter="[all{$:/config/Manager/Show}!is{$:/config/Manager/System}fields[]sort[title]] -title -modified -modifier -created -creator -created" variable="field"> + <option value=<<field>>><$text text=<<field>>/></option> + </$list> + </optgroup> + </$select> + <$checkbox tiddler="$:/config/Manager/Order" field="text" checked="reverse" unchecked="forward" default="forward"> + <<lingo Controls/Order/Prompt>> + </$checkbox> + </div> + <div class="tc-manager-control"> + <$checkbox tiddler="$:/config/Manager/System" field="text" checked="" unchecked="system" default="system"> + {{$:/language/SystemTiddlers/Include/Prompt}} + </$checkbox> + </div> + </div> + <div class="tc-manager-list"> + <$list filter="[all{$:/config/Manager/Show}!is{$:/config/Manager/System}search{$:/config/Manager/Filter}tag:strict{$:/config/Manager/Tag}sort{$:/config/Manager/Sort}order{$:/config/Manager/Order}]"> + <$vars transclusion=<<currentTiddler>>> + <div style="tc-manager-list-item"> + <$button popup=<<qualify "$:/state/manager/popup">> class="tc-btn-invisible tc-manager-list-item-heading" selectedClass="tc-manager-list-item-heading-selected"> + <$text text=<<currentTiddler>>/> + </$button> + <$reveal state=<<qualify "$:/state/manager/popup">> type="nomatch" text="" default="" tag="div" class="tc-manager-list-item-content tc-popup-handle"> + <div class="tc-manager-list-item-content-tiddler"> + <$list filter="[all[shadows+tiddlers]tag[$:/tags/Manager/ItemMain]!has[draft.of]]" variable="listItem"> + <<list-item-content-item>> + </$list> + </div> + <div class="tc-manager-list-item-content-sidebar"> + <$list filter="[all[shadows+tiddlers]tag[$:/tags/Manager/ItemSidebar]!has[draft.of]]" variable="listItem"> + <<list-item-content-item>> + </$list> + </div> + </$reveal> + </div> + </$vars> + </$list> + </div> +</div> diff --git a/core/ui/Manager/ItemMainFields.tid b/core/ui/Manager/ItemMainFields.tid new file mode 100644 index 000000000..cf88e52c6 --- /dev/null +++ b/core/ui/Manager/ItemMainFields.tid @@ -0,0 +1,9 @@ +title: $:/Manager/ItemMain/Fields +tags: $:/tags/Manager/ItemMain +caption: {{$:/language/Manager/Item/Fields}} + +<table> +<tbody> +<$list filter="[all[current]fields[]sort[title]] -text" template="$:/core/ui/TiddlerFieldTemplate" variable="listItem"/> +</tbody> +</table> diff --git a/core/ui/Manager/ItemMainRawText.tid b/core/ui/Manager/ItemMainRawText.tid new file mode 100644 index 000000000..627095070 --- /dev/null +++ b/core/ui/Manager/ItemMainRawText.tid @@ -0,0 +1,5 @@ +title: $:/Manager/ItemMain/RawText +tags: $:/tags/Manager/ItemMain +caption: {{$:/language/Manager/Item/RawText}} + +<pre><code><$view/></code></pre> diff --git a/core/ui/Manager/ItemMainWikifiedText.tid b/core/ui/Manager/ItemMainWikifiedText.tid new file mode 100644 index 000000000..0e9fd1e75 --- /dev/null +++ b/core/ui/Manager/ItemMainWikifiedText.tid @@ -0,0 +1,5 @@ +title: $:/Manager/ItemMain/WikifiedText +tags: $:/tags/Manager/ItemMain +caption: {{$:/language/Manager/Item/WikifiedText}} + +<$transclude mode="block"/> diff --git a/core/ui/Manager/ItemSidebarColour.tid b/core/ui/Manager/ItemSidebarColour.tid new file mode 100644 index 000000000..6b432239b --- /dev/null +++ b/core/ui/Manager/ItemSidebarColour.tid @@ -0,0 +1,15 @@ +title: $:/Manager/ItemSidebar/Colour +tags: $:/tags/Manager/ItemSidebar +caption: {{$:/language/Manager/Item/Colour}} + +\define swatch-styles() +height: 1em; +background-color: $(colour)$ +\end + +<$vars colour={{!!color}}> +<p style=<<swatch-styles>>/> +</$vars> +<p> +<$edit-text field="color" tag="input" type="color"/> / <$edit-text field="color" tag="input" type="text" size="9"/> +</p> diff --git a/core/ui/Manager/ItemSidebarIcon.tid b/core/ui/Manager/ItemSidebarIcon.tid new file mode 100644 index 000000000..c9fe85a27 --- /dev/null +++ b/core/ui/Manager/ItemSidebarIcon.tid @@ -0,0 +1,23 @@ +title: $:/Manager/ItemSidebar/Icon +tags: $:/tags/Manager/ItemSidebar +caption: {{$:/language/Manager/Item/Icon}} + +<p> +<div class="tc-manager-icon-editor"> +<$button popup=<<qualify "$:/state/popup/image-picker">> class="tc-btn-invisible"> +<$transclude tiddler={{!!icon}}> +{{$:/language/Manager/Item/Icon/None}} +</$transclude> +</$button> +<div class="tc-block-dropdown-wrapper" style="position: static;"> +<$reveal state=<<qualify "$:/state/popup/image-picker">> type="nomatch" text="" default="" tag="div" class="tc-popup"> +<div class="tc-block-dropdown tc-popup-keep" style="width: 80%; left: 10%; right: 10%; padding: 0.5em;"> +<$macrocall $name="image-picker-include-tagged-images" actions=""" +<$action-setfield $field="icon" $value=<<imageTitle>>/> +<$action-deletetiddler $tiddler=<<qualify "$:/state/popup/image-picker">>/> +"""/> +</div> +</$reveal> +</div> +</div> +</p> diff --git a/core/ui/Manager/ItemSidebarTags.tid b/core/ui/Manager/ItemSidebarTags.tid new file mode 100644 index 000000000..e22c2a19a --- /dev/null +++ b/core/ui/Manager/ItemSidebarTags.tid @@ -0,0 +1,32 @@ +title: $:/Manager/ItemSidebar/Tags +tags: $:/tags/Manager/ItemSidebar +caption: {{$:/language/Manager/Item/Tags}} + +\define tag-checkbox-actions() +<$action-listops + $tiddler="$:/config/Manager/RecentTags" + $subfilter="[<tag>] [list[$:/config/Manager/RecentTags]] +[limit[12]]" +/> +\end + +\define tag-picker-actions() +<<tag-checkbox-actions>> +<$action-listops + $tiddler=<<currentTiddler>> + $field="tags" + $subfilter="[<tag>] [all[current]tags[]]" +/> +\end + +<p> +<$list filter="[is[current]tags[]] [list[$:/config/Manager/RecentTags]] +[sort[title]] " variable="tag"> +<div> +<$checkbox tiddler=<<currentTiddler>> tag=<<tag>> actions=<<tag-checkbox-actions>>> +<$macrocall $name="tag-pill" tag=<<tag>>/> +</$checkbox> +</div> +</$list> +</p> +<p> +<$macrocall $name="tag-picker" actions=<<tag-picker-actions>>/> +</p> diff --git a/core/ui/Manager/ItemSidebarTools.tid b/core/ui/Manager/ItemSidebarTools.tid new file mode 100644 index 000000000..45876e989 --- /dev/null +++ b/core/ui/Manager/ItemSidebarTools.tid @@ -0,0 +1,10 @@ +title: $:/Manager/ItemSidebar/Tools +tags: $:/tags/Manager/ItemSidebar +caption: {{$:/language/Manager/Item/Tools}} + +<p> +<$button to=<<currentTiddler>>>{{$:/core/images/link}} open</$button> +</p> +<p> +<$button message="tm-edit-tiddler" param=<<currentTiddler>>>{{$:/core/images/edit-button}} edit</$button> +</p> diff --git a/core/ui/MoreSideBar/Explorer.tid b/core/ui/MoreSideBar/Explorer.tid new file mode 100644 index 000000000..ae0e8fe99 --- /dev/null +++ b/core/ui/MoreSideBar/Explorer.tid @@ -0,0 +1,5 @@ +title: $:/core/ui/MoreSideBar/Explorer +tags: $:/tags/MoreSideBar +caption: {{$:/language/SideBar/Explorer/Caption}} + +<<tree "$:/">> diff --git a/core/ui/MoreSideBar/Plugins.tid b/core/ui/MoreSideBar/Plugins.tid new file mode 100644 index 000000000..614bcaeee --- /dev/null +++ b/core/ui/MoreSideBar/Plugins.tid @@ -0,0 +1,8 @@ +title: $:/core/ui/MoreSideBar/Plugins +tags: $:/tags/MoreSideBar +caption: {{$:/language/ControlPanel/Plugins/Caption}} + + +{{$:/language/ControlPanel/Plugins/Installed/Hint}} + +<<tabs "[all[shadows+tiddlers]tag[$:/tags/MoreSideBar/Plugins]!has[draft.of]]" "$:/core/ui/MoreSideBar/Plugins/Plugins">> diff --git a/core/ui/MoreSideBar/plugins/Languages.tid b/core/ui/MoreSideBar/plugins/Languages.tid new file mode 100644 index 000000000..2220f0124 --- /dev/null +++ b/core/ui/MoreSideBar/plugins/Languages.tid @@ -0,0 +1,5 @@ +title: $:/core/ui/MoreSideBar/Plugins/Languages +tags: $:/tags/MoreSideBar/Plugins +caption: {{$:/language/ControlPanel/Plugins/Languages/Caption}} + +<$list filter="[!has[draft.of]plugin-type[language]sort[description]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}/> diff --git a/core/ui/MoreSideBar/plugins/Plugins.tid b/core/ui/MoreSideBar/plugins/Plugins.tid new file mode 100644 index 000000000..96933542a --- /dev/null +++ b/core/ui/MoreSideBar/plugins/Plugins.tid @@ -0,0 +1,5 @@ +title: $:/core/ui/MoreSideBar/Plugins/Plugins +tags: $:/tags/MoreSideBar/Plugins +caption: {{$:/language/ControlPanel/Plugins/Plugins/Caption}} + +<$list filter="[!has[draft.of]plugin-type[plugin]sort[description]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}>>/> diff --git a/core/ui/MoreSideBar/plugins/Theme.tid b/core/ui/MoreSideBar/plugins/Theme.tid new file mode 100644 index 000000000..48447cd6e --- /dev/null +++ b/core/ui/MoreSideBar/plugins/Theme.tid @@ -0,0 +1,5 @@ +title: $:/core/ui/MoreSideBar/Plugins/Theme +tags: $:/tags/MoreSideBar/Plugins +caption: {{$:/language/ControlPanel/Plugins/Themes/Caption}} + +<$list filter="[!has[draft.of]plugin-type[theme]sort[description]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}/> diff --git a/core/ui/PageControls.tid b/core/ui/PageControls.tid index 6e9e04138..b12fc5203 100644 --- a/core/ui/PageControls.tid +++ b/core/ui/PageControls.tid @@ -6,7 +6,9 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ <div class="tc-page-controls"> <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem"> <$reveal type="nomatch" state=<<config-title>> text="hide"> +<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]"> <$transclude tiddler=<<listItem>> mode="inline"/> +</$set> </$reveal> </$list> </div> diff --git a/core/ui/PageControls/language.tid b/core/ui/PageControls/language.tid index becbf2363..c0e7123df 100644 --- a/core/ui/PageControls/language.tid +++ b/core/ui/PageControls/language.tid @@ -21,34 +21,7 @@ $(languagePluginTitle)$/icon </$button> </span> <$reveal state=<<qualify "$:/state/popup/language">> type="popup" position="below" animate="yes"> -<div class="tc-drop-down tc-drop-down-language-chooser"> -<$linkcatcher to="$:/language"> -<$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[description]]"> -<$link> -<span class="tc-drop-down-bullet"> -<$reveal type="match" state="$:/language" text=<<currentTiddler>>> -• -</$reveal> -<$reveal type="nomatch" state="$:/language" text=<<currentTiddler>>> -  -</$reveal> -</span> -<span class="tc-image-button"> -<$set name="languagePluginTitle" value=<<currentTiddler>>> -<$transclude subtiddler=<<flag-title>>> -<$list filter="[all[current]field:title[$:/languages/en-GB]]"> -<$transclude tiddler="$:/languages/en-GB/icon"/> -</$list> -</$transclude> -</$set> -</span> -<$view field="description"> -<$view field="name"> -<$view field="title"/> -</$view> -</$view> -</$link> -</$list> -</$linkcatcher> +<div class="tc-drop-down"> +{{$:/snippets/languageswitcher}} </div> </$reveal> \ No newline at end of file diff --git a/core/ui/PageControls/manager.tid b/core/ui/PageControls/manager.tid new file mode 100644 index 000000000..b2a7ed9bf --- /dev/null +++ b/core/ui/PageControls/manager.tid @@ -0,0 +1,19 @@ +title: $:/core/ui/Buttons/manager +tags: $:/tags/PageControls +caption: {{$:/core/images/list}} {{$:/language/Buttons/Manager/Caption}} +description: {{$:/language/Buttons/Manager/Hint}} + +\define manager-button(class) +<$button to="$:/Manager" tooltip={{$:/language/Buttons/Manager/Hint}} aria-label={{$:/language/Buttons/Manager/Caption}} class="""$(tv-config-toolbar-class)$ $class$"""> +<$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> +{{$:/core/images/list}} +</$list> +<$list filter="[<tv-config-toolbar-text>prefix[yes]]"> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Manager/Caption}}/></span> +</$list> +</$button> +\end + +<$list filter="[list[$:/StoryList]] +[field:title[$:/Manager]]" emptyMessage=<<manager-button>>> +<<manager-button "tc-selected">> +</$list> diff --git a/core/ui/PageControls/more-page-actions.tid b/core/ui/PageControls/more-page-actions.tid index 11e149fc7..a3b18201f 100644 --- a/core/ui/PageControls/more-page-actions.tid +++ b/core/ui/PageControls/more-page-actions.tid @@ -27,8 +27,12 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ <$reveal type="match" state=<<config-title>> text="hide"> +<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]"> + <$transclude tiddler=<<listItem>> mode="inline"/> +</$set> + </$reveal> </$list> diff --git a/core/ui/PageControls/new-journal.tid b/core/ui/PageControls/new-journal.tid index f8c7950a9..6b26b5ed2 100644 --- a/core/ui/PageControls/new-journal.tid +++ b/core/ui/PageControls/new-journal.tid @@ -3,9 +3,19 @@ tags: $:/tags/PageControls caption: {{$:/core/images/new-journal-button}} {{$:/language/Buttons/NewJournal/Caption}} description: {{$:/language/Buttons/NewJournal/Hint}} +\define journalActions() +<$wikify name="journalTitle" text="""<$macrocall $name="now" format=<<journalTitleTemplate>>/>"""> +<$reveal type="nomatch" state=<<journalTitle>> text=""> +<$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<journalTags>> text={{{ [<journalTitle>get[]] }}}/> +</$reveal> +<$reveal type="match" state=<<journalTitle>> text=""> +<$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<journalTags>> text=<<journalText>>/> +</$reveal> +</$wikify> +\end + \define journalButton() -<$button tooltip={{$:/language/Buttons/NewJournal/Hint}} aria-label={{$:/language/Buttons/NewJournal/Caption}} class=<<tv-config-toolbar-class>>> -<$action-sendmessage $message="tm-new-tiddler" title=<<now "$(journalTitleTemplate)$">> tags="$(journalTags)$"/> +<$button tooltip={{$:/language/Buttons/NewJournal/Hint}} aria-label={{$:/language/Buttons/NewJournal/Caption}} class=<<tv-config-toolbar-class>> actions=<<journalActions>>> <$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> {{$:/core/images/new-journal-button}} </$list> @@ -16,5 +26,6 @@ description: {{$:/language/Buttons/NewJournal/Hint}} \end <$set name="journalTitleTemplate" value={{$:/config/NewJournal/Title}}> <$set name="journalTags" value={{$:/config/NewJournal/Tags}}> +<$set name="journalText" value={{$:/config/NewJournal/Text}}> <<journalButton>> -</$set></$set> \ No newline at end of file +</$set></$set></$set> \ No newline at end of file diff --git a/core/ui/PageControls/print.tid b/core/ui/PageControls/print.tid new file mode 100644 index 000000000..cc2709cd2 --- /dev/null +++ b/core/ui/PageControls/print.tid @@ -0,0 +1,13 @@ +title: $:/core/ui/Buttons/print +tags: $:/tags/PageControls +caption: {{$:/core/images/print-button}} {{$:/language/Buttons/Print/Caption}} +description: {{$:/language/Buttons/Print/Hint}} + +<$button message="tm-print" tooltip={{$:/language/Buttons/Print/Hint}} aria-label={{$:/language/Buttons/Print/Caption}} class=<<tv-config-toolbar-class>>> +<$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> +{{$:/core/images/print-button}} +</$list> +<$list filter="[<tv-config-toolbar-text>prefix[yes]]"> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Print/Caption}}/></span> +</$list> +</$button> \ No newline at end of file diff --git a/core/ui/PageControls/storyview.tid b/core/ui/PageControls/storyview.tid index 43076c639..acdb08d12 100644 --- a/core/ui/PageControls/storyview.tid +++ b/core/ui/PageControls/storyview.tid @@ -20,20 +20,6 @@ $:/core/images/storyview-$(storyview)$ </span> <$reveal state=<<qualify "$:/state/popup/storyview">> type="popup" position="below" animate="yes"> <div class="tc-drop-down"> -<$linkcatcher to="$:/view"> -<$list filter="[storyviews[]]" variable="storyview"> -<$link to=<<storyview>>> -<span class="tc-drop-down-bullet"> -<$reveal type="match" state="$:/view" text=<<storyview>>> -• -</$reveal> -<$reveal type="nomatch" state="$:/view" text=<<storyview>>> -  -</$reveal> -</span> -<$transclude tiddler=<<icon>>/> -<$text text=<<storyview>>/></$link> -</$list> -</$linkcatcher> +{{$:/snippets/viewswitcher}} </div> </$reveal> \ No newline at end of file diff --git a/core/ui/PageControls/theme.tid b/core/ui/PageControls/theme.tid index bbe73e97b..e5574eabf 100644 --- a/core/ui/PageControls/theme.tid +++ b/core/ui/PageControls/theme.tid @@ -16,19 +16,7 @@ description: {{$:/language/Buttons/Theme/Hint}} <$reveal state=<<qualify "$:/state/popup/theme">> type="popup" position="below" animate="yes"> <div class="tc-drop-down"> <$linkcatcher to="$:/theme"> -<$list filter="[plugin-type[theme]sort[title]]" variable="themeTitle"> -<$link to=<<themeTitle>>> -<span class="tc-drop-down-bullet"> -<$reveal type="match" state="$:/theme" text=<<themeTitle>>> -• -</$reveal> -<$reveal type="nomatch" state="$:/theme" text=<<themeTitle>>> -  -</$reveal> -</span> -<$view tiddler=<<themeTitle>> field="name"/> -</$link> -</$list> +{{$:/snippets/themeswitcher}} </$linkcatcher> </div> </$reveal> \ No newline at end of file diff --git a/core/ui/PageControls/timestamp.tid b/core/ui/PageControls/timestamp.tid new file mode 100644 index 000000000..28cfbd74e --- /dev/null +++ b/core/ui/PageControls/timestamp.tid @@ -0,0 +1,27 @@ +title: $:/core/ui/Buttons/timestamp +tags: $:/tags/PageControls +caption: {{$:/core/images/timestamp-on}} {{$:/language/Buttons/Timestamp/Caption}} +description: {{$:/language/Buttons/Timestamp/Hint}} + +<$reveal type="nomatch" state="$:/config/TimestampDisable" text="yes"> +<$button tooltip={{$:/language/Buttons/Timestamp/On/Hint}} aria-label={{$:/language/Buttons/Timestamp/On/Caption}} class=<<tv-config-toolbar-class>>> +<$action-setfield $tiddler="$:/config/TimestampDisable" $value="yes"/> +<$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> +{{$:/core/images/timestamp-on}} +</$list> +<$list filter="[<tv-config-toolbar-text>prefix[yes]]"> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Timestamp/On/Caption}}/></span> +</$list> +</$button> +</$reveal> +<$reveal type="match" state="$:/config/TimestampDisable" text="yes"> +<$button tooltip={{$:/language/Buttons/Timestamp/Off/Hint}} aria-label={{$:/language/Buttons/Timestamp/Off/Caption}} class=<<tv-config-toolbar-class>>> +<$action-setfield $tiddler="$:/config/TimestampDisable" $value="no"/> +<$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> +{{$:/core/images/timestamp-off}} +</$list> +<$list filter="[<tv-config-toolbar-text>prefix[yes]]"> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Timestamp/Off/Caption}}/></span> +</$list> +</$button> +</$reveal> \ No newline at end of file diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid index acd70ee83..1a539f247 100644 --- a/core/ui/PageTemplate.tid +++ b/core/ui/PageTemplate.tid @@ -22,7 +22,7 @@ tc-page-container tc-page-view-$(themeTitle)$ tc-language-$(languageTitle)$ <div class=<<containerClasses>>> -<$navigator story="$:/StoryList" history="$:/HistoryList" openLinkFromInsideRiver={{$:/config/Navigation/openLinkFromInsideRiver}} openLinkFromOutsideRiver={{$:/config/Navigation/openLinkFromOutsideRiver}}> +<$navigator story="$:/StoryList" history="$:/HistoryList" openLinkFromInsideRiver={{$:/config/Navigation/openLinkFromInsideRiver}} openLinkFromOutsideRiver={{$:/config/Navigation/openLinkFromOutsideRiver}} relinkOnRename={{$:/config/RelinkOnRename}}> <$dropzone> diff --git a/core/ui/PluginInfo.tid b/core/ui/PluginInfo.tid index 9e43b0dee..d8944bf35 100644 --- a/core/ui/PluginInfo.tid +++ b/core/ui/PluginInfo.tid @@ -6,10 +6,15 @@ $(currentTiddler)$/$(languageTitle)$/$(currentTab)$ \define info-tiddler-title() $(currentTiddler)$/$(currentTab)$ \end +\define default-tiddler-title() +$:/core/ui/PluginInfo/Default/$(currentTab)$ +\end <$transclude tiddler=<<localised-info-tiddler-title>> mode="block"> <$transclude tiddler=<<currentTiddler>> subtiddler=<<localised-info-tiddler-title>> mode="block"> <$transclude tiddler=<<currentTiddler>> subtiddler=<<info-tiddler-title>> mode="block"> +<$transclude tiddler=<<default-tiddler-title>> mode="block"> {{$:/language/ControlPanel/Plugin/NoInfoFound/Hint}} </$transclude> </$transclude> </$transclude> +</$transclude> diff --git a/core/ui/PluginInfoDefaultContents.tid b/core/ui/PluginInfoDefaultContents.tid new file mode 100644 index 000000000..f006d0c60 --- /dev/null +++ b/core/ui/PluginInfoDefaultContents.tid @@ -0,0 +1,13 @@ +title: $:/core/ui/PluginInfo/Default/contents + +\define lingo-base() $:/language/TiddlerInfo/Advanced/PluginInfo/ +<<lingo Hint>> +<ul> +<$list filter="[all[current]plugintiddlers[]sort[title]]" emptyMessage=<<lingo Empty/Hint>>> +<li> +<$link to={{!!title}}> +<$view field="title"/> +</$link> +</li> +</$list> +</ul> diff --git a/core/ui/PluginListItemTemplate.tid b/core/ui/PluginListItemTemplate.tid new file mode 100644 index 000000000..f781bca92 --- /dev/null +++ b/core/ui/PluginListItemTemplate.tid @@ -0,0 +1,9 @@ +title: $:/core/ui/PluginListItemTemplate + +<div class="tc-menu-list-item"> +<$link to={{!!title}}> +<$view field="description"> +<$view field="title"/> +</$view> +</$link> +</div> \ No newline at end of file diff --git a/core/ui/SideBar/More.tid b/core/ui/SideBar/More.tid index d0a0e4bb2..624a3ae4a 100644 --- a/core/ui/SideBar/More.tid +++ b/core/ui/SideBar/More.tid @@ -3,5 +3,5 @@ tags: $:/tags/SideBar caption: {{$:/language/SideBar/More/Caption}} <div class="tc-more-sidebar"> -<<tabs "[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" "$:/core/ui/MoreSideBar/Tags" "$:/state/tab/moresidebar" "tc-vertical">> -</div> +<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" default={{$:/config/DefaultMoreSidebarTab}} state="$:/state/tab/moresidebar" class="tc-vertical" /> +</div> \ No newline at end of file diff --git a/core/ui/SideBar/Open.tid b/core/ui/SideBar/Open.tid index 8b2d9c46d..61e52b420 100644 --- a/core/ui/SideBar/Open.tid +++ b/core/ui/SideBar/Open.tid @@ -3,10 +3,28 @@ tags: $:/tags/SideBar caption: {{$:/language/SideBar/Open/Caption}} \define lingo-base() $:/language/CloseAll/ + +\define drop-actions() +<$action-listops $tiddler="$:/StoryList" $subfilter="+[insertbefore:currentTiddler<actionTiddler>]"/> +\end + <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop"> - +<div style="position: relative;"> +<$droppable actions=<<drop-actions>>> +<div class="tc-droppable-placeholder"> +  +</div> +<div> <$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="tc-btn-invisible tc-btn-mini">×</$button> <$link to={{!!title}}><$view field="title"/></$link> - +</div> +</$droppable> +</div> </$list> - +<$tiddler tiddler=""> +<$droppable actions=<<drop-actions>>> +<div class="tc-droppable-placeholder"> +  +</div> <$button message="tm-close-all-tiddlers" class="tc-btn-invisible tc-btn-mini"><<lingo Button>></$button> +</$droppable> +</$tiddler> diff --git a/core/ui/SideBar/Tools.tid b/core/ui/SideBar/Tools.tid index 8d0568590..8a123b1c7 100644 --- a/core/ui/SideBar/Tools.tid +++ b/core/ui/SideBar/Tools.tid @@ -17,7 +17,7 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem"> -<div style="position:relative;"> +<div style="position:relative;" class={{{ [<listItem>encodeuricomponent[]addprefix[tc-btn-]] }}}> <$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <$transclude tiddler=<<listItem>>/> <i class="tc-muted"><$transclude tiddler=<<listItem>> field="description"/></i> diff --git a/core/ui/SideBarLists.tid b/core/ui/SideBarLists.tid index dfe012502..f54380721 100644 --- a/core/ui/SideBarLists.tid +++ b/core/ui/SideBarLists.tid @@ -17,9 +17,12 @@ title: $:/core/ui/SideBarLists {{$:/core/images/close-button}} </$button> <$button popup=<<qualify "$:/state/popup/search-dropdown">> class="tc-btn-invisible"> +{{$:/core/images/down-arrow}} +<$list filter="[{$:/temp/search}minlength{$:/config/Search/MinLength}limit[1]]" variable="listItem"> <$set name="resultCount" value="""<$count filter="[!is[system]search{$(searchTiddler)$}]"/>"""> -{{$:/core/images/down-arrow}} {{$:/language/Search/Matches}} +{{$:/language/Search/Matches}} </$set> +</$list> </$button> </$reveal> <$reveal state="$:/temp/search" type="match" text=""> @@ -33,8 +36,12 @@ title: $:/core/ui/SideBarLists <$reveal tag="div" class="tc-block-dropdown tc-search-drop-down tc-popup-handle" state=<<qualify "$:/state/popup/search-dropdown">> type="nomatch" text="" default=""> +<$list filter="[{$:/temp/search}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem"> + {{$:/core/ui/SearchResults}} +</$list> + </$reveal> </$reveal> diff --git a/core/ui/TagManager.tid b/core/ui/TagManager.tid index fe3489dc9..eeb2135c5 100644 --- a/core/ui/TagManager.tid +++ b/core/ui/TagManager.tid @@ -1,6 +1,7 @@ title: $:/TagManager icon: $:/core/images/tag-button color: #bbb +caption: {{$:/language/TagManager/Caption}} \define lingo-base() $:/language/TagManager/ \define iconEditorTab(type) @@ -51,7 +52,7 @@ $title$$(currentTiddler)$ <$list filter="[tags[]!is[system]sort[title]]"> <tr> <td><$edit-text field="color" tag="input" type="color"/></td> -<td><$transclude tiddler="$:/core/ui/TagTemplate"/></td> +<td><$macrocall $name="tag" tag=<<currentTiddler>>/></td> <td><$count filter="[all[current]tagging[]]"/></td> <td> <$macrocall $name="iconEditor" title={{!!title}}/> diff --git a/core/ui/TagTemplate.tid b/core/ui/TagTemplate.tid index f302d8f3d..243062be7 100644 --- a/core/ui/TagTemplate.tid +++ b/core/ui/TagTemplate.tid @@ -1,30 +1,15 @@ title: $:/core/ui/TagTemplate -\define tag-styles() -background-color:$(backgroundColor)$; -fill:$(foregroundColor)$; -color:$(foregroundColor)$; -\end - -\define tag-body-inner(colour,fallbackTarget,colourA,colourB) -<$vars foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">> backgroundColor="""$colour$"""> -<$button popup=<<qualify "$:/state/popup/tag">> class="tc-btn-invisible tc-tag-label" style=<<tag-styles>>> -<$transclude tiddler={{!!icon}}/> <$view field="title" format="text" /> -</$button> -<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes" class="tc-drop-down"><$transclude tiddler="$:/core/ui/ListItemTemplate"/> +<span class="tc-tag-list-item"> +<$set name="transclusion" value=<<currentTiddler>>> +<$macrocall $name="tag-pill-body" tag=<<currentTiddler>> icon={{!!icon}} colour={{!!color}} palette={{$:/palette}} element-tag="""$button""" element-attributes="""popup=<<qualify "$:/state/popup/tag">> dragFilter='[all[current]tagging[]]' tag='span'"""/> +<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes" class="tc-drop-down"> +<$transclude tiddler="$:/core/ui/ListItemTemplate"/> <$list filter="[all[shadows+tiddlers]tag[$:/tags/TagDropdown]!has[draft.of]]" variable="listItem"> <$transclude tiddler=<<listItem>>/> -</$list> +</$list> <hr> -<$list filter="[all[current]tagging[]]" template="$:/core/ui/ListItemTemplate"/> +<$macrocall $name="list-tagged-draggable" tag=<<currentTiddler>>/> </$reveal> -</$vars> -\end - -\define tag-body(colour,palette) -<span class="tc-tag-list-item"> -<$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}}/> +</$set> </span> -\end - -<$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}}/> diff --git a/core/ui/TiddlerInfo.tid b/core/ui/TiddlerInfo.tid index 3e51e4855..f7447fea1 100644 --- a/core/ui/TiddlerInfo.tid +++ b/core/ui/TiddlerInfo.tid @@ -1,3 +1,13 @@ title: $:/core/ui/TiddlerInfo +<div style="position:relative;"> +<div class="tc-tiddler-controls" style="position:absolute;right:0;"> +<$reveal state="$:/config/TiddlerInfo/Mode" type="match" text="sticky"> +<$button set=<<tiddlerInfoState>> setTo="" tooltip={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class="tc-btn-invisible"> +{{$:/core/images/close-button}} +</$button> +</$reveal> +</div> +</div> + <$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/TiddlerInfo]!has[draft.of]]" default={{$:/config/TiddlerInfo/Default}}/> \ No newline at end of file diff --git a/core/ui/ViewTemplate.tid b/core/ui/ViewTemplate.tid index 83af05645..ce685c148 100644 --- a/core/ui/ViewTemplate.tid +++ b/core/ui/ViewTemplate.tid @@ -1,11 +1,11 @@ title: $:/core/ui/ViewTemplate \define frame-classes() -tc-tiddler-frame tc-tiddler-view-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$ $(tiddlerTagClasses)$ +tc-tiddler-frame tc-tiddler-view-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$ $(tiddlerTagClasses)$ $(userClass)$ \end \define folded-state() $:/state/folded/$(currentTiddler)$ \end -<$set name="storyTiddler" value=<<currentTiddler>>><$set name="tiddlerInfoState" value=<<qualify "$:/state/popup/tiddler-info">>><$tiddler tiddler=<<currentTiddler>>><div class=<<frame-classes>>><$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list> +<$vars storyTiddler=<<currentTiddler>> tiddlerInfoState=<<qualify "$:/state/popup/tiddler-info">> userClass={{!!class}}><$tiddler tiddler=<<currentTiddler>>><div data-tiddler-title=<<currentTiddler>> data-tags={{!!tags}} class=<<frame-classes>>><$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list> </div> -</$tiddler></$set></$set> +</$tiddler></$vars> diff --git a/core/ui/ViewTemplate/body.tid b/core/ui/ViewTemplate/body.tid index 4ef5b5650..f2d65332e 100644 --- a/core/ui/ViewTemplate/body.tid +++ b/core/ui/ViewTemplate/body.tid @@ -13,4 +13,4 @@ tags: $:/tags/ViewTemplate </$list> -</$reveal> +</$reveal> \ No newline at end of file diff --git a/core/ui/ViewTemplate/import.tid b/core/ui/ViewTemplate/import.tid index 9dc4a52ea..4de7539b3 100644 --- a/core/ui/ViewTemplate/import.tid +++ b/core/ui/ViewTemplate/import.tid @@ -3,19 +3,27 @@ tags: $:/tags/ViewTemplate \define lingo-base() $:/language/Import/ +\define buttons() +<$button message="tm-delete-tiddler" param=<<currentTiddler>>><<lingo Listing/Cancel/Caption>></$button> +<$button message="tm-perform-import" param=<<currentTiddler>>><<lingo Listing/Import/Caption>></$button> +<<lingo Listing/Preview>> <$select tiddler="$:/state/importpreviewtype" default="$:/core/ui/ImportPreviews/Text"> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/ImportPreview]!has[draft.of]]"> +<option value=<<currentTiddler>>>{{!!caption}}</option> +</$list> +</$select> +\end + <$list filter="[all[current]field:plugin-type[import]]"> <div class="tc-import"> <<lingo Listing/Hint>> -<$button message="tm-delete-tiddler" param=<<currentTiddler>>><<lingo Listing/Cancel/Caption>></$button> -<$button message="tm-perform-import" param=<<currentTiddler>>><<lingo Listing/Import/Caption>></$button> +<<buttons>> {{||$:/core/ui/ImportListing}} -<$button message="tm-delete-tiddler" param=<<currentTiddler>>><<lingo Listing/Cancel/Caption>></$button> -<$button message="tm-perform-import" param=<<currentTiddler>>><<lingo Listing/Import/Caption>></$button> +<<buttons>> </div> diff --git a/core/ui/ViewTemplate/plugin.tid b/core/ui/ViewTemplate/plugin.tid index 2c7d2081c..07bb3b618 100644 --- a/core/ui/ViewTemplate/plugin.tid +++ b/core/ui/ViewTemplate/plugin.tid @@ -2,7 +2,11 @@ title: $:/core/ui/ViewTemplate/plugin tags: $:/tags/ViewTemplate <$list filter="[all[current]has[plugin-type]] -[all[current]field:plugin-type[import]]"> - -{{||$:/core/ui/TiddlerInfo/Advanced/PluginInfo}} - +<$set name="plugin-type" value={{!!plugin-type}}> +<$set name="default-popup-state" value="yes"> +<$set name="qualified-state" value=<<qualify "$:/state/plugin-info">>> +{{||$:/core/ui/Components/plugin-info}} +</$set> +</$set> +</$set> </$list> diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid index 1254d8005..c813f8040 100644 --- a/core/ui/ViewTemplate/title.tid +++ b/core/ui/ViewTemplate/title.tid @@ -10,7 +10,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$ <div class="tc-tiddler-title"> <div class="tc-titlebar"> <span class="tc-tiddler-controls"> -<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]"><$transclude tiddler=<<listItem>>/></$set></$reveal></$list> </span> <$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}> <$link> diff --git a/core/ui/ViewToolbar/clone.tid b/core/ui/ViewToolbar/clone.tid index 0a28769ac..5625c5a2a 100644 --- a/core/ui/ViewToolbar/clone.tid +++ b/core/ui/ViewToolbar/clone.tid @@ -3,11 +3,15 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/clone-button}} {{$:/language/Buttons/Clone/Caption}} description: {{$:/language/Buttons/Clone/Hint}} +\whitespace trim <$button message="tm-new-tiddler" param=<<currentTiddler>> tooltip={{$:/language/Buttons/Clone/Hint}} aria-label={{$:/language/Buttons/Clone/Caption}} class=<<tv-config-toolbar-class>>> <$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> {{$:/core/images/clone-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<span class="tc-btn-text"><$text text={{$:/language/Buttons/Clone/Caption}}/></span> +<span class="tc-btn-text"> +<$text text=" "/> +<$text text={{$:/language/Buttons/Clone/Caption}}/> +</span> </$list> </$button> \ No newline at end of file diff --git a/core/ui/ViewToolbar/close-others.tid b/core/ui/ViewToolbar/close-others.tid index 3038cafe1..55042d989 100644 --- a/core/ui/ViewToolbar/close-others.tid +++ b/core/ui/ViewToolbar/close-others.tid @@ -3,11 +3,15 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/close-others-button}} {{$:/language/Buttons/CloseOthers/Caption}} description: {{$:/language/Buttons/CloseOthers/Hint}} +\whitespace trim <$button message="tm-close-other-tiddlers" param=<<currentTiddler>> tooltip={{$:/language/Buttons/CloseOthers/Hint}} aria-label={{$:/language/Buttons/CloseOthers/Caption}} class=<<tv-config-toolbar-class>>> <$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> {{$:/core/images/close-others-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<span class="tc-btn-text"><$text text={{$:/language/Buttons/CloseOthers/Caption}}/></span> +<span class="tc-btn-text"> +<$text text=" "/> +<$text text={{$:/language/Buttons/CloseOthers/Caption}}/> +</span> </$list> </$button> \ No newline at end of file diff --git a/core/ui/ViewToolbar/close.tid b/core/ui/ViewToolbar/close.tid index 3f90b68f1..49695a77a 100644 --- a/core/ui/ViewToolbar/close.tid +++ b/core/ui/ViewToolbar/close.tid @@ -3,11 +3,14 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/close-button}} {{$:/language/Buttons/Close/Caption}} description: {{$:/language/Buttons/Close/Hint}} +\whitespace trim <$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class=<<tv-config-toolbar-class>>> <$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> {{$:/core/images/close-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<span class="tc-btn-text"><$text text={{$:/language/Buttons/Close/Caption}}/></span> +<span class="tc-btn-text"> +<$text text={{$:/language/Buttons/Close/Caption}}/> +</span> </$list> </$button> \ No newline at end of file diff --git a/core/ui/ViewToolbar/edit.tid b/core/ui/ViewToolbar/edit.tid index 5b8b83560..fd299c173 100644 --- a/core/ui/ViewToolbar/edit.tid +++ b/core/ui/ViewToolbar/edit.tid @@ -3,11 +3,15 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/edit-button}} {{$:/language/Buttons/Edit/Caption}} description: {{$:/language/Buttons/Edit/Hint}} +\whitespace trim <$button message="tm-edit-tiddler" tooltip={{$:/language/Buttons/Edit/Hint}} aria-label={{$:/language/Buttons/Edit/Caption}} class=<<tv-config-toolbar-class>>> <$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> {{$:/core/images/edit-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<span class="tc-btn-text"><$text text={{$:/language/Buttons/Edit/Caption}}/></span> +<span class="tc-btn-text"> +<$text text=" "/> +<$text text={{$:/language/Buttons/Edit/Caption}}/> +</span> </$list> </$button> \ No newline at end of file diff --git a/core/ui/ViewToolbar/fold-bar.tid b/core/ui/ViewToolbar/fold-bar.tid index 6e813dbb4..1b62975c5 100644 --- a/core/ui/ViewToolbar/fold-bar.tid +++ b/core/ui/ViewToolbar/fold-bar.tid @@ -1,6 +1,6 @@ title: $:/core/ui/Buttons/fold-bar tags: $:/tags/ViewToolbar -caption: {{$:/language/Buttons/Fold/FoldBar/Caption}} +caption: {{$:/core/images/chevron-up}} {{$:/language/Buttons/Fold/FoldBar/Caption}} description: {{$:/language/Buttons/Fold/FoldBar/Hint}} <!-- This dummy toolbar button is here to allow visibility of the fold-bar to be controlled as if it were a toolbar button --> \ No newline at end of file diff --git a/core/ui/ViewToolbar/fold-others.tid b/core/ui/ViewToolbar/fold-others.tid index c85a72bad..55c31c721 100644 --- a/core/ui/ViewToolbar/fold-others.tid +++ b/core/ui/ViewToolbar/fold-others.tid @@ -3,12 +3,16 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/fold-others-button}} {{$:/language/Buttons/FoldOthers/Caption}} description: {{$:/language/Buttons/FoldOthers/Hint}} +\whitespace trim <$button tooltip={{$:/language/Buttons/FoldOthers/Hint}} aria-label={{$:/language/Buttons/FoldOthers/Caption}} class=<<tv-config-toolbar-class>>> <$action-sendmessage $message="tm-fold-other-tiddlers" $param=<<currentTiddler>> foldedStatePrefix="$:/state/folded/"/> <$list filter="[<tv-config-toolbar-icons>prefix[yes]]" variable="listItem"> {{$:/core/images/fold-others-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<span class="tc-btn-text"><$text text={{$:/language/Buttons/FoldOthers/Caption}}/></span> +<span class="tc-btn-text"> +<$text text=" "/> +<$text text={{$:/language/Buttons/FoldOthers/Caption}}/> +</span> </$list> </$button> \ No newline at end of file diff --git a/core/ui/ViewToolbar/fold.tid b/core/ui/ViewToolbar/fold.tid index 545114a82..902344224 100644 --- a/core/ui/ViewToolbar/fold.tid +++ b/core/ui/ViewToolbar/fold.tid @@ -3,24 +3,32 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/fold-button}} {{$:/language/Buttons/Fold/Caption}} description: {{$:/language/Buttons/Fold/Hint}} -<$reveal type="nomatch" state=<<folded-state>> text="hide" default="show"><$button tooltip={{$:/language/Buttons/Fold/Hint}} aria-label={{$:/language/Buttons/Fold/Caption}} class=<<tv-config-toolbar-class>>> +\whitespace trim +<$reveal type="nomatch" state=<<folded-state>> text="hide" default="show"> +<$button tooltip={{$:/language/Buttons/Fold/Hint}} aria-label={{$:/language/Buttons/Fold/Caption}} class=<<tv-config-toolbar-class>>> <$action-sendmessage $message="tm-fold-tiddler" $param=<<currentTiddler>> foldedState=<<folded-state>>/> <$list filter="[<tv-config-toolbar-icons>prefix[yes]]" variable="listItem"> {{$:/core/images/fold-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> <span class="tc-btn-text"> +<$text text=" "/> <$text text={{$:/language/Buttons/Fold/Caption}}/> </span> </$list> -</$button></$reveal><$reveal type="match" state=<<folded-state>> text="hide" default="show"><$button tooltip={{$:/language/Buttons/Unfold/Hint}} aria-label={{$:/language/Buttons/Unfold/Caption}} class=<<tv-config-toolbar-class>>> +</$button> +</$reveal> +<$reveal type="match" state=<<folded-state>> text="hide" default="show"> +<$button tooltip={{$:/language/Buttons/Unfold/Hint}} aria-label={{$:/language/Buttons/Unfold/Caption}} class=<<tv-config-toolbar-class>>> <$action-sendmessage $message="tm-fold-tiddler" $param=<<currentTiddler>> foldedState=<<folded-state>>/> <$list filter="[<tv-config-toolbar-icons>prefix[yes]]" variable="listItem"> {{$:/core/images/unfold-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> <span class="tc-btn-text"> +<$text text=" "/> <$text text={{$:/language/Buttons/Unfold/Caption}}/> </span> </$list> -</$button></$reveal> \ No newline at end of file +</$button> +</$reveal> \ No newline at end of file diff --git a/core/ui/ViewToolbar/info.tid b/core/ui/ViewToolbar/info.tid index f6f40860f..a5dd9afce 100644 --- a/core/ui/ViewToolbar/info.tid +++ b/core/ui/ViewToolbar/info.tid @@ -3,11 +3,31 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/info-button}} {{$:/language/Buttons/Info/Caption}} description: {{$:/language/Buttons/Info/Hint}} -<$button popup=<<tiddlerInfoState>> tooltip={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected"> +\whitespace trim +\define button-content() <$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> {{$:/core/images/info-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<span class="tc-btn-text"><$text text={{$:/language/Buttons/Info/Caption}}/></span> +<span class="tc-btn-text"> +<$text text={{$:/language/Buttons/Info/Caption}}/> +</span> </$list> -</$button> \ No newline at end of file +\end +<$reveal state="$:/config/TiddlerInfo/Mode" type="match" text="popup"> +<$button popup=<<tiddlerInfoState>> tooltip={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected"> +<$macrocall $name="button-content" mode="inline"/> +</$button> +</$reveal> +<$reveal state="$:/config/TiddlerInfo/Mode" type="match" text="sticky"> +<$reveal state=<<tiddlerInfoState>> type="match" text="" default=""> +<$button set=<<tiddlerInfoState>> setTo="yes" tooltip={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected"> +<$macrocall $name="button-content" mode="inline"/> +</$button> +</$reveal> +<$reveal state=<<tiddlerInfoState>> type="nomatch" text="" default=""> +<$button set=<<tiddlerInfoState>> setTo="" tooltip={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected"> +<$macrocall $name="button-content" mode="inline"/> +</$button> +</$reveal> +</$reveal> \ No newline at end of file diff --git a/core/ui/ViewToolbar/more-tiddler-actions.tid b/core/ui/ViewToolbar/more-tiddler-actions.tid index c20294250..b344dc4d1 100644 --- a/core/ui/ViewToolbar/more-tiddler-actions.tid +++ b/core/ui/ViewToolbar/more-tiddler-actions.tid @@ -3,6 +3,7 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/down-arrow}} {{$:/language/Buttons/More/Caption}} description: {{$:/language/Buttons/More/Hint}} +\whitespace trim \define config-title() $:/config/ViewToolbarButtons/Visibility/$(listItem)$ \end @@ -11,9 +12,13 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$ {{$:/core/images/down-arrow}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<span class="tc-btn-text"><$text text={{$:/language/Buttons/More/Caption}}/></span> +<span class="tc-btn-text"> +<$text text=" "/> +<$text text={{$:/language/Buttons/More/Caption}}/> +</span> </$list> -</$button><$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="below" animate="yes"> +</$button> +<$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="belowleft" animate="yes"> <div class="tc-drop-down"> @@ -27,8 +32,12 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$ <$reveal type="match" state=<<config-title>> text="hide"> +<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]"> + <$transclude tiddler=<<listItem>> mode="inline"/> +</$set> + </$reveal> </$list> diff --git a/core/ui/ViewToolbar/new-here.tid b/core/ui/ViewToolbar/new-here.tid index 94a81b07f..5089bbf59 100644 --- a/core/ui/ViewToolbar/new-here.tid +++ b/core/ui/ViewToolbar/new-here.tid @@ -3,6 +3,7 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/new-here-button}} {{$:/language/Buttons/NewHere/Caption}} description: {{$:/language/Buttons/NewHere/Hint}} +\whitespace trim \define newHereButtonTags() [[$(currentTiddler)$]] \end @@ -13,7 +14,9 @@ description: {{$:/language/Buttons/NewHere/Hint}} {{$:/core/images/new-here-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<span class="tc-btn-text"><$text text={{$:/language/Buttons/NewHere/Caption}}/></span> +<span class="tc-btn-text"> +<$text text={{$:/language/Buttons/NewHere/Caption}}/> +</span> </$list> </$button> \end diff --git a/core/ui/ViewToolbar/new-journal-here.tid b/core/ui/ViewToolbar/new-journal-here.tid index 32f2db311..54291a6f2 100644 --- a/core/ui/ViewToolbar/new-journal-here.tid +++ b/core/ui/ViewToolbar/new-journal-here.tid @@ -3,22 +3,29 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/new-journal-button}} {{$:/language/Buttons/NewJournalHere/Caption}} description: {{$:/language/Buttons/NewJournalHere/Hint}} +\whitespace trim \define journalButtonTags() [[$(currentTiddlerTag)$]] $(journalTags)$ \end \define journalButton() <$button tooltip={{$:/language/Buttons/NewJournalHere/Hint}} aria-label={{$:/language/Buttons/NewJournalHere/Caption}} class=<<tv-config-toolbar-class>>> -<$action-sendmessage $message="tm-new-tiddler" title=<<now "$(journalTitleTemplate)$">> tags=<<journalButtonTags>>/> +<$wikify name="journalTitle" text="""<$macrocall $name="now" format=<<journalTitleTemplate>>/>"""> +<$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<journalButtonTags>>/> <$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> {{$:/core/images/new-journal-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<span class="tc-btn-text"><$text text={{$:/language/Buttons/NewJournalHere/Caption}}/></span> +<span class="tc-btn-text"> +<$text text={{$:/language/Buttons/NewJournalHere/Caption}}/> +</span> </$list> +</$wikify> </$button> \end <$set name="journalTitleTemplate" value={{$:/config/NewJournal/Title}}> <$set name="journalTags" value={{$:/config/NewJournal/Tags}}> <$set name="currentTiddlerTag" value=<<currentTiddler>>> <<journalButton>> -</$set></$set></$set> \ No newline at end of file +</$set> +</$set> +</$set> \ No newline at end of file diff --git a/core/ui/ViewToolbar/open-window.tid b/core/ui/ViewToolbar/open-window.tid index 6c885fc94..b3f982f26 100644 --- a/core/ui/ViewToolbar/open-window.tid +++ b/core/ui/ViewToolbar/open-window.tid @@ -3,11 +3,15 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/open-window}} {{$:/language/Buttons/OpenWindow/Caption}} description: {{$:/language/Buttons/OpenWindow/Hint}} +\whitespace trim <$button message="tm-open-window" tooltip={{$:/language/Buttons/OpenWindow/Hint}} aria-label={{$:/language/Buttons/OpenWindow/Caption}} class=<<tv-config-toolbar-class>>> <$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> {{$:/core/images/open-window}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<span class="tc-btn-text"><$text text={{$:/language/Buttons/OpenWindow/Caption}}/></span> +<span class="tc-btn-text"> +<$text text=" "/> +<$text text={{$:/language/Buttons/OpenWindow/Caption}}/> +</span> </$list> </$button> \ No newline at end of file diff --git a/core/ui/ViewToolbar/permalink.tid b/core/ui/ViewToolbar/permalink.tid index 0867a3138..b6ea2c0c8 100644 --- a/core/ui/ViewToolbar/permalink.tid +++ b/core/ui/ViewToolbar/permalink.tid @@ -3,11 +3,15 @@ tags: $:/tags/ViewToolbar caption: {{$:/core/images/permalink-button}} {{$:/language/Buttons/Permalink/Caption}} description: {{$:/language/Buttons/Permalink/Hint}} +\whitespace trim <$button message="tm-permalink" tooltip={{$:/language/Buttons/Permalink/Hint}} aria-label={{$:/language/Buttons/Permalink/Caption}} class=<<tv-config-toolbar-class>>> <$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> {{$:/core/images/permalink-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<span class="tc-btn-text"><$text text={{$:/language/Buttons/Permalink/Caption}}/></span> +<span class="tc-btn-text"> +<$text text=" "/> +<$text text={{$:/language/Buttons/Permalink/Caption}}/> +</span> </$list> </$button> \ No newline at end of file diff --git a/core/ui/ViewToolbar/permaview.tid b/core/ui/ViewToolbar/permaview.tid index 5797b5e00..523bac128 100644 --- a/core/ui/ViewToolbar/permaview.tid +++ b/core/ui/ViewToolbar/permaview.tid @@ -3,11 +3,15 @@ tags: $:/tags/ViewToolbar $:/tags/PageControls caption: {{$:/core/images/permaview-button}} {{$:/language/Buttons/Permaview/Caption}} description: {{$:/language/Buttons/Permaview/Hint}} +\whitespace trim <$button message="tm-permaview" tooltip={{$:/language/Buttons/Permaview/Hint}} aria-label={{$:/language/Buttons/Permaview/Caption}} class=<<tv-config-toolbar-class>>> <$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> {{$:/core/images/permaview-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<span class="tc-btn-text"><$text text={{$:/language/Buttons/Permaview/Caption}}/></span> +<span class="tc-btn-text"> +<$text text=" "/> +<$text text={{$:/language/Buttons/Permaview/Caption}}/> +</span> </$list> </$button> \ No newline at end of file diff --git a/core/wiki/config/DefaultMoreSidebarTab.tid b/core/wiki/config/DefaultMoreSidebarTab.tid new file mode 100644 index 000000000..a90f9a7e8 --- /dev/null +++ b/core/wiki/config/DefaultMoreSidebarTab.tid @@ -0,0 +1,3 @@ +title: $:/config/DefaultMoreSidebarTab + +$:/core/ui/MoreSideBar/Tags \ No newline at end of file diff --git a/core/wiki/config/DownloadSaverAutoSave.tid b/core/wiki/config/DownloadSaverAutoSave.tid new file mode 100644 index 000000000..6c1ad8de0 --- /dev/null +++ b/core/wiki/config/DownloadSaverAutoSave.tid @@ -0,0 +1,3 @@ +title: $:/config/DownloadSaver/AutoSave + +no \ No newline at end of file diff --git a/core/wiki/config/Manager.multids b/core/wiki/config/Manager.multids new file mode 100644 index 000000000..11d370750 --- /dev/null +++ b/core/wiki/config/Manager.multids @@ -0,0 +1,8 @@ +title: $:/config/Manager/ + +Show: tiddlers +Filter: +Order: forward +Sort: title +System: system +Tag: diff --git a/core/wiki/config/ManagerItemState.multids b/core/wiki/config/ManagerItemState.multids new file mode 100644 index 000000000..845034ff6 --- /dev/null +++ b/core/wiki/config/ManagerItemState.multids @@ -0,0 +1,3 @@ +title: $:/state/popup/manager/item/$:/Manager/ + +ItemMain/RawText: hide \ No newline at end of file diff --git a/core/wiki/config/OfficialPluginLibrary.tid b/core/wiki/config/OfficialPluginLibrary.tid index 78e513137..b524ece9e 100644 --- a/core/wiki/config/OfficialPluginLibrary.tid +++ b/core/wiki/config/OfficialPluginLibrary.tid @@ -1,6 +1,6 @@ title: $:/config/OfficialPluginLibrary tags: $:/tags/PluginLibrary -url: http://tiddlywiki.com/library/v5.1.13/index.html +url: https://tiddlywiki.com/library/v5.1.17/index.html caption: {{$:/language/OfficialPluginLibrary}} {{$:/language/OfficialPluginLibrary/Hint}} diff --git a/core/wiki/config/PageControlButtons.multids b/core/wiki/config/PageControlButtons.multids index eb54546ed..f880b3399 100644 --- a/core/wiki/config/PageControlButtons.multids +++ b/core/wiki/config/PageControlButtons.multids @@ -11,11 +11,14 @@ core/ui/Buttons/refresh: hide core/ui/Buttons/import: hide core/ui/Buttons/language: hide core/ui/Buttons/tag-manager: hide +core/ui/Buttons/manager: hide core/ui/Buttons/more-page-actions: hide core/ui/Buttons/new-journal: hide core/ui/Buttons/new-image: hide core/ui/Buttons/palette: hide core/ui/Buttons/permaview: hide +core/ui/Buttons/print: hide core/ui/Buttons/storyview: hide +core/ui/Buttons/timestamp: hide core/ui/Buttons/theme: hide core/ui/Buttons/unfold-all: hide diff --git a/core/wiki/config/SearchMinLength.tid b/core/wiki/config/SearchMinLength.tid new file mode 100644 index 000000000..16acd5579 --- /dev/null +++ b/core/wiki/config/SearchMinLength.tid @@ -0,0 +1,3 @@ +title: $:/config/Search/MinLength + +3 \ No newline at end of file diff --git a/core/wiki/config/TagsMinLength.tid b/core/wiki/config/TagsMinLength.tid new file mode 100644 index 000000000..fbe748bfb --- /dev/null +++ b/core/wiki/config/TagsMinLength.tid @@ -0,0 +1,3 @@ +title: $:/config/Tags/MinLength + +0 \ No newline at end of file diff --git a/core/wiki/config/TiddlerInfoMode.tid b/core/wiki/config/TiddlerInfoMode.tid new file mode 100644 index 000000000..80947122b --- /dev/null +++ b/core/wiki/config/TiddlerInfoMode.tid @@ -0,0 +1,2 @@ +title: $:/config/TiddlerInfo/Mode +text: popup \ No newline at end of file diff --git a/core/wiki/config/shortcuts/shortcuts.multids b/core/wiki/config/shortcuts/shortcuts.multids index 84503a77b..9c135b4d4 100644 --- a/core/wiki/config/shortcuts/shortcuts.multids +++ b/core/wiki/config/shortcuts/shortcuts.multids @@ -9,6 +9,7 @@ heading-4: ctrl-4 heading-5: ctrl-5 heading-6: ctrl-6 link: ctrl-L +linkify: alt-shift-L list-bullet: ctrl-shift-L list-number: ctrl-shift-N mono-block: ctrl-shift-M @@ -21,3 +22,4 @@ stamp: ctrl-S strikethrough: ctrl-T subscript: ctrl-shift-B superscript: ctrl-shift-P +transcludify: alt-shift-T diff --git a/core/wiki/currpalettepreview.tid b/core/wiki/currpalettepreview.tid index 56914cc25..b80748737 100644 --- a/core/wiki/currpalettepreview.tid +++ b/core/wiki/currpalettepreview.tid @@ -3,17 +3,16 @@ title: $:/snippets/currpalettepreview \define swatchStyle() background-color: $(swatchColour)$; \end -\define swatch(colour) -<$set name="swatchColour" value={{##$colour$}}> -<div class="tc-swatch" style=<<swatchStyle>>/> -</$set> +\define swatch() +<$set name="swatchColour" value={{##$(colour)$}} +><div class="tc-swatch" style=<<swatchStyle>> title=<<colour>>/></$set> \end -<div class="tc-swatches-horiz"> -<<swatch foreground>> -<<swatch background>> -<<swatch muted-foreground>> -<<swatch primary>> -<<swatch page-background>> -<<swatch tab-background>> -<<swatch tiddler-info-background>> -</div> +<div class="tc-swatches-horiz"><$list filter=" +foreground +background +muted-foreground +primary +page-background +tab-background +tiddler-info-background +" variable="colour"><<swatch>></$list></div> \ No newline at end of file diff --git a/core/wiki/languageswitcher.tid b/core/wiki/languageswitcher.tid index 9b61f0e87..8df13bf31 100644 --- a/core/wiki/languageswitcher.tid +++ b/core/wiki/languageswitcher.tid @@ -1,7 +1,31 @@ title: $:/snippets/languageswitcher -{{$:/language/ControlPanel/Basics/Language/Prompt}} <$select tiddler="$:/language"> +\define flag-title() +$(languagePluginTitle)$/icon +\end + +<$linkcatcher to="$:/language"> +<div class="tc-chooser tc-language-chooser"> <$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[description]]"> -<option value=<<currentTiddler>>><$view field="description"><$view field="name"><$view field="title"/></$view></$view></option> +<$set name="cls" filter="[all[current]field:title{$:/language}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item"><div class=<<cls>>> +<$link> +<span class="tc-image-button"> +<$set name="languagePluginTitle" value=<<currentTiddler>>> +<$transclude subtiddler=<<flag-title>>> +<$list filter="[all[current]field:title[$:/languages/en-GB]]"> +<$transclude tiddler="$:/languages/en-GB/icon"/> </$list> -</$select> \ No newline at end of file +</$transclude> +</$set> +</span> +<$view field="description"> +<$view field="name"> +<$view field="title"/> +</$view> +</$view> +</$link> +</div> +</$set> +</$list> +</div> +</$linkcatcher> \ No newline at end of file diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid index 7aa5a2b51..a5b68ea07 100644 --- a/core/wiki/macros/CSS.tid +++ b/core/wiki/macros/CSS.tid @@ -51,6 +51,14 @@ background-image: -ms-linear-gradient($gradient$); `` \end +\define column-count(columns) +`` +-moz-column-count: $columns$; +-webkit-column-count: $columns$; +column-count: $columns$; +`` +\end + \define datauri(title) <$macrocall $name="makedatauri" type={{$title$!!type}} text={{$title$}}/> \end @@ -62,3 +70,7 @@ background-image: -ms-linear-gradient($gradient$); \define if-no-sidebar(text) <$reveal state="$:/state/sidebar" type="nomatch" text="yes" default="yes">$text$</$reveal> \end + +\define if-background-attachment(text) +<$reveal state="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" type="nomatch" text="">$text$</$reveal> +\end diff --git a/core/wiki/macros/copy-to-clipboard.tid b/core/wiki/macros/copy-to-clipboard.tid new file mode 100644 index 000000000..8d1408255 --- /dev/null +++ b/core/wiki/macros/copy-to-clipboard.tid @@ -0,0 +1,17 @@ +title: $:/core/macros/copy-to-clipboard +tags: $:/tags/Macro + +\define copy-to-clipboard(src,class:"tc-btn-invisible",style) +<$button class=<<__class__>> style=<<__style__>> message="tm-copy-to-clipboard" param=<<__src__>> tooltip={{$:/language/Buttons/CopyToClipboard/Hint}}> +{{$:/core/images/copy-clipboard}} <$text text={{$:/language/Buttons/CopyToClipboard/Caption}}/> +</$button> +\end + +\define copy-to-clipboard-above-right(src,class:"tc-btn-invisible",style) +<div style="position: relative;"> +<div style="position: absolute; bottom: 0; right: 0;"> +<$macrocall $name="copy-to-clipboard" src=<<__src__>> class=<<__class__>> style=<<__style__>>/> +</div> +</div> +\end + diff --git a/core/wiki/macros/diff.tid b/core/wiki/macros/diff.tid new file mode 100644 index 000000000..50dd8bc2d --- /dev/null +++ b/core/wiki/macros/diff.tid @@ -0,0 +1,36 @@ +title: $:/core/macros/diff +tags: $:/tags/Macro + +\define compareTiddlerText(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle) +<$set name="source" tiddler=<<__sourceTiddlerTitle__>> subtiddler=<<__sourceSubTiddlerTitle__>>> +<$set name="dest" tiddler=<<__destTiddlerTitle__>> subtiddler=<<__destSubTiddlerTitle__>>> +<$diff-text source=<<source>> dest=<<dest>>/> +</$set> +</$set> +\end + +\define compareTiddlers(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle,exclude) +<table class="tc-diff-tiddlers"> +<tbody> +<$set name="sourceFields" filter="[<__sourceTiddlerTitle__>fields[]sort[]]"> +<$set name="destFields" filter="[<__destSubTiddlerTitle__>subtiddlerfields<__destTiddlerTitle__>sort[]]"> +<$list filter="[enlist<sourceFields>] [enlist<destFields>] -[enlist<__exclude__>] +[sort[]]" variable="fieldName"> +<tr> +<th> +<$text text=<<fieldName>>/> +</th> +<td> +<$set name="source" tiddler=<<__sourceTiddlerTitle__>> subtiddler=<<__sourceSubTiddlerTitle__>> field=<<fieldName>>> +<$set name="dest" tiddler=<<__destTiddlerTitle__>> subtiddler=<<__destSubTiddlerTitle__>> field=<<fieldName>>> +<$diff-text source=<<source>> dest=<<dest>>> +</$diff-text> +</$set> +</$set> +</td> +</tr> +</$list> +</$set> +</$set> +</tbody> +</table> +\end diff --git a/core/wiki/macros/export.tid b/core/wiki/macros/export.tid index 14f0df01f..089cc870e 100644 --- a/core/wiki/macros/export.tid +++ b/core/wiki/macros/export.tid @@ -6,17 +6,14 @@ $baseFilename$$(extension)$ \end \define exportButton(exportFilter:"[!is[system]sort[title]]",lingoBase,baseFilename:"tiddlers") -<span class="tc-popup-keep"> -<$button popup=<<qualify "$:/state/popup/export">> tooltip={{$lingoBase$Hint}} aria-label={{$lingoBase$Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected"> +<span class="tc-popup-keep"><$button popup=<<qualify "$:/state/popup/export">> tooltip={{$lingoBase$Hint}} aria-label={{$lingoBase$Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected"> <$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> {{$:/core/images/export-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> <span class="tc-btn-text"><$text text={{$lingoBase$Caption}}/></span> </$list> -</$button> -</span> -<$reveal state=<<qualify "$:/state/popup/export">> type="popup" position="below" animate="yes"> +</$button></span><$reveal state=<<qualify "$:/state/popup/export">> type="popup" position="below" animate="yes"> <div class="tc-drop-down"> <$list filter="[all[shadows+tiddlers]tag[$:/tags/Exporter]]"> <$set name="extension" value={{!!extension}}> diff --git a/core/wiki/macros/image-picker.tid b/core/wiki/macros/image-picker.tid index 68bbba34d..186fe3473 100644 --- a/core/wiki/macros/image-picker.tid +++ b/core/wiki/macros/image-picker.tid @@ -1,26 +1,38 @@ -title: $:/core/macros/image-picker +created: 20170715180840889 +modified: 20170715180914005 tags: $:/tags/Macro +title: $:/core/macros/image-picker +type: text/vnd.tiddlywiki -\define image-picker-inner(actions) +\define image-picker-thumbnail(actions) <$button tag="a" tooltip="""$(imageTitle)$"""> - $actions$ - <$transclude tiddler=<<imageTitle>>/> - </$button> \end -\define image-picker(actions,subfilter:"") -<div class="tc-image-chooser"> - -<$list filter="[all[shadows+tiddlers]is[image]$subfilter$!has[draft.of]] -[type[application/pdf]] +[sort[title]]" variable="imageTitle"> - -<$macrocall $name="image-picker-inner" actions="""$actions$"""/> - +\define image-picker-list(filter,actions) +<$list filter="""$filter$""" variable="imageTitle"> +<$macrocall $name="image-picker-thumbnail" actions="""$actions$"""/> </$list> - -</div> - \end +\define image-picker(actions,filter:"[all[shadows+tiddlers]is[image]] -[type[application/pdf]] +[!has[draft.of]$subfilter$sort[title]]",subfilter:"") +<div class="tc-image-chooser"> +<$vars state-system=<<qualify "$:/state/image-picker/system">>> +<$checkbox tiddler=<<state-system>> field="text" checked="show" unchecked="hide" default="hide"> +{{$:/language/SystemTiddlers/Include/Prompt}} +</$checkbox> +<$reveal state=<<state-system>> type="match" text="hide" default="hide" tag="div"> +<$macrocall $name="image-picker-list" filter="""$filter$ +[!is[system]]""" actions="""$actions$"""/> +</$reveal> +<$reveal state=<<state-system>> type="nomatch" text="hide" default="hide" tag="div"> +<$macrocall $name="image-picker-list" filter="""$filter$""" actions="""$actions$"""/> +</$reveal> +</$vars> +</div> +\end + +\define image-picker-include-tagged-images(actions) +<$macrocall $name="image-picker" filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[!has[draft.of]sort[title]]" actions="""$actions$"""/> +\end diff --git a/core/wiki/macros/list.tid b/core/wiki/macros/list.tid index 9d22b968a..b8797e2de 100644 --- a/core/wiki/macros/list.tid +++ b/core/wiki/macros/list.tid @@ -1,9 +1,9 @@ title: $:/core/macros/list tags: $:/tags/Macro -\define list-links(filter,type:"ul",subtype:"li",class:"") +\define list-links(filter,type:"ul",subtype:"li",class:"",emptyMessage) <$type$ class="$class$"> -<$list filter="$filter$"> +<$list filter="$filter$" emptyMessage=<<__emptyMessage__>>> <$subtype$> <$link to={{!!title}}> <$transclude field="caption"> @@ -14,3 +14,85 @@ tags: $:/tags/Macro </$list> </$type$> \end + +\define list-links-draggable-drop-actions() +<$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore:currentTiddler<actionTiddler>]"/> +\end + +\define list-links-draggable(tiddler,field:"list",type:"ul",subtype:"li",class:"",itemTemplate) +<$vars targetTiddler="""$tiddler$""" targetField="""$field$"""> +<$type$ class="$class$"> +<$list filter="[list[$tiddler$!!$field$]]"> +<$droppable actions=<<list-links-draggable-drop-actions>> tag="""$subtype$"""> +<div class="tc-droppable-placeholder"> +  +</div> +<div> +<$transclude tiddler="""$itemTemplate$"""> +<$link to={{!!title}}> +<$transclude field="caption"> +<$view field="title"/> +</$transclude> +</$link> +</$transclude> +</div> +</$droppable> +</$list> +</$type$> +<$tiddler tiddler=""> +<$droppable actions=<<list-links-draggable-drop-actions>> tag="div"> +<div class="tc-droppable-placeholder"> +  +</div> +<div style="height:0.5em;"/> +</$droppable> +</$tiddler> +</$vars> +\end + +\define list-tagged-draggable-drop-actions() +<!-- Save the current ordering of the tiddlers with this tag --> +<$set name="order" filter="[<tag>tagging[]]"> +<!-- Remove any list-after or list-before fields from the tiddlers with this tag --> +<$list filter="[<tag>tagging[]]"> +<$action-deletefield $field="list-before"/> +<$action-deletefield $field="list-after"/> +</$list> +<!-- Assign the list field of the tag with the current ordering --> +<$action-setfield $tiddler=<<tag>> $field="list" $value=<<order>>/> +<!-- Add the newly inserted item to the list --> +<$action-listops $tiddler=<<tag>> $field="list" $subfilter="+[insertbefore:currentTiddler<actionTiddler>]"/> +<!-- Make sure the newly added item has the right tag --> +<$action-listops $tiddler=<<actionTiddler>> $tags="[<tag>]"/> +</$set> +\end + +\define list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div") +<$set name="tag" value="""$tag$"""> +<$list filter="[<tag>tagging[]$subFilter$]" emptyMessage=<<__emptyMessage__>>> +<$elementTag$ class="tc-menu-list-item"> +<$droppable actions=<<list-tagged-draggable-drop-actions>>> +<$elementTag$ class="tc-droppable-placeholder"> +  +</$elementTag$> +<$elementTag$> +<$transclude tiddler="""$itemTemplate$"""> +<$link to={{!!title}}> +<$view field="title"/> +</$link> +</$transclude> +</$elementTag$> +</$droppable> +</$elementTag$> +</$list> +<$tiddler tiddler=""> +<$droppable actions=<<list-tagged-draggable-drop-actions>>> +<$elementTag$ class="tc-droppable-placeholder"> +  +</$elementTag$> +<$elementTag$ style="height:0.5em;"> +</$elementTag$> +</$droppable> +</$tiddler> +</$set> +\end diff --git a/core/wiki/macros/tabs.tid b/core/wiki/macros/tabs.tid index c9d44d2e3..cc12c1f41 100644 --- a/core/wiki/macros/tabs.tid +++ b/core/wiki/macros/tabs.tid @@ -1,22 +1,24 @@ title: $:/core/macros/tabs tags: $:/tags/Macro -\define tabs(tabsList,default,state:"$:/state/tab",class,template) +\define tabs(tabsList,default,state:"$:/state/tab",class,template,buttonTemplate,retain) <div class="tc-tab-set $class$"> <div class="tc-tab-buttons $class$"> <$list filter="$tabsList$" variable="currentTab"><$set name="save-currentTiddler" value=<<currentTiddler>>><$tiddler tiddler=<<currentTab>>><$button set=<<qualify "$state$">> setTo=<<currentTab>> default="$default$" selectedClass="tc-tab-selected" tooltip={{!!tooltip}}> <$tiddler tiddler=<<save-currentTiddler>>> <$set name="tv-wikilinks" value="no"> +<$transclude tiddler="$buttonTemplate$" mode="inline"> <$transclude tiddler=<<currentTab>> field="caption"> <$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/> </$transclude> +</$transclude> </$set></$tiddler></$button></$tiddler></$set></$list> </div> <div class="tc-tab-divider $class$"/> <div class="tc-tab-content $class$"> <$list filter="$tabsList$" variable="currentTab"> -<$reveal type="match" state=<<qualify "$state$">> text=<<currentTab>> default="$default$"> +<$reveal type="match" state=<<qualify "$state$">> text=<<currentTab>> default="$default$" retain="""$retain$"""> <$transclude tiddler="$template$" mode="block"> diff --git a/core/wiki/macros/tag-picker.tid b/core/wiki/macros/tag-picker.tid new file mode 100644 index 000000000..81bfaaabc --- /dev/null +++ b/core/wiki/macros/tag-picker.tid @@ -0,0 +1,55 @@ +title: $:/core/macros/tag-picker +tags: $:/tags/Macro + +\define add-tag-actions() +<$action-sendmessage $message="tm-add-tag" $param={{$:/temp/NewTagName}}/> +<$action-deletetiddler $tiddler="$:/temp/NewTagName"/> +\end + +\define add-tag-actions() +<$action-sendmessage $message="tm-add-tag" $param={{$:/temp/NewTagName}}/> +<$action-deletetiddler $tiddler="$:/temp/NewTagName"/> +\end + +\define tag-button() +<$button class="tc-btn-invisible" tag="a"> +$(actions)$ +<$action-deletetiddler $tiddler="$:/temp/NewTagName"/> +<$macrocall $name="tag-pill" tag=<<tag>>/> +</$button> +\end + +\define tag-picker(actions) +<$set name="actions" value="""$actions$"""> +<div class="tc-edit-add-tag"> +<span class="tc-add-tag-name"> +<$keyboard key="ENTER" actions=<<add-tag-actions>>> +<$edit-text tiddler="$:/temp/NewTagName" tag="input" default="" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}} focusPopup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-edit-texteditor tc-popup-handle"/> +</$keyboard> +</span> <$button popup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-btn-invisible" tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button> <span class="tc-add-tag-button"> +<$set name="tag" value={{$:/temp/NewTagName}}> +<$button set="$:/temp/NewTagName" setTo="" class=""> +$actions$ +<$action-deletetiddler $tiddler="$:/temp/NewTagName"/> +{{$:/language/EditTemplate/Tags/Add/Button}} +</$button> +</$set> +</span> +</div> +<div class="tc-block-dropdown-wrapper"> +<$reveal state=<<qualify "$:/state/popup/tags-auto-complete">> type="nomatch" text="" default=""> +<div class="tc-block-dropdown"> +<$list filter="[{$:/temp/NewTagName}minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem"> +<$list filter="[tags[]!is[system]search:title{$:/temp/NewTagName}sort[]]" variable="tag"> +<<tag-button>> +</$list></$list> +<hr> +<$list filter="[{$:/temp/NewTagName}minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem"> +<$list filter="[tags[]is[system]search:title{$:/temp/NewTagName}sort[]]" variable="tag"> +<<tag-button>> +</$list></$list> +</div> +</$reveal> +</div> +</$set> +\end diff --git a/core/wiki/macros/tag.tid b/core/wiki/macros/tag.tid index b65bfc046..0afa74c53 100644 --- a/core/wiki/macros/tag.tid +++ b/core/wiki/macros/tag.tid @@ -1,6 +1,30 @@ title: $:/core/macros/tag tags: $:/tags/Macro +\define tag-pill-styles() +background-color:$(backgroundColor)$; +fill:$(foregroundColor)$; +color:$(foregroundColor)$; +\end + +\define tag-pill-inner(tag,icon,colour,fallbackTarget,colourA,colourB,element-tag,element-attributes,actions) +<$vars foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">> backgroundColor="""$colour$"""> +<$element-tag$ $element-attributes$ class="tc-tag-label tc-btn-invisible" style=<<tag-pill-styles>>> +$actions$<$transclude tiddler="""$icon$"""/> <$view tiddler="""$tag$""" field="title" format="text" /> +</$element-tag$> +</$vars> +\end + +\define tag-pill-body(tag,icon,colour,palette,element-tag,element-attributes,actions) +<$macrocall $name="tag-pill-inner" tag="""$tag$""" icon="""$icon$""" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/> +\end + +\define tag-pill(tag,element-tag:"span",element-attributes:"",actions:"") +<span class="tc-tag-list-item"> +<$macrocall $name="tag-pill-body" tag="""$tag$""" icon={{$tag$!!icon}} colour={{$tag$!!color}} palette={{$:/palette}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/> +</span> +\end + \define tag(tag) {{$tag$||$:/core/ui/TagTemplate}} \end diff --git a/core/wiki/macros/timeline.tid b/core/wiki/macros/timeline.tid index 295d46b35..ecc0c7e7a 100644 --- a/core/wiki/macros/timeline.tid +++ b/core/wiki/macros/timeline.tid @@ -2,7 +2,6 @@ created: 20141212105914482 modified: 20141212110330815 tags: $:/tags/Macro title: $:/core/macros/timeline -type: text/vnd.tiddlywiki \define timeline-title() <!-- Override this macro with a global macro diff --git a/core/wiki/macros/toc.tid b/core/wiki/macros/toc.tid index 75431c575..23d55b5f5 100644 --- a/core/wiki/macros/toc.tid +++ b/core/wiki/macros/toc.tid @@ -3,164 +3,166 @@ tags: $:/tags/Macro \define toc-caption() <$set name="tv-wikilinks" value="no"> -<$transclude field="caption"> -<$view field="title"/> -</$transclude> + <$transclude field="caption"> + <$view field="title"/> + </$transclude> </$set> \end -\define toc-body(rootTag,tag,sort:"",itemClassFilter) +\define toc-body(tag,sort:"",itemClassFilter,exclude,path) <ol class="tc-toc"> -<$list filter="""[all[shadows+tiddlers]tag[$tag$]!has[draft.of]$sort$]"""> -<$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item"> -<li class=<<toc-item-class>>> -<$list filter="[all[current]toc-link[no]]" emptyMessage="<$link><$view field='caption'><$view field='title'/></$view></$link>"> -<<toc-caption>> -</$list> -<$list filter="""[all[current]] -[[$rootTag$]]"""> -<$macrocall $name="toc-body" rootTag="""$rootTag$""" tag=<<currentTiddler>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/> -</$list> -</li> -</$set> -</$list> + <$list filter="""[all[shadows+tiddlers]tag[$tag$]!has[draft.of]$sort$] -[[$tag$]] $exclude$"""> + <$vars item=<<currentTiddler>> path="""$path$/$tag$""" excluded="""$exclude$ -[[$tag$]]"""> + <$set name="toc-item-class" filter="""$itemClassFilter$""" emptyValue="toc-item" value="toc-item-selected"> + <li class=<<toc-item-class>>> + <$list filter="[all[current]toc-link[no]]" emptyMessage="<$link><$view field='caption'><$view field='title'/></$view></$link>"> + <<toc-caption>> + </$list> + <$macrocall $name="toc-body" tag=<<item>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$""" exclude=<<excluded>> path=<<path>>/> + </li> + </$set> + </$vars> + </$list> </ol> \end -\define toc(tag,sort:"",itemClassFilter) -<<toc-body rootTag:"""$tag$""" tag:"""$tag$""" sort:"""$sort$""" itemClassFilter:"""itemClassFilter""">> +\define toc(tag,sort:"",itemClassFilter:" ") +<<toc-body tag:"""$tag$""" sort:"""$sort$""" itemClassFilter:"""$itemClassFilter$""">> \end -\define toc-linked-expandable-body(tag,sort:"",itemClassFilter) -<$set name="toc-state" value=<<qualify """$:/state/toc/$tag$-$(currentTiddler)$""">>> -<$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item"> -<li class=<<toc-item-class>>> -<$link> -<$reveal type="nomatch" state=<<toc-state>> text="open"> -<$button set=<<toc-state>> setTo="open" class="tc-btn-invisible"> -{{$:/core/images/right-arrow}} -</$button> -</$reveal> -<$reveal type="match" state=<<toc-state>> text="open"> -<$button set=<<toc-state>> setTo="close" class="tc-btn-invisible"> -{{$:/core/images/down-arrow}} -</$button> -</$reveal> -<<toc-caption>> -</$link> -<$reveal type="match" state=<<toc-state>> text="open"> -<$macrocall $name="toc-expandable" tag=<<currentTiddler>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/> -</$reveal> -</li> -</$set> +\define toc-linked-expandable-body(tag,sort:"",itemClassFilter,exclude,path) +<!-- helper function --> +<$set name="toc-state" value=<<qualify """$:/state/toc$path$-$(currentTiddler)$""">>> + <$set name="toc-item-class" filter="""$itemClassFilter$""" emptyValue="toc-item" value="toc-item-selected"> + <li class=<<toc-item-class>>> + <$link> + <$reveal type="nomatch" state=<<toc-state>> text="open"> + <$button set=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep"> + {{$:/core/images/right-arrow}} + </$button> + </$reveal> + <$reveal type="match" state=<<toc-state>> text="open"> + <$button set=<<toc-state>> setTo="close" class="tc-btn-invisible tc-popup-keep"> + {{$:/core/images/down-arrow}} + </$button> + </$reveal> + <<toc-caption>> + </$link> + <$reveal type="match" state=<<toc-state>> text="open"> + <$macrocall $name="toc-expandable" tag=<<currentTiddler>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$""" exclude="""$exclude$""" path="""$path$"""/> + </$reveal> + </li> + </$set> </$set> \end -\define toc-unlinked-expandable-body(tag,sort:"",itemClassFilter) -<$set name="toc-state" value=<<qualify """$:/state/toc/$tag$-$(currentTiddler)$""">>> -<$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item"> -<li class=<<toc-item-class>>> -<$reveal type="nomatch" state=<<toc-state>> text="open"> -<$button set=<<toc-state>> setTo="open" class="tc-btn-invisible"> -{{$:/core/images/right-arrow}} -<<toc-caption>> -</$button> -</$reveal> -<$reveal type="match" state=<<toc-state>> text="open"> -<$button set=<<toc-state>> setTo="close" class="tc-btn-invisible"> -{{$:/core/images/down-arrow}} -<<toc-caption>> -</$button> -</$reveal> -<$reveal type="match" state=<<toc-state>> text="open"> -<$macrocall $name="toc-expandable" tag=<<currentTiddler>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/> -</$reveal> -</li> -</$set> +\define toc-unlinked-expandable-body(tag,sort:"",itemClassFilter:" ",exclude,path) +<!-- helper function --> +<$set name="toc-state" value=<<qualify """$:/state/toc$path$-$(currentTiddler)$""">>> + <$set name="toc-item-class" filter="""$itemClassFilter$""" emptyValue="toc-item" value="toc-item-selected"> + <li class=<<toc-item-class>>> + <$reveal type="nomatch" state=<<toc-state>> text="open"> + <$button set=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep"> + {{$:/core/images/right-arrow}} + <<toc-caption>> + </$button> + </$reveal> + <$reveal type="match" state=<<toc-state>> text="open"> + <$button set=<<toc-state>> setTo="close" class="tc-btn-invisible tc-popup-keep"> + {{$:/core/images/down-arrow}} + <<toc-caption>> + </$button> + </$reveal> + <$reveal type="match" state=<<toc-state>> text="open"> + <$macrocall $name="toc-expandable" tag=<<currentTiddler>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$""" exclude="""$exclude$""" path="""$path$"""/> + </$reveal> + </li> + </$set> </$set> \end \define toc-expandable-empty-message() -<<toc-linked-expandable-body tag:"""$(tag)$""" sort:"""$(sort)$""" itemClassFilter:"""$(itemClassFilter)$""">> +<<toc-linked-expandable-body tag:"""$(tag)$""" sort:"""$(sort)$""" itemClassFilter:"""$(itemClassFilter)$""" exclude:"""$(excluded)$""" path:"""$(path)$""">> \end -\define toc-expandable(tag,sort:"",itemClassFilter) -<$vars tag="""$tag$""" sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""> -<ol class="tc-toc toc-expandable"> -<$list filter="[all[shadows+tiddlers]tag[$tag$]!has[draft.of]$sort$]"> -<$list filter="[all[current]toc-link[no]]" emptyMessage=<<toc-expandable-empty-message>>> -<<toc-unlinked-expandable-body tag:"""$tag$""" sort:"""$sort$""" itemClassFilter:"""itemClassFilter""">> -</$list> -</$list> -</ol> +\define toc-expandable(tag,sort:"",itemClassFilter:" ",exclude,path) +<$vars tag="""$tag$""" sort="""$sort$""" itemClassFilter="""$itemClassFilter$""" excluded="""$exclude$ -[[$tag$]]""" path="""$path$/$tag$"""> + <ol class="tc-toc toc-expandable"> + <$list filter="""[all[shadows+tiddlers]tag[$tag$]!has[draft.of]$sort$] -[[$tag$]] $exclude$"""> + <$list filter="[all[current]toc-link[no]]" emptyMessage=<<toc-expandable-empty-message>> > + <$macrocall $name="toc-unlinked-expandable-body" tag="""$tag$""" sort="""$sort$""" itemClassFilter="""itemClassFilter""" exclude=<<excluded>> path=<<path>> /> + </$list> + </$list> + </ol> </$vars> \end -\define toc-linked-selective-expandable-body(tag,sort:"",itemClassFilter) -<$set name="toc-state" value=<<qualify """$:/state/toc/$tag$-$(currentTiddler)$""">>> -<$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item"> -<li class=<<toc-item-class>>> -<$link> -<$list filter="[all[current]tagging[]limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button>"> -<$reveal type="nomatch" state=<<toc-state>> text="open"> -<$button set=<<toc-state>> setTo="open" class="tc-btn-invisible"> -{{$:/core/images/right-arrow}} -</$button> -</$reveal> -<$reveal type="match" state=<<toc-state>> text="open"> -<$button set=<<toc-state>> setTo="close" class="tc-btn-invisible"> -{{$:/core/images/down-arrow}} -</$button> -</$reveal> -</$list> -<<toc-caption>> -</$link> -<$reveal type="match" state=<<toc-state>> text="open"> -<$macrocall $name="toc-selective-expandable" tag=<<currentTiddler>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/> -</$reveal> -</li> -</$set> +\define toc-linked-selective-expandable-body(tag,sort:"",itemClassFilter:" ",exclude,path) +<$set name="toc-state" value=<<qualify """$:/state/toc$path$-$(currentTiddler)$""">>> + <$set name="toc-item-class" filter="""$itemClassFilter$""" emptyValue="toc-item" value="toc-item-selected" > + <li class=<<toc-item-class>>> + <$link> + <$list filter="[all[current]tagging[]limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button>"> + <$reveal type="nomatch" state=<<toc-state>> text="open"> + <$button set=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep"> + {{$:/core/images/right-arrow}} + </$button> + </$reveal> + <$reveal type="match" state=<<toc-state>> text="open"> + <$button set=<<toc-state>> setTo="close" class="tc-btn-invisible tc-popup-keep"> + {{$:/core/images/down-arrow}} + </$button> + </$reveal> + </$list> + <<toc-caption>> + </$link> + <$reveal type="match" state=<<toc-state>> text="open"> + <$macrocall $name="toc-selective-expandable" tag=<<currentTiddler>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$""" exclude="""$exclude$""" path="""$path$"""/> + </$reveal> + </li> + </$set> </$set> \end -\define toc-unlinked-selective-expandable-body(tag,sort:"",itemClassFilter) -<$set name="toc-state" value=<<qualify """$:/state/toc/$tag$-$(currentTiddler)$""">>> -<$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item"> -<li class=<<toc-item-class>>> -<$list filter="[all[current]tagging[]limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button> <$view field='caption'><$view field='title'/></$view>"> -<$reveal type="nomatch" state=<<toc-state>> text="open"> -<$button set=<<toc-state>> setTo="open" class="tc-btn-invisible"> -{{$:/core/images/right-arrow}} -<<toc-caption>> -</$button> -</$reveal> -<$reveal type="match" state=<<toc-state>> text="open"> -<$button set=<<toc-state>> setTo="close" class="tc-btn-invisible"> -{{$:/core/images/down-arrow}} -<<toc-caption>> -</$button> -</$reveal> -</$list> -<$reveal type="match" state=<<toc-state>> text="open"> -<$macrocall $name="""toc-selective-expandable""" tag=<<currentTiddler>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/> -</$reveal> -</li> -</$set> +\define toc-unlinked-selective-expandable-body(tag,sort:"",itemClassFilter:" ",exclude,path) +<$set name="toc-state" value=<<qualify """$:/state/toc$path$-$(currentTiddler)$""">>> + <$set name="toc-item-class" filter="""$itemClassFilter$""" emptyValue="toc-item" value="toc-item-selected"> + <li class=<<toc-item-class>>> + <$list filter="[all[current]tagging[]limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button> <$view field='caption'><$view field='title'/></$view>"> + <$reveal type="nomatch" state=<<toc-state>> text="open"> + <$button set=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep"> + {{$:/core/images/right-arrow}} + <<toc-caption>> + </$button> + </$reveal> + <$reveal type="match" state=<<toc-state>> text="open"> + <$button set=<<toc-state>> setTo="close" class="tc-btn-invisible tc-popup-keep"> + {{$:/core/images/down-arrow}} + <<toc-caption>> + </$button> + </$reveal> + </$list> + <$reveal type="match" state=<<toc-state>> text="open"> + <$macrocall $name="""toc-selective-expandable""" tag=<<currentTiddler>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$""" exclude="""$exclude$""" path="""$path$"""/> + </$reveal> + </li> + </$set> </$set> \end \define toc-selective-expandable-empty-message() -<<toc-linked-selective-expandable-body tag:"""$(tag)$""" sort:"""$(sort)$""" itemClassFilter:"""$(itemClassFilter)$""">> +<<toc-linked-selective-expandable-body tag:"""$(tag)$""" sort:"""$(sort)$""" itemClassFilter:"""$(itemClassFilter)$""" exclude:"""$(excluded)$""" path:"""$(path)$""">> \end -\define toc-selective-expandable(tag,sort:"",itemClassFilter) -<$vars tag="""$tag$""" sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""> -<ol class="tc-toc toc-selective-expandable"> -<$list filter="[all[shadows+tiddlers]tag[$tag$]!has[draft.of]$sort$]"> -<$list filter="[all[current]toc-link[no]]" variable="ignore" emptyMessage=<<toc-selective-expandable-empty-message>>> -<<toc-unlinked-selective-expandable-body tag:"""$tag$""" sort:"""$sort$""" itemClassFilter:"""$itemClassFilter$""">> -</$list> -</$list> -</ol> +\define toc-selective-expandable(tag,sort:"",itemClassFilter,exclude,path) +<$vars tag="""$tag$""" sort="""$sort$""" itemClassFilter="""$itemClassFilter$""" excluded="""$exclude$ -[[$tag$]]""" path="""$path$/$tag$"""> + <ol class="tc-toc toc-selective-expandable"> + <$list filter="""[all[shadows+tiddlers]tag[$tag$]!has[draft.of]$sort$] -[[$tag$]] $exclude$"""> + <$list filter="[all[current]toc-link[no]]" variable="ignore" emptyMessage=<<toc-selective-expandable-empty-message>> > + <$macrocall $name=toc-unlinked-selective-expandable-body tag="""$tag$""" sort="""$sort$""" itemClassFilter="""$itemClassFilter$""" exclude=<<excluded>> path=<<path>> > + </$list> + </$list> + </ol> </$vars> \end @@ -170,30 +172,30 @@ tags: $:/tags/Macro \define toc-tabbed-external-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"") <$tiddler tiddler={{$selectedTiddler$}}> -<div class="tc-tabbed-table-of-contents"> -<$linkcatcher to="$selectedTiddler$"> -<div class="tc-table-of-contents"> -<$macrocall $name="toc-selective-expandable" tag="""$tag$""" sort="""$sort$""" itemClassFilter=<<toc-tabbed-selected-item-filter selectedTiddler:"""$selectedTiddler$""">>/> -</div> -</$linkcatcher> -<div class="tc-tabbed-table-of-contents-content"> -<$reveal state="""$selectedTiddler$""" type="nomatch" text=""> -<$transclude mode="block" tiddler="$template$"> -<h1><<toc-caption>></h1> -<$transclude mode="block">$missingText$</$transclude> -</$transclude> -</$reveal> -<$reveal state="""$selectedTiddler$""" type="match" text=""> -$unselectedText$ -</$reveal> -</div> -</div> + <div class="tc-tabbed-table-of-contents"> + <$linkcatcher to="$selectedTiddler$"> + <div class="tc-table-of-contents"> + <$macrocall $name="toc-selective-expandable" tag="""$tag$""" sort="""$sort$""" itemClassFilter=<<toc-tabbed-selected-item-filter selectedTiddler:"""$selectedTiddler$""">>/> + </div> + </$linkcatcher> + <div class="tc-tabbed-table-of-contents-content"> + <$reveal state="""$selectedTiddler$""" type="nomatch" text=""> + <$transclude mode="block" tiddler="$template$"> + <h1><<toc-caption>></h1> + <$transclude mode="block">$missingText$</$transclude> + </$transclude> + </$reveal> + <$reveal state="""$selectedTiddler$""" type="match" text=""> + $unselectedText$ + </$reveal> + </div> + </div> </$tiddler> \end \define toc-tabbed-internal-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"") <$linkcatcher to="""$selectedTiddler$"""> -<$macrocall $name="toc-tabbed-external-nav" tag="""$tag$""" sort="""$sort$""" selectedTiddler="""$selectedTiddler$""" unselectedText="""$unselectedText$""" missingText="""$missingText$""" template="""$template$"""/> + <$macrocall $name="toc-tabbed-external-nav" tag="""$tag$""" sort="""$sort$""" selectedTiddler="""$selectedTiddler$""" unselectedText="""$unselectedText$""" missingText="""$missingText$""" template="""$template$"""/> </$linkcatcher> \end diff --git a/core/wiki/macros/tree.tid b/core/wiki/macros/tree.tid new file mode 100644 index 000000000..a6d2a8227 --- /dev/null +++ b/core/wiki/macros/tree.tid @@ -0,0 +1,53 @@ +title: $:/core/macros/tree +tags: $:/tags/Macro + +\define leaf-node(prefix) +<li> +<$list filter="""[[$prefix$$(chunk)$]is[shadow]] [[$prefix$$(chunk)$]is[tiddler]] +[removeprefix[$prefix$]] +[limit[1]]""" +emptyMessage="""<$text text="$prefix$$(chunk)$"/>"""> +<span>{{$:/core/images/file}}</span> <$link to="""$prefix$$(chunk)$"""> +<$view field="title"/> +</$link> +</$list> +</li> +\end + +\define branch-node(prefix) +<$reveal type="nomatch" text="" default="""$(chunk)$"""> +<li> +<$list filter="""[all[shadows+tiddlers]prefix[$prefix$$(chunk)$]] -[[$prefix$$(chunk)$]] +[limit[1]]"""> +<$reveal type="nomatch" state="""$:/state/tree/$prefix$$(chunk)$""" text="show"> +<$button set="""$:/state/tree/$prefix$$(chunk)$""" setTo="show" class="tc-btn-invisible">{{$:/core/images/folder}} <$text text="""$(chunk)$"""/></$button> +</$reveal> +<$reveal type="match" state="""$:/state/tree/$prefix$$(chunk)$""" text="show"> +<$button set="""$:/state/tree/$prefix$$(chunk)$""" setTo="hide" class="tc-btn-invisible">{{$:/core/images/folder}} <$text text="""$(chunk)$"""/></$button> +</$reveal> +</$list> +<$list filter="""[all[shadows+tiddlers]prefix[$prefix$$(chunk)$]] -[[$prefix$$(chunk)$]] +[limit[1]]"""><span>(<$count filter="""[all[shadows+tiddlers]prefix[$prefix$$(chunk)$]] -[[$prefix$$(chunk)$]]"""/>)</span> +<$reveal type="match" state="""$:/state/tree/$prefix$$(chunk)$""" text="show"> +<$macrocall $name="tree-node" prefix="""$prefix$$(chunk)$"""/> +</$reveal> +</$list> +</li> +</$reveal> +\end + +\define tree-node(prefix) +<ol> +<$list filter="[all[shadows+tiddlers]removeprefix[$prefix$]splitbefore[/]sort[title]] +[!suffix[/]]" variable="chunk"> +<<leaf-node """$prefix$""">> +</$list> +<$list filter="[all[shadows+tiddlers]removeprefix[$prefix$]splitbefore[/]sort[title]] +[suffix[/]]" variable="chunk"> +<<branch-node """$prefix$""">> +</$list> +</ol> +\end + +\define tree(prefix) +<div class="tc-tree"> +<span><$text text="""$prefix$"""/></span> +<div> +<$macrocall $name="tree-node" prefix="""$prefix$"""/> +</div> +</div> +\end diff --git a/core/wiki/palettepreview.tid b/core/wiki/palettepreview.tid index baf5a25b9..e3debf8d6 100644 --- a/core/wiki/palettepreview.tid +++ b/core/wiki/palettepreview.tid @@ -1,5 +1,5 @@ title: $:/snippets/palettepreview <$set name="currentTiddler" value={{$:/palette}}> -<$transclude tiddler="$:/snippets/currpalettepreview"/> +{{||$:/snippets/currpalettepreview}} </$set> diff --git a/core/wiki/paletteswitcher.tid b/core/wiki/paletteswitcher.tid index f3f08713a..14c647b55 100644 --- a/core/wiki/paletteswitcher.tid +++ b/core/wiki/paletteswitcher.tid @@ -1,12 +1,8 @@ title: $:/snippets/paletteswitcher -\define lingo-base() $:/language/ControlPanel/Palette/ -<div class="tc-prompt"> -<<lingo Prompt>> <$view tiddler={{$:/palette}} field="name"/> -</div> - <$linkcatcher to="$:/palette"> -<div class="tc-chooser"><$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]sort[description]]"><div class="tc-chooser-item"><$link to={{!!title}}><div><$reveal state="$:/palette" type="match" text={{!!title}}>•</$reveal><$reveal state="$:/palette" type="nomatch" text={{!!title}}> </$reveal> ''<$view field="name" format="text"/>'' - <$view field="description" format="text"/></div><$transclude tiddler="$:/snippets/currpalettepreview"/></$link></div> +<div class="tc-chooser"><$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]sort[description]]"><$set name="cls" filter="[all[current]prefix{$:/palette}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item"><div class=<<cls>>><$link to={{!!title}}>''<$view field="name" format="text"/>'' - <$view field="description" format="text"/>{{||$:/snippets/currpalettepreview}}</$link> +</div></$set> </$list> </div> </$linkcatcher> \ No newline at end of file diff --git a/core/wiki/peek-stylesheets.tid b/core/wiki/peek-stylesheets.tid new file mode 100644 index 000000000..06ef57cf4 --- /dev/null +++ b/core/wiki/peek-stylesheets.tid @@ -0,0 +1,77 @@ +title: $:/snippets/peek-stylesheets + +\define expandable-stylesheets-list() +<ol> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]"> +<$vars state=<<qualify "$:/config/peek-stylesheets/open/">>> +<$set name="state" value={{{ [<state>addsuffix<currentTiddler>] }}}> +<li> +<$reveal type="match" state=<<state>> text="yes" tag="span"> +<$button set=<<state>> setTo="no" class="tc-btn-invisible"> +{{$:/core/images/down-arrow}} +</$button> +</$reveal> +<$reveal type="nomatch" state=<<state>> text="yes" tag="span"> +<$button set=<<state>> setTo="yes" class="tc-btn-invisible"> +{{$:/core/images/right-arrow}} +</$button> +</$reveal> +<$link> +<$view field="title"/> +</$link> +<$reveal type="match" state=<<state>> text="yes" tag="div"> +<$set name="source" tiddler=<<currentTiddler>>> +<$wikify name="styles" text=<<source>>> +<pre> +<code> +<$text text=<<styles>>/> +</code> +</pre> +</$wikify> +</$set> +</$reveal> +</li> +</$set> +</$vars> +</$list> +</ol> +\end + +\define stylesheets-list() +<ol> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]"> +<li> +<$link> +<$view field="title"/> +</$link> +<$set name="source" tiddler=<<currentTiddler>>> +<$wikify name="styles" text=<<source>>> +<pre> +<code> +<$text text=<<styles>>/> +</code> +</pre> +</$wikify> +</$set> +</li> +</$list> +</ol> +\end + +<$vars modeState=<<qualify "$:/config/peek-stylesheets/mode/">>> + +<$reveal type="nomatch" state=<<modeState>> text="expanded" tag="div"> +<$button set=<<modeState>> setTo="expanded" class="tc-btn-invisible">{{$:/core/images/chevron-right}} {{$:/language/ControlPanel/Stylesheets/Expand/Caption}}</$button> +</$reveal> +<$reveal type="match" state=<<modeState>> text="expanded" tag="div"> +<$button set=<<modeState>> setTo="restored" class="tc-btn-invisible">{{$:/core/images/chevron-down}} {{$:/language/ControlPanel/Stylesheets/Restore/Caption}}</$button> +</$reveal> + +<$reveal type="nomatch" state=<<modeState>> text="expanded" tag="div"> +<<expandable-stylesheets-list>> +</$reveal> +<$reveal type="match" state=<<modeState>> text="expanded" tag="div"> +<<stylesheets-list>> +</$reveal> + +</$vars> diff --git a/core/wiki/tags/EditorToolbar.tid b/core/wiki/tags/EditorToolbar.tid index 4611721ea..cf94edea0 100644 --- a/core/wiki/tags/EditorToolbar.tid +++ b/core/wiki/tags/EditorToolbar.tid @@ -1,2 +1,2 @@ title: $:/tags/EditorToolbar -list: $:/core/ui/EditorToolbar/paint $:/core/ui/EditorToolbar/opacity $:/core/ui/EditorToolbar/line-width $:/core/ui/EditorToolbar/clear $:/core/ui/EditorToolbar/bold $:/core/ui/EditorToolbar/italic $:/core/ui/EditorToolbar/strikethrough $:/core/ui/EditorToolbar/underline $:/core/ui/EditorToolbar/superscript $:/core/ui/EditorToolbar/subscript $:/core/ui/EditorToolbar/mono-line $:/core/ui/EditorToolbar/mono-block $:/core/ui/EditorToolbar/quote $:/core/ui/EditorToolbar/list-bullet $:/core/ui/EditorToolbar/list-number $:/core/ui/EditorToolbar/heading-1 $:/core/ui/EditorToolbar/heading-2 $:/core/ui/EditorToolbar/heading-3 $:/core/ui/EditorToolbar/heading-4 $:/core/ui/EditorToolbar/heading-5 $:/core/ui/EditorToolbar/heading-6 $:/core/ui/EditorToolbar/link $:/core/ui/EditorToolbar/excise $:/core/ui/EditorToolbar/picture $:/core/ui/EditorToolbar/stamp $:/core/ui/EditorToolbar/size $:/core/ui/EditorToolbar/editor-height $:/core/ui/EditorToolbar/more $:/core/ui/EditorToolbar/preview $:/core/ui/EditorToolbar/preview-type +list: $:/core/ui/EditorToolbar/paint $:/core/ui/EditorToolbar/opacity $:/core/ui/EditorToolbar/line-width $:/core/ui/EditorToolbar/rotate-left $:/core/ui/EditorToolbar/clear $:/core/ui/EditorToolbar/bold $:/core/ui/EditorToolbar/italic $:/core/ui/EditorToolbar/strikethrough $:/core/ui/EditorToolbar/underline $:/core/ui/EditorToolbar/superscript $:/core/ui/EditorToolbar/subscript $:/core/ui/EditorToolbar/mono-line $:/core/ui/EditorToolbar/mono-block $:/core/ui/EditorToolbar/quote $:/core/ui/EditorToolbar/list-bullet $:/core/ui/EditorToolbar/list-number $:/core/ui/EditorToolbar/heading-1 $:/core/ui/EditorToolbar/heading-2 $:/core/ui/EditorToolbar/heading-3 $:/core/ui/EditorToolbar/heading-4 $:/core/ui/EditorToolbar/heading-5 $:/core/ui/EditorToolbar/heading-6 $:/core/ui/EditorToolbar/link $:/core/ui/EditorToolbar/excise $:/core/ui/EditorToolbar/picture $:/core/ui/EditorToolbar/stamp $:/core/ui/EditorToolbar/size $:/core/ui/EditorToolbar/editor-height $:/core/ui/EditorToolbar/more $:/core/ui/EditorToolbar/preview $:/core/ui/EditorToolbar/preview-type diff --git a/core/wiki/tags/ManagerItemMain.tid b/core/wiki/tags/ManagerItemMain.tid new file mode 100644 index 000000000..fa1af0824 --- /dev/null +++ b/core/wiki/tags/ManagerItemMain.tid @@ -0,0 +1,2 @@ +title: $:/tags/Manager/ItemMain +list: $:/Manager/ItemMain/WikifiedText $:/Manager/ItemMain/RawText $:/Manager/ItemMain/Fields \ No newline at end of file diff --git a/core/wiki/tags/ManagerItemSidebar.tid b/core/wiki/tags/ManagerItemSidebar.tid new file mode 100644 index 000000000..b450ef772 --- /dev/null +++ b/core/wiki/tags/ManagerItemSidebar.tid @@ -0,0 +1,2 @@ +title: $:/tags/Manager/ItemSidebar +list: $:/Manager/ItemSidebar/Tags $:/Manager/ItemSidebar/Colour $:/Manager/ItemSidebar/Icon $:/Manager/ItemSidebar/Tools \ No newline at end of file diff --git a/core/wiki/tags/MoreSideBar.tid b/core/wiki/tags/MoreSideBar.tid index b7f17dace..f3371ef4b 100644 --- a/core/wiki/tags/MoreSideBar.tid +++ b/core/wiki/tags/MoreSideBar.tid @@ -1,3 +1,3 @@ title: $:/tags/MoreSideBar -list: [[$:/core/ui/MoreSideBar/All]] [[$:/core/ui/MoreSideBar/Recent]] [[$:/core/ui/MoreSideBar/Tags]] [[$:/core/ui/MoreSideBar/Missing]] [[$:/core/ui/MoreSideBar/Drafts]] [[$:/core/ui/MoreSideBar/Orphans]] [[$:/core/ui/MoreSideBar/Types]] [[$:/core/ui/MoreSideBar/System]] [[$:/core/ui/MoreSideBar/Shadows]] +list: [[$:/core/ui/MoreSideBar/All]] [[$:/core/ui/MoreSideBar/Recent]] [[$:/core/ui/MoreSideBar/Tags]] [[$:/core/ui/MoreSideBar/Missing]] [[$:/core/ui/MoreSideBar/Drafts]] [[$:/core/ui/MoreSideBar/Orphans]] [[$:/core/ui/MoreSideBar/Types]] [[$:/core/ui/MoreSideBar/System]] [[$:/core/ui/MoreSideBar/Shadows]] [[$:/core/ui/MoreSideBar/Explorer]] [[$:/core/ui/MoreSideBar/Plugins]] diff --git a/core/wiki/tags/PageControls.tid b/core/wiki/tags/PageControls.tid index 3bef09b7d..4d5972827 100644 --- a/core/wiki/tags/PageControls.tid +++ b/core/wiki/tags/PageControls.tid @@ -1,2 +1,2 @@ title: $:/tags/PageControls -list: [[$:/core/ui/Buttons/home]] [[$:/core/ui/Buttons/close-all]] [[$:/core/ui/Buttons/fold-all]] [[$:/core/ui/Buttons/unfold-all]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/new-journal]] [[$:/core/ui/Buttons/new-image]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/export-page]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/advanced-search]] [[$:/core/ui/Buttons/tag-manager]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/palette]] [[$:/core/ui/Buttons/theme]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/refresh]] [[$:/core/ui/Buttons/more-page-actions]] +list: [[$:/core/ui/Buttons/home]] [[$:/core/ui/Buttons/close-all]] [[$:/core/ui/Buttons/fold-all]] [[$:/core/ui/Buttons/unfold-all]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/new-journal]] [[$:/core/ui/Buttons/new-image]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/export-page]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/advanced-search]] [[$:/core/ui/Buttons/manager]] [[$:/core/ui/Buttons/tag-manager]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/palette]] [[$:/core/ui/Buttons/theme]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/timestamp]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/print]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/refresh]] [[$:/core/ui/Buttons/more-page-actions]] diff --git a/core/wiki/themeswitcher.tid b/core/wiki/themeswitcher.tid index b7b7bd029..4e8f8d759 100644 --- a/core/wiki/themeswitcher.tid +++ b/core/wiki/themeswitcher.tid @@ -1,9 +1,8 @@ title: $:/snippets/themeswitcher -\define lingo-base() $:/language/ControlPanel/Theme/ -<<lingo Prompt>> <$view tiddler={{$:/theme}} field="name"/> - <$linkcatcher to="$:/theme"> -<$list filter="[plugin-type[theme]sort[title]]"><div><$reveal state="$:/theme" type="match" text={{!!title}}>•</$reveal><$reveal state="$:/theme" type="nomatch" text={{!!title}}> </$reveal> <$link to={{!!title}}>''<$view field="name" format="text"/>'' <$view field="description" format="text"/></$link></div> +<div class="tc-chooser"><$list filter="[plugin-type[theme]sort[title]]"><$set name="cls" filter="[all[current]field:title{$:/theme}] [[$:/theme]!has[text]addsuffix[s/tiddlywiki/vanilla]field:title<currentTiddler>] +[limit[1]]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item"><div class=<<cls>>><$link to={{!!title}}>''<$view field="name" format="text"/>'' <$view field="description" format="text"/></$link></div> +</$set> </$list> +</div> </$linkcatcher> \ No newline at end of file diff --git a/core/wiki/title.tid b/core/wiki/title.tid index 2d06f2eee..6db4cdca1 100644 --- a/core/wiki/title.tid +++ b/core/wiki/title.tid @@ -1,4 +1,3 @@ title: $:/core/wiki/title -type: text/vnd.tiddlywiki {{$:/SiteTitle}} --- {{$:/SiteSubtitle}} \ No newline at end of file diff --git a/core/wiki/viewswitcher.tid b/core/wiki/viewswitcher.tid index fc6d74c59..73544ed30 100644 --- a/core/wiki/viewswitcher.tid +++ b/core/wiki/viewswitcher.tid @@ -1,8 +1,18 @@ title: $:/snippets/viewswitcher -\define lingo-base() $:/language/ControlPanel/StoryView/ -<<lingo Prompt>> <$select tiddler="$:/view"> -<$list filter="[storyviews[]]"> -<option><$view field="title"/></option> +\define icon() +$:/core/images/storyview-$(storyview)$ +\end +<$linkcatcher to="$:/view"> +<div class="tc-chooser"> +<$list filter="[storyviews[]]" variable="storyview"> +<$set name="cls" filter="[<storyview>prefix{$:/view}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item"><div class=<<cls>>> +<$link to=<<storyview>>> +<$transclude tiddler=<<icon>>/> +<$text text=<<storyview>>/> +</$link> +</div> +</$set> </$list> -</$select> \ No newline at end of file +</div> +</$linkcatcher> \ No newline at end of file diff --git a/editions/aws/tiddlers/HelloThere.tid b/editions/aws/tiddlers/HelloThere.tid new file mode 100644 index 000000000..8a6dc6c21 --- /dev/null +++ b/editions/aws/tiddlers/HelloThere.tid @@ -0,0 +1,3 @@ +title: HelloThere + +This wiki provides a starting point for working with the AWS plugin for TiddlyWiki under Node.js. diff --git a/editions/aws/tiddlywiki.info b/editions/aws/tiddlywiki.info new file mode 100644 index 000000000..52f419699 --- /dev/null +++ b/editions/aws/tiddlywiki.info @@ -0,0 +1,18 @@ +{ + "description": "Amazon Web Services edition", + "plugins": [ + "tiddlywiki/async", + "tiddlywiki/jszip", + "tiddlywiki/aws" + ], + "themes": [ + "tiddlywiki/vanilla", + "tiddlywiki/snowwhite" + ], + "build": { + "index": [ + "--rendertiddler","$:/core/save/all","index.html","text/plain"], + "lambda": [ + "--rendertiddler","$:/plugins/tiddlywiki/aws/lambdas/main","index.js","text/plain"] + } +} diff --git a/editions/classicparserdemo/tiddlers/HTML Formatting.tid b/editions/classicparserdemo/tiddlers/HTML Formatting.tid index 916ca267f..eb76eafab 100644 --- a/editions/classicparserdemo/tiddlers/HTML Formatting.tid +++ b/editions/classicparserdemo/tiddlers/HTML Formatting.tid @@ -19,11 +19,11 @@ TiddlyWiki provides support for rendering pure HTML markup. To do this, simply w !!"""Embedded iFrame""" {{{ <html> -<iframe src="http://www.youtube.com/embed/Cj6ho1-G6tw" +<iframe src="https://www.youtube.com/embed/Cj6ho1-G6tw" width="450" height="315" frameborder="0" allowfullscreen/> </html> }}} <html> -<iframe src="http://www.youtube.com/embed/Cj6ho1-G6tw?vq=hd720&iv_load_policy=3" +<iframe src="https://www.youtube.com/embed/Cj6ho1-G6tw?vq=hd720&iv_load_policy=3" width="450" height="315" frameborder="0" allowfullscreen/> </html> diff --git a/editions/classicparserdemo/tiddlers/Markup.tid b/editions/classicparserdemo/tiddlers/Markup.tid index d2f52c915..454fe2e17 100644 --- a/editions/classicparserdemo/tiddlers/Markup.tid +++ b/editions/classicparserdemo/tiddlers/Markup.tid @@ -55,8 +55,8 @@ TiddlyWiki markup is a dedicated markup syntax to <<tag Formatting "format your |[[Pretty Link|Tiddler Name]]|{{{[[Pretty Link|Tiddler Name]]}}}| |>| [[External Links|External Link]] | |A valid URL is automatically rendered as an external link.|>| -|http://www.tiddlywiki.com|{{{http://www.tiddlywiki.com}}}| -|[[Pretty External Link|http://www.tiddlywiki.com]]|{{{[[Pretty External Link|http://www.tiddlywiki.com]]}}}| +|https://www.tiddlywiki.com|{{{https://www.tiddlywiki.com}}}| +|[[Pretty External Link|https://www.tiddlywiki.com]]|{{{[[Pretty External Link|https://www.tiddlywiki.com]]}}}| |>| ![[Filesystem Links|Links]] | |You can, of course, use file system links both as plain or pretty links.|>| |''Windows Network Path''|{{{[[file://///server/share]]}}}| @@ -65,11 +65,11 @@ TiddlyWiki markup is a dedicated markup syntax to <<tag Formatting "format your |''Relative Path (Subfolder)''|{{{[[folder/file]]}}}| |>| ![[Images]] | |In general, image files are external to a TiddlyWiki.|>| -|[img[http://www.tiddlywiki.com/favicon.ico]]|{{{[img[path/image.jpg]]}}}| -| aligned right  [>img[http://www.tiddlywiki.com/favicon.ico]]|{{{[>img[path/image.jpg]]}}}| -|[<img[http://www.tiddlywiki.com/favicon.ico]]  aligned left|{{{[<img[path/image.jpg]]}}}| -|w/ internal link [>img[http://www.tiddlywiki.com/favicon.ico][TiddlyWiki]]|{{{[img[path/image.jpg][TiddlerName]]}}}| -|w/ external link [>img[http://www.tiddlywiki.com/favicon.ico][http://www.tiddlywiki.com]]|{{{[img[path/image.jpg][TiddlyWiki|http://www.tiddlywiki.com]]}}}| +|[img[https://www.tiddlywiki.com/favicon.ico]]|{{{[img[path/image.jpg]]}}}| +| aligned right  [>img[https://www.tiddlywiki.com/favicon.ico]]|{{{[>img[path/image.jpg]]}}}| +|[<img[https://www.tiddlywiki.com/favicon.ico]]  aligned left|{{{[<img[path/image.jpg]]}}}| +|w/ internal link [>img[https://www.tiddlywiki.com/favicon.ico][TiddlyWiki]]|{{{[img[path/image.jpg][TiddlerName]]}}}| +|w/ external link [>img[https://www.tiddlywiki.com/favicon.ico][https://www.tiddlywiki.com]]|{{{[img[path/image.jpg][TiddlyWiki|https://www.tiddlywiki.com]]}}}| |>| ![[Gradients|gradient]] | |<<gradient horiz #faa #afa #aaf>>  __vert__ical or __horiz__ontal<br>  see [[gradient macro|http://tiddlywiki.org/#%5B%5Bgradient%20(macro)%5D%5D]]>>|{{{<<gradient horiz #faa #afa #aaf>>wiki text>>}}}| |>| ![[Tables]] | @@ -84,7 +84,7 @@ TiddlyWiki markup is a dedicated markup syntax to <<tag Formatting "format your |>| ![[Embedded HTML|HTML Formatting]] | |<html><span style="padding-right:30px;font-size:2em;">any</span><br /><b>valid</b> <em>xhtml</em></html>|<html><code style="font-weight:bold"><html></code></html>{{{<span style="padding-right:30px;font-size:2em;">any</span><br /><b>valid</b> <em>xhtml</em>}}}<html><code style="font-weight:bold"></html></code></html>| |>| [[Embedded <iframe>|HTML Formatting]] | -|<html><iframe height="200px" width="300px" src="http://www.youtube.com/embed/Cj6ho1-G6tw?vq=hd720" frameborder="0" allowfullscreen/></html>|<html><code style="font-weight:bold"><html></code></html>{{{<iframe src="http://the.url"/>}}}<html><code style="font-weight:bold"></html></code></html>| +|<html><iframe height="200px" width="300px" src="https://www.youtube.com/embed/Cj6ho1-G6tw?vq=hd720" frameborder="0" allowfullscreen/></html>|<html><code style="font-weight:bold"><html></code></html>{{{<iframe src="http://the.url"/>}}}<html><code style="font-weight:bold"></html></code></html>| |>| ![[Line Break|Line Breaks]] | |handy for entering multi-line content into table cells or lists|>| |a<br>b|{{{a<br>b}}} or {{{a<br/>a}}} or {{{a<br />a}}}| diff --git a/editions/codemirrordemo/tiddlers/DefaultSidebarTab.tid b/editions/codemirrordemo/tiddlers/DefaultSidebarTab.tid new file mode 100644 index 000000000..e28688819 --- /dev/null +++ b/editions/codemirrordemo/tiddlers/DefaultSidebarTab.tid @@ -0,0 +1,5 @@ +title: $:/config/DefaultSidebarTab + + +$:/codemirrordemo/sidebar/cheatsheet + diff --git a/editions/codemirrordemo/tiddlers/HelloThere.tid b/editions/codemirrordemo/tiddlers/HelloThere.tid index 75f3882d3..11ec8ce0e 100644 --- a/editions/codemirrordemo/tiddlers/HelloThere.tid +++ b/editions/codemirrordemo/tiddlers/HelloThere.tid @@ -1,11 +1,43 @@ title: HelloThere -This is a demo of TiddlyWiki5 incorporating a plugin for the [[CodeMirror|http://codemirror.net/]] text editor for the web. +This is a demo of [[TiddlyWiki5|https://tiddlywiki.com]] incorporating a plugin for the [[CodeMirror|http://codemirror.net/]] text editor for the web. -Try editing the tiddler LoremIpsum to try out the editor. +The ~CodeMirror plugin can be extended with ~AddOns for more functionality: -To add the plugin to your own TiddlyWiki5, just drag this link to the browser window: +* Search and Replace +* Text - Autocompletion +* Syntax highlighting +* Fullscreen editing +* Keymaps in the style of Emacs, Sublime Text or Vim +* Closing Brackets +* Closing Tags + +NOTE: This demo has the ''Sublime Text'' keymap installed. + +!!!Try editing the tiddler [[Draft of 'LoremIpsum']] to try out the editor. + +Some commands and functions to try: + +* Ctrl+F : Search panel to search for expressions +* Ctrl+H (sublime text shortcut, default is Ctrl+Shift+R) : Search and Replace +* Ctrl+Space : Triggers Autocompletion +* typing an opening bracket like `{` automatically creates the closing bracket `}` +* tiddlers with type `application/javascript`, `application/json`, `text/css`, `text/html`, `text/xml`, `text/x-markdown` and `text/x-tiddlywiki` have Syntax Highlighting +* tiddlers with type `text/html` automatically close tags like `<div>` when the closing `>` gets typed +* Multiple cursors: holding Ctrl pressed while selecting words results in multiple cursors. If you type, all selections will update + +This demo uses the ''Sublime Text Keymap'' - See the Sidebar Tab ''Keymap'' or the [[Sublime Text Keymap Readme|$:/plugins/tiddlywiki/codemirror-keymap-sublime-text/readme]] for all available keyboard shortcuts + +To add the base plugin to your own ~TiddlyWiki5, just drag this link to the browser window: [[$:/plugins/tiddlywiki/codemirror]] -{{$:/plugins/tiddlywiki/codemirror/readme}} +[[CodeMirror plugin Readme|$:/plugins/tiddlywiki/codemirror/readme]] + +[[CodeMirror plugin Usage|$:/plugins/tiddlywiki/codemirror/usage]] + +To add ~AddOns to your ~CodeMirror plugin, go to ~ControlPanel - Plugins and drag the desired ~AddOn to your wiki browser window + +The configuration for ~AddOns is done automatically, configuration for sensible settings can be done in ~ControlPanel - Settings - ~CodeMirror + + diff --git a/editions/codemirrordemo/tiddlers/KeyMap.tid b/editions/codemirrordemo/tiddlers/KeyMap.tid new file mode 100644 index 000000000..72febaa78 --- /dev/null +++ b/editions/codemirrordemo/tiddlers/KeyMap.tid @@ -0,0 +1,4 @@ +title: $:/config/codemirror/keyMap +type: string + +sublime diff --git a/editions/codemirrordemo/tiddlers/KeymapCheatsheet.tid b/editions/codemirrordemo/tiddlers/KeymapCheatsheet.tid new file mode 100644 index 000000000..4c8843b8f --- /dev/null +++ b/editions/codemirrordemo/tiddlers/KeymapCheatsheet.tid @@ -0,0 +1,57 @@ +caption: Keymap +tags: $:/tags/SideBar +title: $:/codemirrordemo/sidebar/cheatsheet + + +|Shortcut |Function |h +|Shift-Tab |indentLess | +|Shift-Ctrl-K |deleteLine | +|Alt-Q |wrapLines | +|Alt-T |transposeChars | +|Alt-Left |goSubwordLeft | +|Alt-Right |goSubwordRight | +|Ctrl-Up |scrollLineUp | +|Ctrl-Down |scrollLineDown | +|Alt-L |selectLine | +|Shift-Alt-L |splitSelectionByLine | +|Ctrl-Esc |singleSelectionTop | +|Shift-Enter |insertLineAfter | +|Shift-Ctrl-Enter |insertLineBefore | +|Ctrl-D |selectNextOccurrence | +|Shift-Ctrl-Space |selectScope | +|Shift-Ctrl-M |selectBetweenBrackets | +|Alt-M |goToBracket | +|Shift-Ctrl-Up |swapLineUp | +|Shift-Ctrl-Down |swapLineDown | +|Ctrl-/ |toggleCommentIndented | +|Ctrl-J |joinLines | +|Shift-Ctrl-D |duplicateLine | +|F9 |sortLines | +|Ctrl-F9 |sortLinesInsensitive | +|F2 |nextBookmark | +|Shift-F2 |prevBookmark | +|Ctrl-F2 |toggleBookmark | +|Shift-Ctrl-F2 |clearBookmarks | +|Alt-F2 |selectBookmarks | +|Backspace |smartBackspace | +|Ctrl-K Ctrl-K |delLineRight | +|Ctrl-K Alt-U |upcaseAtCursor | +|Ctrl-K Alt-L |downcaseAtCursor | +|Ctrl-K Ctrl-Space |setSublimeMark | +|Ctrl-K Ctrl-A |selectToSublimeMark | +|Ctrl-K Alt-D |deleteToSublimeMark | +|Ctrl-K Ctrl-X |swapWithSublimeMark | +|Ctrl-K Ctrl-Y |sublimeYank | +|Ctrl-K Ctrl-C |showInCenter | +|Ctrl-K Ctrl-G |clearBookmarks | +|Ctrl-K Ctrl-Backspace |delLineLeft | +|Ctrl-K Ctrl-0 |unfoldAll | +|Ctrl-K Ctrl-J |unfoldAll | +|Ctrl-Alt-Up |addCursorToPrevLine | +|Ctrl-Alt-Down |addCursorToNextLine | +|Ctrl-F3 |findUnder | +|Shift-Ctrl-F3 |findUnderPrevious | +|Shift-Ctrl-[ |fold | +|Shift-Ctrl-] |unfold | +|Ctrl-H |replace | + diff --git a/editions/codemirrordemo/tiddlers/SiteSubtitle.tid b/editions/codemirrordemo/tiddlers/SiteSubtitle.tid index a5556748c..7896f7fdb 100644 --- a/editions/codemirrordemo/tiddlers/SiteSubtitle.tid +++ b/editions/codemirrordemo/tiddlers/SiteSubtitle.tid @@ -1,3 +1,3 @@ title: $:/SiteSubtitle -a demo of the CodeMirror plugin for TiddlyWiki5 \ No newline at end of file +~CodeMirror plugins for ~TiddlyWiki diff --git a/editions/codemirrordemo/tiddlers/SiteTitle.tid b/editions/codemirrordemo/tiddlers/SiteTitle.tid index a32e85d40..ab6ef6881 100644 --- a/editions/codemirrordemo/tiddlers/SiteTitle.tid +++ b/editions/codemirrordemo/tiddlers/SiteTitle.tid @@ -1,3 +1,3 @@ title: $:/SiteTitle -codemirrordemo \ No newline at end of file +~CodeMirror Demo diff --git a/editions/codemirrordemo/tiddlers/cm-theme-tiddlywiki.tid b/editions/codemirrordemo/tiddlers/cm-theme-tiddlywiki.tid new file mode 100644 index 000000000..501b20b9a --- /dev/null +++ b/editions/codemirrordemo/tiddlers/cm-theme-tiddlywiki.tid @@ -0,0 +1,56 @@ +title: $:/themes/codemirror/tiddlywiki +tags: $:/tags/Stylesheet +module-type: codemirror-theme +name: tiddlywiki + +.cm-s-tiddlywiki { + font-size: 1em; + line-height: 1.5em; + letter-spacing: 0.3px; + word-spacing: 1px; + background: <<colour page-background>>; + color: <<colour foreground>>; +} +.cm-s-tiddlywiki .CodeMirror-lines { + padding: 8px 0; +} +.cm-s-tiddlywiki .CodeMirror-gutters { + background-color: <<colour page-background>>; + padding-right: 10px; + z-index: 3; + border: none; +} +.cm-s-tiddlywiki div.CodeMirror-cursor { + border-left: 3px solid <<colour very-muted-foreground>>; +} +.cm-s-tiddlywiki .CodeMirror-activeline-background { + background: <<colour tiddler-editor-fields-even>>; +} +.cm-s-tiddlywiki .CodeMirror-selected { + background: <<colour muted-foreground>>; +} +.cm-s-tiddlywiki .cm-comment { + font-style: italic; + color: <<colour muted-foreground>>; +} +.cm-s-tiddlywiki .CodeMirror-linenumber { + color: italic; +} + +.cm-s-tiddlywiki span.cm-atom, .cm-s-tiddlywiki span.cm-number, .cm-s-tiddlywiki span.cm-keyword, .cm-s-tiddlywiki span.cm-variable, .cm-s-tiddlywiki span.cm-attribute, .cm-s-tiddlywiki span.cm-quote, .cm-s-tiddlywiki-light span.cm-hr, .cm-s-tiddlywiki-light span.cm-link { color: #063289; } + +.cm-s-tiddlywiki span.cm-property { color: #b29762; } +.cm-s-tiddlywiki span.cm-punctuation, .cm-s-tiddlywiki span.cm-unit, .cm-s-tiddlywiki span.cm-negative { color: #063289; } +.cm-s-tiddlywiki span.cm-string, .cm-s-tiddlywiki span.cm-operator { color: #1659df; } +.cm-s-tiddlywiki span.cm-positive { color: #896724; } + +.cm-s-tiddlywiki span.cm-variable-2, .cm-s-tiddlywiki span.cm-variable-3, .cm-s-tiddlywiki span.cm-type, .cm-s-tiddlywiki span.cm-string-2, .cm-s-tiddlywiki span.cm-url { color: #896724; } +.cm-s-tiddlywiki span.cm-def, .cm-s-tiddlywiki span.cm-tag, .cm-s-tiddlywiki span.cm-builtin, .cm-s-tiddlywiki span.cm-qualifier, .cm-s-tiddlywiki span.cm-header, .cm-s-tiddlywiki span.cm-em { color: #2d2006; } +.cm-s-tiddlywiki span.cm-bracket, .cm-s-tiddlywiki span.cm-comment { color: #b6ad9a; } + +/* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... */ +/* .cm-s-tiddlywiki span.cm-error { background: #896724; color: #728fcb; } */ +.cm-s-tiddlywiki span.cm-error, .cm-s-tiddlywiki span.cm-invalidchar { color: #f00; } + +.cm-s-tiddlywiki span.cm-header { font-weight: normal; } +.cm-s-tiddlywiki .CodeMirror-matchingbracket { text-decoration: underline; color: #faf8f5 !important; } diff --git a/editions/codemirrordemo/tiddlers/cm-theme.tid b/editions/codemirrordemo/tiddlers/cm-theme.tid new file mode 100644 index 000000000..1a9acf58d --- /dev/null +++ b/editions/codemirrordemo/tiddlers/cm-theme.tid @@ -0,0 +1,3 @@ +title: $:/config/codemirror/theme + +tiddlywiki diff --git a/editions/codemirrordemo/tiddlers/lineNumbers.tid b/editions/codemirrordemo/tiddlers/lineNumbers.tid new file mode 100644 index 000000000..2fc5763b2 --- /dev/null +++ b/editions/codemirrordemo/tiddlers/lineNumbers.tid @@ -0,0 +1,4 @@ +title: $:/config/codemirror/lineNumbers +type: bool + +true diff --git a/editions/codemirrordemo/tiddlers/sidebarlayout.tid b/editions/codemirrordemo/tiddlers/sidebarlayout.tid new file mode 100644 index 000000000..2bfa95e13 --- /dev/null +++ b/editions/codemirrordemo/tiddlers/sidebarlayout.tid @@ -0,0 +1,3 @@ +title: $:/themes/tiddlywiki/vanilla/options/sidebarlayout + +fluid-fixed \ No newline at end of file diff --git a/editions/codemirrordemo/tiddlers/styleActiveLine.tid b/editions/codemirrordemo/tiddlers/styleActiveLine.tid new file mode 100644 index 000000000..2c3d4e439 --- /dev/null +++ b/editions/codemirrordemo/tiddlers/styleActiveLine.tid @@ -0,0 +1,4 @@ +title: $:/config/codemirror/styleActiveLine +type: bool + +true diff --git a/editions/codemirrordemo/tiddlywiki.info b/editions/codemirrordemo/tiddlywiki.info index bd07c052b..7baa8f5a0 100644 --- a/editions/codemirrordemo/tiddlywiki.info +++ b/editions/codemirrordemo/tiddlywiki.info @@ -1,7 +1,18 @@ { "description": "Demo of the CodeMirror plugin", "plugins": [ - "tiddlywiki/codemirror" + "tiddlywiki/codemirror", + "tiddlywiki/codemirror-closebrackets", + "tiddlywiki/codemirror-closetag", + "tiddlywiki/codemirror-autocomplete", + "tiddlywiki/codemirror-search-replace", + "tiddlywiki/codemirror-fullscreen-editing", + "tiddlywiki/codemirror-mode-xml", + "tiddlywiki/codemirror-mode-javascript", + "tiddlywiki/codemirror-mode-css", + "tiddlywiki/codemirror-mode-x-tiddlywiki", + "tiddlywiki/codemirror-mode-markdown", + "tiddlywiki/codemirror-keymap-sublime-text" ], "themes": [ "tiddlywiki/vanilla", diff --git a/editions/de-AT/tiddlers/Community.tid b/editions/de-AT/tiddlers/Community.tid index bc30af90f..a0789ad35 100644 --- a/editions/de-AT/tiddlers/Community.tid +++ b/editions/de-AT/tiddlers/Community.tid @@ -9,4 +9,4 @@ Einige interessante Projekte: <<list-links filter:"[tag[Community]]">> -tiddlywiki.com: http://tiddlywiki.com/#Community \ No newline at end of file +tiddlywiki.com: https://tiddlywiki.com/#Community \ No newline at end of file diff --git a/editions/de-AT/tiddlers/HelloThere.tid b/editions/de-AT/tiddlers/HelloThere.tid index 366ff78ba..60c2147f8 100644 --- a/editions/de-AT/tiddlers/HelloThere.tid +++ b/editions/de-AT/tiddlers/HelloThere.tid @@ -10,15 +10,15 @@ type: text/vnd.tiddlywiki ! Willkommen! -''Haben Sie schon jemals das Gefühl gehabt, Ihr Gehirn ist nicht groß genug, um sich alles zu merken, was Ihnen wichtig ist?'' +''Haben Sie schon jemals das Gefühl gehabt, Ihr Gehirn sei nicht groß genug, um sich alles zu merken, was Ihnen wichtig ist?'' -Willkommen bei ''~TiddlyWiki'', dem einzigartigen [[nicht-linearen|Philosophy von Tiddlern]] Web-Notizbuch, das Ihnen hilft Ihre Ideen zu [[sammeln|Erstellen von Notizen]], [[strukturieren|TiddlyWiki Strukturieren]] und [[weiter zu geben|Informationen weitergeben]]. +Willkommen bei ''~TiddlyWiki'', dem einzigartigen [[nicht-linearen|Philosophy von Tiddlern]] Web-Notizbuch, das Ihnen hilft Ihre Ideen zu [[sammeln|Erstellen von Notizen]], zu [[strukturieren|TiddlyWiki Strukturieren]] und [[weiter zu geben|Informationen weitergeben]]. <div style="font-size:0.7em;text-align:center;margin-top:2em;margin-bottom:2em;"> <<list-thumbnails filter:"[tag[HelloThumbnail]]" width:"168" height:"95">> </div> -Anders, als bei herkömmlichen online Dienste, lässt Ihnen ~TiddlyWiki die Freiheit, wo sie ihre Daten speichern. Da ~TiddlyWiki alle Daten als simplen Text speichert, sind Notizen, die Sie heute machen, garantiert in Jahrzehnten noch einfach lesbar. +Anders, als bei herkömmlichen Online-Diensten, lässt Ihnen ~TiddlyWiki die Freiheit, wo sie ihre Daten speichern. Da ~TiddlyWiki alle Daten als simplen Text speichert, sind Notizen, die Sie heute machen, garantiert in Jahrzehnten noch einfach lesbar. <div style="font-size:0.7em;text-align:center;margin-top:3em;margin-bottom:3em;"> <a href="http://groups.google.com/group/TiddlyWiki" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank"> @@ -30,7 +30,7 @@ Anders, als bei herkömmlichen online Dienste, lässt Ihnen ~TiddlyWiki die Frei <a href="https://github.com/Jermolene/TiddlyWiki5" class="tc-btn-big-green" style="background-color:#444;" target="_blank"> {{$:/core/images/github}} ~TiddlyWiki on ~GitHub </a> -<a href="http://tiddlywiki.com" class="tc-btn-big-green" style="background-color:#green;" target="_blank"> +<a href="https://tiddlywiki.com" class="tc-btn-big-green" style="background-color:#green;" target="_blank"> {{Motovun Jack.svg}} ~TiddlyWiki Homepage </a> </div> diff --git a/editions/de-AT/tiddlers/Makros.tid b/editions/de-AT/tiddlers/Makros.tid index 046ec47fe..4d0cdebd3 100644 --- a/editions/de-AT/tiddlers/Makros.tid +++ b/editions/de-AT/tiddlers/Makros.tid @@ -10,4 +10,4 @@ Hier werden die globalen Makros aufgelistet, die in diesem Wiki beschrieben werd <<list-links [tag[Makros]]>> -Weitere Makros siehe: http://tiddlywiki.com/#Macros \ No newline at end of file +Weitere Makros siehe: https://tiddlywiki.com/#Macros \ No newline at end of file diff --git a/editions/de-AT/tiddlers/Releases.tid b/editions/de-AT/tiddlers/Releases.tid index 752d77971..239332ffd 100644 --- a/editions/de-AT/tiddlers/Releases.tid +++ b/editions/de-AT/tiddlers/Releases.tid @@ -3,4 +3,4 @@ modified: 20150518080417093 title: Releases type: text/vnd.tiddlywiki -Siehe: http://tiddlywiki.com/prerelease/#Releases \ No newline at end of file +Siehe: https://tiddlywiki.com/prerelease/#Releases \ No newline at end of file diff --git a/editions/de-AT/tiddlers/Widgets.tid b/editions/de-AT/tiddlers/Widgets.tid index 7c51789af..320628c75 100644 --- a/editions/de-AT/tiddlers/Widgets.tid +++ b/editions/de-AT/tiddlers/Widgets.tid @@ -6,4 +6,4 @@ tags: InhaltsVerzeichnis title: Widgets type: text/vnd.tiddlywiki -Es gibt momentan ca. 30 Widgets. Siehe: http://tiddlywiki.com/#Widgets \ No newline at end of file +Es gibt momentan ca. 30 Widgets. Siehe: https://tiddlywiki.com/#Widgets \ No newline at end of file diff --git a/editions/de-AT/tiddlers/WikiText mehr Beispiele.tid b/editions/de-AT/tiddlers/WikiText mehr Beispiele.tid index 47bfad1fd..6b3042a48 100644 --- a/editions/de-AT/tiddlers/WikiText mehr Beispiele.tid +++ b/editions/de-AT/tiddlers/WikiText mehr Beispiele.tid @@ -5,4 +5,4 @@ modifier: pmario title: WikiText mehr Beispiele type: text/vnd.tiddlywiki -Siehe: http://tiddlywiki.com \ No newline at end of file +Siehe: https://tiddlywiki.com \ No newline at end of file diff --git a/editions/de-AT/tiddlers/beispiele/Task Management Plugins.tid b/editions/de-AT/tiddlers/beispiele/Task Management Plugins.tid index 224155b7f..c26cc9d3a 100644 --- a/editions/de-AT/tiddlers/beispiele/Task Management Plugins.tid +++ b/editions/de-AT/tiddlers/beispiele/Task Management Plugins.tid @@ -8,5 +8,5 @@ type: text/vnd.tiddlywiki Die "~TiddlyWiki Community" hat bereits begonnen, Plugins zu erstellen, mit denen ganze Projekte verwaltet werden können. -* Briefcase: http://tiddlywiki.com/#%22GSD5%22%20by%20Roma%20Hicks +* Briefcase: https://tiddlywiki.com/#%22GSD5%22%20by%20Roma%20Hicks * Briefcase in Aktion: http://gsd5.tiddlyspot.com/ \ No newline at end of file diff --git a/editions/de-AT/tiddlers/beispiele/Was kann TiddlyWiki.tid b/editions/de-AT/tiddlers/beispiele/Was kann TiddlyWiki.tid index 3a3d500a7..e081e9d93 100644 --- a/editions/de-AT/tiddlers/beispiele/Was kann TiddlyWiki.tid +++ b/editions/de-AT/tiddlers/beispiele/Was kann TiddlyWiki.tid @@ -18,4 +18,4 @@ type: text/vnd.tiddlywiki * Da ~TiddlyWiki eine einzelne Datei ist, ist es sehr einfach sie mit anderen zu teilen. zB: Per mail verschicken --- fertig. * Erstellen einer lokalen Wissensdatenbank mit mehreren vernetzten ~TiddlyWiki Dateien. -Weitere interessante Anwendungsmöglichkeiten finden Sie unter [[Community]] und auf http://tiddlywiki.com \ No newline at end of file +Weitere interessante Anwendungsmöglichkeiten finden Sie unter [[Community]] und auf https://tiddlywiki.com \ No newline at end of file diff --git a/editions/de-AT/tiddlers/bilder/Tiddler_Poster.png.tid b/editions/de-AT/tiddlers/bilder/Tiddler_Poster.png.tid index ab3e74e49..661076006 100644 --- a/editions/de-AT/tiddlers/bilder/Tiddler_Poster.png.tid +++ b/editions/de-AT/tiddlers/bilder/Tiddler_Poster.png.tid @@ -1,5 +1,5 @@ created: 20150513150003950 -source: http://tiddlywiki.com/poster +source: https://tiddlywiki.com/poster tags: picture title: Tiddler Poster.png type: image/png diff --git a/editions/de-AT/tiddlers/community/Fur_Entwickler.tid b/editions/de-AT/tiddlers/community/Fur_Entwickler.tid index 285462cd3..0c656c8dc 100644 --- a/editions/de-AT/tiddlers/community/Fur_Entwickler.tid +++ b/editions/de-AT/tiddlers/community/Fur_Entwickler.tid @@ -6,6 +6,6 @@ type: text/vnd.tiddlywiki Es gibt mehrere Ressourcen für Entwickler, um mehr über das TiddlyWiki Projekt zu erfahren, zu diskutieren und vor allem mitzuhelfen. -* [[tiddlywiki.com/dev|http://tiddlywiki.com/dev]] Offizielle Entwickler Doku. +* [[tiddlywiki.com/dev|https://tiddlywiki.com/dev]] Offizielle Entwickler Doku. * [[TiddlyWikiDev group|http://groups.google.com/group/TiddlyWikiDev]] Google Diskussionsforum für Entwickler. * https://github.com/Jermolene/TiddlyWiki5 .. Github Repository. diff --git a/editions/de-AT/tiddlers/community/Wie_kann_ich_helfen_.tid b/editions/de-AT/tiddlers/community/Wie_kann_ich_helfen_.tid index e647e35ee..04cd2fa1a 100644 --- a/editions/de-AT/tiddlers/community/Wie_kann_ich_helfen_.tid +++ b/editions/de-AT/tiddlers/community/Wie_kann_ich_helfen_.tid @@ -14,7 +14,7 @@ OpenSource-Projekte, wie ~TiddlyWiki wachsen und gedeihen ''nur'' durch das Enga * Zwitschern sie über ~TiddlyWiki :) [[I love TiddlyWiki because...|https://twitter.com/intent/tweet?text=I+love+TiddlyWiki+because...&source=tiddlywiki5]] * Klicken sie den [[TiddlyWiki5 Star Button auf GitHub|https://github.com/Jermolene/TiddlyWiki5]] -* [[Veröffentlichen Sie das TiddlyWiki Poster|http://tiddlywiki.com/poster]] +* [[Veröffentlichen Sie das TiddlyWiki Poster|https://tiddlywiki.com/poster]] [img width=232 [Tiddler Poster.png]] diff --git a/editions/de-AT/tiddlers/howto/Installation von TiddlyWiki mit Node.js.tid b/editions/de-AT/tiddlers/howto/Installation von TiddlyWiki mit Node.js.tid index 0b2b739a1..99310161b 100644 --- a/editions/de-AT/tiddlers/howto/Installation von TiddlyWiki mit Node.js.tid +++ b/editions/de-AT/tiddlers/howto/Installation von TiddlyWiki mit Node.js.tid @@ -6,4 +6,4 @@ tags: howto title: Installation von TiddlyWiki mit Node.js type: text/vnd.tiddlywiki -Siehe: [ext[http://tiddlywiki.com/#GettingStarted - Node.js]] \ No newline at end of file +Siehe: [ext[https://tiddlywiki.com/#GettingStarted - Node.js]] \ No newline at end of file diff --git a/editions/de-AT/tiddlers/howto/Speichern auf TiddlySpot.tid b/editions/de-AT/tiddlers/howto/Speichern auf TiddlySpot.tid index 2c2ad120f..3b5a1d0e6 100644 --- a/editions/de-AT/tiddlers/howto/Speichern auf TiddlySpot.tid +++ b/editions/de-AT/tiddlers/howto/Speichern auf TiddlySpot.tid @@ -11,8 +11,8 @@ TiddlySpot ist ein freier Hosting Service von Simon und Daniel Baird. Er ist bei ~TiddlyWiki5 wird momentan noch nicht als Standard Wiki angeboten, Sie können aber folgende Schritte verwenden um ~TiddlyWiki auf ~TiddlySpot zu speichern. # Erstellen Sie ein Wiki auf http://tiddlyspot.com/ und merken Sie sich den Namen und Ihr Passwort! -# Für Österreich: öffnen Sie http://tiddlywiki.com/languages/de-AT/empty.html in Ihrem Browser. -#* Für Deutschland: http://tiddlywiki.com/languages/de-DE/empty.html +# Für Österreich: öffnen Sie https://tiddlywiki.com/languages/de-AT/empty.html in Ihrem Browser. +#* Für Deutschland: https://tiddlywiki.com/languages/de-DE/empty.html # Wählen Sie im [[Control-Panel|$:/ControlPanel]], den "Speichern" Tab und tragen Sie im "~TiddlySpot" Bereich, den Wiki Namen und das Passwort ein. # Klicken Sie den "Speichern" Button. Nach einiger Zeit, bekommen Sie rechts oben die Mitteilung "Wiki gespeichert". Das Speichern kann je nach Internetverbindung und Wiki Größe einige Sekunden dauern. #* //Das Erstellen eines neuen Wikis funktioniert nicht mit Firefox, da die Sicherheitseinstellungen diese Vorgehensweise nicht erlauben. Google Chrome kann verwendet werden. Ein späteres Editieren von tiddlyspot.com ist auch mit Firefox möglich!// diff --git a/editions/de-AT/tiddlers/howto/Speichern mit Chrome.tid b/editions/de-AT/tiddlers/howto/Speichern mit Chrome.tid index f450ab359..a23dad99a 100644 --- a/editions/de-AT/tiddlers/howto/Speichern mit Chrome.tid +++ b/editions/de-AT/tiddlers/howto/Speichern mit Chrome.tid @@ -10,11 +10,11 @@ Diese Methode ist etwas umständlich, da man Einstellungen immer wieder manuell !! Speichern mit Chrome -<<iframe-responsive src:"http://www.youtube.com/embed/LcoZ7hQCuFI">> +<<iframe-responsive src:"https://www.youtube.com/embed/LcoZ7hQCuFI">> # Speichern Sie eine leere Datei der deutschen Version. #> {{$:/editions/de-AT-DE/snippets/download-empty-button}} -#> Wenn der Button nicht funktioniert, dann klicken Sie den Link mit der rechten Maustaste und wählen: "Ziel Speichern unter ..." http://tiddlywiki.com/languages/de-AT/empty.html oder http://tiddlywiki.com/languages/de-DE/empty.html +#> Wenn der Button nicht funktioniert, dann klicken Sie den Link mit der rechten Maustaste und wählen: "Ziel Speichern unter ..." https://tiddlywiki.com/languages/de-AT/empty.html oder https://tiddlywiki.com/languages/de-DE/empty.html #> Je nach Browser folgen Sie den Dialogen! # Suchen Sie die eben geladene Datei im Datei Manager. #* Geben Sie der Datei einen vernünftigen Namen und stellen Sie sicher, dass die Endung `.html` oder `.htm` ist. diff --git a/editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox - Android.tid b/editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox - Android.tid index a4e482258..54503056b 100644 --- a/editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox - Android.tid +++ b/editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox - Android.tid @@ -15,7 +15,7 @@ Alternativ zu dieser Beschreibung gibt es ein kurzes [[englisches Video |TiddlyW #* https://addons.mozilla.org/en-US/android/addon/save-link-menus/ # Laden Sie eine leere TiddlyWiki Datei, indem Sie den folgenden Link "tippen und halten" bis ein Dialog erscheint #* Tippen sie: "Link Speichern.." -#* http://tiddlywiki.com/empty.html +#* https://tiddlywiki.com/empty.html #> Um den Link zu speichern, benötigen Sie obige "save-link-menus" Erweiterung! # Wenn die Datei gespeichert wurde, dann klicken Sie sie in der Meldungsübersicht oder mit dem "Download Manager" # Wählen Sie öffnen mit FireFox anstatt mit dem Standard Android Programm. diff --git a/editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox.tid b/editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox.tid index 404bacea6..a6dfacef2 100644 --- a/editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox.tid +++ b/editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox.tid @@ -12,7 +12,7 @@ Wenn Sie "Firefox for Android" verwenden, dann beachten sie: [[Speichern mit Tid !! Speichern mit TiddlyFox -<<iframe-responsive src:"http://www.youtube.com/embed/bsWE7jXPbb0">> +<<iframe-responsive src:"https://www.youtube.com/embed/bsWE7jXPbb0">> # Stellen Sie sicher, dass Sie die [[aktuelle Version von Firefox|http://getfirefox.com]] verwenden. # Installieren Sie die aktuelle TiddlyFox Erweiterung von: https://addons.mozilla.org/en-US/firefox/addon/tiddlyfox/ diff --git a/editions/de-AT/tiddlers/howto/Speichern mit TiddlyIE.tid b/editions/de-AT/tiddlers/howto/Speichern mit TiddlyIE.tid index e451d83e0..760e487f9 100644 --- a/editions/de-AT/tiddlers/howto/Speichern mit TiddlyIE.tid +++ b/editions/de-AT/tiddlers/howto/Speichern mit TiddlyIE.tid @@ -8,15 +8,15 @@ type: text/vnd.tiddlywiki !! Speichern mit TiddlyIE -<<iframe-responsive src:"http://www.youtube.com/embed/OrWuvjs3Ly0">> +<<iframe-responsive src:"https://www.youtube.com/embed/OrWuvjs3Ly0">> # Installieren Sie TiddlyIE AddOn von: #* https://github.com/davidjade/TiddlyIE/releases # Starten Sie Internet Explorer neu. IE wird beim Start einen Dialog anzeigen, mit dem Sie das AddOn freischalten können. #> Es ist möglich, dass Sie aufgefordert werden das //Microsoft Script Runtime// zu erlauben. Tun Sie das! # Klicken Sie den folgenden Link mit der rechten Maustaste und wählen: "Ziel Speichern unter ..." -#> http://tiddlywiki.com/languages/de-AT/empty.html oder -#> http://tiddlywiki.com/languages/de-DE/empty.html +#> https://tiddlywiki.com/languages/de-AT/empty.html oder +#> https://tiddlywiki.com/languages/de-DE/empty.html # Suchen Sie die eben geladene Datei im Datei Manager. #* Geben Sie der Datei einen vernünftigen Namen und stellen Sie sicher, dass die Endung `.html` ist. # Öffnen Sie die Datei mit dem Internet Explorer diff --git a/editions/de-AT/tiddlers/howto/Speichern mit iPad_iPhone.tid b/editions/de-AT/tiddlers/howto/Speichern mit iPad_iPhone.tid index 90bc53416..6fd27c77d 100644 --- a/editions/de-AT/tiddlers/howto/Speichern mit iPad_iPhone.tid +++ b/editions/de-AT/tiddlers/howto/Speichern mit iPad_iPhone.tid @@ -14,7 +14,7 @@ Verwendung von TWEdit: # Öffnen Sie TWEdit. # Tippen Sie den Titel in der Mitte des "Toolbars". #* Eine Text Box sollte sich öffnen, in der Sie die URL eingeben können. -# Verwenden Sie die URL `http://tiddlywiki.com/languages/de-AT/empty.html` oder `http://tiddlywiki.com/languages/de-DE/empty.html` +# Verwenden Sie die URL `https://tiddlywiki.com/languages/de-AT/empty.html` oder `https://tiddlywiki.com/languages/de-DE/empty.html` # Wenn die leere Version geladen wurde, dann tippen Sie "save" (Das zweite "icon" oben rechts) #* Ein Hinweis Dialog sollte erscheinen, wo Sie den lokalen Namen eingeben können. # Geben Sie den neuen Dateinamen ein. Die Endung `.html` nicht vergessen! diff --git a/editions/de-AT/tiddlers/howto/TiddlyWiki mit Node.js.tid b/editions/de-AT/tiddlers/howto/TiddlyWiki mit Node.js.tid index 02afc0509..6eb05d60b 100644 --- a/editions/de-AT/tiddlers/howto/TiddlyWiki mit Node.js.tid +++ b/editions/de-AT/tiddlers/howto/TiddlyWiki mit Node.js.tid @@ -6,4 +6,4 @@ tags: howto title: TiddlyWiki mit Node.js type: text/vnd.tiddlywiki -siehe: http://tiddlywiki.com/#TiddlyWiki%20on%20Node.js \ No newline at end of file +siehe: https://tiddlywiki.com/#TiddlyWiki%20on%20Node.js \ No newline at end of file diff --git a/editions/de-AT/tiddlers/howto/TiddlyWiki und TiddlyDesktop.tid b/editions/de-AT/tiddlers/howto/TiddlyWiki und TiddlyDesktop.tid index 3d79c1b15..a64460e1d 100644 --- a/editions/de-AT/tiddlers/howto/TiddlyWiki und TiddlyDesktop.tid +++ b/editions/de-AT/tiddlers/howto/TiddlyWiki und TiddlyDesktop.tid @@ -17,4 +17,4 @@ TiddlyDesktop ist ein Programm für Windows, Mac OS X und Linux, mit dem Sie Tid Ein kurzes, englisches Einführungs-Video zu TiddlyDesktop: -<iframe width="560" height="315" src="http://www.youtube.com/embed/i3Bggkm7paA" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/i3Bggkm7paA" frameborder="0" allowfullscreen></iframe> diff --git a/editions/de-AT/tiddlers/howto/Windows HTA Hack.tid b/editions/de-AT/tiddlers/howto/Windows HTA Hack.tid index 40f91b062..34f32f6ff 100644 --- a/editions/de-AT/tiddlers/howto/Windows HTA Hack.tid +++ b/editions/de-AT/tiddlers/howto/Windows HTA Hack.tid @@ -14,6 +14,6 @@ TW wird standardmäßig im UTF-8 Format gespeichert. Wird die Datei wieder mit e Hier ist ein Video von Mario Pietsch, dass den Umgang IE, HTA und TiddlyWiki zeigt. -<iframe width="560" height="315" src="http://www.youtube.com/embed/OrWuvjs3Ly0" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/OrWuvjs3Ly0" frameborder="0" allowfullscreen></iframe> Siehe Wikipedia (englisch): http://en.wikipedia.org/wiki/HTML_Application diff --git a/editions/de-AT/tiddlers/konzept/Informationen_weitergeben.tid b/editions/de-AT/tiddlers/konzept/Informationen_weitergeben.tid index d20addb83..06d8a3736 100644 --- a/editions/de-AT/tiddlers/konzept/Informationen_weitergeben.tid +++ b/editions/de-AT/tiddlers/konzept/Informationen_weitergeben.tid @@ -1,6 +1,6 @@ created: 20140908163900000 modified: 20150518141847244 -origin: http://tiddlywiki.com/#Sharing%20your%20tiddlers%20with%20others +origin: https://tiddlywiki.com/#Sharing%20your%20tiddlers%20with%20others tags: Konzept title: Informationen weitergeben type: text/vnd.tiddlywiki diff --git a/editions/de-AT/tiddlers/konzept/Permalink.tid b/editions/de-AT/tiddlers/konzept/Permalink.tid index e2d03e601..4a6428dcf 100644 --- a/editions/de-AT/tiddlers/konzept/Permalink.tid +++ b/editions/de-AT/tiddlers/konzept/Permalink.tid @@ -6,11 +6,11 @@ type: text/vnd.tiddlywiki Die einfachste Form eines Permalinks ist ein Link auf einen einzelnen Tiddler. Dazu wird die URL mit `#` erweitert. -* http://tiddlywiki.com/languages/de-DE/#Willkommen! +* https://tiddlywiki.com/languages/de-DE/#Willkommen! Der Titel kann Leerzeichen enthalten: -* [[http://tiddlywiki.com/languages/de-DE/#Was kann TiddlyWiki]] +* [[https://tiddlywiki.com/languages/de-DE/#Was kann TiddlyWiki]] Hinweis: Doppelte eckige Klammern sind hier nicht erforderlich. Wenn vorhanden, werden sie entfernt. diff --git a/editions/de-AT/tiddlers/konzept/Permaview.tid b/editions/de-AT/tiddlers/konzept/Permaview.tid index fa27b709a..fc9f709f7 100644 --- a/editions/de-AT/tiddlers/konzept/Permaview.tid +++ b/editions/de-AT/tiddlers/konzept/Permaview.tid @@ -16,18 +16,18 @@ Ein Permaview hat folgendes Fromat: `URL/#ZielTiddler:[[Liste mit mehreren]] Tid Beispiel: -* http://tiddlywiki.com/languages/de-DE/#Permaview:%5b%5bInformationen%20weitergeben%5d%5d%20Permaview%20Permalink +* https://tiddlywiki.com/languages/de-DE/#Permaview:%5b%5bInformationen%20weitergeben%5d%5d%20Permaview%20Permalink Wenn der Ziel-Tiddler in der Story-Liste nicht vorhanden ist, dann wird er automatisch als Erster aufgelistet. Ist er in der Liste vorhanden, wie zB oben "Permaview", dann wird die Story entsprechend der Liste angezeigt. Weitere Beispiele: -* [[http://tiddlywiki.com/#Tiddlers:Tags TiddlerFields]] -* [[http://tiddlywiki.com/#Tiddlers:Tiddlers Tags TiddlerFields]] +* [[https://tiddlywiki.com/#Tiddlers:Tags TiddlerFields]] +* [[https://tiddlywiki.com/#Tiddlers:Tiddlers Tags TiddlerFields]] Es ist ebenfalls möglich eine Story über eine Tag-Liste als Filter aufzurufen. -* <a href="http://tiddlywiki.com/languages/de-DE/#:[tag[task]]">~http://tiddlywiki.com/languages/de-DE/#:[tag[task]]</a> +* <a href="https://tiddlywiki.com/languages/de-DE/#:[tag[task]]">~https://tiddlywiki.com/languages/de-DE/#:[tag[task]]</a> !! Über URL Codierung diff --git a/editions/de-AT/tiddlers/konzept/Philosophy_von_Tiddlern.tid b/editions/de-AT/tiddlers/konzept/Philosophy_von_Tiddlern.tid index 4215a2d24..348f51274 100644 --- a/editions/de-AT/tiddlers/konzept/Philosophy_von_Tiddlern.tid +++ b/editions/de-AT/tiddlers/konzept/Philosophy_von_Tiddlern.tid @@ -1,6 +1,6 @@ created: 20131128075743966 modified: 20150518115747032 -origin: http://tiddlywiki.com/#Philosophy%20of%20Tiddlers +origin: https://tiddlywiki.com/#Philosophy%20of%20Tiddlers tags: Konzept title: Philosophy von Tiddlern type: text/vnd.tiddlywiki diff --git a/editions/de-AT/tiddlers/konzept/TiddlyWiki_Strukturieren.tid b/editions/de-AT/tiddlers/konzept/TiddlyWiki_Strukturieren.tid index b9f2600b7..7ff74f84e 100644 --- a/editions/de-AT/tiddlers/konzept/TiddlyWiki_Strukturieren.tid +++ b/editions/de-AT/tiddlers/konzept/TiddlyWiki_Strukturieren.tid @@ -1,6 +1,6 @@ created: 20150518115646924 modified: 20150518121920209 -origin: http://tiddlywiki.com/#Structuring%20TiddlyWiki +origin: https://tiddlywiki.com/#Structuring%20TiddlyWiki tags: Konzept title: TiddlyWiki Strukturieren type: text/vnd.tiddlywiki diff --git a/editions/de-AT/tiddlers/konzept/Titel_Listen.tid b/editions/de-AT/tiddlers/konzept/Titel_Listen.tid index 88f661038..df331ec94 100644 --- a/editions/de-AT/tiddlers/konzept/Titel_Listen.tid +++ b/editions/de-AT/tiddlers/konzept/Titel_Listen.tid @@ -1,6 +1,6 @@ created: 20150117152418000 modified: 20150518121901359 -origin: http://tiddlywiki.com/#Title%20List +origin: https://tiddlywiki.com/#Title%20List tags: Konzept title: Titel Listen type: text/vnd.tiddlywiki diff --git a/editions/de-AT/tiddlers/lexikon/DataTiddlers.tid b/editions/de-AT/tiddlers/lexikon/DataTiddlers.tid index 3d174eeaf..f15791758 100644 --- a/editions/de-AT/tiddlers/lexikon/DataTiddlers.tid +++ b/editions/de-AT/tiddlers/lexikon/DataTiddlers.tid @@ -6,4 +6,4 @@ tags: Lexikon title: DataTiddlers type: text/vnd.tiddlywiki -Siehe: http://tiddlywiki.com/#DataTiddlers \ No newline at end of file +Siehe: https://tiddlywiki.com/#DataTiddlers \ No newline at end of file diff --git a/editions/de-AT/tiddlers/lexikon/Filter.tid b/editions/de-AT/tiddlers/lexikon/Filter.tid index 5226077df..f812eb09c 100644 --- a/editions/de-AT/tiddlers/lexikon/Filter.tid +++ b/editions/de-AT/tiddlers/lexikon/Filter.tid @@ -6,4 +6,4 @@ tags: Lexikon Referenz title: Filter type: text/vnd.tiddlywiki -Siehe: http://tiddlywiki.com/#Filters \ No newline at end of file +Siehe: https://tiddlywiki.com/#Filters \ No newline at end of file diff --git a/editions/de-AT/tiddlers/lexikon/JeremyRuston.tid b/editions/de-AT/tiddlers/lexikon/JeremyRuston.tid index 5313e9bf4..780ec0be1 100644 --- a/editions/de-AT/tiddlers/lexikon/JeremyRuston.tid +++ b/editions/de-AT/tiddlers/lexikon/JeremyRuston.tid @@ -6,7 +6,7 @@ tags: Lexikon title: JeremyRuston type: text/vnd.tiddlywiki -Zitat von [[tiddlywiki.com|http://tiddlywiki.com/#JeremyRuston]] +Zitat von [[tiddlywiki.com|https://tiddlywiki.com/#JeremyRuston]] <<< I'm the inventor of ~TiddlyWiki. I am available through my company ''~FederatialLimited'' for consultancy and speaking engagements. diff --git a/editions/de-AT/tiddlers/lexikon/Node.js.tid b/editions/de-AT/tiddlers/lexikon/Node.js.tid index 5307d4cc0..53735afd5 100644 --- a/editions/de-AT/tiddlers/lexikon/Node.js.tid +++ b/editions/de-AT/tiddlers/lexikon/Node.js.tid @@ -6,4 +6,4 @@ tags: Lexikon title: Node.js type: text/vnd.tiddlywiki -Siehe: http://tiddlywiki.com/#Node.js \ No newline at end of file +Siehe: https://tiddlywiki.com/#Node.js \ No newline at end of file diff --git a/editions/de-AT/tiddlers/lexikon/TextReferenz.tid b/editions/de-AT/tiddlers/lexikon/TextReferenz.tid index 58ce43de4..7008b748d 100644 --- a/editions/de-AT/tiddlers/lexikon/TextReferenz.tid +++ b/editions/de-AT/tiddlers/lexikon/TextReferenz.tid @@ -6,4 +6,4 @@ tags: Lexikon title: TextReferenz type: text/vnd.tiddlywiki -Siehe: http://tiddlywiki.com/#TextReference \ No newline at end of file +Siehe: https://tiddlywiki.com/#TextReference \ No newline at end of file diff --git a/editions/de-AT/tiddlers/lexikon/Tiddler.tid b/editions/de-AT/tiddlers/lexikon/Tiddler.tid index 6f31484e0..5334caa35 100644 --- a/editions/de-AT/tiddlers/lexikon/Tiddler.tid +++ b/editions/de-AT/tiddlers/lexikon/Tiddler.tid @@ -18,4 +18,4 @@ Die Bezeichnung Tiddler mag etwas verwirrend sein, ist aber verwirrend ''unverke Intern ist ein tiddler ein Verzeichnis von unveränderbaren "name:value" Paaren, die als "fields" (Felder) bezeichnet werden. Das einzige Feld, das vorhanden sein ''muss'' ist das "text" Feld. -Weitere Informationen finden Sie unter: http://tiddlywiki.com/#TiddlerFields \ No newline at end of file +Weitere Informationen finden Sie unter: https://tiddlywiki.com/#TiddlerFields \ No newline at end of file diff --git a/editions/de-AT/tiddlers/lexikon/TiddlyWiki mit node.js.tid b/editions/de-AT/tiddlers/lexikon/TiddlyWiki mit node.js.tid index e12f0d925..5b71e8082 100644 --- a/editions/de-AT/tiddlers/lexikon/TiddlyWiki mit node.js.tid +++ b/editions/de-AT/tiddlers/lexikon/TiddlyWiki mit node.js.tid @@ -6,4 +6,4 @@ tags: Lexikon title: TiddlyWiki mit node.js type: text/vnd.tiddlywiki -siehe: http://tiddlywiki.com/#TiddlyWiki%20on%20Node.js \ No newline at end of file +siehe: https://tiddlywiki.com/#TiddlyWiki%20on%20Node.js \ No newline at end of file diff --git a/editions/de-AT/tiddlers/lexikon/TiddlyWiki on node-webkit.tid b/editions/de-AT/tiddlers/lexikon/TiddlyWiki on node-webkit.tid index fa05351ed..1b96adad4 100644 --- a/editions/de-AT/tiddlers/lexikon/TiddlyWiki on node-webkit.tid +++ b/editions/de-AT/tiddlers/lexikon/TiddlyWiki on node-webkit.tid @@ -6,4 +6,4 @@ tags: Lexikon title: TiddlyWiki on NW.js type: text/vnd.tiddlywiki -Siehe: http://tiddlywiki.com/#NW.js \ No newline at end of file +Siehe: https://tiddlywiki.com/#NW.js \ No newline at end of file diff --git a/editions/de-AT/tiddlers/lexikon/TiddlyWiki.tid b/editions/de-AT/tiddlers/lexikon/TiddlyWiki.tid index 68c867eaf..7b2334ba1 100644 --- a/editions/de-AT/tiddlers/lexikon/TiddlyWiki.tid +++ b/editions/de-AT/tiddlers/lexikon/TiddlyWiki.tid @@ -10,4 +10,4 @@ type: text/vnd.tiddlywiki ~TiddlyWiki wird von einem Team um JeremyRuston entwickelt und gepflegt. Das Team ist organisiert unter der Organisation UnaMesa, einer Non-Profit-Organisation zur Entwicklung und Pflege von elektronischen Lernsystemen. -Nähere Informationen und auch die jeweils aktuellste Fassung von ~TiddlyWiki finden Sie unter http://www.tiddlywiki.com/. \ No newline at end of file +Nähere Informationen und auch die jeweils aktuellste Fassung von ~TiddlyWiki finden Sie unter https://www.tiddlywiki.com/. \ No newline at end of file diff --git a/editions/de-AT/tiddlers/lexikon/Was geschah mit dem alten TiddlyWiki.tid b/editions/de-AT/tiddlers/lexikon/Was geschah mit dem alten TiddlyWiki.tid index 47d733975..b3f2d0afe 100644 --- a/editions/de-AT/tiddlers/lexikon/Was geschah mit dem alten TiddlyWiki.tid +++ b/editions/de-AT/tiddlers/lexikon/Was geschah mit dem alten TiddlyWiki.tid @@ -6,4 +6,4 @@ tags: TWclassic Lexikon title: Was geschah mit dem alten TiddlyWiki type: text/vnd.tiddlywiki -TiddlyWiki-classic kann unter http://classic.tiddlywiki.com gefunden werden. \ No newline at end of file +TiddlyWiki-classic kann unter https://classic.tiddlywiki.com gefunden werden. \ No newline at end of file diff --git a/editions/de-AT/tiddlers/system/$__StaticBanner.tid b/editions/de-AT/tiddlers/system/$__StaticBanner.tid index 37e5ae750..6b9812d7b 100644 --- a/editions/de-AT/tiddlers/system/$__StaticBanner.tid +++ b/editions/de-AT/tiddlers/system/$__StaticBanner.tid @@ -1,3 +1,3 @@ title: $:/StaticBanner -<div class="tc-static-alert"><div class="tc-static-alert-inner">Diese Seite ist Teil der "reinen" HTML Version von ~TiddlyWiki auf http://tiddlywiki.com/languages/de-AT</div></div> +<div class="tc-static-alert"><div class="tc-static-alert-inner">Diese Seite ist Teil der "reinen" HTML Version von ~TiddlyWiki auf https://tiddlywiki.com/languages/de-AT</div></div> diff --git a/editions/de-AT/tiddlers/system/static.content.tid b/editions/de-AT/tiddlers/system/static.content.tid index 62a6bcc56..9dcc4ef52 100644 --- a/editions/de-AT/tiddlers/system/static.content.tid +++ b/editions/de-AT/tiddlers/system/static.content.tid @@ -2,7 +2,7 @@ title: $:/core/templates/static.content type: text/vnd.tiddlywiki hack-to-give-us-something-to-compare-against: yes -\define tv-wikilink-template() http://tiddlywiki.com/static/$uri_doubleencoded$.html +\define tv-wikilink-template() https://tiddlywiki.com/static/$uri_doubleencoded$.html <!-- For Google, and people without JavaScript--> <$reveal state="!!hack-to-give-us-something-to-compare-against" type="nomatch" text=<<savingEmpty>>> @@ -11,17 +11,17 @@ Es scheint, dass bei diesem Browser JavaScript deaktiviert wurde. Sie können di !! Deutsch - Deutschland -* http://tiddlywiki.com/languages/de-DE/static.html - Einzelne Tiddler als individuelle Seiten. -* [ext[http://tiddlywiki.com/languages/de-DE/alltiddlers.html#Willkommen!]] - Eine Datei mit allen Tiddlern. +* https://tiddlywiki.com/languages/de-DE/static.html - Einzelne Tiddler als individuelle Seiten. +* [ext[https://tiddlywiki.com/languages/de-DE/alltiddlers.html#Willkommen!]] - Eine Datei mit allen Tiddlern. !! Deutsch - Österreich -* http://tiddlywiki.com/languages/de-AT/static.html - Einzelne Tiddler als individuelle Seiten. -* [ext[http://tiddlywiki.com/languages/de-AT/alltiddlers.html#Willkommen!]] - Eine Datei mit allen Tiddlern. +* https://tiddlywiki.com/languages/de-AT/static.html - Einzelne Tiddler als individuelle Seiten. +* [ext[https://tiddlywiki.com/languages/de-AT/alltiddlers.html#Willkommen!]] - Eine Datei mit allen Tiddlern. !! Englische Version -* http://tiddlywiki.com/static.html - Einzelne Tiddler als individuelle Seiten. -* http://tiddlywiki.com/alltiddlers.html#HelloThere - single file containing all tiddlers +* https://tiddlywiki.com/static.html - Einzelne Tiddler als individuelle Seiten. +* https://tiddlywiki.com/alltiddlers.html#HelloThere - single file containing all tiddlers </$reveal> diff --git a/editions/de-AT/tiddlers/video/Einfuhrungsvideo.tid b/editions/de-AT/tiddlers/video/Einfuhrungsvideo.tid index c0ac58af7..3472b7b15 100644 --- a/editions/de-AT/tiddlers/video/Einfuhrungsvideo.tid +++ b/editions/de-AT/tiddlers/video/Einfuhrungsvideo.tid @@ -10,8 +10,8 @@ type: text/vnd.tiddlywiki Diese Videopräsentation (englisch) erklärt die grundlegenden Möglichkeiten von TiddlyWiki. -<iframe width="560" height="315" src="http://www.youtube.com/embed/KtCUr83XgyE" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/KtCUr83XgyE" frameborder="0" allowfullscreen></iframe> Die Präsentation, die in diesem Video verwendet wurde, finden Sie hier: -http://tiddlywiki.com/editions/introduction/ +https://tiddlywiki.com/editions/introduction/ diff --git a/editions/de-AT/tiddlers/video/TiddlyWiki mit Firefox fur Android Video.tid b/editions/de-AT/tiddlers/video/TiddlyWiki mit Firefox fur Android Video.tid index f050c7e19..d5b184a04 100644 --- a/editions/de-AT/tiddlers/video/TiddlyWiki mit Firefox fur Android Video.tid +++ b/editions/de-AT/tiddlers/video/TiddlyWiki mit Firefox fur Android Video.tid @@ -8,4 +8,4 @@ type: text/vnd.tiddlywiki Das Video von Jeremy Ruston, gibt eine kurze Übersicht, wie ~TiddlyWiki mit "Firefox für Android" verwendet werden kann. -<iframe width="560" height="315" src="http://www.youtube.com/embed/iikkv9orGGI" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/iikkv9orGGI" frameborder="0" allowfullscreen></iframe> diff --git a/editions/de-AT/tiddlers/widgets/ImageWidget.tid b/editions/de-AT/tiddlers/widgets/ImageWidget.tid index 67f0b1355..071634e9f 100644 --- a/editions/de-AT/tiddlers/widgets/ImageWidget.tid +++ b/editions/de-AT/tiddlers/widgets/ImageWidget.tid @@ -6,4 +6,4 @@ tags: Widgets title: ImageWidget type: text/vnd.tiddlywiki -Siehe: http://tiddlywiki.com/#ImageWidget \ No newline at end of file +Siehe: https://tiddlywiki.com/#ImageWidget \ No newline at end of file diff --git a/editions/de-AT/tiddlers/widgets/ImportVariablesWidget.tid b/editions/de-AT/tiddlers/widgets/ImportVariablesWidget.tid index 518136cf4..486b4fac5 100644 --- a/editions/de-AT/tiddlers/widgets/ImportVariablesWidget.tid +++ b/editions/de-AT/tiddlers/widgets/ImportVariablesWidget.tid @@ -6,4 +6,4 @@ tags: Widgets Lexikon title: ImportVariablesWidget type: text/vnd.tiddlywiki -Siehe: http://tiddlywiki.com/#ImportVariablesWidget \ No newline at end of file +Siehe: https://tiddlywiki.com/#ImportVariablesWidget \ No newline at end of file diff --git a/editions/de-AT/tiddlers/widgets/LinkWidget.tid b/editions/de-AT/tiddlers/widgets/LinkWidget.tid index 09ecd8026..4e4db1b49 100644 --- a/editions/de-AT/tiddlers/widgets/LinkWidget.tid +++ b/editions/de-AT/tiddlers/widgets/LinkWidget.tid @@ -6,4 +6,4 @@ tags: Lexikon title: LinkWidget type: text/vnd.tiddlywiki -Siehe: http://tiddlywiki.com/#LinkWidget \ No newline at end of file +Siehe: https://tiddlywiki.com/#LinkWidget \ No newline at end of file diff --git a/editions/de-AT/tiddlers/wikitext/Bilder in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Bilder in WikiText.tid index 898f9cc8c..1a2407ad8 100644 --- a/editions/de-AT/tiddlers/wikitext/Bilder in WikiText.tid +++ b/editions/de-AT/tiddlers/wikitext/Bilder in WikiText.tid @@ -19,9 +19,9 @@ Bilder können in WikiText mit folgender Syntax verwendet werden: oder ``` -[img[http://tiddlywiki.com/favicon.ico]] Dieses verlinkte Bild wird eventuell nicht angezeigt, wenn Sie offline sind! +[img[https://tiddlywiki.com/favicon.ico]] Dieses verlinkte Bild wird eventuell nicht angezeigt, wenn Sie offline sind! ``` -[img[http://tiddlywiki.com/favicon.ico]] +[img[https://tiddlywiki.com/favicon.ico]] Wenn die Bildquelle der Titel eines existierenden Tiddlers ist, dann wird dieser direkt angezeigt. Ansonsten wird die Quelle als URL angesehen und ein HTML `<img>` Element wird erzeugt. Das `src` Attribut wird auf die [[URL]] gesetzt. diff --git a/editions/de-AT/tiddlers/wikitext/Verknupfungen in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Verknupfungen in WikiText.tid index 6bb48135f..a106ed4f8 100644 --- a/editions/de-AT/tiddlers/wikitext/Verknupfungen in WikiText.tid +++ b/editions/de-AT/tiddlers/wikitext/Verknupfungen in WikiText.tid @@ -56,14 +56,14 @@ Dargestellt als: Um zu externen Seiten zu verknüpfen muss die volle URL verwendet werden: ``` -* http://tiddlywiki.com/ -* [[TW5|http://tiddlywiki.com/]] +* https://tiddlywiki.com/ +* [[TW5|https://tiddlywiki.com/]] ``` Dargestellt als: -* http://tiddlywiki.com/ -* [[TW5|http://tiddlywiki.com/]] +* https://tiddlywiki.com/ +* [[TW5|https://tiddlywiki.com/]] Die automatische Erkennung von externen Verknüpfungen hat einige Schwächen. Deshalb ist es möglich eine externe Verknüpfung zu definieren: diff --git a/editions/de-AT/tiddlers/wikitext/Widgets in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Widgets in WikiText.tid index c38bb196b..457bdffc7 100644 --- a/editions/de-AT/tiddlers/wikitext/Widgets in WikiText.tid +++ b/editions/de-AT/tiddlers/wikitext/Widgets in WikiText.tid @@ -29,4 +29,4 @@ Widgets erben alle Funktionalitäten von [[HTML in WikiText]]: Siehe auch: [[HTML in WikiText]] für mehr Informationen. -Alle möglichen Widgets werden auf der TiddlyWiki Seite aufgelistet: [ext[http://tiddlywiki.com/#Widgets in WikiText]] +Alle möglichen Widgets werden auf der TiddlyWiki Seite aufgelistet: [ext[https://tiddlywiki.com/#Widgets in WikiText]] diff --git a/editions/de-DE/tiddlers/system/$__StaticBanner.tid b/editions/de-DE/tiddlers/system/$__StaticBanner.tid index 6565cfdad..2313dc5a0 100644 --- a/editions/de-DE/tiddlers/system/$__StaticBanner.tid +++ b/editions/de-DE/tiddlers/system/$__StaticBanner.tid @@ -1,3 +1,3 @@ title: $:/StaticBanner -<div class="tc-static-alert"><div class="tc-static-alert-inner">Diese Seite ist Teil der "reinen" HTML Version von ~TiddlyWiki auf http://tiddlywiki.com/languages/de-DE</div></div> +<div class="tc-static-alert"><div class="tc-static-alert-inner">Diese Seite ist Teil der "reinen" HTML Version von ~TiddlyWiki auf https://tiddlywiki.com/languages/de-DE</div></div> diff --git a/editions/dev/tiddlers/HelloThere.tid b/editions/dev/tiddlers/HelloThere.tid index e28f9f075..83dd24d04 100644 --- a/editions/dev/tiddlers/HelloThere.tid +++ b/editions/dev/tiddlers/HelloThere.tid @@ -2,10 +2,10 @@ modified: 20141122200310516 tags: TableOfContents title: HelloThere -Welcome to the developer documentation for TiddlyWiki (http://tiddlywiki.com/). It is currently a work in progress as material from two different sources is adapted and merged in addition to original content being added: +Welcome to the developer documentation for TiddlyWiki (https://tiddlywiki.com/). It is currently a work in progress as material from two different sources is adapted and merged in addition to original content being added: * An assignment by Christian Jurke and Christian Heigele, two students working on their Master's degree in Information Technology at the Gießen University of Applied Sciences (Technische Hochschule Mittelhessen). Their work can be seen in the [[Introduction]] and the tiddlers that link from it. -* The original developer documentation from http://tiddlywiki.com: +* The original developer documentation from https://tiddlywiki.com: ** [[TiddlyWiki for Developers]] ** [[TiddlyWiki Coding Style Guidelines]] ** [[TiddlyWiki Architecture]] diff --git a/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid b/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid index 4893a16fa..6070d5d32 100644 --- a/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid +++ b/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid @@ -1,5 +1,6 @@ title: Releasing a new version of TiddlyWiki +# Verify the version numbers in [[$:/config/OfficialPluginLibrary]] (both in `editions/tw5.com` and `editions/prerelease/tiddlers/system`) # Move the latest release note from the prerelease edition into the tw5.com edition # Adjust the release date and the ''released'' field of the latest release tiddler (eg, [[Release 5.1.3]]) # Ensure [[TiddlyWiki Releases]] has the new version as the default tab @@ -19,9 +20,8 @@ title: Releasing a new version of TiddlyWiki # Run `../build.jermolene.github.io/bld.sh` to build the content files # Verify that the files in the `jermolene.github.io` directory are correct # Run `../build.jermolene.github.io/github-push.sh` to push the new files to GitHub -# Run `../build.jermolene.github.io/tiddlyspace-upload.sh <username> <password>` to upload the release to TiddlySpace -# Tweet the release with the text "TiddlyWiki v5.x.x released to http://tiddlywiki.com #newtiddlywikirelease" +# Tweet the release with the text "TiddlyWiki v5.x.x released to https://tiddlywiki.com #newtiddlywikirelease" # Preparation for the next release: -## Adjust version number in [[$:/config/OfficialPluginLibrary]] +## Adjust version number in [[$:/config/OfficialPluginLibrary]] (both in `editions/tw5.com` and `editions/prerelease/tiddlers/system`) and [[$:/config/LocalPluginLibrary]] ## Adjust version number in https://github.com/Jermolene/build.jermolene.github.io in `prerelease-bld.sh`, `bld.sh` and `make-library-bld.sh` diff --git a/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid b/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid index ce027d462..0bbc34194 100644 --- a/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid +++ b/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid @@ -6,7 +6,7 @@ Nonetheless, you may find techniques that are useful for your own scripts. ! Hosting -http://tiddlywiki.com is served by [[GitHub Pages|https://pages.github.com]] from the repository https://github.com/Jermolene/jermolene.github.io +https://tiddlywiki.com is served by [[GitHub Pages|https://pages.github.com]] from the repository https://github.com/Jermolene/jermolene.github.io The scripts live in the repository https://github.com/Jermolene/build.jermolene.github.io diff --git a/editions/dev/tiddlers/from Heigele and Jurke/Data-Storage.tid b/editions/dev/tiddlers/from Heigele and Jurke/Data-Storage.tid index a3f801605..c26af2aa8 100644 --- a/editions/dev/tiddlers/from Heigele and Jurke/Data-Storage.tid +++ b/editions/dev/tiddlers/from Heigele and Jurke/Data-Storage.tid @@ -10,5 +10,5 @@ TW has two approaches to save the user data. These approaches depends on way you <pre>testText</pre> </div> ``` -The Div-Area has the same attributes like the standard tillder fields, listed in [[TiddlerFields|http://tiddlywiki.com/#TiddlerFields]], all attributes which are not in this list are parsed as a custom field. The only required attribute is the name attribute, all other attributes are optional.\\ +The Div-Area has the same attributes like the standard tillder fields, listed in [[TiddlerFields|https://tiddlywiki.com/#TiddlerFields]], all attributes which are not in this list are parsed as a custom field. The only required attribute is the name attribute, all other attributes are optional.\\ With a activated encryption the data is stored in a special Div-Area called "encryptedStoreArea". TiddlyWiki uses the Standford [[JavaScript Crypto Libary|http://bitwiseshiftleft.github.io/sjcl/]]. The encrypted Tiddlers are saved in a JSON string within this Div-Area. diff --git a/editions/dev/tiddlers/from Heigele and Jurke/Saver.tid b/editions/dev/tiddlers/from Heigele and Jurke/Saver.tid index 7c59c1751..a34ae084b 100644 --- a/editions/dev/tiddlers/from Heigele and Jurke/Saver.tid +++ b/editions/dev/tiddlers/from Heigele and Jurke/Saver.tid @@ -13,8 +13,8 @@ Modules with ``module-type: saver`` provide functionality to save the whole wiki <dt>download</dt> <dd>This message is used when the wiki or a single tiddler should explicitly be downloaded. The control panel for example uses this method to provide a button which saves the wiki as a static HTML file.</dd> </dl> -A saver module has to export two functions. ``canSave(wiki)`` returning true if this module is capable of working and ``create(wiki}`` returning an instance of a saver object. -This saver object has to provide an ``info`` property containing a name, a priority, an array of methods it supports and a method ``save(text,method,callback)``. This method is called from TW with the actual text which should be saved, the method which is used and a callback function to report errors: ``callback("Error while saving")`` or to notify that saving went well: ``callback("Saving went well :)")``. If the saver method successfully saved the file it has to return true, or false otherwise. +A saver module has to export two functions. ``canSave(wiki)`` returning true if this module is capable of working and ``create(wiki)`` returning an instance of a saver object. +This saver object has to provide an ``info`` property containing a name, a priority, an array of methods it supports and a method ``save(text,method,callback)``. This method is called from TW with the actual text which should be saved, the method which is used and a callback function to report errors: ``callback("Error while saving")`` or to notify that saving went well: ``callback(null, "Saving went well :)")``. If the saver method successfully saved the file it has to return true, or false otherwise. Saves are triggered by messages from the UI. The syncer module uses the saver with the highest priority capable of the requested method to save the file. -The core plug-in contains a saver capable of saving the current state of the wiki to the local hard drive by using a special Firefox extension called Tiddlyfox. If this extension is not available, the savers ``canSave`` method would return false. A saver with a lower priority would then ask the user to save the current state as a new HTML file. \ No newline at end of file +The core plug-in contains a saver capable of saving the current state of the wiki to the local hard drive by using a special Firefox extension called Tiddlyfox. If this extension is not available, the savers ``canSave`` method would return false. A saver with a lower priority would then ask the user to save the current state as a new HTML file. diff --git a/editions/dev/tiddlers/from Heigele and Jurke/Selective Update.tid b/editions/dev/tiddlers/from Heigele and Jurke/Selective Update.tid index b3b08b745..5bfa3bbf0 100644 --- a/editions/dev/tiddlers/from Heigele and Jurke/Selective Update.tid +++ b/editions/dev/tiddlers/from Heigele and Jurke/Selective Update.tid @@ -8,7 +8,7 @@ title: Selective Update With [[Messages]] a widget is able to put some kind of events into the TiddlyWiki application which is one part of the dynamic behaviour of widgets. The other part is selective updating. Widgets are often dependant on tiddler states. -The [[ListWidget|http://tiddlywiki.com/#ListWidget]] for example can be configured to list all tiddlers which are tagged with "important". +The [[ListWidget|https://tiddlywiki.com/#ListWidget]] for example can be configured to list all tiddlers which are tagged with "important". Now, when such a tiddler is changed and it's "important" tag is removed, this change should reflect in the ~ListWidget. To allow widgets to react on such changes, each widget can provide a function ``refresh(changedTiddlers)``. The [[RootWidget|RootWidget and Rendering Startup]] is registered to the wiki store, using the [[Event Mechanism]]. When an change event occurs it starts to call the refresh function of its children with a list of the changed tiddlers. diff --git a/editions/dev/tiddlers/from Heigele and Jurke/UI and Rendering Pipeline.tid b/editions/dev/tiddlers/from Heigele and Jurke/UI and Rendering Pipeline.tid index e58c09004..7f77c229a 100644 --- a/editions/dev/tiddlers/from Heigele and Jurke/UI and Rendering Pipeline.tid +++ b/editions/dev/tiddlers/from Heigele and Jurke/UI and Rendering Pipeline.tid @@ -15,7 +15,7 @@ This next chapter will focus on the parts of the core plug-in that provide the U <<< {{rendering.svg}} -<<< The rendering pipeline [http://tiddlywiki.com/talkytalky, 17.07.2014] +<<< The rendering pipeline [https://tiddlywiki.com/talkytalky, 17.07.2014] <$list filter="[!has[draft.of]has[chapter.of]chapter.of[UI and Rendering Pipeline]tag[doc]sort[sub.num]]"> diff --git a/editions/dev/tiddlers/from Heigele and Jurke/WikiText Markup.tid b/editions/dev/tiddlers/from Heigele and Jurke/WikiText Markup.tid index 95e21da75..ade5377cc 100644 --- a/editions/dev/tiddlers/from Heigele and Jurke/WikiText Markup.tid +++ b/editions/dev/tiddlers/from Heigele and Jurke/WikiText Markup.tid @@ -12,9 +12,9 @@ During the saving process these tags renders to HTML elements for example: WikiText:--- Renders as: HTML:<hr> -WikiText:[img[http://tiddlywiki.com/favicon.ico]] +WikiText:[img[https://tiddlywiki.com/favicon.ico]] Renders as: TW -HTML:<img src="http://tiddlywiki.com/favicon.ico"> +HTML:<img src="https://tiddlywiki.com/favicon.ico"> ``` Furthermore the WikiText is used to access the widgets which are integrated in the application.These widgets are used to enhance the the WikiText with a rich functionality. Widgets are based on the ~HTML-Syntax but always starts with a $. diff --git a/editions/dev/tiddlers/from tw5.com/Contributing to the TiddlyWiki Plugin Library.tid b/editions/dev/tiddlers/from tw5.com/Contributing to the TiddlyWiki Plugin Library.tid index cc3bec88e..1520a1156 100644 --- a/editions/dev/tiddlers/from tw5.com/Contributing to the TiddlyWiki Plugin Library.tid +++ b/editions/dev/tiddlers/from tw5.com/Contributing to the TiddlyWiki Plugin Library.tid @@ -3,7 +3,7 @@ modified: 20141016083333808 title: Contributing to the TiddlyWiki Plugin Library type: text/vnd.tiddlywiki -The TiddlyWiki Plugin library is the set of plugins, themes and languages that are distributed via http://tiddlywiki.com. +The TiddlyWiki Plugin library is the set of plugins, themes and languages that are distributed via https://tiddlywiki.com. The plugin library is intended to help end users of TiddlyWiki in the following ways: diff --git a/editions/dev/tiddlers/from tw5.com/Developing plugins using Node.js and GitHub.tid b/editions/dev/tiddlers/from tw5.com/Developing plugins using Node.js and GitHub.tid index c7e1ed234..543d629d4 100644 --- a/editions/dev/tiddlers/from tw5.com/Developing plugins using Node.js and GitHub.tid +++ b/editions/dev/tiddlers/from tw5.com/Developing plugins using Node.js and GitHub.tid @@ -10,7 +10,7 @@ The most practical way to develop plugins is to use Node.js with the tiddlywiki5 !! 1. Installation -First read http://tiddlywiki.com/static/PluginMechanism.html. +First read https://tiddlywiki.com/static/PluginMechanism.html. Install Git from http://git-scm.com/downloads @@ -81,7 +81,7 @@ Create the file plugin.info with content: !! 4. Create the files for your plugin -For example files see the plugins in the ~TiddlyWiki5 repository i.e. those located at plugins/tiddlywiki/. See [[TiddlerFiles|http://tiddlywiki.com/#TiddlerFiles]] for details of the supported tiddler file formats. +For example files see the plugins in the ~TiddlyWiki5 repository i.e. those located at plugins/tiddlywiki/. See [[TiddlerFiles|https://tiddlywiki.com/#TiddlerFiles]] for details of the supported tiddler file formats. !!5. Build your files into a ~TiddlyWiki diff --git a/editions/dev/tiddlers/from tw5.com/How to create a translation for TiddlyWiki.tid b/editions/dev/tiddlers/from tw5.com/How to create a translation for TiddlyWiki.tid index 428e4fcd3..4cab413f5 100644 --- a/editions/dev/tiddlers/from tw5.com/How to create a translation for TiddlyWiki.tid +++ b/editions/dev/tiddlers/from tw5.com/How to create a translation for TiddlyWiki.tid @@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki ! Prerequisites -* [[TiddlyWiki on Node.js|http://tiddlywiki.com/#TiddlyWiki%20on%20Node.js]] +* [[TiddlyWiki on Node.js|https://tiddlywiki.com/#TiddlyWiki%20on%20Node.js]] * A GitHub account to submit the translation to tiddlywiki.com ! Setting Up @@ -39,7 +39,7 @@ Content of `plugin.info` for Joe Bloggs' Welsh translation: } ``` -[[MultiTiddlerFiles|http://tiddlywiki.com/#MultiTiddlerFiles]] make it possible to pack the text of several tiddlers in a single text file, simplifying some editing tasks. +[[MultiTiddlerFiles|https://tiddlywiki.com/#MultiTiddlerFiles]] make it possible to pack the text of several tiddlers in a single text file, simplifying some editing tasks. ! Handling Updates diff --git a/editions/dev/tiddlers/from tw5.com/How to create plugins in the browser.tid b/editions/dev/tiddlers/from tw5.com/How to create plugins in the browser.tid index 0314e3119..cce9b3982 100644 --- a/editions/dev/tiddlers/from tw5.com/How to create plugins in the browser.tid +++ b/editions/dev/tiddlers/from tw5.com/How to create plugins in the browser.tid @@ -4,14 +4,14 @@ tags: howto title: How to create plugins in the browser type: text/vnd.tiddlywiki -The recommended technique for building TiddlyWiki plugins involves running [[TiddlyWiki on Node.js|http://tiddlywiki.com/#TiddlyWiki%20on%20Node.js]], but there is now an experimental technique for creating plugins directly in the browser. +The recommended technique for building TiddlyWiki plugins involves running [[TiddlyWiki on Node.js|https://tiddlywiki.com/#TiddlyWiki%20on%20Node.js]], but there is now an experimental technique for creating plugins directly in the browser. ! Overview Loading a plugin in the browser has several consequences: * The original plugin tiddler itself is unchanged -* The payload tiddlers are set up as individual [[ShadowTiddlers|http://tiddlywiki.com/#ShadowTiddlers]] +* The payload tiddlers are set up as individual [[ShadowTiddlers|https://tiddlywiki.com/#ShadowTiddlers]] To make a modified copy of a plugin, one edits the constituent shadow tiddlers (doing this actually overrides the shadow tiddler with a new non-shadow tiddler containing the modified content). The repacking process retrieves the current value of all the shadow tiddlers included in the plugin, and then bundles the new values back into the original plugin tiddler. diff --git a/editions/dev/tiddlers/from tw5.com/How to customise the password prompt.tid b/editions/dev/tiddlers/from tw5.com/How to customise the password prompt.tid index 53eb35433..3848cdfca 100644 --- a/editions/dev/tiddlers/from tw5.com/How to customise the password prompt.tid +++ b/editions/dev/tiddlers/from tw5.com/How to customise the password prompt.tid @@ -5,11 +5,11 @@ modified: 20141006085526118 You can customise the text and appearance of the password prompt that is displayed when encrypted TiddlyWiki files are first opened. -To do so, create a tiddler tagged {{$:/core/wiki/rawmarkup|$:/core/ui/TagTemplate}} containing: +To do so, create a tiddler tagged {{$:/core/wiki/rawmarkup||$:/core/ui/TagTemplate}} containing: # A JavaScript `<script>` tag containing code to override the configuration variable `$tw.boot.encryptionPrompts.decrypt` # CSS `<style>` definitions targeting the `tc-password-wrapper` class to apply styles to the form Raw markup tiddlers are spliced into the top of the standalone HTML file, and are executed before the boot prefix and boot kernel. -See $:/PathEncryptionPrompt for an example. +See $:/PatchEncryptionPrompt for an example. diff --git a/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid b/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid index 0ac1b0df8..e658fe346 100644 --- a/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid +++ b/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid @@ -4,7 +4,7 @@ tags: dev title: JavaScript Macros type: text/vnd.tiddlywiki -Macros can be implemented as JavaScript modules as well as via the [[wikitext syntax|http://tiddlywiki.com/#Macros%20in%20WikiText]]. +Macros can be implemented as JavaScript modules as well as via the [[wikitext syntax|https://tiddlywiki.com/#Macros%20in%20WikiText]]. ! Overview diff --git a/editions/dev/tiddlers/from tw5.com/TiddlyWiki Architecture.tid b/editions/dev/tiddlers/from tw5.com/TiddlyWiki Architecture.tid index 45afdc337..214cc81aa 100644 --- a/editions/dev/tiddlers/from tw5.com/TiddlyWiki Architecture.tid +++ b/editions/dev/tiddlers/from tw5.com/TiddlyWiki Architecture.tid @@ -4,7 +4,7 @@ tags: dev title: TiddlyWiki Architecture type: text/vnd.tiddlywiki -The heart of TiddlyWiki is an extensible representation transformation engine for text and images. Given the text of a tiddler and its associated [[ContentType|http://tiddlywiki.com/#ContentType]], the engine can produce a rendering of the tiddler in a new [[ContentType|http://tiddlywiki.com/#ContentType]]. Furthermore, it can efficiently selectively update the rendering to track any changes in the tiddler or its dependents. +The heart of TiddlyWiki is an extensible representation transformation engine for text and images. Given the text of a tiddler and its associated [[ContentType|https://tiddlywiki.com/#ContentType]], the engine can produce a rendering of the tiddler in a new [[ContentType|https://tiddlywiki.com/#ContentType]]. Furthermore, it can efficiently selectively update the rendering to track any changes in the tiddler or its dependents. ! Overview @@ -40,7 +40,7 @@ $tw.wiki.makeTiddlerIterator($tw.wiki.getTiddlersWithTag('timeline') }); ``` -Data which should not be visible to end users under normal operation (eg. internal components, plugins, persisted state for GUI widgets) is stored in [[system tiddlers|http://tiddlywiki.com/#SystemTiddlers]] organised via a set of [[namespaces|http://tiddlywiki.com/#Naming%20of%20System%20Tiddlers]]. +Data which should not be visible to end users under normal operation (eg. internal components, plugins, persisted state for GUI widgets) is stored in [[system tiddlers|https://tiddlywiki.com/#SystemTiddlers]] organised via a set of [[namespaces|https://tiddlywiki.com/#Naming%20of%20System%20Tiddlers]]. The similarity between filesystem paths and system tiddler names is intentional and will be used to provide a hierarchical browsing interface in a future TiddlyWiki release. @@ -51,7 +51,7 @@ TiddlyWiki's view layer has a //lot// in common with desktop widget toolkits and !! Role of the DOM Because TiddlyWiki may re-render content, plugins should treat the DOM as write-only. -In other words, any state you store in the DOM could vanish at any instant and you need to use TiddlyWiki's internal [[StateMechanism|http://tiddlywiki.com/#StateMechanism]] instead. +In other words, any state you store in the DOM could vanish at any instant and you need to use TiddlyWiki's internal [[StateMechanism|https://tiddlywiki.com/#StateMechanism]] instead. In a desktop application, the base widget class defines a method such as `paint(canvas)` which is called in response to `expose` events or "data has changed" messages. @@ -65,4 +65,4 @@ While TiddlyWiki's extended [[WikiText]] is similar in design to HTML templating In this respect, it's closer to a glue language like Qt Quick or Python with Javascript filling the "create new components" role of C/C++ in widget toolkits like Qt and GTK+. -To familiarise yourself with this, read [[Widgets in WikiText|http://tiddlywiki.com/#Widgets%20in%20WikiText]] and [[Introduction to Filters|http://tiddlywiki.com/#Introduction%20to%20Filters]]. then examine the internals for a tiddler like [[TaskManagementExample|http://tiddlywiki.com/#TaskManagementExample]]. +To familiarise yourself with this, read [[Widgets in WikiText|https://tiddlywiki.com/#Widgets%20in%20WikiText]] and [[Introduction to Filters|https://tiddlywiki.com/#Introduction%20to%20Filters]]. then examine the internals for a tiddler like [[TaskManagementExample|https://tiddlywiki.com/#TaskManagementExample]]. diff --git a/editions/dev/tiddlers/from tw5.com/TiddlyWiki on node-webkit.tid b/editions/dev/tiddlers/from tw5.com/TiddlyWiki on node-webkit.tid index b85c8a51a..c1cafb24f 100644 --- a/editions/dev/tiddlers/from tw5.com/TiddlyWiki on node-webkit.tid +++ b/editions/dev/tiddlers/from tw5.com/TiddlyWiki on node-webkit.tid @@ -3,7 +3,7 @@ modified: 20140101175304016 title: TiddlyWiki on NW.js type: text/vnd.tiddlywiki -[[NW.js|http://tiddlywiki.com/#NW.js]] (previously known as "node-webkit") allows TiddlyWiki to be set up as a native application for Windows, Mac OS X or Linux. +[[NW.js|https://tiddlywiki.com/#NW.js]] (previously known as "node-webkit") allows TiddlyWiki to be set up as a native application for Windows, Mac OS X or Linux. ! Setting up diff --git a/editions/dev/tiddlers/from tw5.com/TiddlyWiki5 Development Environment.tid b/editions/dev/tiddlers/from tw5.com/TiddlyWiki5 Development Environment.tid index a5c318c5b..4d220f3d1 100644 --- a/editions/dev/tiddlers/from tw5.com/TiddlyWiki5 Development Environment.tid +++ b/editions/dev/tiddlers/from tw5.com/TiddlyWiki5 Development Environment.tid @@ -7,7 +7,7 @@ title: TiddlyWiki5 Development Environment ! Setting up npm -[[Installing TiddlyWiki5|http://tiddlywiki.com/#Installing%20TiddlyWiki%20on%20Node.js]] with NPM downloads a snapshot release of TiddlyWiki5. To use a development copy of the TiddlyWiki5 repository instead of the copy installed by [[NPM]], use this command within the root of the TiddlyWiki5 repo: +[[Installing TiddlyWiki5|https://tiddlywiki.com/#Installing%20TiddlyWiki%20on%20Node.js]] with NPM downloads a snapshot release of TiddlyWiki5. To use a development copy of the TiddlyWiki5 repository instead of the copy installed by [[NPM]], use this command within the root of the TiddlyWiki5 repo: ```bash npm link diff --git a/editions/dev/tiddlers/from tw5.com/mechanisms/TestingMechanism.tid b/editions/dev/tiddlers/from tw5.com/mechanisms/TestingMechanism.tid index 90694073d..c334ab256 100644 --- a/editions/dev/tiddlers/from tw5.com/mechanisms/TestingMechanism.tid +++ b/editions/dev/tiddlers/from tw5.com/mechanisms/TestingMechanism.tid @@ -33,4 +33,4 @@ node ./tiddlywiki.js \ The `test.html` file will be placed in the `output` folder within the wiki folder. Open it in the browser to see the test results. There is a prebuilt version of `test.html` at: -http://tiddlywiki.com/test.html +https://tiddlywiki.com/test.html diff --git a/editions/tw5.com/tiddlers/howtos/Adding Babel Polyfill to TiddlyWiki.tid b/editions/dev/tiddlers/new/Adding Babel Polyfill to TiddlyWiki.tid similarity index 98% rename from editions/tw5.com/tiddlers/howtos/Adding Babel Polyfill to TiddlyWiki.tid rename to editions/dev/tiddlers/new/Adding Babel Polyfill to TiddlyWiki.tid index 944daadca..3d231cce5 100644 --- a/editions/tw5.com/tiddlers/howtos/Adding Babel Polyfill to TiddlyWiki.tid +++ b/editions/dev/tiddlers/new/Adding Babel Polyfill to TiddlyWiki.tid @@ -1,7 +1,6 @@ modified: 20160112175006000 created: 20160112025328000 title: Adding Babel Polyfill to TiddlyWiki -tags: documenting Concepts type: text/vnd.tiddlywiki Not all browsers support the latest features of ES2015. The Babel project offers a polyfill that can be included into your TiddlyWiki so those features can be available to your plugins. To do this you will need a copy of the polyfill source. diff --git a/editions/dev/tiddlers/new/HookMechanism.tid b/editions/dev/tiddlers/new/HookMechanism.tid index 93b7a1cb4..82883d16d 100644 --- a/editions/dev/tiddlers/new/HookMechanism.tid +++ b/editions/dev/tiddlers/new/HookMechanism.tid @@ -1,5 +1,5 @@ created: 20141122200310516 -modified: 20141122200310516 +modified: 20170209130807520 title: HookMechanism type: text/vnd.tiddlywiki diff --git a/editions/dev/tiddlers/new/Hook_ th-page-refreshed.tid b/editions/dev/tiddlers/new/Hook_ th-page-refreshed.tid new file mode 100644 index 000000000..6584c7361 --- /dev/null +++ b/editions/dev/tiddlers/new/Hook_ th-page-refreshed.tid @@ -0,0 +1,15 @@ +created: 20180104155916980 +modified: 20180104160025999 +tags: HookMechanism +title: Hook: th-page-refreshed +type: text/vnd.tiddlywiki + +This hook notifies plugins that a page refresh has just occurred. It is typically used to apply post-rendering effects. + +Hook function parameters: + +* (none) + +Return value: + +* (none) diff --git a/editions/dev/tiddlers/new/Hook__th-deleting-tiddler.tid b/editions/dev/tiddlers/new/Hook__th-deleting-tiddler.tid new file mode 100644 index 000000000..dc482c1b8 --- /dev/null +++ b/editions/dev/tiddlers/new/Hook__th-deleting-tiddler.tid @@ -0,0 +1,17 @@ +created: 20170209115611070 +modified: 20170209145906743 +tags: HookMechanism +title: Hook: th-deleting-tiddler +type: text/vnd.tiddlywiki + +This hook allows plugins to inspect tiddlers before they are deleted via the ''delete'' toolbar button. When the delete button is used from the edit toolbar there are actually two invocations of the `th-deleting-tiddler` hook function: one for the original tiddler and one for the draft. + +Note that this hook is not invoked for tiddlers deleted by other means such as the ActionDeleteTiddlerWidget. + +Hook function parameters: + +* ''tiddler'': tiddler object about to be deleted + +Return value: + +* unmodified tiddler to be deleted diff --git a/editions/dev/tiddlers/new/Hook__th-editing-tiddler.tid b/editions/dev/tiddlers/new/Hook__th-editing-tiddler.tid new file mode 100644 index 000000000..508d5ae75 --- /dev/null +++ b/editions/dev/tiddlers/new/Hook__th-editing-tiddler.tid @@ -0,0 +1,15 @@ +created: 20170629080243049 +modified: 20170629080243049 +tags: HookMechanism +title: Hook: th-editing-tiddler +type: text/vnd.tiddlywiki + +This hook allows plugins to inspect tiddlers before they are edited via the ''edit'' toolbar button. + +Hook function parameters: + +* ''event'': DOM event object that triggered the edit + +Return value: + +* ''editTiddler'': ''true'' to continue with editing the tiddler as usual, ''false'' to silently suppress editing diff --git a/editions/dev/tiddlers/new/Hook__th-importing-file.tid b/editions/dev/tiddlers/new/Hook__th-importing-file.tid new file mode 100644 index 000000000..0e50311c5 --- /dev/null +++ b/editions/dev/tiddlers/new/Hook__th-importing-file.tid @@ -0,0 +1,22 @@ +created: 20171010115148355 +modified: 20171010115148355 +tags: HookMechanism +title: Hook: th-importing-file +type: text/vnd.tiddlywiki + +This hook allows plugins to inspect or modify the details of files imported via drag and drop or the "import" button. It is invoked as each [[File object|https://developer.mozilla.org/en-US/docs/Web/API/File]] provided by the browser in response to an import or drag and drop is being read. The hook function can choose to ignore the file, in which case TiddlyWiki's default processing proceeds to read and import the content of the file. Alternatively, the hook function can process the file to extract the tiddlers itself, and then pass them back to TiddlyWiki to be handled by the rest of the import process. + +Use this hook if you want to control how tiddlers are extracted from files during an import. See [[Hook: th-importing-tiddler]] if you want to process each imported tiddler after they have been extracted from the files. + +Hook function parameters: + +* ''info'': an object with properties containing information relating to the current file: +** ''file'': reference to the browser's [[File object|https://developer.mozilla.org/en-US/docs/Web/API/File]] +** ''type'': the MIME type of the file. If not provided by the browser then TiddlyWiki attempts to infer the type from the file extension +** ''isBinary'': flag for whether the file contains binary data (which requires that the file type be recognised by TiddlyWiki) +** ''callback'': callback function to be called with an array of tiddler field objects extracted from the file object + +Return value: + +* ''true'' indicates that the hook handled the file, and passed any extracted tiddlers to the callback +* ''false'' indicates that the hook didn't process the file diff --git a/editions/dev/tiddlers/new/Hook__th-importing-tiddler.tid b/editions/dev/tiddlers/new/Hook__th-importing-tiddler.tid new file mode 100644 index 000000000..6b9b533f9 --- /dev/null +++ b/editions/dev/tiddlers/new/Hook__th-importing-tiddler.tid @@ -0,0 +1,25 @@ +created: 20170209130829546 +modified: 20171010115148355 +tags: HookMechanism +title: Hook: th-importing-tiddler +type: text/vnd.tiddlywiki + +This hook allows plugins to inspect or modify tiddlers as they are imported via the import mechanism. It is invoked when the final "Import" button is clicked, and the selected tiddlers are being imported into the store. + +Use this hook if you want to process each imported tiddler after they have been extracted from the files. See [[Hook: th-importing-file]] if you want to control how tiddlers are extracted from files during an import. + +Hook function parameters: + +* ''tiddler'': tiddler object about to be imported + +Return value: + +* tiddler object to be imported + +The original tiddler object can be returned unmodified by the hook. If the hook needs to modify the tiddler then it should return a new tiddler object, for example: + +``` + return new $tw.Tiddler(tiddler,{"my-field": value}); +``` + +Hooks must not change the ''title'' field but can freely modify any other field of the tiddler. diff --git a/editions/dev/tiddlers/new/Hook__th-navigating.tid b/editions/dev/tiddlers/new/Hook__th-navigating.tid new file mode 100644 index 000000000..4f4350341 --- /dev/null +++ b/editions/dev/tiddlers/new/Hook__th-navigating.tid @@ -0,0 +1,19 @@ +created: 20170219130829546 +modified: 20170219145518777 +tags: HookMechanism +title: Hook: th-navigating +type: text/vnd.tiddlywiki + +This hook allows plugins to monitor and modify navigation events. + +Hook function parameters: + +* ''event'': object describing the navigation event: +** ''event.navigateTo'': title of target tiddler +** ''event.navigateFromTitle'': title of tiddler containing the +** ''event.navigateSuppressNavigation'': boolean; when true the target tiddler opens without the usual scrolling +** ''event.navigateFromClientRect'': rectange in client coordinates of the DOM node triggering the navigation + +Return value: + +* possibly modified event object diff --git a/editions/dev/tiddlers/new/Hook__th-relinking-tiddler.tid b/editions/dev/tiddlers/new/Hook__th-relinking-tiddler.tid new file mode 100644 index 000000000..c09b99a85 --- /dev/null +++ b/editions/dev/tiddlers/new/Hook__th-relinking-tiddler.tid @@ -0,0 +1,24 @@ +created: 20170209145637233 +modified: 20170209150007550 +tags: HookMechanism +title: Hook: th-relinking-tiddler +type: text/vnd.tiddlywiki + +This hook allows plugins to inspect tiddlers before they are relinked ("relinking" is the optional operation of relinking references to a tiddler when it is renamed). + +Hook function parameters: + +* ''newTiddler'': tiddler object incorporating the relinking +* ''oldTiddler'': optional existing tiddler object that will be overwritten + +Return value: + +* ''newTiddler'': tiddler object to be used for the relinking operation. + +The original tiddler object can be returned unmodified by the hook. If the hook needs to modify the tiddler then it should return a new tiddler object, for example: + +``` + return new $tw.Tiddler(tiddler,{"my-field": value}); +``` + +Hooks must not change the ''title'' field but can freely modify any other field of the tiddler. diff --git a/editions/dev/tiddlers/new/Hook__th-renaming-tiddler.tid b/editions/dev/tiddlers/new/Hook__th-renaming-tiddler.tid new file mode 100644 index 000000000..f1805c6a8 --- /dev/null +++ b/editions/dev/tiddlers/new/Hook__th-renaming-tiddler.tid @@ -0,0 +1,24 @@ +created: 20170209145207186 +modified: 20170209145633522 +tags: HookMechanism +title: Hook: th-renaming-tiddler +type: text/vnd.tiddlywiki + +This hook allows plugins to inspect tiddlers before they are modified by the `tm-rename-tiddler` message. + +Hook function parameters: + +* ''newTiddler'': tiddler object incorporating the rename +* ''oldTiddler'': optional existing tiddler object that will be overwritten + +Return value: + +* newTiddler: tiddler object to be used for the renaming operation. + +The original tiddler object can be returned unmodified by the hook. If the hook needs to modify the tiddler then it should return a new tiddler object, for example: + +``` + return new $tw.Tiddler(tiddler,{"my-field": value}); +``` + +Hooks must not change the ''title'' field but can freely modify any other field of the tiddler. diff --git a/editions/dev/tiddlers/new/Hook__th-server-command-post-start.tid b/editions/dev/tiddlers/new/Hook__th-server-command-post-start.tid new file mode 100644 index 000000000..cd30b42b1 --- /dev/null +++ b/editions/dev/tiddlers/new/Hook__th-server-command-post-start.tid @@ -0,0 +1,18 @@ +created: 20180409142128584 +modified: 20180409142128584 +tags: HookMechanism +title: Hook: th-server-command-post-start +type: text/vnd.tiddlywiki + +This hook allows plugins to extend the TiddlyWiki server command after it initializes. The two +most obvious use cases are adding routes (such as an attachments folder for external files) +to the SimpleServer instance and adding a websockets handler to the HTTP server. + +Hook function parameters: + +* SimpleServer instance +** Defined in core/modules/commands/server.js +* NodeJS HTTP Server instance +** See the NodeJS docs at [ext[https://nodejs.org/docs/latest-v8.x/api/http.html#http_class_http_server]] + +Return value is ignored. diff --git a/editions/tw5.com/tiddlers/howtos/Using ES2016 for Writing Plugins.tid b/editions/dev/tiddlers/new/Using ES2016 for Writing Plugins.tid similarity index 98% rename from editions/tw5.com/tiddlers/howtos/Using ES2016 for Writing Plugins.tid rename to editions/dev/tiddlers/new/Using ES2016 for Writing Plugins.tid index f34d10a4a..f89a90f8f 100644 --- a/editions/tw5.com/tiddlers/howtos/Using ES2016 for Writing Plugins.tid +++ b/editions/dev/tiddlers/new/Using ES2016 for Writing Plugins.tid @@ -1,6 +1,5 @@ modified: 20160305222940000 created: 20160111034749658 -tags: documenting Concepts title: Using ES2016 for Writing Plugins type: text/vnd.tiddlywiki @@ -115,7 +114,7 @@ export function startup() { } ``` -Or in the case of a [[Macro|http://tiddlywiki.com/dev/#JavaScript%20Macros]]: +Or in the case of a [[Macro|https://tiddlywiki.com/dev/#JavaScript%20Macros]]: ```javascript export const name = 'my-macro'; diff --git a/editions/dev/tiddlers/new/Using Notifications.tid b/editions/dev/tiddlers/new/Using Notifications.tid new file mode 100644 index 000000000..fb4ea6638 --- /dev/null +++ b/editions/dev/tiddlers/new/Using Notifications.tid @@ -0,0 +1,31 @@ +tags: dev +title: Using Notifications +type: text/vnd.tiddlywiki + +!! Overview + +The notifier module is part of TiddlyWiki's suite of built-in utilities. It displays the text of a tiddler as a notification that briefly appears at the top right top of the screen. They are automatically dismissed after a few seconds. + + +Notifications are an easy and visual way to notify the user of key information that is transient -- in other words, it shouldn't matter whether the user misses the notification (modals or alerts that require manual dismissal should be used in these cases). + +An example is the `Saved wiki` notification seen each time the "save" button is clicked in the single file configuration of TiddlyWiki. + +The notification module makes it easy to display such notifcations, including all the heavy lifting of the notification creation, appending it to the DOM, animating it and finally removing it from the DOM. + +!! Parameters + +The notifier module only has one method (`display(title,options)`) that accepts two parameters: + +* title: The title of an existing tiddler +** If the tiddler does not exist, then no notification will take place +** The content of this tiddler will be transcluded into the notification body +* Options: An object containing a `variables` property that will be applied in the tiddler transclusion + +!! Usage + +A notifier instance is availably directly on the global `$tw` object: + +```js +$tw.notifier.display("$:/language/Notifications/Save/Starting"); +``` diff --git a/editions/dev/tiddlers/new/th-opening-default-tiddlers-list.tid b/editions/dev/tiddlers/new/th-opening-default-tiddlers-list.tid index 7c848aeca..2a79f5585 100644 --- a/editions/dev/tiddlers/new/th-opening-default-tiddlers-list.tid +++ b/editions/dev/tiddlers/new/th-opening-default-tiddlers-list.tid @@ -1,10 +1,17 @@ created: 20141122200310516 -modified: 20141122200310516 +modified: 20170209115548070 +tags: HookMechanism title: Hook: th-opening-default-tiddlers-list type: text/vnd.tiddlywiki This hook allows plugins to add to or remove from the list of tiddlers that are opened when the wiki is first loaded or the home button is clicked. -The function takes a list of tiddlers as its only argument and returns a modified list of tiddler titles to display. +Hook function parameters: + +* ''list'': array of tiddler titles to be opened + +Return value: + +* modified array of tiddler titles to be opened Note that this hook is invoked with the tiddler titles that are generated from the filter in [[$:/DefaultTiddlers]]. Any added entries must be tiddler titles, not filter expressions. diff --git a/editions/dev/tiddlers/new/th-saving-tiddler.tid b/editions/dev/tiddlers/new/th-saving-tiddler.tid index 82e37756e..81b0a54d5 100644 --- a/editions/dev/tiddlers/new/th-saving-tiddler.tid +++ b/editions/dev/tiddlers/new/th-saving-tiddler.tid @@ -1,9 +1,10 @@ created: 20150908150314994 -modified: 20150908150314994 +modified: 20170209145506427 +tags: HookMechanism title: Hook: th-saving-tiddler type: text/vnd.tiddlywiki -This hook allows plugins to modify tiddlers before they are saved via the ''confirm'' toolbar button; the hook is not invoked for tiddlers that are saved through other means, such as state tiddlers created by the ActionSetFieldWidget. +This hook allows plugins to inspect or modify tiddlers before they are saved via the ''confirm'' toolbar button; the hook is not invoked for tiddlers that are saved through other means, such as state tiddlers created by the ActionSetFieldWidget. Hook function parameters: diff --git a/editions/dev/tiddlers/system/ContributionBanner.tid b/editions/dev/tiddlers/system/ContributionBanner.tid new file mode 100644 index 000000000..f9ec77791 --- /dev/null +++ b/editions/dev/tiddlers/system/ContributionBanner.tid @@ -0,0 +1,20 @@ +title: $:/ContributionBanner +tags: $:/tags/EditTemplate +list-after: $:/core/ui/EditTemplate/title + +\define makeGitHubLink() +https://github.com/Jermolene/TiddlyWiki5/edit/master/editions/dev/tiddlers/$(githubLink)$ +\end +\define innerMakeGitHubLink(linkText) +<$set name="githubLink" value={{$:/config/OriginalTiddlerPaths##$(draftOfTiddler)$}}> +<a href=<<makeGitHubLink>> class="tc-tiddlylink-external" target="_blank" rel="noopener noreferrer">$linkText$</a> +</$set> +\end +\define outerMakeGitHubLink(linkText) +<$set name="draftOfTiddler" value={{$(currentTiddler)$!!draft.of}}> +<<innerMakeGitHubLink "$linkText$">> +</$set> +\end +<div class="tc-improvement-banner"> +{{$:/core/images/star-filled}} Can you help us improve this documentation? [ext[Find out how|https://tiddlywiki.com/#Improving%20TiddlyWiki%20Documentation]] to edit <<outerMakeGitHubLink "this tiddler on ~GitHub">> +</div> diff --git a/editions/dev/tiddlers/system/GoogleAnalyticsAccount.tid b/editions/dev/tiddlers/system/GoogleAnalyticsAccount.tid deleted file mode 100644 index 1e0f77e7c..000000000 --- a/editions/dev/tiddlers/system/GoogleAnalyticsAccount.tid +++ /dev/null @@ -1,3 +0,0 @@ -title: $:/GoogleAnalyticsAccount - -UA-32839735-1 \ No newline at end of file diff --git a/editions/dev/tiddlers/system/GoogleAnalyticsDomain.tid b/editions/dev/tiddlers/system/GoogleAnalyticsDomain.tid deleted file mode 100644 index ee2e3f723..000000000 --- a/editions/dev/tiddlers/system/GoogleAnalyticsDomain.tid +++ /dev/null @@ -1,3 +0,0 @@ -title: $:/GoogleAnalyticsDomain - -tiddlywiki.com \ No newline at end of file diff --git a/editions/dev/tiddlers/system/Sources.tid b/editions/dev/tiddlers/system/Sources.tid new file mode 100644 index 000000000..0c5082205 --- /dev/null +++ b/editions/dev/tiddlers/system/Sources.tid @@ -0,0 +1,23 @@ +title: $:/editions/tw5.com/TiddlerInfo/Sources +tags: $:/tags/TiddlerInfo +caption: Sources + +\define github-link-base() +https://github.com/Jermolene/TiddlyWiki5/blob/master/editions/dev/tiddlers/$(title)$ +\end + +\define make-github-link() +<$set name="title" value={{$:/config/OriginalTiddlerPaths##$(currentTiddler)$}}> +<$set name="title" filter="[<title>encodeuricomponent[]]" select="0"> +<a href=<<github-link-base>> class="tc-tiddlylink-external" target="_blank" rel="noopener noreferrer"><$text text=<<github-link-base>>/></a> +</$set> +</$set> +\end + +<$list filter="[all[current]!is[system]!is[shadow]]"> + +Help us to improve the documentation by sending a ~GitHub pull request for this tiddler: + +* <<make-github-link>> + +</$list> diff --git a/editions/dev/tiddlers/system/StaticBanner.tid b/editions/dev/tiddlers/system/StaticBanner.tid index f73e902ce..ad8943940 100644 --- a/editions/dev/tiddlers/system/StaticBanner.tid +++ b/editions/dev/tiddlers/system/StaticBanner.tid @@ -1,3 +1,3 @@ title: $:/StaticBanner -<div class="tc-static-alert"><div class="tc-static-alert-inner">This page is part of a static HTML representation of the ~TiddlyWiki at http://tiddlywiki.com/dev/</div></div> +<div class="tc-static-alert"><div class="tc-static-alert-inner">This page is part of a static HTML representation of the ~TiddlyWiki at https://tiddlywiki.com/dev/</div></div> diff --git a/editions/dev/tiddlers/system/static.content.tid b/editions/dev/tiddlers/system/static.content.tid index 0bdb1a305..fff4fca0e 100644 --- a/editions/dev/tiddlers/system/static.content.tid +++ b/editions/dev/tiddlers/system/static.content.tid @@ -2,15 +2,15 @@ title: $:/core/templates/static.content type: text/vnd.tiddlywiki hack-to-give-us-something-to-compare-against: yes -\define tv-wikilink-template() http://tiddlywiki.com/dev/static/$uri_doubleencoded$.html +\define tv-wikilink-template() https://tiddlywiki.com/dev/static/$uri_doubleencoded$.html <!-- For Google, and people without JavaScript--> <$reveal state="!!hack-to-give-us-something-to-compare-against" type="nomatch" text=<<savingEmpty>>> It looks like this browser doesn't run JavaScript. You can use one of these static HTML versions to browse the same content: -* http://tiddlywiki.com/dev/static.html - browse individual tiddlers as separate pages -* http://tiddlywiki.com/dev/alltiddlers.html#HelloThere - single file containing all tiddlers +* https://tiddlywiki.com/dev/static.html - browse individual tiddlers as separate pages +* https://tiddlywiki.com/dev/alltiddlers.html#HelloThere - single file containing all tiddlers --- diff --git a/editions/dev/tiddlywiki.info b/editions/dev/tiddlywiki.info index 320b09dd2..0a695359f 100644 --- a/editions/dev/tiddlywiki.info +++ b/editions/dev/tiddlywiki.info @@ -1,8 +1,7 @@ { - "description": "Developer documentation from http://tiddlywiki.com/dev/", + "description": "Developer documentation from https://tiddlywiki.com/dev/", "plugins": [ "tiddlywiki/highlight", - "tiddlywiki/googleanalytics", "tiddlywiki/nodewebkitsaver", "tiddlywiki/github-fork-ribbon" ], @@ -25,6 +24,7 @@ "en-GB", "en-US", "es-ES", + "fa-IR", "fr-FR", "hi-IN", "ia-IA", @@ -55,5 +55,8 @@ "--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", "--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain", "--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"] + }, + "config": { + "retain-original-tiddler-path": true } } diff --git a/editions/empty/tiddlywiki.info b/editions/empty/tiddlywiki.info index 6d24d2bd1..6d8c58b97 100644 --- a/editions/empty/tiddlywiki.info +++ b/editions/empty/tiddlywiki.info @@ -17,7 +17,7 @@ "static": [ "--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain", "--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", - "--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain", - "--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain"] + "--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain", + "--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"] } } \ No newline at end of file diff --git a/editions/es-ES-server/tiddlers/system/GoogleAnalyticsAccount.tid b/editions/es-ES-server/tiddlers/system/GoogleAnalyticsAccount.tid deleted file mode 100644 index 29cbc27e0..000000000 --- a/editions/es-ES-server/tiddlers/system/GoogleAnalyticsAccount.tid +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/GoogleAnalyticsAccount - diff --git a/editions/es-ES-server/tiddlers/system/GoogleAnalyticsDomain.tid b/editions/es-ES-server/tiddlers/system/GoogleAnalyticsDomain.tid deleted file mode 100644 index 0c6a7e02d..000000000 --- a/editions/es-ES-server/tiddlers/system/GoogleAnalyticsDomain.tid +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/GoogleAnalyticsDomain - diff --git a/editions/es-ES/tiddlers/CodeMirror_Plugin.tid b/editions/es-ES/tiddlers/CodeMirror_Plugin.tid index 3621b8657..a9ff29cef 100644 --- a/editions/es-ES/tiddlers/CodeMirror_Plugin.tid +++ b/editions/es-ES/tiddlers/CodeMirror_Plugin.tid @@ -9,4 +9,4 @@ type: text/vnd.tiddlywiki El plugin [[CodeMirror|http://codemirror.net/]] incorpora un sofisticado editor web de texto. -DIsponible en: http://tiddlywiki.com/plugins/tiddlywiki/codemirror/ +DIsponible en: https://tiddlywiki.com/plugins/tiddlywiki/codemirror/ diff --git a/editions/es-ES/tiddlers/Contributing.tid b/editions/es-ES/tiddlers/Contributing.tid index 8211f62e3..02ac612db 100644 --- a/editions/es-ES/tiddlers/Contributing.tid +++ b/editions/es-ES/tiddlers/Contributing.tid @@ -13,7 +13,7 @@ Estamos encantados de recibir contribuciones al código y la documentación de T * Ayudando a [[mejorar la documentación|Improving TiddlyWiki Documentation]] * Aportando código a través de [[GitHub|https://github.com/Jermolene/TiddlyWiki5]] -** Más detalles en http://tiddlywiki.com/dev +** Más detalles en https://tiddlywiki.com/dev Hay, además, más formas de [[contribuir con el proyecto|HelpingTiddlyWiki]]. diff --git a/editions/es-ES/tiddlers/D3_Plugin.tid b/editions/es-ES/tiddlers/D3_Plugin.tid index 6b5bc0008..6bd1d70d7 100644 --- a/editions/es-ES/tiddlers/D3_Plugin.tid +++ b/editions/es-ES/tiddlers/D3_Plugin.tid @@ -9,4 +9,4 @@ type: text/vnd.tiddlywiki El plugin D3 integra en ~TiddlyWiki la librería de visualización D3. -Disponible en: http://tiddlywiki.com/plugins/tiddlywiki/d3/ +Disponible en: https://tiddlywiki.com/plugins/tiddlywiki/d3/ diff --git a/editions/es-ES/tiddlers/Draft_of_'Nuevo_Tiddler'.tid b/editions/es-ES/tiddlers/Draft_of_'Nuevo_Tiddler'.tid deleted file mode 100644 index e8310cb53..000000000 --- a/editions/es-ES/tiddlers/Draft_of_'Nuevo_Tiddler'.tid +++ /dev/null @@ -1,11 +0,0 @@ -created: 20160422103150655 -draft.of: Nuevo Tiddler -draft.title: Nuevo Tiddler -modified: 20160422103359572 -tags: -title: Draft of 'Nuevo Tiddler' -type: text/vnd.tiddlywiki - -<<.flink PluginTypeField>> - -<<.toc-tab HelloThere>> \ No newline at end of file diff --git a/editions/es-ES/tiddlers/Empty_Edition.tid b/editions/es-ES/tiddlers/Empty_Edition.tid index f2c5f894e..464343181 100644 --- a/editions/es-ES/tiddlers/Empty_Edition.tid +++ b/editions/es-ES/tiddlers/Empty_Edition.tid @@ -12,6 +12,6 @@ Puede descargarse desde: > {{$:/editions/es-ES/snippets/download-empty-button}} ->Si el botón no funciona, guarda este enlace: http://tiddlywiki.com/languages/es-ES/empty.html +>Si el botón no funciona, guarda este enlace: https://tiddlywiki.com/languages/es-ES/empty.html > Seguramente el navegador te pida que confirmes la descarga diff --git a/editions/es-ES/tiddlers/Full_Edition.tid b/editions/es-ES/tiddlers/Full_Edition.tid index 106a64d3e..d669248c6 100644 --- a/editions/es-ES/tiddlers/Full_Edition.tid +++ b/editions/es-ES/tiddlers/Full_Edition.tid @@ -10,4 +10,4 @@ La edición completa de ~Tiddlywiki consta de todos los idiomas, temas y plugins La edición completa puede descargarse de: -http://tiddlywiki.com/editions/full/ +https://tiddlywiki.com/editions/full/ diff --git a/editions/es-ES/tiddlers/GettingStarted.tid b/editions/es-ES/tiddlers/GettingStarted.tid index 6ccebc399..10187a486 100644 --- a/editions/es-ES/tiddlers/GettingStarted.tid +++ b/editions/es-ES/tiddlers/GettingStarted.tid @@ -31,7 +31,7 @@ Te interesa ver también: Si el botón no funciona, guarda el siguiente enlace: -<a href="http://tiddlywiki.com/languages/es-ES/index.html" download="index.html">~http://tiddlywiki.com/languages/es-ES/index.html</a> +<a href="https://tiddlywiki.com/languages/es-ES/index.html" download="index.html">~https://tiddlywiki.com/languages/es-ES/index.html</a> El navegador puede pedirte que confirmes la acción antes de comenzar la descarga <<< diff --git a/editions/es-ES/tiddlers/Getting_Started_Video.tid b/editions/es-ES/tiddlers/Getting_Started_Video.tid index 0cc161c79..ba006e39a 100644 --- a/editions/es-ES/tiddlers/Getting_Started_Video.tid +++ b/editions/es-ES/tiddlers/Getting_Started_Video.tid @@ -10,4 +10,4 @@ Este breve tutorial te enseña cómo guardar cambios en TiddlyWIki. //El video está un poco anticuado, pero esperamos poder ponerlo pronto al día.// -<iframe width="560" height="315" src="http://www.youtube.com/embed/1g66s7UbyuU" frameborder="0" allowfullscreen></iframe> \ No newline at end of file +<iframe width="560" height="315" src="https://www.youtube.com/embed/1g66s7UbyuU" frameborder="0" allowfullscreen></iframe> \ No newline at end of file diff --git a/editions/es-ES/tiddlers/HelloThere.tid b/editions/es-ES/tiddlers/HelloThere.tid index e0a897652..0b1cea4bb 100644 --- a/editions/es-ES/tiddlers/HelloThere.tid +++ b/editions/es-ES/tiddlers/HelloThere.tid @@ -23,7 +23,7 @@ Al revés que los servicios online convencionales, TiddlyWiki te deja escoger d <a href="http://groups.google.com/group/TiddlyWiki" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank" rel="noopener noreferrer"> {{$:/core/images/mail}} ~TiddlyWiki en Google Groups </a> -<a href="http://www.youtube.com/c/JeremyRuston" class="tc-btn-big-green" style="background-color:#e52d27;" target="_blank" rel="noopener noreferrer"> +<a href="https://www.youtube.com/c/JeremyRuston" class="tc-btn-big-green" style="background-color:#e52d27;" target="_blank" rel="noopener noreferrer"> {{$:/core/images/video}} ~TiddlyWiki en ~YouTube </a> <a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="background-color:#5E9FCA;" target="_blank" rel="noopener noreferrer"> diff --git a/editions/es-ES/tiddlers/Highlight_Plugin.tid b/editions/es-ES/tiddlers/Highlight_Plugin.tid index 3d844d042..c0e22db04 100644 --- a/editions/es-ES/tiddlers/Highlight_Plugin.tid +++ b/editions/es-ES/tiddlers/Highlight_Plugin.tid @@ -9,4 +9,4 @@ type: text/vnd.tiddlywiki Desarrollado para programadores, el plugin Highlight permite aplicar colores a la sintaxis del texto. -See http://tiddlywiki.com/plugins/tiddlywiki/highlight/ +See https://tiddlywiki.com/plugins/tiddlywiki/highlight/ diff --git a/editions/es-ES/tiddlers/How_to_add_a_banner_for_GitHub_contributions.tid b/editions/es-ES/tiddlers/How_to_add_a_banner_for_GitHub_contributions.tid index 3d7e64d1e..e12911ec7 100644 --- a/editions/es-ES/tiddlers/How_to_add_a_banner_for_GitHub_contributions.tid +++ b/editions/es-ES/tiddlers/How_to_add_a_banner_for_GitHub_contributions.tid @@ -6,7 +6,7 @@ tags: Learning title: How to add a banner for GitHub contributions type: text/vnd.tiddlywiki -Cuando editas un tiddler en http://tiddlywiki.com, aparece una pequeña banda de color rosa que te invita a editar la fuente del tiddler en GitHub. +Cuando editas un tiddler en https://tiddlywiki.com, aparece una pequeña banda de color rosa que te invita a editar la fuente del tiddler en GitHub. Si usas Node.js, puedes reproducir este mismo efecto para tu propio ~TiddlyWiki, de la siguiente manera: diff --git a/editions/es-ES/tiddlers/Images_in_WikiText.tid b/editions/es-ES/tiddlers/Images_in_WikiText.tid index eaac1396a..1ffb71c93 100644 --- a/editions/es-ES/tiddlers/Images_in_WikiText.tid +++ b/editions/es-ES/tiddlers/Images_in_WikiText.tid @@ -16,7 +16,7 @@ Se puede insertar y dar formato a imágenes con WikiText. La sintaxis para ello |!Acción |!Sintaxis |!Código de ejemplo |!Resultado | |Insertar imagen<br> (origen interno) |`[img[Título del tiddler con la imagen]]` |`[img[Motovun Jack.jpg]]` |[img[Motovun Jack.jpg]] | -|Insertar imagen<br> (origen externo) |`[img[URL de la imagen]]` |`[img[http://tiddlywiki.com/favicon.ico]]` |[img[http://tiddlywiki.com/favicon.ico]] | +|Insertar imagen<br> (origen externo) |`[img[URL de la imagen]]` |`[img[https://tiddlywiki.com/favicon.ico]]` |[img[https://tiddlywiki.com/favicon.ico]] | |Insertar imagen<br> con descripción emergente |`[img[descripción|origen]]` |`[img[Descripción emergente|Motovun Jack.jpg ]]`<br><br>^^(Pasa el ratón por encima de la imagen para ver la descripción emergente)^^ |[img[Esta es una descripción emergente|Motovun Jack.jpg]] | |Insertar imagen <br>con atributos |`[img atributo[descripción|origen]]` |`[img width=100 [Motovun Jack.jpg]]` |[img width=100 [Motovun Jack.jpg]] | diff --git a/editions/es-ES/tiddlers/Improving_TiddlyWiki_Documentation.tid b/editions/es-ES/tiddlers/Improving_TiddlyWiki_Documentation.tid index 35691e51e..44b03b74e 100644 --- a/editions/es-ES/tiddlers/Improving_TiddlyWiki_Documentation.tid +++ b/editions/es-ES/tiddlers/Improving_TiddlyWiki_Documentation.tid @@ -6,7 +6,7 @@ tags: Community title: Improving TiddlyWiki Documentation type: text/vnd.tiddlywiki -Cualquiera puede proponer mejoras en la documentación de TiddlyWiki que aparece en http://tiddlywiki.com. +Cualquiera puede proponer mejoras en la documentación de TiddlyWiki que aparece en https://tiddlywiki.com. # Lee y sigue la [[Guía de estilo para documentación |Documentation Style Guide]] @@ -14,7 +14,7 @@ Cualquiera puede proponer mejoras en la documentación de TiddlyWiki que aparece # Si no lo has hecho aún, firma el [[acuerdo de licencia de contribución|Contributor License Agreement]] -# En http://tiddlywiki.com, haz clic en el botón <<.button "edit">> del tiddler que quieres mejorar +# En https://tiddlywiki.com, haz clic en el botón <<.button "edit">> del tiddler que quieres mejorar # Aparecerá un banner de color rosa con el texto <<.em "Can you help us improve this documentation? Find out how to edit this tiddler on ~GitHub">> @@ -34,12 +34,12 @@ Cualquiera puede proponer mejoras en la documentación de TiddlyWiki que aparece # En la página siguiente, pulsa el botón verde <<.word "Create pull request">> -[[Jermolene|https://github.com/Jermolene]] u otro de los desarrolladores principales tendrán así la oportunidad de incorporar tus cambios en la próxima edición de http://tiddlywiki.com. +[[Jermolene|https://github.com/Jermolene]] u otro de los desarrolladores principales tendrán así la oportunidad de incorporar tus cambios en la próxima edición de https://tiddlywiki.com. Mario Pietsch ha creado estos videotutoriales al respecto: -<iframe width="560" height="315" src="http://www.youtube.com/embed/L4zTkMYcri8" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/L4zTkMYcri8" frameborder="0" allowfullscreen></iframe> -<iframe width="560" height="315" src="http://www.youtube.com/embed/6ElUruH92tc" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/6ElUruH92tc" frameborder="0" allowfullscreen></iframe> -<iframe width="560" height="315" src="http://www.youtube.com/embed/axFCk9KsMFc" frameborder="0" allowfullscreen></iframe> \ No newline at end of file +<iframe width="560" height="315" src="https://www.youtube.com/embed/axFCk9KsMFc" frameborder="0" allowfullscreen></iframe> \ No newline at end of file diff --git a/editions/es-ES/tiddlers/Introducing_TiddlyDesktop_Video.tid b/editions/es-ES/tiddlers/Introducing_TiddlyDesktop_Video.tid index 4e6301dbe..387904df4 100644 --- a/editions/es-ES/tiddlers/Introducing_TiddlyDesktop_Video.tid +++ b/editions/es-ES/tiddlers/Introducing_TiddlyDesktop_Video.tid @@ -8,4 +8,4 @@ type: text/vnd.tiddlywiki Esta breve introducción muestra cómo instalar y usar TiddlyDesktop (en inglés): -<iframe width="560" height="315" src="http://www.youtube.com/embed/i3Bggkm7paA" frameborder="0" allowfullscreen></iframe> \ No newline at end of file +<iframe width="560" height="315" src="https://www.youtube.com/embed/i3Bggkm7paA" frameborder="0" allowfullscreen></iframe> \ No newline at end of file diff --git a/editions/es-ES/tiddlers/Introduction_Video.tid b/editions/es-ES/tiddlers/Introduction_Video.tid index 928922e24..5d3fce212 100644 --- a/editions/es-ES/tiddlers/Introduction_Video.tid +++ b/editions/es-ES/tiddlers/Introduction_Video.tid @@ -8,8 +8,8 @@ type: text/vnd.tiddlywiki Esta breve presentación expone los principios básicos de TiddlyWiki. -<iframe width="560" height="315" src="http://www.youtube.com/embed/KtCUr83XgyE" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/KtCUr83XgyE" frameborder="0" allowfullscreen></iframe> El TiddlyWiki usado para este video se encuentra aquí: -http://tiddlywiki.com/editions/introduction/ +https://tiddlywiki.com/editions/introduction/ diff --git a/editions/es-ES/tiddlers/KaTeX_Plugin.tid b/editions/es-ES/tiddlers/KaTeX_Plugin.tid index 8ce83cd8d..5d534bb2e 100644 --- a/editions/es-ES/tiddlers/KaTeX_Plugin.tid +++ b/editions/es-ES/tiddlers/KaTeX_Plugin.tid @@ -9,4 +9,4 @@ type: text/vnd.tiddlywiki Este plugin permite mostrar notación matemática escrita en ~LaTeX. -Disponible en: http://tiddlywiki.com/plugins/tiddlywiki/katex/ +Disponible en: https://tiddlywiki.com/plugins/tiddlywiki/katex/ diff --git a/editions/es-ES/tiddlers/Manually_installing_a_plugin.tid b/editions/es-ES/tiddlers/Manually_installing_a_plugin.tid index e21fb0516..0578ac246 100644 --- a/editions/es-ES/tiddlers/Manually_installing_a_plugin.tid +++ b/editions/es-ES/tiddlers/Manually_installing_a_plugin.tid @@ -10,7 +10,7 @@ type: text/vnd.tiddlywiki # Abre ~TiddlyWiki en el navegador -# En otra ventana del navegador, busca un enlace al plugin que quieres instalar en la página que lo contiene, p. ej., el enlace <<.tid ~$:/plugins/tiddlywiki/katex>> en http://tiddlywiki.com/plugins/tiddlywiki/katex/) +# En otra ventana del navegador, busca un enlace al plugin que quieres instalar en la página que lo contiene, p. ej., el enlace <<.tid ~$:/plugins/tiddlywiki/katex>> en https://tiddlywiki.com/plugins/tiddlywiki/katex/) # Arrastra el enlace hasta tu página. Aparecerá una banda de color verde en la parte superior de la pantalla. diff --git a/editions/es-ES/tiddlers/Markdown_Plugin.tid b/editions/es-ES/tiddlers/Markdown_Plugin.tid index c609eb6aa..a36d6915f 100644 --- a/editions/es-ES/tiddlers/Markdown_Plugin.tid +++ b/editions/es-ES/tiddlers/Markdown_Plugin.tid @@ -9,4 +9,4 @@ type: text/vnd.tiddlywiki Para uso con el lenguaje de marcado Markdown, en lugar de WikiText. -Disponible http://tiddlywiki.com/plugins/tiddlywiki/markdown/ +Disponible https://tiddlywiki.com/plugins/tiddlywiki/markdown/ diff --git a/editions/es-ES/tiddlers/OXTWIG.tid b/editions/es-ES/tiddlers/OXTWIG.tid index 3d97d02e7..d6f83193e 100644 --- a/editions/es-ES/tiddlers/OXTWIG.tid +++ b/editions/es-ES/tiddlers/OXTWIG.tid @@ -16,10 +16,10 @@ También tenemos lista de correo: https://groups.google.com/forum/#!members/oxtw La segunda reunión del OXTWIG se celebró el jueves 16 de enero de 2014: -<iframe width="560" height="315" src="http://www.youtube.com/embed/WOK_nVBf_6U" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/WOK_nVBf_6U" frameborder="0" allowfullscreen></iframe> !! OXTWIG #1 La primera reunión del OXTWIG se celebró el jueves 21 de noviembre de 2013: -<iframe width="560" height="315" src="http://www.youtube.com/embed/tpNf_Dms_TE" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/tpNf_Dms_TE" frameborder="0" allowfullscreen></iframe> diff --git a/editions/es-ES/tiddlers/PermaLinks.tid b/editions/es-ES/tiddlers/PermaLinks.tid index 7cff7c7fa..7ca555aff 100644 --- a/editions/es-ES/tiddlers/PermaLinks.tid +++ b/editions/es-ES/tiddlers/PermaLinks.tid @@ -12,11 +12,11 @@ Un <<.def permalink>> permite enlaces directos a tiddlers individuales de un ~Ti La forma más simple de un permalink es un enlace sencillo adjunto a la dirección de base con `#`: -http://tiddlywiki.com/#HelloThere +https://tiddlywiki.com/#HelloThere El título del tiddler puede contener espacios si es necesario: -[[http://tiddlywiki.com/#Using TiddlyWiki on Node.js]] +[[https://tiddlywiki.com/#Using TiddlyWiki on Node.js]] No es necesario encerrar el título en corchetes dobles, aunque si lo haces, no pasa nada, porque se elmininan. @@ -24,17 +24,17 @@ No es necesario encerrar el título en corchetes dobles, aunque si lo haces, no El permalink también puede definir la secuencia de tiddlers que se abre junto al tiddler principal, como hace un [[filtro|Filters]]: -[[http://tiddlywiki.com/#TiddlerFields:Tiddlers TiddlerTags TiddlerFields ContentType]] +[[https://tiddlywiki.com/#TiddlerFields:Tiddlers TiddlerTags TiddlerFields ContentType]] Si el tiddler principal no está presente entre los tiddlers de la StoryRiver, se inserta automáticamente al principio, lo que significa que estos dos ejemplos apuntan al tiddler <<.tid Tiddlers>> en la secuencia <<.tid "Tiddlers, Tags, ~TiddlerFields">>: -[[http://tiddlywiki.com/#Tiddlers:Tags TiddlerFields]] +[[https://tiddlywiki.com/#Tiddlers:Tags TiddlerFields]] -[[http://tiddlywiki.com/#Tiddlers:Tiddlers Tags TiddlerFields]] +[[https://tiddlywiki.com/#Tiddlers:Tiddlers Tags TiddlerFields]] También es posible definir un filtro sin especificar un tiddler en concreto: -<a href="http://tiddlywiki.com/#:[tags[task]]">~http://tiddlywiki.com/#:[tags[task]]</a> +<a href="https://tiddlywiki.com/#:[tags[task]]">~https://tiddlywiki.com/#:[tags[task]]</a> ! Codificación de URL's diff --git a/editions/es-ES/tiddlers/Resume_Builder_Edition.tid b/editions/es-ES/tiddlers/Resume_Builder_Edition.tid index f183e3994..adf09fa3a 100644 --- a/editions/es-ES/tiddlers/Resume_Builder_Edition.tid +++ b/editions/es-ES/tiddlers/Resume_Builder_Edition.tid @@ -8,6 +8,6 @@ type: text/vnd.tiddlywiki El <<.def "Editor de currículum">> es una edición especial de ~Tiddlywiki concebida para la creación de manera sencilla de un currículum profesional que se puede imprimir o guardar en la web. -http://tiddlywiki.com/editions/resumebuilder/ +https://tiddlywiki.com/editions/resumebuilder/ (En inglés. Está en preparación la edición en castellano) diff --git a/editions/es-ES/tiddlers/SafeMode.tid b/editions/es-ES/tiddlers/SafeMode.tid index fdcec0650..9f4f240c1 100644 --- a/editions/es-ES/tiddlers/SafeMode.tid +++ b/editions/es-ES/tiddlers/SafeMode.tid @@ -14,7 +14,7 @@ El <<.def "modo seguro">> desactiva la mayoría de customizaciones en ~TiddlyWik Modo seguro se activa al arrancar ~TiddlyWiki con el hash `#:safe`. -http://tiddlywiki.com/#:safe +https://tiddlywiki.com/#:safe ! Cómo trabaja el modo seguro diff --git a/editions/es-ES/tiddlers/Saving_on_Safari.tid b/editions/es-ES/tiddlers/Saving_on_Safari.tid index 69c4bc890..f809d0fdd 100644 --- a/editions/es-ES/tiddlers/Saving_on_Safari.tid +++ b/editions/es-ES/tiddlers/Saving_on_Safari.tid @@ -12,7 +12,7 @@ Este método para guardar cambios es un poco rudimentario porque requiere interv #> {{$:/editions/es-ES/snippets/download-empty-button}} -#>Si el botón no funciona, guarda este enlace: http://tiddlywiki.com/languages/es-ES/empty.html +#>Si el botón no funciona, guarda este enlace: https://tiddlywiki.com/languages/es-ES/empty.html #> Seguramente el navegador te pida que confirmes la descarga diff --git a/editions/es-ES/tiddlers/Saving_on_iPad_iPhone.tid b/editions/es-ES/tiddlers/Saving_on_iPad_iPhone.tid index d1f4eceee..c63f2aa4e 100644 --- a/editions/es-ES/tiddlers/Saving_on_iPad_iPhone.tid +++ b/editions/es-ES/tiddlers/Saving_on_iPad_iPhone.tid @@ -17,7 +17,7 @@ Instrucciones de uso: #* Aparecerá un cuadro de texto en el que puedes indicar una URL -# Escribe la URL `http://tiddlywiki.com/languages/es-ES/empty.html` +# Escribe la URL `https://tiddlywiki.com/languages/es-ES/empty.html` # Cuando se cargue el TiddlyWiki vacío, toca el icono ''Guardar'' (el segundo icono por la derecha, en la barra superior) diff --git a/editions/es-ES/tiddlers/Saving_with_TiddlyFox_on_Android.tid b/editions/es-ES/tiddlers/Saving_with_TiddlyFox_on_Android.tid index 7766ffdf0..c11314d3c 100644 --- a/editions/es-ES/tiddlers/Saving_with_TiddlyFox_on_Android.tid +++ b/editions/es-ES/tiddlers/Saving_with_TiddlyFox_on_Android.tid @@ -23,7 +23,7 @@ También puedes consultar el [[video tutorial|TiddlyWiki on Firefox for Android #Descarga un TiddlyWiki en blanco guardando el enlace: -#* http://tiddlywiki.com/languages/es-ES/empty.html +#* https://tiddlywiki.com/languages/es-ES/empty.html #>Para guardar el enlace, mantenlo presionado y selecciona "Save link" (asegúrate de tener instalada la extensión "save-link-menus") diff --git a/editions/es-ES/tiddlers/Saving_with_TiddlyIE.tid b/editions/es-ES/tiddlers/Saving_with_TiddlyIE.tid index e68febe84..be8bd03e5 100644 --- a/editions/es-ES/tiddlers/Saving_with_TiddlyIE.tid +++ b/editions/es-ES/tiddlers/Saving_with_TiddlyIE.tid @@ -18,7 +18,7 @@ type: text/vnd.tiddlywiki #> {{$:/editions/es-ES/snippets/download-empty-button}} -#>Si el botón no funciona, guarda este enlace: http://tiddlywiki.com/languages/es-ES/empty.html +#>Si el botón no funciona, guarda este enlace: https://tiddlywiki.com/languages/es-ES/empty.html #> Seguramente el navegador te pida que confirmes la descarga diff --git a/editions/es-ES/tiddlers/Saving_with_the_HTML5_fallback_saver.tid b/editions/es-ES/tiddlers/Saving_with_the_HTML5_fallback_saver.tid index 05e66d367..ac599a14c 100644 --- a/editions/es-ES/tiddlers/Saving_with_the_HTML5_fallback_saver.tid +++ b/editions/es-ES/tiddlers/Saving_with_the_HTML5_fallback_saver.tid @@ -12,7 +12,7 @@ Este método para guardar cambios es un poco rudimentario porque requiere interv #> {{$:/editions/es-ES/snippets/download-empty-button}} -#>Si el botón no funciona, guarda este enlace: http://tiddlywiki.com/languages/es-ES/empty.html +#>Si el botón no funciona, guarda este enlace: https://tiddlywiki.com/languages/es-ES/empty.html #> Seguramente el navegador te pida que confirmes la descarga diff --git a/editions/es-ES/tiddlers/Some_of_the_things_you_can_do_with_TiddlyWiki.tid b/editions/es-ES/tiddlers/Some_of_the_things_you_can_do_with_TiddlyWiki.tid index effa1928f..54d0884be 100644 --- a/editions/es-ES/tiddlers/Some_of_the_things_you_can_do_with_TiddlyWiki.tid +++ b/editions/es-ES/tiddlers/Some_of_the_things_you_can_do_with_TiddlyWiki.tid @@ -32,4 +32,4 @@ type: text/vnd.tiddlywiki * Preparar toda una base de conocimientos, local u online con un archivo ~TiddlyWiki que enlace a otros. Aquí hay un [[ejemplo en castellano|http://recursos.giffmex.org]] -* Preparar una presentación visual de datos, usando tiddlers como fuente de datos. Un buen ejemplo lo tienes [[en esta página| http://tiddlywiki.com/plugins/tiddlywiki/d3/]] +* Preparar una presentación visual de datos, usando tiddlers como fuente de datos. Un buen ejemplo lo tienes [[en esta página| https://tiddlywiki.com/plugins/tiddlywiki/d3/]] diff --git a/editions/es-ES/tiddlers/TW2Parser_Plugin.tid b/editions/es-ES/tiddlers/TW2Parser_Plugin.tid index 9e54f3bb2..9cd45332f 100644 --- a/editions/es-ES/tiddlers/TW2Parser_Plugin.tid +++ b/editions/es-ES/tiddlers/TW2Parser_Plugin.tid @@ -9,4 +9,4 @@ type: text/vnd.tiddlywiki Este es un plugin experimental que añade la funcionalidad de mostrar WikiText escrito para la primera versión <<.word Classic>> de ~TiddlyWiki. -Está disponible en: http://tiddlywiki.com/plugins/tiddlywiki/tw2parser/ +Está disponible en: https://tiddlywiki.com/plugins/tiddlywiki/tw2parser/ diff --git a/editions/es-ES/tiddlers/Text-Slicer_Edition.tid b/editions/es-ES/tiddlers/Text-Slicer_Edition.tid index 7601f3cd6..bafa20fdb 100644 --- a/editions/es-ES/tiddlers/Text-Slicer_Edition.tid +++ b/editions/es-ES/tiddlers/Text-Slicer_Edition.tid @@ -8,4 +8,4 @@ type: text/vnd.tiddlywiki El <<.def " Cortatextos">> es una edición especial que contiene herramientas para dividir largos textos en tiddlers individuales. -http://tiddlywiki.com/editions/text-slicer/ +https://tiddlywiki.com/editions/text-slicer/ diff --git a/editions/es-ES/tiddlers/TiddlerLinks.tid b/editions/es-ES/tiddlers/TiddlerLinks.tid index 6f2fb20fc..33b9a4ba0 100644 --- a/editions/es-ES/tiddlers/TiddlerLinks.tid +++ b/editions/es-ES/tiddlers/TiddlerLinks.tid @@ -28,4 +28,4 @@ TiddlyWiki5 modifica la apariencia de los enlaces para dar información adiciona |A un tiddler oculto que no ha sido anulado |[[TalCual|$:/core/copyright.txt]] | |A un tiddler oculto que ha sido anulado por un tiddler común |[[TalCual|$:/SiteTitle]] | -Los enlaces externos se muestran así: http://tiddlywiki.com/ o [[así|http://tiddlywiki.com/]]. +Los enlaces externos se muestran así: https://tiddlywiki.com/ o [[así|https://tiddlywiki.com/]]. diff --git a/editions/es-ES/tiddlers/TiddlyWikiClassic.tid b/editions/es-ES/tiddlers/TiddlyWikiClassic.tid index 0e08fc08d..2b336d561 100644 --- a/editions/es-ES/tiddlers/TiddlyWikiClassic.tid +++ b/editions/es-ES/tiddlers/TiddlyWikiClassic.tid @@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki TiddlyWiki Classic recibe aún mantenimiento y está disponible en: -http://classic.tiddlywiki.com/ +https://classic.tiddlywiki.com/ Mario Pietsch ha publicado una página que compara la sintaxis y otras diferencias entre la versión [[Classic|TiddlyWikiClassic]] y la [[actual|TiddlyWiki5]]: diff --git a/editions/es-ES/tiddlers/TiddlyWiki_Hangouts.tid b/editions/es-ES/tiddlers/TiddlyWiki_Hangouts.tid index c9247601e..072fa2f95 100644 --- a/editions/es-ES/tiddlers/TiddlyWiki_Hangouts.tid +++ b/editions/es-ES/tiddlers/TiddlyWiki_Hangouts.tid @@ -12,4 +12,4 @@ De todos modos, se anuncian debidamente en el [[Grupo de TiddlyWiki|https://grou Los últimos //Hangouts// están archivados en este canal de ~YouTube: -<iframe width="560" height="315" src="http://www.youtube.com/embed/videoseries?list=PLVT_2PPd-1p34gGCQ5qpwC8QdykxVAI3u" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/videoseries?list=PLVT_2PPd-1p34gGCQ5qpwC8QdykxVAI3u" frameborder="0" allowfullscreen></iframe> diff --git a/editions/es-ES/tiddlers/TiddlyWiki_on_Firefox_for_Android_Video.tid b/editions/es-ES/tiddlers/TiddlyWiki_on_Firefox_for_Android_Video.tid index 15b4e4860..0a7359a75 100644 --- a/editions/es-ES/tiddlers/TiddlyWiki_on_Firefox_for_Android_Video.tid +++ b/editions/es-ES/tiddlers/TiddlyWiki_on_Firefox_for_Android_Video.tid @@ -8,4 +8,4 @@ type: text/vnd.tiddlywiki Este breve //screencast// muestra cómo configurar Firefox para Android para guardar cambios en TiddlyWiki: -<iframe width="560" height="315" src="http://www.youtube.com/embed/iikkv9orGGI" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/iikkv9orGGI" frameborder="0" allowfullscreen></iframe> diff --git a/editions/es-ES/tiddlers/Upgrading.tid b/editions/es-ES/tiddlers/Upgrading.tid index 6a5678428..74eb375af 100644 --- a/editions/es-ES/tiddlers/Upgrading.tid +++ b/editions/es-ES/tiddlers/Upgrading.tid @@ -22,7 +22,7 @@ Este procedimiento funcionará en la mayoría de navegadores. Ni uno solo de tus # Localiza el archivo HTML de ~TiddlyWiki en tu disco duro -# Abre el navegador y ve a http://tiddlywiki.com/upgrade.html. Ahí encontrarás el <<.word Upgrader>>: asistente de actualización de ~TiddlyWiki. Tiene una gran flecha en el centro y, debajo de ella, el número de versión al que corresponde +# Abre el navegador y ve a https://tiddlywiki.com/upgrade.html. Ahí encontrarás el <<.word Upgrader>>: asistente de actualización de ~TiddlyWiki. Tiene una gran flecha en el centro y, debajo de ella, el número de versión al que corresponde # Arrastra el archivo HTML de TiddlyWiki a la ventana del navegador donde tienes el Upgrader y suéltalo sobre la flecha diff --git a/editions/es-ES/tiddlers/What_happened_to_the_original_TiddlyWiki_.tid b/editions/es-ES/tiddlers/What_happened_to_the_original_TiddlyWiki_.tid index de8413966..ef89dc0ed 100644 --- a/editions/es-ES/tiddlers/What_happened_to_the_original_TiddlyWiki_.tid +++ b/editions/es-ES/tiddlers/What_happened_to_the_original_TiddlyWiki_.tid @@ -6,14 +6,14 @@ tags: HelloThere title: What happened to the original TiddlyWiki? type: text/vnd.tiddlywiki -<a class="tc-float-right tc-bordered-image" href="http://classic.tiddlywiki.com/" target="_blank" rel="noopener noreferrer">[img width="200" [TiddlyWiki Classic.png]]</a> +<a class="tc-float-right tc-bordered-image" href="https://classic.tiddlywiki.com/" target="_blank" rel="noopener noreferrer">[img width="200" [TiddlyWiki Classic.png]]</a> La versión original de TiddlyWiki, que llamamos [[Classic|TiddlyWikiClassic]], sigue disponible en: -http://classic.tiddlywiki.com. +https://classic.tiddlywiki.com. Ten en cuenta que la [[versión actual|TiddlyWiki5]] de ~TiddlyWiki no es totalmente compatible con la versión [[Classic|TiddlyWikiClassic]]. Se pueden importar contenidos, pero necesitan algo de //masaje// para adaptarse al nuevo formato de escritura, WikiText. Actualmente está en desarrollo un plugin: ''tw2parser'', intérprete que permita reproducir fielmente y sin mayor complicación los contenidos creados por TiddlyWikiClassic. -http://tiddlywiki.com/plugins/tiddlywiki/tw2parser/ +https://tiddlywiki.com/plugins/tiddlywiki/tw2parser/ diff --git a/editions/es-ES/tiddlers/_A_Thesis_Notebook__by_Alberto_Molina.tid b/editions/es-ES/tiddlers/_A_Thesis_Notebook__by_Alberto_Molina.tid index bdcc3ac1e..81628e907 100644 --- a/editions/es-ES/tiddlers/_A_Thesis_Notebook__by_Alberto_Molina.tid +++ b/editions/es-ES/tiddlers/_A_Thesis_Notebook__by_Alberto_Molina.tid @@ -16,5 +16,5 @@ Este es un ejemplo de cuaderno de tesis, construido sobre TiddlyWiki 5.0.8-beta. TiddlyWiki es un gran programa creado por Jeremy Ruston. Te permite, entre otras cosas, tomar notas, organizar ideaas, guardar información y ver todas tus cosas de la forma que queres. Es una herramiente increíblemente flexible que puedes adaptar para que satisfaga casi todas tus necesidades. -Este TiddlyWiki ha sido adaptado para servir de cuaderno de notas de filosofía, centrado en autores, libros y artículos, conceptos y teorías, además de notas personales. Lo uso junto con Zotero, que es un programa de bibliografía. Ambos son proyectos gratuitos de código abierto. TiddlyWiki se puede descargar de http://tiddlywiki.com +Este TiddlyWiki ha sido adaptado para servir de cuaderno de notas de filosofía, centrado en autores, libros y artículos, conceptos y teorías, además de notas personales. Lo uso junto con Zotero, que es un programa de bibliografía. Ambos son proyectos gratuitos de código abierto. TiddlyWiki se puede descargar de https://tiddlywiki.com <<< diff --git a/editions/es-ES/tiddlers/tv-auto-open-on-import_Variable.tid b/editions/es-ES/tiddlers/tv-auto-open-on-import_Variable.tid index a0b84e5e9..f9a23bcbb 100644 --- a/editions/es-ES/tiddlers/tv-auto-open-on-import_Variable.tid +++ b/editions/es-ES/tiddlers/tv-auto-open-on-import_Variable.tid @@ -10,4 +10,4 @@ La [[variable|Variables]] <<.def tv-auto-open-on-import>> controla si el mensaje Por defecto, el tiddler se abre, pero si la variable tiene valor <<.value no>>, no lo hace. -Un ejemplo de ajuste de esta variable con valor <<.value no>> puede verse en el plugin de actualización en el [[asistente de actualización de TiddlyWiki|http://www.tiddlywiki.com/upgrade.html]], donde el usuario arrastra los archivos que quiera actualizar pero en pantalla no se muestra la importación del modo habitual. \ No newline at end of file +Un ejemplo de ajuste de esta variable con valor <<.value no>> puede verse en el plugin de actualización en el [[asistente de actualización de TiddlyWiki|https://www.tiddlywiki.com/upgrade.html]], donde el usuario arrastra los archivos que quiera actualizar pero en pantalla no se muestra la importación del modo habitual. \ No newline at end of file diff --git a/editions/fr-FR-server/tiddlers/system/GoogleAnalyticsAccount.tid b/editions/fr-FR-server/tiddlers/system/GoogleAnalyticsAccount.tid deleted file mode 100644 index 29cbc27e0..000000000 --- a/editions/fr-FR-server/tiddlers/system/GoogleAnalyticsAccount.tid +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/GoogleAnalyticsAccount - diff --git a/editions/fr-FR-server/tiddlers/system/GoogleAnalyticsDomain.tid b/editions/fr-FR-server/tiddlers/system/GoogleAnalyticsDomain.tid deleted file mode 100644 index 0c6a7e02d..000000000 --- a/editions/fr-FR-server/tiddlers/system/GoogleAnalyticsDomain.tid +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/GoogleAnalyticsDomain - diff --git a/editions/fr-FR/tiddlers/$__editions_tw5.com_variable-macros.tid b/editions/fr-FR/tiddlers/$__editions_tw5.com_variable-macros.tid index 31f58db60..dd84d5ba7 100644 --- a/editions/fr-FR/tiddlers/$__editions_tw5.com_variable-macros.tid +++ b/editions/fr-FR/tiddlers/$__editions_tw5.com_variable-macros.tid @@ -7,7 +7,7 @@ type: text/vnd.tiddlywiki \define .variable-examples(v,text:"Exemples") <$link to="$v$ Variable (Examples)">$text$</$link> \define .macro-examples(m,text:"Exemples") <$link to="$m$ Macro (Examples)">$text$</$link> -\define .js-macro-link(_) [[$_$|http://tiddlywiki.com/dev/index.html#JavaScript%20Macros]] +\define .js-macro-link(_) [[$_$|https://tiddlywiki.com/dev/index.html#JavaScript%20Macros]] \define .this-is-static-link-variable() <<.tip "This variable has no useful effect when ~TiddlyWiki is running in a browser, as the `href` attribute is ignored there -- links between tiddlers are performed by JavaScript instead. The variable comes into play when one is using the [[Node.js configuration|TiddlyWiki on Node.js]] to [[generate a static version|RenderTiddlersCommand]] of a wiki.">> diff --git a/editions/fr-FR/tiddlers/A_Gentle_Guide_to_TiddlyWiki.tid b/editions/fr-FR/tiddlers/A_Gentle_Guide_to_TiddlyWiki.tid index c95f51077..6ab9d4a29 100644 --- a/editions/fr-FR/tiddlers/A_Gentle_Guide_to_TiddlyWiki.tid +++ b/editions/fr-FR/tiddlers/A_Gentle_Guide_to_TiddlyWiki.tid @@ -20,4 +20,4 @@ Comment faire fonctionner <<tw>> chez vous ? Notre conseil est de commencer par Voir aussi<<:>> -* [ext[Developer Documentation|http://tiddlywiki.com/dev/index.html]] (en anglais) +* [ext[Developer Documentation|https://tiddlywiki.com/dev/index.html]] (en anglais) diff --git a/editions/fr-FR/tiddlers/Chinese (Simplified) Edition.tid b/editions/fr-FR/tiddlers/Chinese (Simplified) Edition.tid index 0308dd749..35aff8ac5 100644 --- a/editions/fr-FR/tiddlers/Chinese (Simplified) Edition.tid +++ b/editions/fr-FR/tiddlers/Chinese (Simplified) Edition.tid @@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki TiddlyWiki 的简体中文翻译版本： -<!-- * ''文件'': http://tiddlywiki.com/languages/zh-Hans/index.html --> -* ''空白版本'': http://tiddlywiki.com/languages/zh-Hans/empty.html +<!-- * ''文件'': https://tiddlywiki.com/languages/zh-Hans/index.html --> +* ''空白版本'': https://tiddlywiki.com/languages/zh-Hans/empty.html 另请参阅 [[中文 (正體) 版|Chinese (Traditional) Edition]]。 diff --git a/editions/fr-FR/tiddlers/Chinese (Traditional) Edition.tid b/editions/fr-FR/tiddlers/Chinese (Traditional) Edition.tid index 57065ff41..59c9ba04a 100644 --- a/editions/fr-FR/tiddlers/Chinese (Traditional) Edition.tid +++ b/editions/fr-FR/tiddlers/Chinese (Traditional) Edition.tid @@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki TiddlyWiki 的正體中文翻譯版本： -<!-- * ''文件'': http://tiddlywiki.com/languages/zh-Hant/index.html --> -* ''空白版本'': http://tiddlywiki.com/languages/zh-Hant/empty.html +<!-- * ''文件'': https://tiddlywiki.com/languages/zh-Hant/index.html --> +* ''空白版本'': https://tiddlywiki.com/languages/zh-Hant/empty.html 另請參閱 [[中文 (简体) 版|Chinese (Simplified) Edition]]。 diff --git a/editions/fr-FR/tiddlers/CodeMirror_Plugin.tid b/editions/fr-FR/tiddlers/CodeMirror_Plugin.tid index ec5ad894f..0bd3b19a6 100644 --- a/editions/fr-FR/tiddlers/CodeMirror_Plugin.tid +++ b/editions/fr-FR/tiddlers/CodeMirror_Plugin.tid @@ -7,4 +7,4 @@ type: text/vnd.tiddlywiki Ce plugin offre l'intégration d'un éditeur web sophistiqué au sein de TiddlyWiki. -Voir http://tiddlywiki.com/plugins/tiddlywiki/codemirror/ +Voir https://tiddlywiki.com/plugins/tiddlywiki/codemirror/ diff --git a/editions/fr-FR/tiddlers/Contributing.tid b/editions/fr-FR/tiddlers/Contributing.tid index 9b8121fd2..7a6600eb9 100644 --- a/editions/fr-FR/tiddlers/Contributing.tid +++ b/editions/fr-FR/tiddlers/Contributing.tid @@ -10,7 +10,7 @@ Nous accueillons les contributions au code et à la documentation de TiddlyWiki * [[SignalerBugs|ReportingBugs]] * Aider à [[améliorer notre documentation|Improving TiddlyWiki Documentation]] * Contribuer au code via [[GitHub|https://github.com/Jermolene/TiddlyWiki5]] -** Voir http://tiddlywiki.com/dev pour plus de détails +** Voir https://tiddlywiki.com/dev pour plus de détails Il existe encore plusieurs façons d'[[aider TiddlyWiki|HelpingTiddlyWiki]]. diff --git a/editions/fr-FR/tiddlers/ContributingTemplate.tid b/editions/fr-FR/tiddlers/ContributingTemplate.tid index 5e3719cda..bd58e0ec1 100644 --- a/editions/fr-FR/tiddlers/ContributingTemplate.tid +++ b/editions/fr-FR/tiddlers/ContributingTemplate.tid @@ -3,7 +3,7 @@ modified: 20130825144900000 title: ContributingTemplate type: text/vnd.tiddlywiki -\define tv-wikilink-template() http://tiddlywiki.com/static/$uri_doubleencoded$.html +\define tv-wikilink-template() https://tiddlywiki.com/static/$uri_doubleencoded$.html ! Contributing to TiddlyWiki5 {{Contributing}} diff --git a/editions/fr-FR/tiddlers/D3_Plugin.tid b/editions/fr-FR/tiddlers/D3_Plugin.tid index 16e5b3bfc..bb48e6e0a 100644 --- a/editions/fr-FR/tiddlers/D3_Plugin.tid +++ b/editions/fr-FR/tiddlers/D3_Plugin.tid @@ -7,4 +7,4 @@ type: text/vnd.tiddlywiki Ce plugin intègre la célèbre bibliothèque de visualisation D3 au sein de TiddlyWiki. -Voir http://tiddlywiki.com/plugins/tiddlywiki/d3/ +Voir https://tiddlywiki.com/plugins/tiddlywiki/d3/ diff --git a/editions/fr-FR/tiddlers/Developers.tid b/editions/fr-FR/tiddlers/Developers.tid index 207f89e45..f13d60dc9 100644 --- a/editions/fr-FR/tiddlers/Developers.tid +++ b/editions/fr-FR/tiddlers/Developers.tid @@ -7,6 +7,6 @@ type: text/vnd.tiddlywiki Les développeurs disposent de plusieurs ressources pour discuter et contribuer au développement de TiddlyWiki. -* [[tiddlywiki.com/dev|http://tiddlywiki.com/dev]] la documentation officielle de développement +* [[tiddlywiki.com/dev|https://tiddlywiki.com/dev]] la documentation officielle de développement * [[TiddlyWikiDev group|http://groups.google.com/group/TiddlyWikiDev]] pour les discussions au sujet du développement de TiddlyWiki * https://github.com/Jermolene/TiddlyWiki5 pour le code source et l'activité de développement diff --git a/editions/fr-FR/tiddlers/Empty Edition.tid b/editions/fr-FR/tiddlers/Empty Edition.tid index c026698c3..ca0ef5f37 100644 --- a/editions/fr-FR/tiddlers/Empty Edition.tid +++ b/editions/fr-FR/tiddlers/Empty Edition.tid @@ -10,5 +10,5 @@ L'édition <<gf "basique">> de ~TiddlyWiki est une distribution minimale, sans p L'édition //basique// peut être récupérée à l'adresse<<dp>> > {{$:/editions/fr-FR/snippets/download-empty-button}} -> Si le bouton ne fonctionne pas, enregistrez ce lien<<dp>> http://tiddlywiki.com/languages/fr-FR/empty.html +> Si le bouton ne fonctionne pas, enregistrez ce lien<<dp>> https://tiddlywiki.com/languages/fr-FR/empty.html > Votre navigateur vous demandera peut-être d'accepter explicitement l'enregistrement avant qu'il démarre diff --git a/editions/fr-FR/tiddlers/Features.tid b/editions/fr-FR/tiddlers/Features.tid index 393bb6ada..1436a6d38 100644 --- a/editions/fr-FR/tiddlers/Features.tid +++ b/editions/fr-FR/tiddlers/Features.tid @@ -17,8 +17,8 @@ Plus d'informations sur les fonctionnalités spécifiques de <<tw>><<dp>> * Des outils d'interface utilisateur conviviaux comme <<alert-demo>>, <$button message="tm-modal" param="SampleWizard">wizards</$button> et <$button message="tm-notify" param="SampleNotification">notifications</$button> * Essayez le <$button message="tm-full-screen">mode plein-écran</$button> -* Explorez le [[plugin de visualisation D3.js|http://tiddlywiki.com/plugins/tiddlywiki/d3/index.html]] -* Accédez à [[CodeMirror par plugin|http://tiddlywiki.com/plugins/tiddlywiki/codemirror/index.html]] -* Notez avec [[Markdown par plugin|http://tiddlywiki.com/plugins/tiddlywiki/markdown/index.html]] -* Conservez le marquage [[TiddlyWiki Classic par plugin|http://tiddlywiki.com/plugins/tiddlywiki/tw2parser/index.html]] +* Explorez le [[plugin de visualisation D3.js|https://tiddlywiki.com/plugins/tiddlywiki/d3/index.html]] +* Accédez à [[CodeMirror par plugin|https://tiddlywiki.com/plugins/tiddlywiki/codemirror/index.html]] +* Notez avec [[Markdown par plugin|https://tiddlywiki.com/plugins/tiddlywiki/markdown/index.html]] +* Conservez le marquage [[TiddlyWiki Classic par plugin|https://tiddlywiki.com/plugins/tiddlywiki/tw2parser/index.html]] * Enfin, mais non des moindres, TiddlyWiki est un des rares exemples d'utilisation d'une [[quine|Quine]] au quotidien. \ No newline at end of file diff --git a/editions/fr-FR/tiddlers/French (France) Edition.tid b/editions/fr-FR/tiddlers/French (France) Edition.tid index 4160641aa..52528def7 100644 --- a/editions/fr-FR/tiddlers/French (France) Edition.tid +++ b/editions/fr-FR/tiddlers/French (France) Edition.tid @@ -8,5 +8,5 @@ type: text/vnd.tiddlywiki La traduction en Français (France) de TiddlyWiki démarre ici : -* ''documentation'' : http://tiddlywiki.com/languages/fr-FR/index.html -* ''empty'' : http://tiddlywiki.com/languages/fr-FR/empty.html +* ''documentation'' : https://tiddlywiki.com/languages/fr-FR/index.html +* ''empty'' : https://tiddlywiki.com/languages/fr-FR/empty.html diff --git a/editions/fr-FR/tiddlers/Full_Edition.tid b/editions/fr-FR/tiddlers/Full_Edition.tid index 208585c6b..46a94de84 100644 --- a/editions/fr-FR/tiddlers/Full_Edition.tid +++ b/editions/fr-FR/tiddlers/Full_Edition.tid @@ -9,4 +9,4 @@ L'édition <<gf complète>> de <<tw>> intègre toutes les langues, thèmes et pl L'édition complète peut être téléchargée via<<:>> -http://tiddlywiki.com/editions/full/ +https://tiddlywiki.com/editions/full/ diff --git a/editions/fr-FR/tiddlers/German (Austria) Edition.tid b/editions/fr-FR/tiddlers/German (Austria) Edition.tid index a304bc6d9..f1f8e7d72 100644 --- a/editions/fr-FR/tiddlers/German (Austria) Edition.tid +++ b/editions/fr-FR/tiddlers/German (Austria) Edition.tid @@ -9,7 +9,7 @@ type: text/vnd.tiddlywiki Die österreichische Übersetzung von TiddlyWiki ist verfügbar unter: -* ''Dokumentation'': http://tiddlywiki.com/languages/de-AT/index.html -* ''Leer'': http://tiddlywiki.com/languages/de-AT/empty.html +* ''Dokumentation'': https://tiddlywiki.com/languages/de-AT/index.html +* ''Leer'': https://tiddlywiki.com/languages/de-AT/empty.html Siehe auch: [[Deutsch (Deutschland) Edition]]. diff --git a/editions/fr-FR/tiddlers/German (Germany) Edition.tid b/editions/fr-FR/tiddlers/German (Germany) Edition.tid index 1b21d64db..bc1961771 100644 --- a/editions/fr-FR/tiddlers/German (Germany) Edition.tid +++ b/editions/fr-FR/tiddlers/German (Germany) Edition.tid @@ -9,7 +9,7 @@ type: text/vnd.tiddlywiki Die deutsche Übersetzung von TiddlyWiki ist verfügbar unter: -* ''Dokumentation'': http://tiddlywiki.com/languages/de-DE/index.html -* ''Leer'': http://tiddlywiki.com/languages/de-DE/empty.html +* ''Dokumentation'': https://tiddlywiki.com/languages/de-DE/index.html +* ''Leer'': https://tiddlywiki.com/languages/de-DE/empty.html Siehe auch: [[Deutsch (Österreich) Edition]]. diff --git a/editions/fr-FR/tiddlers/Getting Started Video.tid b/editions/fr-FR/tiddlers/Getting Started Video.tid index 2ac130274..b7e3e3a2d 100644 --- a/editions/fr-FR/tiddlers/Getting Started Video.tid +++ b/editions/fr-FR/tiddlers/Getting Started Video.tid @@ -9,4 +9,4 @@ Ce rapide tutoriel vous explique brièvement comment enregistrer vos modificatio //Notez que cette vidéo est un peu ancienne, et qu'elle sera mise à jour bientôt !// -<iframe width="560" height="315" src="http://www.youtube.com/embed/1g66s7UbyuU" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/1g66s7UbyuU" frameborder="0" allowfullscreen></iframe> diff --git a/editions/fr-FR/tiddlers/GettingStarted.tid b/editions/fr-FR/tiddlers/GettingStarted.tid index 165db5a44..9fbd71706 100644 --- a/editions/fr-FR/tiddlers/GettingStarted.tid +++ b/editions/fr-FR/tiddlers/GettingStarted.tid @@ -26,7 +26,7 @@ Autres informations : Si le bouton ne fonctionne pas, sauvegardez ce lien : -<a href="http://tiddlywiki.com/languages/fr-FR/index.html" download="index.html">~http://tiddlywiki.com/languages/fr-FR/index.html</a> +<a href="https://tiddlywiki.com/languages/fr-FR/index.html" download="index.html">~https://tiddlywiki.com/languages/fr-FR/index.html</a> Votre navigateur vous demandera sans doute confirmation avant de démarrer le téléchargement. <<< diff --git a/editions/fr-FR/tiddlers/HelloThere.tid b/editions/fr-FR/tiddlers/HelloThere.tid index e49e6e153..3e30c374f 100644 --- a/editions/fr-FR/tiddlers/HelloThere.tid +++ b/editions/fr-FR/tiddlers/HelloThere.tid @@ -23,7 +23,7 @@ Contrairement aux services en ligne classiques, TiddlyWiki vous permet de choisi <a href="http://groups.google.com/group/TiddlyWiki" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank" rel="noopener noreferrer"> {{$:/core/images/mail}} ~TiddlyWiki Mailing List </a> -<a href="http://www.youtube.com/c/JeremyRuston" class="tc-btn-big-green" style="background-color:#e52d27;" target="_blank" rel="noopener noreferrer"> +<a href="https://www.youtube.com/c/JeremyRuston" class="tc-btn-big-green" style="background-color:#e52d27;" target="_blank" rel="noopener noreferrer"> {{$:/core/images/video}} ~TiddlyWiki sur ~YouTube </a> <a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="background-color:#5E9FCA;" target="_blank" rel="noopener noreferrer"> diff --git a/editions/fr-FR/tiddlers/HelpingTiddlyWiki.tid b/editions/fr-FR/tiddlers/HelpingTiddlyWiki.tid index 7482e05a4..968c65cb7 100644 --- a/editions/fr-FR/tiddlers/HelpingTiddlyWiki.tid +++ b/editions/fr-FR/tiddlers/HelpingTiddlyWiki.tid @@ -15,7 +15,7 @@ Les Projets OpenSource comme << tw >> prospèrent grâce aux réactions et à l' * Tweeter sur ~TiddlyWiki: [[I love TiddlyWiki because...|https://twitter.com/intent/tweet?text=I+love+TiddlyWiki+because...&source=tiddlywiki5]] * [img[https://img.shields.io/github/stars/jermolene/tiddlywiki5.svg?style=social&label=Star]] * [[Etoiler le référentiel TiddlyWiki5 sur GitHub|https://github.com/Jermolene/TiddlyWiki5]] -* [[Afficher la bannière TiddlyWiki|http://tiddlywiki.com/poster]] +* [[Afficher la bannière TiddlyWiki|https://tiddlywiki.com/poster]] [img width=232 [Tiddler Poster.png]] diff --git a/editions/fr-FR/tiddlers/Highlight_Plugin.tid b/editions/fr-FR/tiddlers/Highlight_Plugin.tid index 130f683c7..e64567e10 100644 --- a/editions/fr-FR/tiddlers/Highlight_Plugin.tid +++ b/editions/fr-FR/tiddlers/Highlight_Plugin.tid @@ -7,4 +7,4 @@ type: text/vnd.tiddlywiki Ce plugin propose la coloration syntaxique. -Voir http://tiddlywiki.com/plugins/tiddlywiki/highlight/ +Voir https://tiddlywiki.com/plugins/tiddlywiki/highlight/ diff --git a/editions/fr-FR/tiddlers/How to add a banner for GitHub contributions.tid b/editions/fr-FR/tiddlers/How to add a banner for GitHub contributions.tid index 16efce24a..fcc1f844a 100644 --- a/editions/fr-FR/tiddlers/How to add a banner for GitHub contributions.tid +++ b/editions/fr-FR/tiddlers/How to add a banner for GitHub contributions.tid @@ -5,7 +5,7 @@ tags: Learning title: How to add a banner for GitHub contributions type: text/vnd.tiddlywiki -Lorsque vous éditez un tiddler sur http://tiddlywiki.com, vous voyez un petit bandeau qui vous invite à éditer la source du tiddler sur ~GitHub. +Lorsque vous éditez un tiddler sur https://tiddlywiki.com, vous voyez un petit bandeau qui vous invite à éditer la source du tiddler sur ~GitHub. Si vous utilisez Node.js, vous pouvez répliquer cette fonction pour votre propre site basé sur TiddlyWiki de la manière suivante<<dp>> diff --git a/editions/fr-FR/tiddlers/Images_in_WikiText.tid b/editions/fr-FR/tiddlers/Images_in_WikiText.tid index 1c37d753d..23a119035 100644 --- a/editions/fr-FR/tiddlers/Images_in_WikiText.tid +++ b/editions/fr-FR/tiddlers/Images_in_WikiText.tid @@ -12,11 +12,11 @@ Les images peuvent être affichées avec WikiText avec la syntaxe suivante, selo ``` [img[Sainte Anastasie.png]] -ou [img[http://tiddlywiki.com/favicon.ico]] +ou [img[https://tiddlywiki.com/favicon.ico]] ``` [img[Sainte Anastasie.png]] -ou [img[http://tiddlywiki.com/favicon.ico]] +ou [img[https://tiddlywiki.com/favicon.ico]] Si la source de l'image correspond au titre d'un tiddler, alors le tiddler est affiché directement. Autrement elle est interprétée comme une URL et la balise HTML `<img>` est générée muni de l'attribut `src` contenant l'URL. diff --git a/editions/fr-FR/tiddlers/Improving TiddlyWiki Documentation.tid b/editions/fr-FR/tiddlers/Improving TiddlyWiki Documentation.tid index 0840d30cd..dbb5b7151 100644 --- a/editions/fr-FR/tiddlers/Improving TiddlyWiki Documentation.tid +++ b/editions/fr-FR/tiddlers/Improving TiddlyWiki Documentation.tid @@ -7,11 +7,11 @@ type: text/vnd.tiddlywiki (''NB''<<dp>> si vous souhaitez travailler sur la traduction française, reportez-vous plutôt aux [[infos traducteurs|Informations pour les traducteurs]].) -N'importe qui peut proposer des améliorations à la documentation ~TiddlyWiki présente sur http://tiddlywiki.com<<dp>> +N'importe qui peut proposer des améliorations à la documentation ~TiddlyWiki présente sur https://tiddlywiki.com<<dp>> # Lisez et suivez le [[Manuel de style pour la documentation TiddlyWiki|Documentation Style Guide]] # Si vous n'en n'avez pas déjà un, créez un compte sur https://github.com -# Sur http://tiddlywiki.com, cliquez sur le bouton "edit" du tiddler que vous souhaitez améliorer +# Sur https://tiddlywiki.com, cliquez sur le bouton "edit" du tiddler que vous souhaitez améliorer # Vous devriez voir un bandeau rose avec le texte suivant<<dp>> //Pouvez-vous nous aider à améliorer cette documentation ? Voyez comment éditer ce tiddler sur ~GitHub//. # Cliquez sur le lien externe ...''ce tiddler sur ~GitHub'' ## Une alerte va s'afficher comme quoi <<gf "you need to fork this repository to propose changes">> (<<gf "vous devez cloner ce répertoire avant de pouvoir proposer des modifications">>). Un //fork// est votre propre exemplaire du répertoire, qui intègrera les modifications que vous proposez @@ -22,12 +22,12 @@ N'importe qui peut proposer des améliorations à la documentation ~TiddlyWiki p # Cliquez sur le bouton vert intitulé ''Propose file change'' # Sur l'écran suivant, cliquez sur le bouton vert intitulé ''Create pull request'' -[[Jermolene|https://github.com/Jermolene]] ou l'un des autres développeurs principaux sera alors en mesure de fusionner votre //pull request// de façon à l'intégrer à la prochaine version de http://tiddlywiki.com. +[[Jermolene|https://github.com/Jermolene]] ou l'un des autres développeurs principaux sera alors en mesure de fusionner votre //pull request// de façon à l'intégrer à la prochaine version de https://tiddlywiki.com. Mario Pietsch a créé pour vous ces tutoriels vidéos<<dp>> -<iframe width="560" height="315" src="http://www.youtube.com/embed/L4zTkMYcri8" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/L4zTkMYcri8" frameborder="0" allowfullscreen></iframe> -<iframe width="560" height="315" src="http://www.youtube.com/embed/6ElUruH92tc" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/6ElUruH92tc" frameborder="0" allowfullscreen></iframe> -<iframe width="560" height="315" src="http://www.youtube.com/embed/axFCk9KsMFc" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/axFCk9KsMFc" frameborder="0" allowfullscreen></iframe> diff --git a/editions/fr-FR/tiddlers/Informations pour les traducteurs.tid b/editions/fr-FR/tiddlers/Informations pour les traducteurs.tid index cdb34cf8f..3277a2d45 100644 --- a/editions/fr-FR/tiddlers/Informations pour les traducteurs.tid +++ b/editions/fr-FR/tiddlers/Informations pour les traducteurs.tid @@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki Pour contribuer à cette traduction de la documentation //tiddlywiki.com//, commencez par repérer sur [[fr-edition.tiddlyspot.com|http://fr-edition.tiddlyspot.com]] quelques tiddlers non traduits, pas mis à jour, voire mal traduits. Évitez seulement ceux qui sont <a href="http://fr-edition.tiddlyspot.com#:[tag[en cours]]" target="_blank">tagués en cours</a> car comme leur tag l'indique, ils ont été réservés. Ensuite<<:>> * si vous travaillez en mode Node.js sur un //clone git// de l'édition `fr-FR`, vous pouvez traduire à partir de votre clone en respectant les quelques indications ci-dessous, puis proposer un pull request sur ~GitHub en vous aidant si besoin de la [[documentation|Improving TiddlyWiki Documentation]] -* sinon, traduisez directement, soit en ligne, soit sur une [[sauvegarde du site|http://tiddlywiki.com/prerelease/languages/fr-FR/#%24%3A%2Fcore%2Fui%2FButtons%2Fsave-wiki]] (c'est plus prudent). Puis<<:>> +* sinon, traduisez directement, soit en ligne, soit sur une [[sauvegarde du site|https://tiddlywiki.com/prerelease/languages/fr-FR/#%24%3A%2Fcore%2Fui%2FButtons%2Fsave-wiki]] (c'est plus prudent). Puis<<:>> ** exportez votre travail [[dans un fichier JSON|Exporter un sous-ensemble de tiddlers]] ** envoyez ce fichier à une personne susceptible d'effectuer un //pull request// sur ~GitHub, ou directement sur la liste de diffusion. Nous ne disposons pas encore de mécanismes très évolués pour gérer le travail de traduction en parallèle, donc ne gardez pas vos traductions sous le coude trop longtemps<<:>> il vaut mieux envoyer un tiddler à la fois que s'apercevoir trop tard que quelqu'un d'autre l'a traduit en parallèle. diff --git a/editions/fr-FR/tiddlers/Introducing TiddlyDesktop Video.tid b/editions/fr-FR/tiddlers/Introducing TiddlyDesktop Video.tid index 5db43ee55..a5acf2697 100644 --- a/editions/fr-FR/tiddlers/Introducing TiddlyDesktop Video.tid +++ b/editions/fr-FR/tiddlers/Introducing TiddlyDesktop Video.tid @@ -7,4 +7,4 @@ type: text/vnd.tiddlywiki Cette courte introduction montre comment installer et utiliser TiddlyDesktop<<dp>> -<iframe width="560" height="315" src="http://www.youtube.com/embed/i3Bggkm7paA" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/i3Bggkm7paA" frameborder="0" allowfullscreen></iframe> diff --git a/editions/fr-FR/tiddlers/Introduction Video.tid b/editions/fr-FR/tiddlers/Introduction Video.tid index 455819e9b..37b870aa3 100644 --- a/editions/fr-FR/tiddlers/Introduction Video.tid +++ b/editions/fr-FR/tiddlers/Introduction Video.tid @@ -7,8 +7,8 @@ type: text/vnd.tiddlywiki Cette rapide présentation explique les principes de base de TiddlyWiki. -<iframe width="560" height="315" src="http://www.youtube.com/embed/KtCUr83XgyE" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/KtCUr83XgyE" frameborder="0" allowfullscreen></iframe> On peut trouver le ~TiddlyWiki utilisé pour produire cette vidéo ici<<dp>> -http://tiddlywiki.com/editions/introduction/ +https://tiddlywiki.com/editions/introduction/ diff --git a/editions/fr-FR/tiddlers/JeremyRuston.tid b/editions/fr-FR/tiddlers/JeremyRuston.tid index 300d36987..ed35dadd4 100644 --- a/editions/fr-FR/tiddlers/JeremyRuston.tid +++ b/editions/fr-FR/tiddlers/JeremyRuston.tid @@ -17,5 +17,5 @@ Je suis l'inventeur original de TiddlyWiki. Vous pouvez me retrouver sur ces ser Encore plus d'infos<<:>> * Une [[interview de moi sur The Inquirer|http://www.theinquirer.net/inquirer/feature/2105529/bt-software-engineer-tells-telco-source]] par Wendy Grossman -* Une [[interview hilarante avec moi|http://www.youtube.com/watch?v=auyIhw8MTmQ]] de la télévision britanique en 1983 +* Une [[interview hilarante avec moi|https://www.youtube.com/watch?v=auyIhw8MTmQ]] de la télévision britanique en 1983 * Ici, un vidéo de présentation que j'ai réalisée en 2007 appelée [["How to Start an Open Source Project"|http://vimeo.com/856110]]. diff --git a/editions/fr-FR/tiddlers/KaTeX_Plugin.tid b/editions/fr-FR/tiddlers/KaTeX_Plugin.tid index f021cb388..c4abd1427 100644 --- a/editions/fr-FR/tiddlers/KaTeX_Plugin.tid +++ b/editions/fr-FR/tiddlers/KaTeX_Plugin.tid @@ -7,4 +7,4 @@ type: text/vnd.tiddlywiki Ce plugin ajoute la possibilité d'afficher les notations mathématiques écrites en in ~LaTeX. -Voir http://tiddlywiki.com/plugins/tiddlywiki/katex/ +Voir https://tiddlywiki.com/plugins/tiddlywiki/katex/ diff --git a/editions/fr-FR/tiddlers/Launch of TiddlyWiki.tid b/editions/fr-FR/tiddlers/Launch of TiddlyWiki.tid index b457fc86c..96494068b 100644 --- a/editions/fr-FR/tiddlers/Launch of TiddlyWiki.tid +++ b/editions/fr-FR/tiddlers/Launch of TiddlyWiki.tid @@ -4,7 +4,7 @@ modified: 20141217193442167 title: Launch of TiddlyWiki type: text/vnd.tiddlywiki -En septembre 2004, j'ai donc publié une [[version préliminaire de TiddlyWiki|http://classic.tiddlywiki.com/firstversion.html]]. Il s'agissait de la plus petite application possible démontrant le concept : un simple fichier HTML de 48KB qui s'auto-engendrait. +En septembre 2004, j'ai donc publié une [[version préliminaire de TiddlyWiki|https://classic.tiddlywiki.com/firstversion.html]]. Il s'agissait de la plus petite application possible démontrant le concept : un simple fichier HTML de 48KB qui s'auto-engendrait. L'inconvénient d'avoir écrit de cette manière la première version de <<tw>>, c'est que ça la rendait complètement impraticable pour l'édition — quand vous cliquiez sur <<gf "enregistrer les modifications">>, elle faisait apparaître une fenêtre montrant les données qui auraient été enregistrées s'il avait été possible d'écrire sur le système de fichiers depuis une page HTML. diff --git a/editions/fr-FR/tiddlers/Linking in WikiText.tid b/editions/fr-FR/tiddlers/Linking in WikiText.tid index 889ccbc9a..3e826bd58 100644 --- a/editions/fr-FR/tiddlers/Linking in WikiText.tid +++ b/editions/fr-FR/tiddlers/Linking in WikiText.tid @@ -11,7 +11,7 @@ L'une des aptitudes-clé de WikiText est sa capacité à créer des liens vers d * Lien vers un tiddler via le titre : `[[Titre du Tiddler]]` * Lien vers un tiddler avec libellé : `[[Texte à afficher|Titre du Tiddler]]` * Pour les tiddlers conformes aux règles CamelCase, saisir leur titre génère automatiquement la création du lien -* Pour un lien vers un site externe, saisir l'URL complète du site : `http://tiddlywiki.com/` ou `[[TW5|http://tiddlywiki.com/]]` +* Pour un lien vers un site externe, saisir l'URL complète du site : `https://tiddlywiki.com/` ou `[[TW5|https://tiddlywiki.com/]]` Vous pouvez annuler la prise en compte du lien en le préfixant du signe `~`. diff --git a/editions/fr-FR/tiddlers/Macro_Definitions_in_WikiText.tid b/editions/fr-FR/tiddlers/Macro_Definitions_in_WikiText.tid index 9f2368f3a..5d71d165d 100644 --- a/editions/fr-FR/tiddlers/Macro_Definitions_in_WikiText.tid +++ b/editions/fr-FR/tiddlers/Macro_Definitions_in_WikiText.tid @@ -41,6 +41,6 @@ Les macros peuvent être utilisées dans le tiddler où elles sont définies, ai Pour étendre l'utilisation d'une macro à tous les tiddlers, définissez-la dans un tiddler étiqueté <<.tag $:/tags/Macro>>. -Il est aussi possible de développer une macro dans un [[module JavaScript|http://tiddlywiki.com/dev/index.html#JavaScript%20Macros]]. Les macros ~JavaScript sont disponibles dans tous les tiddlers, et offrent un maximum de flexibilité. +Il est aussi possible de développer une macro dans un [[module JavaScript|https://tiddlywiki.com/dev/index.html#JavaScript%20Macros]]. Les macros ~JavaScript sont disponibles dans tous les tiddlers, et offrent un maximum de flexibilité. On peut importer dans un tiddler les définitions de macros d'une [[sélection|Title Selection]] d'autres tiddlers en utilisant le widget <<.wlink ImportVariablesWidget>>. diff --git a/editions/fr-FR/tiddlers/Markdown Plugin.tid b/editions/fr-FR/tiddlers/Markdown Plugin.tid index c15e95c72..1eb2c6f50 100644 --- a/editions/fr-FR/tiddlers/Markdown Plugin.tid +++ b/editions/fr-FR/tiddlers/Markdown Plugin.tid @@ -8,4 +8,4 @@ type: text/vnd.tiddlywiki Le plugin Markdown permet d'utiliser des tiddlers écrits avec les conventions de balisage [[Markdown]] standard. -Voir http://tiddlywiki.com/plugins/tiddlywiki/markdown/ +Voir https://tiddlywiki.com/plugins/tiddlywiki/markdown/ diff --git a/editions/fr-FR/tiddlers/PermaLinks.tid b/editions/fr-FR/tiddlers/PermaLinks.tid index 0ef0a8c1a..67189e525 100644 --- a/editions/fr-FR/tiddlers/PermaLinks.tid +++ b/editions/fr-FR/tiddlers/PermaLinks.tid @@ -12,11 +12,11 @@ Les permaliens offrent la possibilités de faire des liens directs vers des tidd La forme la plus simple d'un permalien vers un tiddler cible unique est son nom précédé de "#" accolé au lien URL de base <<:>> -http://tiddlywiki.com/#HelloThere +https://tiddlywiki.com/#HelloThere Le titre du tiddler peut contenir des espaces si nécessaire<<:>> -[[http://tiddlywiki.com/#Using TiddlyWiki on Node.js]] +[[https://tiddlywiki.com/#Using TiddlyWiki on Node.js]] Remarquez que les doubles crochets ne sont pas requis autour du titre du tiddler cible<<;>> cependant, s'ils sont présents ils seront supprimés automatiquement. @@ -26,17 +26,17 @@ Remarquez que les doubles crochets ne sont pas requis autour du titre du tiddler Le permalien peut aussi spécifier le déroulé de la liste de tiddlers qui seront ouverts avec le [[Tiddler Filtre|Filters]] cible<<:>> -[[http://tiddlywiki.com/#TiddlerFields:Tiddlers TiddlerTags TiddlerFields ContentType]] +[[https://tiddlywiki.com/#TiddlerFields:Tiddlers TiddlerTags TiddlerFields ContentType]] Si le tiddler cible est absent du déroulé de la liste, il est alors automatiquement inséré au début. Ce qui veut dire que les exemples suivants ciblent tous les deux le tiddler `Tiddlers` avec le déroulé de la suite `Tiddlers`, `Tags`, `TiddlerFields`: -[[http://tiddlywiki.com/#Tiddlers:Tags TiddlerFields]] +[[https://tiddlywiki.com/#Tiddlers:Tags TiddlerFields]] -[[http://tiddlywiki.com/#Tiddlers:Tiddlers Tags TiddlerFields]] +[[https://tiddlywiki.com/#Tiddlers:Tiddlers Tags TiddlerFields]] Il est aussi possible de spécifier, pour les besoins de la navigation, un déroulé filtre sans spécifier de tiddler cible<<:>> -<a href="http://tiddlywiki.com/#:[tags[task]]">~http://tiddlywiki.com/#:[tags[task]]</a> +<a href="https://tiddlywiki.com/#:[tags[task]]">~https://tiddlywiki.com/#:[tags[task]]</a> ! Concernant le codage URL diff --git a/editions/fr-FR/tiddlers/Plugins.tid b/editions/fr-FR/tiddlers/Plugins.tid index c734b0b43..cd1dac765 100644 --- a/editions/fr-FR/tiddlers/Plugins.tid +++ b/editions/fr-FR/tiddlers/Plugins.tid @@ -39,7 +39,7 @@ Se reporter au [[Mécanisme du Plugin|PluginMechanism]] pour plus de détail sur # Faites une sauvegarde du fichier HTML TiddlyWiki ([[voir à ce propos|The First Rule of Using TiddlyWiki]]) # Ouvrez votre TiddlyWiki dans un navigateur -# Cherchez le lien vers le plugin, de type [[$:/plugins/tiddlywiki/exemple]]. Vous trouverez habituellement ce lien sur la page d'accueil du plugin (voir par exemple, http://tiddlywiki.com/plugins/tiddlywiki/katex/) +# Cherchez le lien vers le plugin, de type [[$:/plugins/tiddlywiki/exemple]]. Vous trouverez habituellement ce lien sur la page d'accueil du plugin (voir par exemple, https://tiddlywiki.com/plugins/tiddlywiki/katex/) # Glissez le lien de type [[$:/plugins/tiddlywiki/exemple]] vers la fenêtre du navigateur affichant votre TiddlyWiki # Sauvegardez votre TiddlyWiki # ''Rafraichir'' la page afin que les modifications soient prises en compte diff --git a/editions/fr-FR/tiddlers/ReadMe.tid b/editions/fr-FR/tiddlers/ReadMe.tid index 3ef9880cb..b02b564cb 100644 --- a/editions/fr-FR/tiddlers/ReadMe.tid +++ b/editions/fr-FR/tiddlers/ReadMe.tid @@ -3,7 +3,7 @@ modified: 20141012191051894 title: ReadMe type: text/vnd.tiddlywiki -\define tv-wikilink-template() http://tiddlywiki.com/static/$uri_doubleencoded$.html +\define tv-wikilink-template() https://tiddlywiki.com/static/$uri_doubleencoded$.html <$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> @@ -11,7 +11,7 @@ Bienvenue sur <<tw>>, un carnet de notes personnel web et non-linéaire que tout <<tw>> est un wiki interactif en JavaScript. Il peut être utilisé dans le navigateur sous forme de fichier HTML autonome ou comme une puissante application Node.js. Il est extrêmement personnalisable : l'interface utilisateur dans son intégralité est elle-même implémentée en WikiText recomposable à volonté. -Plus d'informations et démonstrations sur http://tiddlywiki.com +Plus d'informations et démonstrations sur https://tiddlywiki.com ! Installation de <<tw>> sur Node.js diff --git a/editions/fr-FR/tiddlers/ReadMeBinFolder.tid b/editions/fr-FR/tiddlers/ReadMeBinFolder.tid index c7aaae0e0..0d85a99b1 100644 --- a/editions/fr-FR/tiddlers/ReadMeBinFolder.tid +++ b/editions/fr-FR/tiddlers/ReadMeBinFolder.tid @@ -3,5 +3,5 @@ modified: 20140908150853120 title: ReadMeBinFolder type: text/vnd.tiddlywiki -\define tv-wikilink-template() http://tiddlywiki.com/static/$uri_doubleencoded$.html +\define tv-wikilink-template() https://tiddlywiki.com/static/$uri_doubleencoded$.html {{Scripts for TiddlyWiki on Node.js}} diff --git a/editions/fr-FR/tiddlers/SafeMode.tid b/editions/fr-FR/tiddlers/SafeMode.tid index 39a29a72b..03aff0602 100644 --- a/editions/fr-FR/tiddlers/SafeMode.tid +++ b/editions/fr-FR/tiddlers/SafeMode.tid @@ -13,7 +13,7 @@ Le Mode Sans Échec permet de désactiver la plupart des personnalisations de << Le Mode Sans Échec est activé en faisant précéder le lien URL de <<tw>> dans le navigateur par la chaine `#:safe`. Par exemple : -http://tiddlywiki.com/#:safe +https://tiddlywiki.com/#:safe ! Comment fonctionne le Mode Sans Échec diff --git a/editions/fr-FR/tiddlers/Saving on Safari.tid b/editions/fr-FR/tiddlers/Saving on Safari.tid index 76ee06bc7..8d7846631 100644 --- a/editions/fr-FR/tiddlers/Saving on Safari.tid +++ b/editions/fr-FR/tiddlers/Saving on Safari.tid @@ -9,7 +9,7 @@ Cette manière d'enregistrer les modifications est assez pénible, car elle requ # [[Téléchargez|Download]] un TiddlyWiki en cliquant sur ce bouton<<dp>> #> {{$:/editions/fr-FR/snippets/download-empty-button}} -#> Si le bouton ne fonctionne pas, enregistrez ce lien<<dp>> http://tiddlywiki.com/languages/fr-FR/empty.html +#> Si le bouton ne fonctionne pas, enregistrez ce lien<<dp>> https://tiddlywiki.com/languages/fr-FR/empty.html #> Votre navigateur vous demandera peut-être d'accepter explicitement l'enregistrement avant qu'il démarre # Localisez le fichier que vous venez de télécharger #* Vous pouvez le renommer, mais assurez-vous de conserver l'extension `.html` ou `.htm` diff --git a/editions/fr-FR/tiddlers/Saving on iPad_iPhone.tid b/editions/fr-FR/tiddlers/Saving on iPad_iPhone.tid index fcbaec49a..b95660a84 100644 --- a/editions/fr-FR/tiddlers/Saving on iPad_iPhone.tid +++ b/editions/fr-FR/tiddlers/Saving on iPad_iPhone.tid @@ -12,7 +12,7 @@ Instructions d'utilisation<<dp>> # Ouvrez TWEdit # Tapez sur le titre au centre de la barre d'outils #* Une boîte texte doit apparaître dans laquelle vous pouvez saisir une URL -# Entrez l'URL `http://tiddlywiki.com/languages/fr-FR/empty.html` +# Entrez l'URL `https://tiddlywiki.com/languages/fr-FR/empty.html` # Une fois le TiddlyWiki5 vide chargé, tapez sur l'icône ''save'' (il s'agit de la deuxième icône en partant de la droite sur la barre d'outils supérieure) #* Une boîte d'alerte devrait apparaître pour vous permettre d'entrer un nom de fichier local # Entrez le nom de fichier que vous souhaitez utiliser pour le document (en le suffixant par `.html`) diff --git a/editions/fr-FR/tiddlers/Saving with TiddlyFox on Android.tid b/editions/fr-FR/tiddlers/Saving with TiddlyFox on Android.tid index 0ad97b0aa..cf0ceecd3 100644 --- a/editions/fr-FR/tiddlers/Saving with TiddlyFox on Android.tid +++ b/editions/fr-FR/tiddlers/Saving with TiddlyFox on Android.tid @@ -14,7 +14,7 @@ type: text/vnd.tiddlywiki # Installez aussi cette extension qui vous permettra de sauvegarder le fichier <<tw>> localement<<dp>> #* https://addons.mozilla.org/fr/android/addon/save-link-menus/ # [[Téléchargez|Download]] un fichier <<tw>> vide en enregistrant ce lien<<dp>> -#* http://tiddlywiki.com/languages/fr-FR/empty.html +#* https://tiddlywiki.com/languages/fr-FR/empty.html #> (pour enregistrer le lien, assurez-vous d'avoir installé l'extension "save-link-menus", appuyez quelques secondes sur le lien, puis choisissez "Save link") # Une fois le fichier téléchargé, cliquez dessus depuis la zone de notification ou l'application de gestion des téléchargements # Choisissez d'ouvrir le fichier avec Firefox (et non l'application par défaut proposée par Android) diff --git a/editions/fr-FR/tiddlers/Saving with TiddlyIE.tid b/editions/fr-FR/tiddlers/Saving with TiddlyIE.tid index 85267f88d..a970d7781 100644 --- a/editions/fr-FR/tiddlers/Saving with TiddlyIE.tid +++ b/editions/fr-FR/tiddlers/Saving with TiddlyIE.tid @@ -10,7 +10,7 @@ type: text/vnd.tiddlywiki # Redémarrez Internet Explorer. IE vous demandera si vous voulez activer l'extension TiddlyIE. #> Il se peut aussi que vous ayez à activer le //Microsoft Scripting Runtime// # [[Téléchargez|Download]] un <<tw>> vide en enregistrant ce lien<<dp>> -#> http://tiddlywiki.com/languages/fr-FR/empty.html +#> https://tiddlywiki.com/languages/fr-FR/empty.html # Localisez le fichier que vous venez de télécharger #* Vous pouvez le renommer, mais assurez-vous de conserver l'extension `.html` ou `.htm` # Ouvrez le fichier dans Internet Explorer diff --git a/editions/fr-FR/tiddlers/Saving with the HTML5 fallback saver.tid b/editions/fr-FR/tiddlers/Saving with the HTML5 fallback saver.tid index 8c69c7b3f..5cfe8ac6a 100644 --- a/editions/fr-FR/tiddlers/Saving with the HTML5 fallback saver.tid +++ b/editions/fr-FR/tiddlers/Saving with the HTML5 fallback saver.tid @@ -9,7 +9,7 @@ Cette manière d'enregistrer les modifications est assez pénible, car elle requ # [[Téléchargez|Download]] un TiddlyWiki en cliquant sur ce bouton<<dp>> #> {{$:/editions/fr-FR/snippets/download-empty-button}} -#> Si le bouton ne fonctionne pas, enregistrez ce lien<<dp>> http://tiddlywiki.com/languages/fr-FR/empty.html +#> Si le bouton ne fonctionne pas, enregistrez ce lien<<dp>> https://tiddlywiki.com/languages/fr-FR/empty.html #> Votre navigateur vous demandera peut-être d'accepter explicitement l'enregistrement avant qu'il démarre # Localisez le fichier que vous venez de télécharger #* Vous pouvez le renommer, mais assurez-vous de conserver l'extension `.html` ou `.htm` diff --git a/editions/fr-FR/tiddlers/Some of the things you can do with TiddlyWiki.tid b/editions/fr-FR/tiddlers/Some of the things you can do with TiddlyWiki.tid index 35c3b3a3d..c768a88cc 100644 --- a/editions/fr-FR/tiddlers/Some of the things you can do with TiddlyWiki.tid +++ b/editions/fr-FR/tiddlers/Some of the things you can do with TiddlyWiki.tid @@ -18,4 +18,4 @@ type: text/vnd.tiddlywiki * Créer un assistant modal (on parle aussi de //lightbox//) — voir [[Exemple d'assistant|SampleWizard]]<<;>> * Créer une présentation de type « transparents »<<;>> * Créer une base de connaissance complète en local ou en ligne, à partir d'un fichier <<tw>> central pointant vers d'autres fichiers <<tw>> (un exemple est visible à l'adresse http://recursos.giffmex.org)<<;>> -* Créer une infographie en utilisant des tiddlers comme données (voir les infographies à l'adresse http://tiddlywiki.com/plugins/tiddlywiki/d3/). +* Créer une infographie en utilisant des tiddlers comme données (voir les infographies à l'adresse https://tiddlywiki.com/plugins/tiddlywiki/d3/). diff --git a/editions/fr-FR/tiddlers/TW2Parser_Plugin.tid b/editions/fr-FR/tiddlers/TW2Parser_Plugin.tid index 6d5eefdfb..63dba3a00 100644 --- a/editions/fr-FR/tiddlers/TW2Parser_Plugin.tid +++ b/editions/fr-FR/tiddlers/TW2Parser_Plugin.tid @@ -7,4 +7,4 @@ type: text/vnd.tiddlywiki Ce plugin, pour l'instant expérimental, permet d'afficher le WIkiText écrit pour la version classique originelle de TiddlyWiki. -Voir http://tiddlywiki.com/plugins/tiddlywiki/tw2parser/ +Voir https://tiddlywiki.com/plugins/tiddlywiki/tw2parser/ diff --git a/editions/fr-FR/tiddlers/TiddlerLinks.tid b/editions/fr-FR/tiddlers/TiddlerLinks.tid index a9ae6b6ba..6d55696d1 100644 --- a/editions/fr-FR/tiddlers/TiddlerLinks.tid +++ b/editions/fr-FR/tiddlers/TiddlerLinks.tid @@ -26,4 +26,4 @@ TiddlyWiki5 modifie l'apparence des liens des tiddlers pour donner plus d'inform |Vers tiddler shadow non remplacé |[[Ainsi|$:/core/copyright.txt]] | |Vers tiddler shadow remplacé par un tiddler ordinaire|[[Ainsi|$:/SiteTitle]] | -Les liens externes sont affichés comme ceci<<:>> http://tiddlywiki.com/ ou [[comme ça|http://tiddlywiki.com/]]. \ No newline at end of file +Les liens externes sont affichés comme ceci<<:>> https://tiddlywiki.com/ ou [[comme ça|https://tiddlywiki.com/]]. \ No newline at end of file diff --git a/editions/fr-FR/tiddlers/TiddlyWiki Hangouts.tid b/editions/fr-FR/tiddlers/TiddlyWiki Hangouts.tid index c9e16533f..1fc5efede 100644 --- a/editions/fr-FR/tiddlers/TiddlyWiki Hangouts.tid +++ b/editions/fr-FR/tiddlers/TiddlyWiki Hangouts.tid @@ -9,4 +9,4 @@ La communauté TiddlyWiki tient régulièrement salon sur Google Hangouts, en g Les échanges précédents sont archivés sur cette playlist YouTube<<dp>> -<iframe width="560" height="315" src="http://www.youtube.com/embed/videoseries?list=PLVT_2PPd-1p34gGCQ5qpwC8QdykxVAI3u" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/videoseries?list=PLVT_2PPd-1p34gGCQ5qpwC8QdykxVAI3u" frameborder="0" allowfullscreen></iframe> diff --git a/editions/fr-FR/tiddlers/TiddlyWiki on Firefox for Android Video.tid b/editions/fr-FR/tiddlers/TiddlyWiki on Firefox for Android Video.tid index 855530559..03574d271 100644 --- a/editions/fr-FR/tiddlers/TiddlyWiki on Firefox for Android Video.tid +++ b/editions/fr-FR/tiddlers/TiddlyWiki on Firefox for Android Video.tid @@ -7,4 +7,4 @@ type: text/vnd.tiddlywiki Ce court screencast montre comment configurer Firefox pour Android afin de pouvoir sauvegarder les modification de TiddlyWiki<<dp>> -<iframe width="560" height="315" src="http://www.youtube.com/embed/iikkv9orGGI" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/iikkv9orGGI" frameborder="0" allowfullscreen></iframe> diff --git a/editions/fr-FR/tiddlers/Upgrading.tid b/editions/fr-FR/tiddlers/Upgrading.tid index c160d3978..17bb4f522 100644 --- a/editions/fr-FR/tiddlers/Upgrading.tid +++ b/editions/fr-FR/tiddlers/Upgrading.tid @@ -22,7 +22,7 @@ Quand vous mettez à niveau, n'oubliez pas [[la première règle d'utilisation d Cette procédure fonctionnera sur la plupart des navigateurs de bureau. Notez que vos données personnelles ne quittent pas votre navigateur pendant la procédure. # Localisez votre fichier <<tw>> sur le système de fichiers (à l'aide de Windows Explorer, du Finder sur Mac OS X, ou de votre gestionnaire de fichiers sur Linux) -# Visitez la page http://tiddlywiki.com/upgrade.html dans votre navigateur +# Visitez la page https://tiddlywiki.com/upgrade.html dans votre navigateur # Faites glisser votre ancien fichier <<tw>> HTML sur la fenêtre du navigateur #* Si le fichier est crypté, un mot de passe vous sera demandé # Passez en revue la liste des tiddlers qui seront mis à niveau @@ -33,7 +33,7 @@ Cela aura pour résultat de télécharger sur votre ordinateur un fichier nommé ! Mise à niveau hors ligne -Vous pouvez également télécharger le fichier http://tiddlywiki.com/upgrade.html localement et effectuer la même procédure de glisser-déposer pour mettre vos fichiers à niveau. +Vous pouvez également télécharger le fichier https://tiddlywiki.com/upgrade.html localement et effectuer la même procédure de glisser-déposer pour mettre vos fichiers à niveau. ! Problèmes avec les mises à niveau diff --git a/editions/fr-FR/tiddlers/What happened to the original TiddlyWiki_.tid b/editions/fr-FR/tiddlers/What happened to the original TiddlyWiki_.tid index ec6e81429..fd8e7c411 100644 --- a/editions/fr-FR/tiddlers/What happened to the original TiddlyWiki_.tid +++ b/editions/fr-FR/tiddlers/What happened to the original TiddlyWiki_.tid @@ -5,12 +5,12 @@ tags: HelloThere title: What happened to the original TiddlyWiki? type: text/vnd.tiddlywiki -<a class="tc-float-right tc-bordered-image" href="http://classic.tiddlywiki.com/" target="_blank" rel="noopener noreferrer">[img width="200" [TiddlyWiki Classic.png]]</a> +<a class="tc-float-right tc-bordered-image" href="https://classic.tiddlywiki.com/" target="_blank" rel="noopener noreferrer">[img width="200" [TiddlyWiki Classic.png]]</a> La version [[originale|TiddlyWikiClassic]] de TiddlyWiki est toujours disponible à l'adresse : -http://classic.tiddlywiki.com. +https://classic.tiddlywiki.com. Il faut savoir que la [[version courante|TiddlyWiki5]] de TiddlyWiki n'est pas entièrement rétro-compatible avec TiddlyWikiClassic. Le contenu peut être importé mais devra être ajusté pour s'adapter au nouveau format WikiText. Un plugin ''tw2parser'' permettant d'afficher fidèlement la plupart des contenus créés avec TiddlyWikiClassic est en cours de développement<<dp>> -http://tiddlywiki.com/plugins/tiddlywiki/tw2parser/ +https://tiddlywiki.com/plugins/tiddlywiki/tw2parser/ diff --git a/editions/fr-FR/tiddlers/_A Thesis Notebook_ by Alberto Molina.tid b/editions/fr-FR/tiddlers/_A Thesis Notebook_ by Alberto Molina.tid index 9d9c127ff..11865d233 100644 --- a/editions/fr-FR/tiddlers/_A Thesis Notebook_ by Alberto Molina.tid +++ b/editions/fr-FR/tiddlers/_A Thesis Notebook_ by Alberto Molina.tid @@ -13,5 +13,5 @@ Voici un exemple de carnet de thèse réalisé avec TiddlyWiki 5.0.8-beta. TiddlyWiki est un très beau logiciel de Jeremy Ruston. Il vous permet, entre autres choses, de prendre des notes, de gérer vos idées, de garder des informations, et d'afficher un tas de choses de la façon que vous choisirez. C'est un outil incroyablement malléable que vous pouvez adapter à la plupart de vos besoins. -Ce TiddlyWiki a été personnalisé pour être utilisé comme un carnet de notes sur la philosophie, récapitulant auteurs, ouvrages, articles, concepts, théories, et notes personnelles. Je l'utilise avec Zotero, un logiciel spécialisé de bibliographie. Les deux sont des projets libres et ouverts. TiddlyWiki peut-être téléchargé sur http://tiddlywiki.com. +Ce TiddlyWiki a été personnalisé pour être utilisé comme un carnet de notes sur la philosophie, récapitulant auteurs, ouvrages, articles, concepts, théories, et notes personnelles. Je l'utilise avec Zotero, un logiciel spécialisé de bibliographie. Les deux sont des projets libres et ouverts. TiddlyWiki peut-être téléchargé sur https://tiddlywiki.com. <<< diff --git a/editions/full/tiddlywiki.info b/editions/full/tiddlywiki.info index 26138e18b..e683807fa 100644 --- a/editions/full/tiddlywiki.info +++ b/editions/full/tiddlywiki.info @@ -1,23 +1,29 @@ { "description": "Full edition, containing all languages, themes and plugins", "plugins": [ + "tiddlywiki/bibtex", + "tiddlywiki/blog", "tiddlywiki/browser-sniff", "tiddlywiki/cecily", "tiddlywiki/classictools", "tiddlywiki/codemirror", "tiddlywiki/d3", "tiddlywiki/github-fork-ribbon", - "tiddlywiki/googleanalytics", "tiddlywiki/help", "tiddlywiki/highlight", + "tiddlywiki/internals", + "tiddlywiki/jszip", "tiddlywiki/katex", "tiddlywiki/markdown", "tiddlywiki/nodewebkitsaver", + "tiddlywiki/powered-by-tiddlywiki", + "tiddlywiki/qrcode", "tiddlywiki/railroad", "tiddlywiki/stacked-view", "tiddlywiki/text-slicer", - "tiddlywiki/xmldom", - "tiddlywiki/powered-by-tiddlywiki" + "tiddlywiki/xlsx-utils", + "tiddlywiki/sax", + "tiddlywiki/xmldom" ], "languages": [ "ca-ES", @@ -29,7 +35,9 @@ "en-GB", "en-US", "es-ES", + "fa-IR", "fr-FR", + "he-IL", "hi-IN", "ia-IA", "it-IT", @@ -38,8 +46,10 @@ "nl-NL", "pa-IN", "pt-PT", + "pt-BR", "ru-RU", "sk-SK", + "sl-SI", "sv-SE", "zh-Hans", "zh-Hant" @@ -47,6 +57,8 @@ "themes": [ "tiddlywiki/centralised", "tiddlywiki/tight", + "tiddlywiki/heavier", + "tiddlywiki/tight-heavier", "tiddlywiki/readonly", "tiddlywiki/seamless", "tiddlywiki/snowwhite", diff --git a/editions/introduction/tiddlers/slides/Get Started.tid b/editions/introduction/tiddlers/slides/Get Started.tid index 79cc8d7b7..e955696ab 100644 --- a/editions/introduction/tiddlers/slides/Get Started.tid +++ b/editions/introduction/tiddlers/slides/Get Started.tid @@ -4,4 +4,4 @@ title: Get Started Learn more about TiddlyWiki: -http://tiddlywiki.com/#GettingStarted +https://tiddlywiki.com/#GettingStarted diff --git a/editions/introduction/tiddlywiki.info b/editions/introduction/tiddlywiki.info index e2b99c8c3..10637332c 100644 --- a/editions/introduction/tiddlywiki.info +++ b/editions/introduction/tiddlywiki.info @@ -25,6 +25,7 @@ "en-GB", "en-US", "es-ES", + "fa-IR", "fr-FR", "hi-IN", "ia-IA", diff --git a/editions/ko-KR-server/tiddlers/system/GoogleAnalyticsAccount.tid b/editions/ko-KR-server/tiddlers/system/GoogleAnalyticsAccount.tid deleted file mode 100644 index 29cbc27e0..000000000 --- a/editions/ko-KR-server/tiddlers/system/GoogleAnalyticsAccount.tid +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/GoogleAnalyticsAccount - diff --git a/editions/ko-KR-server/tiddlers/system/GoogleAnalyticsDomain.tid b/editions/ko-KR-server/tiddlers/system/GoogleAnalyticsDomain.tid deleted file mode 100644 index 0c6a7e02d..000000000 --- a/editions/ko-KR-server/tiddlers/system/GoogleAnalyticsDomain.tid +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/GoogleAnalyticsDomain - diff --git a/editions/ko-KR/tiddlers/system/Sources.tid b/editions/ko-KR/tiddlers/system/Sources.tid index 4ec0595d0..038151b0b 100644 --- a/editions/ko-KR/tiddlers/system/Sources.tid +++ b/editions/ko-KR/tiddlers/system/Sources.tid @@ -3,7 +3,7 @@ tags: $:/tags/TiddlerInfo caption: 자료 \define makeStaticLink() -http://tiddlywiki.com/languages/ko-KR/static/<$view tiddler=<<currentTiddler>> field="title" format="doubleurlencoded"/>.html +https://tiddlywiki.com/languages/ko-KR/static/<$view tiddler=<<currentTiddler>> field="title" format="doubleurlencoded"/>.html \end \define outerMakeStaticLink() <$macrocall $name="makeStaticLink" $output="text/plain"/> diff --git a/editions/ko-KR/tiddlers/system/StaticBanner.tid b/editions/ko-KR/tiddlers/system/StaticBanner.tid index ae4961e02..045056f3b 100644 --- a/editions/ko-KR/tiddlers/system/StaticBanner.tid +++ b/editions/ko-KR/tiddlers/system/StaticBanner.tid @@ -1,3 +1,3 @@ title: $:/StaticBanner -<div class="tc-static-alert"><div class="tc-static-alert-inner">이 문서는 [[http://tiddlywiki.com/languages/ko-KR/]]에서 티들리위키의 정적 HTML 표현의 일부입니다</div></div> +<div class="tc-static-alert"><div class="tc-static-alert-inner">이 문서는 [[https://tiddlywiki.com/languages/ko-KR/]]에서 티들리위키의 정적 HTML 표현의 일부입니다</div></div> diff --git a/editions/ko-KR/tiddlers/system/static.content.tid b/editions/ko-KR/tiddlers/system/static.content.tid index bcc9862a8..31de0c79b 100644 --- a/editions/ko-KR/tiddlers/system/static.content.tid +++ b/editions/ko-KR/tiddlers/system/static.content.tid @@ -2,15 +2,15 @@ title: $:/core/templates/static.content type: text/vnd.tiddlywiki hack-to-give-us-something-to-compare-against: yes -\define tv-wikilink-template() http://tiddlywiki.com/languages/ko-KR/static/$uri_doubleencoded$.html +\define tv-wikilink-template() https://tiddlywiki.com/languages/ko-KR/static/$uri_doubleencoded$.html <!-- For Google, and people without JavaScript--> <$reveal state="!!hack-to-give-us-something-to-compare-against" type="nomatch" text=<<savingEmpty>>> 이 브라우저는 자바스크립트를 실행하지 않은 것으로 보입니다. 같은 내용을 찾아보려면 정적 HTML 버전 중 하나를 사용할 수 있습니다: -* http://tiddlywiki.com/languages/ko-KR/static.html - 구분된 문서의 개별 티들러 찾아보기 -* http://tiddlywiki.com/languages/ko-KR/alltiddlers.html#HelloThere - 모든 티들러를 포함하는 하나의 파일 +* https://tiddlywiki.com/languages/ko-KR/static.html - 구분된 문서의 개별 티들러 찾아보기 +* https://tiddlywiki.com/languages/ko-KR/alltiddlers.html#HelloThere - 모든 티들러를 포함하는 하나의 파일 --- diff --git a/editions/prerelease/tiddlers/Explore.tid b/editions/prerelease/tiddlers/Explore.tid deleted file mode 100644 index f6e8d601f..000000000 --- a/editions/prerelease/tiddlers/Explore.tid +++ /dev/null @@ -1,41 +0,0 @@ -title: $:/core/ui/MoreSideBar/Explore -tags: $:/tags/MoreSideBar -caption: Explore - -\define treenode-inner(prefix) -<$reveal type="nomatch" text="" default="""$(chunk)$"""> -<li> -<$list filter="""[all[shadows+tiddlers]prefix[$prefix$$(chunk)$]] -[[$prefix$$(chunk)$]] +[limit[1]]""" emptyMessage="""<button class="tc-btn-invisible" disabled>{{$:/core/images/blank}}</button>"""> -<$reveal type="nomatch" state="""$:/state/tree/$prefix$$(chunk)$""" text="show"> -<$button set="""$:/state/tree/$prefix$$(chunk)$""" setTo="show" class="tc-btn-invisible">{{$:/core/images/right-arrow}}</$button> -</$reveal> -<$reveal type="match" state="""$:/state/tree/$prefix$$(chunk)$""" text="show"> -<$button set="""$:/state/tree/$prefix$$(chunk)$""" setTo="hide" class="tc-btn-invisible">{{$:/core/images/down-arrow}}</$button> -</$reveal> -</$list> -<$list filter="""[[$prefix$$(chunk)$]is[shadow]] [[$prefix$$(chunk)$]is[tiddler]] +[limit[1]]""" emptyMessage="""<$text text="$prefix$$(chunk)$"/>"""> -<$link> -<$view field="title"/> -</$link> -</$list> -<$list filter="""[all[shadows+tiddlers]prefix[$prefix$$(chunk)$]] -[[$prefix$$(chunk)$]] +[limit[1]]"""> -(<$count filter="""[all[shadows+tiddlers]prefix[$prefix$$(chunk)$]] -[[$prefix$$(chunk)$]]"""/>) -<$reveal type="match" state="""$:/state/tree/$prefix$$(chunk)$""" text="show"> -<$macrocall $name="treenode" prefix="""$prefix$$(chunk)$"""/> -</$reveal> -</$list> -</li> -</$reveal> -\end - -\define treenode(prefix) -<ol> -<$list filter="[all[shadows+tiddlers]removeprefix[$prefix$]splitbefore[/]sort[title]]" variable="chunk"> -<<treenode-inner """$prefix$""">> -</$list> -</ol> -\end - -<div class="tc-table-of-contents"> -<<treenode "$:/">> -</div> diff --git a/editions/prerelease/tiddlers/Release 5.1.14.tid b/editions/prerelease/tiddlers/Release 5.1.14.tid deleted file mode 100644 index 40d5226ea..000000000 --- a/editions/prerelease/tiddlers/Release 5.1.14.tid +++ /dev/null @@ -1,28 +0,0 @@ -caption: 5.1.14 -created: 20160713124714652 -modified: 20160726084810809 -tags: ReleaseNotes -title: Release 5.1.14 -type: text/vnd.tiddlywiki - -//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.13...v5.1.14]]// - -This is a minor bug fix release. - -!! Bug Fixes - -* - -!! Node.js Bug Fixes - -* - -!! Other Improvements - -* - -! Contributors - -[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki: - -* [[@sukima|https://github.com/sukima]] diff --git a/editions/prerelease/tiddlers/Release 5.1.18.tid b/editions/prerelease/tiddlers/Release 5.1.18.tid new file mode 100644 index 000000000..cf01d2dd7 --- /dev/null +++ b/editions/prerelease/tiddlers/Release 5.1.18.tid @@ -0,0 +1,43 @@ +caption: 5.1.18 +created: 20180512112829164 +modified: 20180512112829164 +tags: ReleaseNotes +title: Release 5.1.18 +type: text/vnd.tiddlywiki + +//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.17...v5.1.18]]// + +!! New and Improved Plugins + +* + +!! Translation Improvements + +New and improved translations: + +* + +!! Usability Improvements + +* + +!! Hackability Improvements + +* + +!! Bug Fixes + +* + +!! Developer Bug Fixes and Improvements + +* + + +! Contributors + +[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki: + +* [[@example|https://github.com/example]] + + \ No newline at end of file diff --git a/editions/prerelease/tiddlers/SaveTrailPlugin-enable.tid b/editions/prerelease/tiddlers/SaveTrailPlugin-enable.tid new file mode 100644 index 000000000..bc5556415 --- /dev/null +++ b/editions/prerelease/tiddlers/SaveTrailPlugin-enable.tid @@ -0,0 +1,2 @@ +title: $:/config/SaveTrailPlugin/enable +text: no diff --git a/editions/prerelease/tiddlers/sidebarwidth.tid b/editions/prerelease/tiddlers/sidebarwidth.tid new file mode 100644 index 000000000..8bb21a684 --- /dev/null +++ b/editions/prerelease/tiddlers/sidebarwidth.tid @@ -0,0 +1,2 @@ +title: $:/themes/tiddlywiki/vanilla/metrics/sidebarwidth +text: 450px diff --git a/editions/prerelease/tiddlers/system/DefaultTiddlers.tid b/editions/prerelease/tiddlers/system/DefaultTiddlers.tid index f822081ff..c947fd59a 100644 --- a/editions/prerelease/tiddlers/system/DefaultTiddlers.tid +++ b/editions/prerelease/tiddlers/system/DefaultTiddlers.tid @@ -1,7 +1,6 @@ created: 20131127215321439 modified: 20140912135951542 title: $:/DefaultTiddlers -type: text/vnd.tiddlywiki [[TiddlyWiki Pre-release]] HelloThere diff --git a/editions/prerelease/tiddlers/system/GoogleAnalyticsAccount.tid b/editions/prerelease/tiddlers/system/GoogleAnalyticsAccount.tid deleted file mode 100644 index 1e0f77e7c..000000000 --- a/editions/prerelease/tiddlers/system/GoogleAnalyticsAccount.tid +++ /dev/null @@ -1,3 +0,0 @@ -title: $:/GoogleAnalyticsAccount - -UA-32839735-1 \ No newline at end of file diff --git a/editions/prerelease/tiddlers/system/GoogleAnalyticsDomain.tid b/editions/prerelease/tiddlers/system/GoogleAnalyticsDomain.tid deleted file mode 100644 index ee2e3f723..000000000 --- a/editions/prerelease/tiddlers/system/GoogleAnalyticsDomain.tid +++ /dev/null @@ -1,3 +0,0 @@ -title: $:/GoogleAnalyticsDomain - -tiddlywiki.com \ No newline at end of file diff --git a/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid b/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid index 3f7c07ffd..391c6e684 100644 --- a/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid +++ b/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid @@ -1,6 +1,6 @@ title: $:/config/LocalPluginLibrary tags: $:/tags/PluginLibrary -url: http://127.0.0.1:8080/prerelease/library/v5.1.12/index.html +url: http://127.0.0.1:8080/prerelease/library/v5.1.18/index.html caption: {{$:/language/OfficialPluginLibrary}} (Prerelease Local) A locally installed version of the official ~TiddlyWiki plugin library at tiddlywiki.com for testing and debugging. //Requires a local web server to share the library// diff --git a/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid b/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid index 924fc6922..c14019b28 100644 --- a/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid +++ b/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid @@ -1,6 +1,6 @@ title: $:/config/OfficialPluginLibrary tags: $:/tags/PluginLibrary -url: http://tiddlywiki.com/prerelease/library/v5.1.12/index.html +url: https://tiddlywiki.com/prerelease/library/v5.1.18/index.html caption: {{$:/language/OfficialPluginLibrary}} (Prerelease) The prerelease version of the official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team. diff --git a/editions/prerelease/tiddlers/system/SiteTitle.tid b/editions/prerelease/tiddlers/system/SiteTitle.tid index eb3d1d643..092fce693 100644 --- a/editions/prerelease/tiddlers/system/SiteTitle.tid +++ b/editions/prerelease/tiddlers/system/SiteTitle.tid @@ -1,6 +1,5 @@ created: 20131211131022562 modified: 20131211131023829 title: $:/SiteTitle -type: text/vnd.tiddlywiki TiddlyWiki Pre-release \ No newline at end of file diff --git a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid index 6dc10e33c..682dad792 100644 --- a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid +++ b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid @@ -1,7 +1,7 @@ title: TiddlyWiki Pre-release modified: 20150428204930183 -This is a pre-release build of TiddlyWiki. It is provided for testing purposes. ''Please don't try to use it for anything important'' -- you should use the latest official release from http://tiddlywiki.com. +This is a pre-release build of TiddlyWiki, [[also available in empty form|https://tiddlywiki.com/prerelease/empty.html]]. It is provided for testing purposes. ''Please don't try to use it for anything important'' -- you should use the latest official release from https://tiddlywiki.com. <$list filter="[tag[ReleaseNotes]!has[released]!sort[created]]"> <h1><$text text=<<currentTiddler>>/></h1> @@ -19,4 +19,3 @@ Set "Stacked" story view <$action-setfield $tiddler="$:/view" text="classic"/> Revert </$button> -* [[Hierarchical system tiddler browser|$:/core/ui/MoreSideBar/Explore]] diff --git a/editions/prerelease/tiddlywiki.info b/editions/prerelease/tiddlywiki.info index 0b6b77ea3..7ca277ce2 100644 --- a/editions/prerelease/tiddlywiki.info +++ b/editions/prerelease/tiddlywiki.info @@ -1,7 +1,6 @@ { "description": "Content for the current prerelease", "plugins": [ - "tiddlywiki/googleanalytics", "tiddlywiki/nodewebkitsaver", "tiddlywiki/github-fork-ribbon", "tiddlywiki/browser-sniff", @@ -10,7 +9,14 @@ "tiddlywiki/powered-by-tiddlywiki", "tiddlywiki/internals", "tiddlywiki/highlight", - "tiddlywiki/markdown" + "tiddlywiki/markdown", + "tiddlywiki/qrcode", + "tiddlywiki/bibtex", + "tiddlywiki/savetrail", + "tiddlywiki/external-attachments", + "tiddlywiki/dynaview", + "tiddlywiki/codemirror", + "tiddlywiki/comments" ], "themes": [ "tiddlywiki/vanilla", @@ -18,7 +24,9 @@ "tiddlywiki/starlight", "tiddlywiki/seamless", "tiddlywiki/centralised", + "tiddlywiki/heavier", "tiddlywiki/tight", + "tiddlywiki/tight-heavier", "tiddlywiki/readonly" ], "languages": [ diff --git a/editions/server/tiddlywiki.info b/editions/server/tiddlywiki.info index ac7bd0aad..7c623fdc4 100644 --- a/editions/server/tiddlywiki.info +++ b/editions/server/tiddlywiki.info @@ -20,7 +20,7 @@ "static": [ "--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain", "--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", - "--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain", - "--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain"] + "--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain", + "--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"] } } diff --git a/editions/test/tiddlers/HelloThere.tid b/editions/test/tiddlers/HelloThere.tid index f0c1d51a2..d41f45fe2 100644 --- a/editions/test/tiddlers/HelloThere.tid +++ b/editions/test/tiddlers/HelloThere.tid @@ -2,4 +2,4 @@ title: HelloThere This is TiddlyWiki's browser-based test runner for version <<version>>. See the bottom of this page for the test results. -http://tiddlywiki.com/ +https://tiddlywiki.com/ diff --git a/editions/test/tiddlers/tests/test-filters.js b/editions/test/tiddlers/tests/test-filters.js index 2af6c2e36..beaee32ea 100644 --- a/editions/test/tiddlers/tests/test-filters.js +++ b/editions/test/tiddlers/tests/test-filters.js @@ -71,15 +71,22 @@ describe("Filter tests", function() { title: "a fourth tiddler", text: "The quality of mercy is not drained by [[Tiddler Three]]", tags: [], + empty: "not", modifier: "JohnDoe"}); wiki.addTiddler({ title: "one", text: "This is the text of tiddler [[one]]", list: "[[Tiddler Three]] [[TiddlerOne]]", + empty: "", modifier: "JohnDoe"}); // Our tests + it("should handle the lookup operator", function() { + expect(wiki.filterTiddlers("Six Seventh 8 +[lookup[Tiddler]]").join(",")).toBe("Missing inaction from TiddlerOne,,Tidd"); + expect(wiki.filterTiddlers("Six Seventh 8 +[lookup:8[Tiddler]]").join(",")).toBe("Missing inaction from TiddlerOne,Tidd,Tidd"); + }); + it("should retrieve shadow tiddlers", function() { expect(wiki.getTiddlerText("Tiddler8")).toBe("Tidd"); }); @@ -191,6 +198,12 @@ describe("Filter tests", function() { expect(wiki.filterTiddlers("[!has[modified]sort[title]]").join(",")).toBe("a fourth tiddler,one"); }); + it("should handle the has:field operator", function() { + expect(wiki.filterTiddlers("[has:field[empty]sort[title]]").join(",")).toBe("a fourth tiddler,one"); + expect(wiki.filterTiddlers("[!has:field[empty]sort[title]]").join(",")).toBe("$:/TiddlerTwo,Tiddler Three,TiddlerOne"); + }); + + it("should handle the limit operator", function() { expect(wiki.filterTiddlers("[!is[system]sort[title]limit[2]]").join(",")).toBe("a fourth tiddler,one"); expect(wiki.filterTiddlers("[prefix[Tid]sort[title]limit[1]]").join(",")).toBe("Tiddler Three"); diff --git a/editions/test/tiddlers/tests/test-utils.js b/editions/test/tiddlers/tests/test-utils.js index 2aa3ea665..fd924e1bf 100644 --- a/editions/test/tiddlers/tests/test-utils.js +++ b/editions/test/tiddlers/tests/test-utils.js @@ -27,11 +27,38 @@ describe("Utility tests", function() { it("should handle formatting a date string", function() { var fds = $tw.utils.formatDateString, + // nov is month: 10! d = new Date(2014,10,9,17,41,28,542); expect(fds(d,"DDD DD MMM YYYY")).toBe("Sunday 9 November 2014"); expect(fds(d,"ddd hh mm ssss")).toBe("Sun 17 41 2828"); expect(fds(d,"MM0DD")).toBe("1109"); expect(fds(d,"MM0\\D\\D")).toBe("110DD"); + + // test some edge cases found at: https://en.wikipedia.org/wiki/ISO_week_date + // 2016-11-13 is Week 45 and it's a Sunday (month nr: 10) + d = new Date(2016,10,12,23,59,59); + expect(fds(d,"WW")).toBe("45"); + d = new Date(2016,10,13,23,59,59,999); + expect(fds(d,"WW")).toBe("45"); + d = new Date(2016,10,13,23,59,60); // see 60 seconds. so it's week 46 + expect(fds(d,"WW")).toBe("46"); + + // 2006 Dez. 31 is end of week 52 (month nr: 11) + d = new Date(2006,11,31,23,59,59); + expect(fds(d,"WW")).toBe("52"); + d = new Date(2006,11,31,23,59,60); + expect(fds(d,"WW")).toBe("1"); + + // 2010 Jan 03 is in week 53 (month nr: 0) + d = new Date(2010,0,3,23,59,59); + expect(fds(d,"WW")).toBe("53"); + d = new Date(2010,0,3,23,59,60); + expect(fds(d,"WW")).toBe("1"); + + // 2014 12 29 is in week 1 of 2015 (month nr. 11) + d = new Date(2014,11,29,23,59,59); + expect(fds(d,"WW")).toBe("1"); + expect(fds(d,"wYYYY")).toBe("2015"); }); it("should parse text references", function() { diff --git a/editions/text-slicer/tiddlers/Sample Text.tid b/editions/text-slicer/tiddlers/Sample Text.tid index b44e6a9ae..3848e73b5 100644 --- a/editions/text-slicer/tiddlers/Sample Text.tid +++ b/editions/text-slicer/tiddlers/Sample Text.tid @@ -1,7 +1,9 @@ title: Sample Text type: text/html -<html> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> </head> <body> @@ -9,19 +11,19 @@ type: text/html <h1>Introduction to TiddlyWiki</h1> <p class="intro"> -Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. <img src="data:image/png;base64,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">Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. <img src="data:image/png;base64,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"/>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. </p> -<h2>What is TiddlyWiki used for?<img src="data:image/png;base64,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JQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAv8fUGzP1bX3cZIAAAAASUVORK5CYII="></h2> +<h2>What is TiddlyWiki used for?<img src="data:image/png;base64,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JQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAhRfJQ2GSYAESEAQAYqvINA0QwIkQAJKAv8fUGzP1bX3cZIAAAAASUVORK5CYII="/></h2> <p class="intro"> Dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. </p> -<h2>What's with all the < angle brackets</h2> +<h2>What's with all the < angle brackets</h2> <p> -An opportunity to see how characters that need HTML encoding (like < angle brackets) are dealt with. +An opportunity to see how characters that need HTML encoding (like < angle brackets) are dealt with. </p> <h3>Who uses TiddlyWiki?</h3> @@ -30,9 +32,9 @@ An opportunity to see how characters that need HTML encoding (like < angle brack Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. </p> -<p> +<blockquote> Consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. -</p> +</blockquote> <h2>Who makes TiddlyWiki?</h2> @@ -152,7 +154,7 @@ Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu </li> <li> -<img src="data:image/png;base64,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"> +<img src="data:image/png;base64,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"/> </li> <li> diff --git a/editions/text-slicer/tiddlywiki.info b/editions/text-slicer/tiddlywiki.info index 11e1808de..7906ba510 100644 --- a/editions/text-slicer/tiddlywiki.info +++ b/editions/text-slicer/tiddlywiki.info @@ -2,7 +2,7 @@ "description": "Tools for slicing up long texts into individual tiddlers", "plugins": [ "tiddlywiki/text-slicer", - "tiddlywiki/xmldom" + "tiddlywiki/sax" ], "languages": [ ], diff --git a/editions/translators/tiddlers/HelloThere.tid b/editions/translators/tiddlers/HelloThere.tid index b57d941f0..728944a80 100644 --- a/editions/translators/tiddlers/HelloThere.tid +++ b/editions/translators/tiddlers/HelloThere.tid @@ -5,4 +5,4 @@ This edition of ~TiddlyWiki is for people who would like to create or update a t * [[Instructions for Translators]] * [[Extracting Translations]] -See http://tiddlywiki.com for more details about ~TiddlyWiki. +See https://tiddlywiki.com for more details about ~TiddlyWiki. diff --git a/editions/translators/tiddlers/Instructions for Translators.tid b/editions/translators/tiddlers/Instructions for Translators.tid index ed76b3ca9..11d2c7dd5 100644 --- a/editions/translators/tiddlers/Instructions for Translators.tid +++ b/editions/translators/tiddlers/Instructions for Translators.tid @@ -20,8 +20,8 @@ Most translatable tiddlers consist of a single field. The "Types" and "Help" gro ! Step by Step -# Make sure you know how to save changes with ~TiddlyWiki, as described on http://tiddlywiki.com/ -# Visit http://tiddlywiki.com/editions/translators/index.html +# Make sure you know how to save changes with ~TiddlyWiki, as described on https://tiddlywiki.com/ +# Visit https://tiddlywiki.com/editions/translators/index.html # Click the ''Save changes'' button below to save a copy of the translators edition to your local hard drive. Name the copy `MyTranslation.html` #* You may want to save the file into your Dropbox folder (or equivalent) to benefit from automatic backups # Open the `MyTranslation.html` in your browser @@ -37,7 +37,7 @@ Most translatable tiddlers consist of a single field. The "Types" and "Help" gro When your translation reaches the point that it's useful to be shared with others you can submit it for inclusion in the TiddlyWiki core. -The easiest way to submit your translation is to publish the HTML file on Dropbox (as described on http://tiddlywiki.com/) and then post a link to the TiddlyWiki discussion group. +The easiest way to submit your translation is to publish the HTML file on Dropbox (as described on https://tiddlywiki.com/) and then post a link to the TiddlyWiki discussion group. Alternatively, you can email the translation directly to Jeremy Ruston or Mario Pietsch. diff --git a/editions/translators/tiddlywiki.info b/editions/translators/tiddlywiki.info index 1957b0522..de75bfa12 100644 --- a/editions/translators/tiddlywiki.info +++ b/editions/translators/tiddlywiki.info @@ -13,7 +13,9 @@ "en-GB", "en-US", "es-ES", + "fa-IR", "fr-FR", + "he-IL", "hi-IN", "ia-IA", "it-IT", @@ -21,9 +23,11 @@ "ko-KR", "nl-NL", "pa-IN", + "pt-BR", "pt-PT", "ru-RU", "sk-SK", + "sl-SI", "sv-SE", "zh-Hans", "zh-Hant" diff --git a/editions/tw5.com-docs/tiddlers/Welcome to tw5.com-docs.tid b/editions/tw5.com-docs/tiddlers/Welcome to tw5.com-docs.tid index 114e5bd86..17f3b7420 100644 --- a/editions/tw5.com-docs/tiddlers/Welcome to tw5.com-docs.tid +++ b/editions/tw5.com-docs/tiddlers/Welcome to tw5.com-docs.tid @@ -1,8 +1,8 @@ title: Welcome to tw5.com-docs -This edition of TiddlyWiki is a tool to help people make and submit improvements to the main documentation on http://tiddlywiki.com/ +This edition of TiddlyWiki is a tool to help people make and submit improvements to the main documentation on https://tiddlywiki.com/ -In this wiki, all the tiddlers from http://tiddlywiki.com (to be precise, all the tiddlers [[from here|https://github.com/Jermolene/TiddlyWiki5/tree/master/editions/tw5.com/tiddlers]]) are packed into a plugin: +In this wiki, all the tiddlers from https://tiddlywiki.com (to be precise, all the tiddlers [[from here|https://github.com/Jermolene/TiddlyWiki5/tree/master/editions/tw5.com/tiddlers]]) are packed into a plugin: [[$:/plugins/tiddlywiki/tw5.com-docs]] diff --git a/editions/tw5.com-server/tiddlers/system/GoogleAnalyticsAccount.tid b/editions/tw5.com-server/tiddlers/system/GoogleAnalyticsAccount.tid deleted file mode 100644 index 29cbc27e0..000000000 --- a/editions/tw5.com-server/tiddlers/system/GoogleAnalyticsAccount.tid +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/GoogleAnalyticsAccount - diff --git a/editions/tw5.com-server/tiddlers/system/GoogleAnalyticsDomain.tid b/editions/tw5.com-server/tiddlers/system/GoogleAnalyticsDomain.tid deleted file mode 100644 index 0c6a7e02d..000000000 --- a/editions/tw5.com-server/tiddlers/system/GoogleAnalyticsDomain.tid +++ /dev/null @@ -1,2 +0,0 @@ -title: $:/GoogleAnalyticsDomain - diff --git a/editions/tw5.com-server/tiddlywiki.info b/editions/tw5.com-server/tiddlywiki.info index 2a8019e13..0c97506fe 100644 --- a/editions/tw5.com-server/tiddlywiki.info +++ b/editions/tw5.com-server/tiddlywiki.info @@ -3,7 +3,8 @@ "plugins": [ "tiddlywiki/tiddlyweb", "tiddlywiki/filesystem", - "tiddlywiki/highlight" + "tiddlywiki/highlight", + "tiddlywiki/mobiledragdrop" ], "themes": [ "tiddlywiki/vanilla", diff --git a/editions/tw5.com/tiddlers/License.tid b/editions/tw5.com/tiddlers/License.tid new file mode 100644 index 000000000..056819430 --- /dev/null +++ b/editions/tw5.com/tiddlers/License.tid @@ -0,0 +1,19 @@ +created: 20170127221457627 +modified: 20170127222646488 +title: License +type: text/vnd.tiddlywiki +tags: About + +TiddlyWiki is published under a [[permissive BSD 3-Clause License|https://opensource.org/licenses/BSD-3-Clause]] stored in the [[shadow tiddler|ShadowTiddlers]] [[$:/core/copyright.txt]]: + +<div style="font-size: 0.5em;line-height:1.4;"> + +{{$:/core/copyright.txt}} + +</div> + +In layman's terms, the license says that you can take TiddlyWiki and do anything you want with it without any license fee payment or other legal obligation to the creators of TiddlyWiki or anyone else. The quid pro quo is that there is no warranty or guarantee with open source projects like TiddlyWiki. You can't sue the contributors to TiddlyWiki for any loss or damage due to the use of TiddlyWiki: even if your data is lost due to a tragic chain of circumstances that involves TiddlyWiki. + +You are respectfully requested that to make an attribution to the project, but there's no obligation to do so. + +For the avoidance of doubt, any information that you choose to store within your own copy of TiddlyWiki remains yours; using TiddlyWiki to publish content doesn't change whatever rights you may have to that content. diff --git a/editions/tw5.com/tiddlers/TiddlyWiki_European_Meetup_2016.tid b/editions/tw5.com/tiddlers/TiddlyWiki_European_Meetup_2016.tid deleted file mode 100644 index 9f48cffd2..000000000 --- a/editions/tw5.com/tiddlers/TiddlyWiki_European_Meetup_2016.tid +++ /dev/null @@ -1,15 +0,0 @@ -created: 20160712121509718 -modified: 20160712121548453 -tags: Meetups -title: TiddlyWiki European Meetup 2016 -type: text/vnd.tiddlywiki - -http://tiddlywiki.com/tiddlywiki-eu-meetup-2016/ - -Here's the stream of day 1: - -<iframe width="560" height="315" src="http://www.youtube.com/embed/7o0ClSI7Tdg" frameborder="0" allowfullscreen></iframe> - -Here's day 2: - -<iframe width="560" height="315" src="http://www.youtube.com/embed/ipXyZkC8tjM" frameborder="0" allowfullscreen></iframe> diff --git a/editions/tw5.com/tiddlers/about/Developers.tid b/editions/tw5.com/tiddlers/about/Developers.tid index 49bf553a3..5df340fcd 100644 --- a/editions/tw5.com/tiddlers/about/Developers.tid +++ b/editions/tw5.com/tiddlers/about/Developers.tid @@ -6,6 +6,6 @@ type: text/vnd.tiddlywiki There are several resources for developers to learn more about TiddlyWiki and to discuss and contribute to its development. -* [[tiddlywiki.com/dev|http://tiddlywiki.com/dev]] is the official developer documentation +* [[tiddlywiki.com/dev|https://tiddlywiki.com/dev]] is the official developer documentation * [[TiddlyWikiDev group|http://groups.google.com/group/TiddlyWikiDev]] for discussions about TiddlyWiki development * https://github.com/Jermolene/TiddlyWiki5 for the source code and development activity diff --git a/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid b/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid index 52d01fb86..b5ef197ff 100644 --- a/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid +++ b/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid @@ -24,7 +24,7 @@ I started experimenting with HTML and JavaScript to explore the idea further. I' ! Launch of TiddlyWiki -So, in September 2004 I released a primitive [[first version of TiddlyWiki|http://classic.tiddlywiki.com/firstversion.html]]. It was the smallest possible thing that demonstrated the idea: it was a simple, self-contained static 48KB HTML file. +So, in September 2004 I released a primitive [[first version of TiddlyWiki|https://classic.tiddlywiki.com/firstversion.html]]. It was the smallest possible thing that demonstrated the idea: it was a simple, self-contained static 48KB HTML file. The downside of writing the first version of TiddlyWiki in this way was that it made it completely impractical to use for editing - when you click 'save changes' it just pops up a window showing the data that would be saved if it were possible for an HTML page to write to the file system. diff --git a/editions/tw5.com/tiddlers/commands/FetchCommand.tid b/editions/tw5.com/tiddlers/commands/FetchCommand.tid new file mode 100644 index 000000000..8570d22ce --- /dev/null +++ b/editions/tw5.com/tiddlers/commands/FetchCommand.tid @@ -0,0 +1,8 @@ +created: 20170218131511071 +modified: 20170218131511071 +tags: Commands +title: FetchCommand +type: text/vnd.tiddlywiki +caption: fetch + +{{$:/language/Help/fetch}} diff --git a/editions/tw5.com/tiddlers/commands/ImportCommand.tid b/editions/tw5.com/tiddlers/commands/ImportCommand.tid new file mode 100644 index 000000000..3789548b7 --- /dev/null +++ b/editions/tw5.com/tiddlers/commands/ImportCommand.tid @@ -0,0 +1,8 @@ +caption: import +created: 20170712153850528 +modified: 20170712153850528 +tags: Commands +title: ImportCommand +type: text/vnd.tiddlywiki + +{{$:/language/Help/import}} diff --git a/editions/tw5.com/tiddlers/commands/RenderCommand.tid b/editions/tw5.com/tiddlers/commands/RenderCommand.tid new file mode 100644 index 000000000..d32710655 --- /dev/null +++ b/editions/tw5.com/tiddlers/commands/RenderCommand.tid @@ -0,0 +1,15 @@ +caption: render +created: 20170919131752774 +modified: 20170919131805871 +tags: Commands +title: RenderCommand +type: text/vnd.tiddlywiki + +{{$:/language/Help/render}} + +<$button class="tc-btn-invisible" style="text-decoration:underline"> +Show available rendering templates +<$action-setfield $tiddler="$:/temp/advancedsearch" text="[all[shadows]prefix[$:/core/templates/]]"/> +<$action-setfield $tiddler="$:/state/tab--1498284803" text="$:/core/ui/AdvancedSearch/Filter"/> +<$action-navigate $to="$:/AdvancedSearch"/> +</$button> diff --git a/editions/tw5.com/tiddlers/commands/SaveCommand.tid b/editions/tw5.com/tiddlers/commands/SaveCommand.tid new file mode 100644 index 000000000..467d564fa --- /dev/null +++ b/editions/tw5.com/tiddlers/commands/SaveCommand.tid @@ -0,0 +1,8 @@ +caption: save +created: 20170919131738203 +modified: 20170919131813069 +tags: Commands +title: SaveCommand +type: text/vnd.tiddlywiki + +{{$:/language/Help/save}} diff --git a/editions/tw5.com/tiddlers/community/Contributing.tid b/editions/tw5.com/tiddlers/community/Contributing.tid index 44bb97342..ca0513d3a 100644 --- a/editions/tw5.com/tiddlers/community/Contributing.tid +++ b/editions/tw5.com/tiddlers/community/Contributing.tid @@ -9,7 +9,7 @@ We welcome contributions to the code and documentation of TiddlyWiki in several * ReportingBugs * Helping to [[improve our documentation|Improving TiddlyWiki Documentation]] * Contributing to the code via [[GitHub|https://github.com/Jermolene/TiddlyWiki5]] -** See http://tiddlywiki.com/dev for more details +** See https://tiddlywiki.com/dev for more details There are other ways to [[help TiddlyWiki|HelpingTiddlyWiki]] too. diff --git a/editions/tw5.com/tiddlers/community/Forums.tid b/editions/tw5.com/tiddlers/community/Forums.tid index 01bd492c2..bca8db1d4 100644 --- a/editions/tw5.com/tiddlers/community/Forums.tid +++ b/editions/tw5.com/tiddlers/community/Forums.tid @@ -1,5 +1,5 @@ created: 20140721121924384 -modified: 20160610085048371 +modified: 20161229091129395 tags: Community title: Forums type: text/vnd.tiddlywiki @@ -10,6 +10,7 @@ The ~TiddlyWiki discussion groups are mailing lists for talking about ~TiddlyWik * The main ~TiddlyWiki group: http://groups.google.com/group/TiddlyWiki *> Note that you do not need a Google Account to join the discussion groups. Subscribe by sending an email to mailto:tiddlywiki+subscribe@googlegroups.com or mailto:tiddlywikidev+subscribe@googlegroups.com. +** An enhanced group search facility is available on [[mail-archive.com|https://www.mail-archive.com/tiddlywiki@googlegroups.com/]] * Watch recordings of our regular [[TiddlyWiki Hangouts]] * Follow [[@TiddlyWiki on Twitter|http://twitter.com/TiddlyWiki]] for the latest news @@ -17,6 +18,7 @@ The ~TiddlyWiki discussion groups are mailing lists for talking about ~TiddlyWik * The TiddlyWikiDev group for developers: http://groups.google.com/group/TiddlyWikiDev *> Note that you do not need a Google Account to join the discussion groups. Subscribe by sending an email to mailto:tiddlywiki+subscribe@googlegroups.com or mailto:tiddlywikidev+subscribe@googlegroups.com. +** An enhanced group search facility is available on [[mail-archive.com|https://www.mail-archive.com/tiddlywikidev@googlegroups.com/]] * Follow [[@TiddlyWiki on Twitter|http://twitter.com/#!/TiddlyWiki]] for the latest news * Get involved in the [[development on GitHub|https://github.com/Jermolene/TiddlyWiki5]] diff --git a/editions/tw5.com/tiddlers/community/HelpingTiddlyWiki.tid b/editions/tw5.com/tiddlers/community/HelpingTiddlyWiki.tid index 9ffd010fb..edf4e5d01 100644 --- a/editions/tw5.com/tiddlers/community/HelpingTiddlyWiki.tid +++ b/editions/tw5.com/tiddlers/community/HelpingTiddlyWiki.tid @@ -14,7 +14,7 @@ OpenSource projects like ~TiddlyWiki thrive on the feedback and engagement of us * Tweet about ~TiddlyWiki: [[I love TiddlyWiki because...|https://twitter.com/intent/tweet?text=I+love+TiddlyWiki+because...&source=tiddlywiki5]] * [img[https://img.shields.io/github/stars/jermolene/tiddlywiki5.svg?style=social&label=Star]] * [[Star the TiddlyWiki5 GitHub Repository|https://github.com/Jermolene/TiddlyWiki5]] -* [[Display the TiddlyWiki Poster|http://tiddlywiki.com/poster]] +* [[Display the TiddlyWiki Poster|https://tiddlywiki.com/poster]] [img width=232 [Tiddler Poster.png]] diff --git a/editions/tw5.com/tiddlers/community/Improving TiddlyWiki Documentation.tid b/editions/tw5.com/tiddlers/community/Improving TiddlyWiki Documentation.tid index d87a345c6..87781d214 100644 --- a/editions/tw5.com/tiddlers/community/Improving TiddlyWiki Documentation.tid +++ b/editions/tw5.com/tiddlers/community/Improving TiddlyWiki Documentation.tid @@ -4,12 +4,12 @@ tags: Community title: Improving TiddlyWiki Documentation type: text/vnd.tiddlywiki -Anyone can submit improvements to the TiddlyWiki documentation that appears on http://tiddlywiki.com. +Anyone can submit improvements to the TiddlyWiki documentation that appears on https://tiddlywiki.com. (For improvements to the core code a more complicated process must be used because of the need to test the changes both in the browser and under Node.js before submission). # Read and observe the [[Documentation Style Guide]] # Create an account on https://github.com if you don't already have one # If you haven't done so already, sign the [[Contributor License Agreement]] as described in [[Signing the Contributor License Agreement]] -# On http://tiddlywiki.com, click "edit" on the tiddler you want to improve +# On https://tiddlywiki.com, click "edit" on the tiddler you want to improve # You should see a pink banner with the text: //Can you help us improve this documentation? Find out how to edit this tiddler on ~GitHub// # Click on the external link ...''this tiddler on ~GitHub'' ## You will be prompted that "you need to fork this repository to propose changes". A "fork" is your own copy of the repository that incorporates the changes you are proposing @@ -20,12 +20,12 @@ Anyone can submit improvements to the TiddlyWiki documentation that appears on h # Click the green button labelled ''Propose file change'' # On the following screen, click the green button labelled ''Create pull request'' -[[Jermolene|https://github.com/Jermolene]] or one of the other core developers will then have the opportunity to merge your pull request so that it is incorporated into the next build of http://tiddlywiki.com. +[[Jermolene|https://github.com/Jermolene]] or one of the other core developers will then have the opportunity to merge your pull request so that it is incorporated into the next build of https://tiddlywiki.com. Mario Pietsch has created these short video tutorials: -<iframe width="560" height="315" src="http://www.youtube.com/embed/L4zTkMYcri8" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/L4zTkMYcri8" frameborder="0" allowfullscreen></iframe> -<iframe width="560" height="315" src="http://www.youtube.com/embed/6ElUruH92tc" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/6ElUruH92tc" frameborder="0" allowfullscreen></iframe> -<iframe width="560" height="315" src="http://www.youtube.com/embed/axFCk9KsMFc" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/axFCk9KsMFc" frameborder="0" allowfullscreen></iframe> diff --git a/editions/tw5.com/tiddlers/community/Meetups.tid b/editions/tw5.com/tiddlers/community/Meetups.tid index dbd08f612..901881e90 100644 --- a/editions/tw5.com/tiddlers/community/Meetups.tid +++ b/editions/tw5.com/tiddlers/community/Meetups.tid @@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki Local meetings around the world for ~TiddlyWiki people: -* The [[TiddlyWiki European Meetup 2016]] in Oxford, UK +* The [[TiddlyWiki European Meetup 2016]] and [[TiddlyWiki European Meetup 2017]] in Oxford, UK * [[OXTWIG]], the ''Oxford ~TiddlyWiki Interest Group'' meets monthly in Oxford, UK to share experiences of using TiddlyWiki * ''[[TiddlyWiki Camp Paris]]'' is an all day celebration and exploration of TiddlyWiki for experienced users and beginners alike diff --git a/editions/tw5.com/tiddlers/community/OXTWIG.tid b/editions/tw5.com/tiddlers/community/OXTWIG.tid index 2f21a4558..404d9d58d 100644 --- a/editions/tw5.com/tiddlers/community/OXTWIG.tid +++ b/editions/tw5.com/tiddlers/community/OXTWIG.tid @@ -14,10 +14,10 @@ We have an email discussion list, too: https://groups.google.com/forum/#!members The second OXTWIG meeting was held on Thursday 16th January 2014: -<iframe width="560" height="315" src="http://www.youtube.com/embed/WOK_nVBf_6U" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/WOK_nVBf_6U" frameborder="0" allowfullscreen></iframe> ! OXTWIG #1 The first OXTWIG meeting was held on Thursday 21st November 2013: -<iframe width="560" height="315" src="http://www.youtube.com/embed/tpNf_Dms_TE" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/tpNf_Dms_TE" frameborder="0" allowfullscreen></iframe> diff --git a/editions/tw5.com/tiddlers/community/TiddlyWiki Hangouts.tid b/editions/tw5.com/tiddlers/community/TiddlyWiki Hangouts.tid index e91a5becb..4a0f0b829 100644 --- a/editions/tw5.com/tiddlers/community/TiddlyWiki Hangouts.tid +++ b/editions/tw5.com/tiddlers/community/TiddlyWiki Hangouts.tid @@ -8,4 +8,4 @@ The TiddlyWiki community holds regular Google Hangouts, usually every Tuesday fr Past Hangouts are archived in this ~YouTube playlist: -<iframe width="560" height="315" src="http://www.youtube.com/embed/videoseries?list=PLVT_2PPd-1p34gGCQ5qpwC8QdykxVAI3u" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/videoseries?list=PLVT_2PPd-1p34gGCQ5qpwC8QdykxVAI3u" frameborder="0" allowfullscreen></iframe> diff --git a/editions/tw5.com/tiddlers/community/TiddlyWiki_European_Meetup_2016.tid b/editions/tw5.com/tiddlers/community/TiddlyWiki_European_Meetup_2016.tid new file mode 100644 index 000000000..c2664c90d --- /dev/null +++ b/editions/tw5.com/tiddlers/community/TiddlyWiki_European_Meetup_2016.tid @@ -0,0 +1,15 @@ +created: 20160712121509718 +modified: 20160712121548453 +tags: Meetups +title: TiddlyWiki European Meetup 2016 +type: text/vnd.tiddlywiki + +https://tiddlywiki.com/tiddlywiki-eu-meetup-2016/ + +Here's the stream of day 1: + +<iframe width="560" height="315" src="https://www.youtube.com/embed/7o0ClSI7Tdg" frameborder="0" allowfullscreen></iframe> + +Here's day 2: + +<iframe width="560" height="315" src="https://www.youtube.com/embed/ipXyZkC8tjM" frameborder="0" allowfullscreen></iframe> diff --git a/editions/tw5.com/tiddlers/community/TiddlyWiki_European_Meetup_2017.tid b/editions/tw5.com/tiddlers/community/TiddlyWiki_European_Meetup_2017.tid new file mode 100644 index 000000000..edb1ed06e --- /dev/null +++ b/editions/tw5.com/tiddlers/community/TiddlyWiki_European_Meetup_2017.tid @@ -0,0 +1,11 @@ +created: 20170426210309235 +modified: 20170426210309235 +tags: Meetups +title: TiddlyWiki European Meetup 2017 +type: text/vnd.tiddlywiki + +The TiddlyWiki European Meetup 2017, Oxford, on June 10th and 11th 2017. + +For more details: + +https://tiddlywiki.com/tiddlywiki-eu-meetup-2017/ diff --git a/editions/tw5.com/tiddlers/community/Translate TiddlyWiki into your language.tid b/editions/tw5.com/tiddlers/community/Translate TiddlyWiki into your language.tid index 322f260b8..345d8c895 100644 --- a/editions/tw5.com/tiddlers/community/Translate TiddlyWiki into your language.tid +++ b/editions/tw5.com/tiddlers/community/Translate TiddlyWiki into your language.tid @@ -6,11 +6,11 @@ type: text/vnd.tiddlywiki There is a special edition of TiddlyWiki that simplifies creating and maintaining translations: -* http://tiddlywiki.com/editions/translators/ to translate current version of ~TiddlyWiki -* http://tiddlywiki.com/prerelease/editions/translators/ to translate latest prerelease version of ~TiddlyWiki +* https://tiddlywiki.com/editions/translators/ to translate current version of ~TiddlyWiki +* https://tiddlywiki.com/prerelease/editions/translators/ to translate latest prerelease version of ~TiddlyWiki Note that no knowledge of Node.js or GitHub is required. You can translate ~TiddlyWiki on Node.js, type `tiddlywiki editions/translators --server` and visit http://127.0.0.1:8080/ in your browser. -See http://tiddlywiki.com/dev for technical details of creating and maintaining translations. +See https://tiddlywiki.com/dev for technical details of creating and maintaining translations. diff --git a/editions/tw5.com/tiddlers/community/examples/A Thesis Notebook.tid b/editions/tw5.com/tiddlers/community/examples/A Thesis Notebook.tid index 36fbdb09b..c43fb1475 100644 --- a/editions/tw5.com/tiddlers/community/examples/A Thesis Notebook.tid +++ b/editions/tw5.com/tiddlers/community/examples/A Thesis Notebook.tid @@ -13,5 +13,5 @@ This is an example of a thesis notebook powered by TiddlyWiki 5.0.8-beta. TiddlyWiki is a great piece of software created by Jeremy Ruston. It allows you, among other things, to take notes, organize ideas, store information, and display all your stuff the way you want. It is an incredibly flexible tool you can adapt to fit almost all your needs. -This TiddlyWiki has been customized to serve as a philosophy notebook centered around authors, books and papers, concepts and theories, and personal notes. I use it along with Zotero, which is a dedicated bibliography software. Both are free, open source projects. TiddlyWiki can be downloaded at http://tiddlywiki.com. +This TiddlyWiki has been customized to serve as a philosophy notebook centered around authors, books and papers, concepts and theories, and personal notes. I use it along with Zotero, which is a dedicated bibliography software. Both are free, open source projects. TiddlyWiki can be downloaded at https://tiddlywiki.com. <<< diff --git a/editions/tw5.com/tiddlers/community/resources/Filter Examples by Tobias Beer.tid b/editions/tw5.com/tiddlers/community/resources/Filter Examples by Tobias Beer.tid new file mode 100644 index 000000000..89d53794a --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/Filter Examples by Tobias Beer.tid @@ -0,0 +1,14 @@ +created: 20141122093837330 +modified: 20161224181607230 +tags: Resources +title: "Filter Examples" by Tobias Beer +type: text/vnd.tiddlywiki +url: http://tobibeer.github.io/tw/filters/#Filter%20Examples + +This wiki gives examples for various [[filters|Filters]] and their use in the [[list widget|ListWidget]] + +{{!!url}} + +<<< +This wiki gives examples for various [[filters|Filters]] and their use in the [[list widget|ListWidget]]. A good starting point to understand what filters yield which results also is [[test-filters.js|https://github.com/Jermolene/TiddlyWiki5/blob/master/editions/test/tiddlers/tests/test-filters.js]]. +<<< diff --git a/editions/tw5.com/tiddlers/community/resources/Full Text Search Plugin by Rob Hoelz.tid b/editions/tw5.com/tiddlers/community/resources/Full Text Search Plugin by Rob Hoelz.tid new file mode 100644 index 000000000..518fcc11b --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/Full Text Search Plugin by Rob Hoelz.tid @@ -0,0 +1,16 @@ +created: 20171109171703588 +modified: 20171109171922913 +tags: Resources plugins +title: Full Text Search Plugin by Rob Hoelz +type: text/vnd.tiddlywiki +url: https://hoelz.ro/files/fts.html + +A plugin to integrate the popular [[lunr.js|https://lunrjs.com/]] search engine, giving TiddlyWiki much more sophisticated search capabilities: + +{{!!url}} + +<<< +Provides an alternative search result list that orders results by search relevance and ignores differences in word forms (ex. //tag// vs //tags//). + +On my personal wiki, I have the problem that there are terms I use across a lot of tiddlers, and sometimes I'll use different forms (such as the aforementioned //tag// vs //tags//). I wanted a plugin to allow me to find the tiddler I'm looking for quickly and didn't require me to worry about how I declined a noun or inflected a verb - so I wrote this plugin, which provides an alternative search list powered by [[lunr.js|https://lunrjs.com/]]. +<<< \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/community/resources/Gospel_Bubbles_by_Rev_David_Gifford.tid b/editions/tw5.com/tiddlers/community/resources/Gospel_Bubbles_by_Rev_David_Gifford.tid new file mode 100644 index 000000000..565374f24 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/Gospel_Bubbles_by_Rev_David_Gifford.tid @@ -0,0 +1,25 @@ +created: 20141122093837330 +modified: 20161224182127471 +tags: Resources +title: "Gospel Bubbles" by Rev. David Gifford +type: text/vnd.tiddlywiki +url: http://giffmex.org/gospels.bubbles.html#Gospels%20Bubbles + +Creates bubble maps of Biblical texts. + +{{!!url}} + +<<< +This ~TiddlyWiki, which is still under construction, has several features that together make it lightning fast to find passages, types of passages, themes, people, places and images in the New Testament Gospels. The bubblemaps are color-coded overviews of each Gospel. Each type of passage (miracle story, parable, etc) was assigned a color. Bubblemaps allow you to do three things: + +#The ''bubblemaps'' are color-coded overviews of each Gospel. Each type of passage (miracle story, parable, etc) was assigned a color. Bubblemaps allow you to do three things: +##See how the different types of passages are distributed throughout each Gospel. +##Hover over passages to see the verses and titles. +##Click on a passage to open it and see the themes and other data it mentions. + +#The ''themes by passage'' indexes are lists of the passages in each Gospel, followed by the themes and other data found in the passage. Clicking on a theme calls up a list of all the passages that mention that theme. + +#The ''indexes of themes'' contain lists of links to each theme, person, group, place and image. Clicking on a theme calls up a list of all the passages that mention that theme. + +#There is a ''search window'' hidden in the right hand menu. Use the search window to find passages quickly, by typing things like sower or paralytic. Click the arrows in the upper right of the screen to open the menu and search. +<<< diff --git a/editions/tw5.com/tiddlers/community/resources/Hosting TiddlyWiki5 on GoogleDrive b/editions/tw5.com/tiddlers/community/resources/Hosting TiddlyWiki5 on GoogleDrive.tid similarity index 100% rename from editions/tw5.com/tiddlers/community/resources/Hosting TiddlyWiki5 on GoogleDrive rename to editions/tw5.com/tiddlers/community/resources/Hosting TiddlyWiki5 on GoogleDrive.tid diff --git a/editions/tw5.com/tiddlers/community/resources/How Does Twederation Work by Jed Carty.tid b/editions/tw5.com/tiddlers/community/resources/How Does Twederation Work by Jed Carty.tid new file mode 100644 index 000000000..de0bd2cb9 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/How Does Twederation Work by Jed Carty.tid @@ -0,0 +1,14 @@ +created: 20141122093837330 +modified: 20161224220352820 +tags: Resources +title: "How Does Twederation Work" by Jed Carty +type: text/vnd.tiddlywiki +url: http://twederation.tiddlyspot.com/#How%20does%20the%20TWederation%20work%20anyway%3F%20-%20The%20TWederation%20(2016122014h0034) + +An explainer about Twederation, a system of sharing information between TiddlyWiki instances. + +{{!!url}} + +<<< +TWederation is a system for sharing information between participating ~TiddlyWikis without using a client-server model. The link here points to a tiddler that gives more details. This particular implementation works something like an online forum. On the rest of the site, you can follow discussions by the developers and collaborators occurring within the Twederation "network" itself. +<<< diff --git a/editions/tw5.com/tiddlers/community/resources/Leaflet_maps_plugin_by_Sylvain_Comte.tid b/editions/tw5.com/tiddlers/community/resources/Leaflet_maps_plugin_by_Sylvain_Comte.tid new file mode 100644 index 000000000..be43c11e3 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/Leaflet_maps_plugin_by_Sylvain_Comte.tid @@ -0,0 +1,18 @@ +created: 20151110060519720 +modified: 20170115170220030 +tags: Resources +title: Leaflet maps plugin by Sylvain Comte +type: text/vnd.tiddlywiki +url: http://sycom.github.io/TiddlyWiki-Plugins/#Leaflet%20plugin + +A mapping plugin based on [[Leaflet|http://leafletjs.com/]] library. Allows you to create maps based upon geographical data contained in tiddlers. + +{{!!url}} + +<<< +The [[leaflet plugin|http://sycom.github.io/TiddlyWiki-Plugins/#Leaflet%20plugin]] is a (working) attempt to integrate the [[leaflet|http://leafletjs.com/]] library in TiddlyWiki in order to display geographical purpose tiddlers. + +For now `<$leafmap>` widget displays an interactive map. Select size, location and zoom, clustering distance, and background. You can display data : geojson, point(s), polygon(s) and/or polyline(s) directly or calling //GeoTiddler//(s). Tiddler can be called individually, by list or with a [[filter|Filters]]. + +Have a look at [[demo page on the web|http://sycom.github.io/TiddlyWiki-Plugins/#A%20plugin%20collection:%5B%5BA%20plugin%20collection%5D%5D%20%5B%5BLeaflet%20plugin%5D%5D]]. +<<< diff --git a/editions/tw5.com/tiddlers/community/resources/Plugins by Uwe Stuehler.tid b/editions/tw5.com/tiddlers/community/resources/Plugins by Uwe Stuehler.tid new file mode 100644 index 000000000..27545b5e7 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/Plugins by Uwe Stuehler.tid @@ -0,0 +1,13 @@ +created: 20171212104509964 +modified: 20171212104733995 +tags: Resources +title: Plugins by Uwe Stuehler +type: text/vnd.tiddlywiki +url: https://ustuehler.github.io + +A collection of plugins from Uwe Stuehler, including: + +* Material Edition, a theme based on Google's "material" design language +* A wrapper for the [[MUURI plugin|https://github.com/haltu/muuri]], bringing complex "masonry"-style layouts to TiddlyWiki + +{{!!url}} diff --git a/editions/tw5.com/tiddlers/community/resources/TB5 a pocket full of tips by Tobias Beer.tid b/editions/tw5.com/tiddlers/community/resources/TB5 a pocket full of tips by Tobias Beer.tid index feba3dab1..31e3fc1ca 100644 --- a/editions/tw5.com/tiddlers/community/resources/TB5 a pocket full of tips by Tobias Beer.tid +++ b/editions/tw5.com/tiddlers/community/resources/TB5 a pocket full of tips by Tobias Beer.tid @@ -1,11 +1,11 @@ created: 20140315085406905 -modified: 20140321084548184 +modified: 20161230173004886 tags: Resources title: "TB5 - a pocket full of tips" by Tobias Beer type: text/vnd.tiddlywiki -url: http://tb5.tiddlyspot.com/ +url: http://tobibeer.github.io/tb5/ -A collection of tips from Tobias Beer +An enormous collection of tips beautifully curated by Tobias Beer. It is actually a collection of sites, with sub-sites dedicated to topics such as filtering (http://tobibeer.github.io/tw/filters/). {{!!url}} diff --git a/editions/tw5.com/tiddlers/community/resources/TW5-SingleExecutable_by_Jed_Carty.tid b/editions/tw5.com/tiddlers/community/resources/TW5-SingleExecutable_by_Jed_Carty.tid new file mode 100644 index 000000000..c23471ea0 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/TW5-SingleExecutable_by_Jed_Carty.tid @@ -0,0 +1,14 @@ +created: 20180320020552940 +modified: 20180320020554172 +tags: Resources +title: TW5-SingleExecutable by Jed Carty +type: text/vnd.tiddlywiki +url: https://github.com/OokTech/TW5-SingleExecutable + +TiddlyWiki5 Packaged with the multi-user plugin in a single executable file. + +{{!!url}} + +<<< +Tiddlywiki, node js, multiuser plugin - all packaged into a single file so user can just download the file and run it and not have to install anything else. Versions available for windows, osx, and linux. +<<< diff --git a/editions/tw5.com/tiddlers/community/resources/TWGuides by Andreas Hahn.tid b/editions/tw5.com/tiddlers/community/resources/TWGuides by Andreas Hahn.tid deleted file mode 100644 index 9af92fc0d..000000000 --- a/editions/tw5.com/tiddlers/community/resources/TWGuides by Andreas Hahn.tid +++ /dev/null @@ -1,16 +0,0 @@ -created: 20140920124011558 -modified: 20150430154230509 -tags: Resources -title: TWGuides by Andreas Hahn -type: text/vnd.tiddlywiki -url: http://twguides.org/ - -A collection of community tips and tutorials curated by Andreas Hahn, including a handy "customiser" that simplifies creating an empty TiddlyWiki with selected plugins and enhancements. - -Updated to include [[Tinka|http://twguides.org/tinka.html]], a plugin that "provides a GUI to create and modify plugins more easily, therefore saving time on the packaging process". - -{{!!url}} - -<<< -The intent of the project is to encourage people to use and actively tweak TiddlyWiki according to their needs. Similar to the old version, I also want to encourage people to share their knowledge and help other people get the most out of this wonderful piece of wiki software. -<<< diff --git a/editions/tw5.com/tiddlers/community/resources/TiddlyDrive Add-on for Google Drive by Joshua Stubbs.tid b/editions/tw5.com/tiddlers/community/resources/TiddlyDrive Add-on for Google Drive by Joshua Stubbs.tid new file mode 100644 index 000000000..211ed4519 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/TiddlyDrive Add-on for Google Drive by Joshua Stubbs.tid @@ -0,0 +1,20 @@ +caption: ~TiddlyDrive +created: 20171109172705241 +delivery: Google Drive Add-on +description: Google Drive add-on to save TiddlyWiki files +method: save +modified: 20171113134317867 +tags: Saving plugins Resources Android Chrome Firefox InternetExplorer iOS Linux Mac Opera PHP Safari Windows +title: TiddlyDrive Add-on for Google Drive by Joshua Stubbs +type: text/vnd.tiddlywiki +url: https://chrome.google.com/webstore/detail/tiddly-drive/oaphhjhbbabdjnpjpiliepphpmnioolo + +An add-on for Google Drive that allows TiddlyWiki files stored there to be opened and saved directly + +{{!!url}} + +<<< +I made an app that lets one edit TiddlyWiki files saved in your Google drive and then saving them back automagically. The page is here https://chrome.google.com/webstore/detail/tiddly-drive/oaphhjhbbabdjnpjpiliepphpmnioolo but I think you need to add it from the Google Drive web interface. + +I even added an optional ability to save with ctrl + s hotkeys. +<<< [[Joshua's launch post|https://groups.google.com/d/topic/tiddlywiki/7pNJizR57e8/discussion]] diff --git a/editions/tw5.com/tiddlers/community/resources/TiddlyServer by Arlen Beiler.tid b/editions/tw5.com/tiddlers/community/resources/TiddlyServer by Arlen Beiler.tid new file mode 100644 index 000000000..38d9ee57a --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/TiddlyServer by Arlen Beiler.tid @@ -0,0 +1,26 @@ +caption: ~TiddlyServer +created: 20171109171415540 +delivery: App +description: An extension to TiddlyWiki's Node.js server +method: sync +modified: 20171113134624304 +tags: Linux Mac Windows Saving Resources +title: TiddlyServer by Arlen Beiler +type: text/vnd.tiddlywiki +url: https://github.com/Arlen22/TiddlyServer + +An extension to the Node.js configuration of TiddlyWiki that adds support for static attachments and for working with multiple wikis at the same time. + +{{!!url}} + +<<< +TiddlyServer 2.0 takes the server command of TiddlyWiki on NodeJS and adds it to a static file server. This means you can load and serve any TiddlyWiki data folder in the same way you can serve a single file TiddlyWiki. + +But you don't need to serve files and folders from just one place, you can serve them from multiple places anywhere on your harddrive (literally anywhere NodeJS can stat, readdir, and readFile). You can even organize them into virtual folders (aka aliases in Apache and mounts in Express). + +The main point, of course, is that you can actually edit your files, not just look at them. Single file TiddlyWikis use the put saver, which needs to be patched using a bookmarklet included on the index page. The instructions for this are below under the heading "One thing that needs to be noted". + +And, of course, you can edit data folder tiddlywikis just like you were running node tiddlywiki.js data --server, except that you run it on the path that you found it at (e.g. http://localhost/personal/notes/). You can have as many data folders open as you want, they don't conflict (though they will each take memory). + +Data folders store individual tiddlers instead of entire wikis. They take less disk space as they also do not store the core and plugins. This means they also save much quicker, especially over the internet. They also save immediately (within 10 seconds or so) and they save drafts. +<<< \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/community/resources/TiddlyWiki extensions for ViM.tid b/editions/tw5.com/tiddlers/community/resources/TiddlyWiki extensions for ViM.tid new file mode 100644 index 000000000..32b0a5814 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/TiddlyWiki extensions for ViM.tid @@ -0,0 +1,10 @@ +created: 20160820000000000 +modified: 20160820000000000 +tags: Resources +title: TiddlyWiki extensions for ViM +type: text/vnd.tiddlywiki +url: https://github.com/roma0104/vim-tid + +[[Vi iMproved|http://www.vim.org/]] syntax file for TiddlyWiki5 `*.tid` files. + +{{!!url}} diff --git a/editions/tw5.com/tiddlers/community/resources/Tinka by Andreas Hahn.tid b/editions/tw5.com/tiddlers/community/resources/Tinka by Andreas Hahn.tid new file mode 100644 index 000000000..cc704405e --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/Tinka by Andreas Hahn.tid @@ -0,0 +1,16 @@ +created: 20140920124011558 +modified: 20170305081535978 +tags: Resources +title: Tinka by Andreas Hahn +type: text/vnd.tiddlywiki +url: https://tinkaplugin.github.io/ + +The Tinka plugin provides the ability to create and modify plugins in the browser, without requiring the use of Node.js. + +See https://github.com/TinkaPlugin/Tinka for the GitHub repo. + +{{!!url}} + +<<< +This is a Control Panel extension that aims to simplify the plugin creation and editing process. After installing, you will find a new tab in your control panel that makes creating and modifying plugins a little bit easier. +<<< diff --git a/editions/tw5.com/tiddlers/community/resources/Widdly by Opennota.tid b/editions/tw5.com/tiddlers/community/resources/Widdly by Opennota.tid new file mode 100644 index 000000000..91ba0ed16 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/Widdly by Opennota.tid @@ -0,0 +1,14 @@ +created: 20180309162923236 +modified: 20180309164105386 +tags: Resources +title: Widdly by Opennota +type: text/vnd.tiddlywiki +url: https://github.com/opennota/widdly + +A cross platform server application that can save tiddlers to a local database + +{{!!url}} + +<<< + a minimal self-hosted app, written in Go, that can serve as a backend for a personal TiddlyWiki. +<<< diff --git a/editions/tw5.com/tiddlers/community/resources/Wikilabs by PMario.tid b/editions/tw5.com/tiddlers/community/resources/Wikilabs by PMario.tid new file mode 100644 index 000000000..dbc8fd1e4 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/Wikilabs by PMario.tid @@ -0,0 +1,16 @@ +created: 201704191641 +modified: 201704191641 +tags: Resources +title: "Wikilabs" by PMario +type: text/vnd.tiddlywiki +url: https://wikilabs.github.io + +A collection of references for testing concepts around ~TiddlyWiki 5... + +{{!!url}} + +<<< +This is PMario's playground with ramblings about ~TiddlyWiki and related stuff. + +It basically is a "jump off" page to various ~TiddlyWiki sites, that show editions, themes and plugins. +<<< diff --git a/editions/tw5.com/tiddlers/community/resources/_ATWiki_ by Lamusia Project.tid b/editions/tw5.com/tiddlers/community/resources/_ATWiki_ by Lamusia Project.tid new file mode 100644 index 000000000..527f5dd9d --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_ATWiki_ by Lamusia Project.tid @@ -0,0 +1,14 @@ +created: 20171219171531482 +modified: 20171219171730344 +tags: Resources +title: "ATWiki" by Lamusia Project +type: text/vnd.tiddlywiki +url: https://lamusia.github.io/#ATWiki + +A desktop application for TiddlyWiki, running on Windows. + +{{!!url}} + +<<< +TiddlyWiki for Windows. A unique non-linear notebook for capturing, organising and sharing complex information. +<<< \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/community/resources/_Cardo-A Task and Project Management Wiki_ by David_Szego.tid b/editions/tw5.com/tiddlers/community/resources/_Cardo-A Task and Project Management Wiki_ by David_Szego.tid new file mode 100644 index 000000000..74bdabbeb --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_Cardo-A Task and Project Management Wiki_ by David_Szego.tid @@ -0,0 +1,14 @@ +created: 20141122093837330 +modified: 20170101184753993 +tags: Resources +title: "Cardo - Task and Project Management Wiki" by David Szego +type: text/vnd.tiddlywiki +url: http://cardo.wiki + +Task & Delegation Tracking, Meetings & Agenda Items, Project Roles, Progress & Status Updates, Reference Items, Tickler Calendar, Conversation Logging, Book Notes & Library, and More! + +{{!!url}} + +<<< +Cardo is a standalone, browser-based tool that can be used as a simple task manager, or as a complex Project Management system (and indeed, I do use it this way in my daily work) as well as a fully Wiki-ized personal knowledge store. It runs completely independently in the browser, even without an Internet connection, making it possible to carry around on a USB stick, or to use on the morning commute. +<<< \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/community/resources/_Dropboard_ by Reid Gould.tid b/editions/tw5.com/tiddlers/community/resources/_Dropboard_ by Reid Gould.tid new file mode 100644 index 000000000..c6561f668 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_Dropboard_ by Reid Gould.tid @@ -0,0 +1,13 @@ +created: 20171111192738730 +creator: MAS +modified: 20171111192738730 +tags: Resources +title: "Dropboard" by Reid Gould +type: text/vnd.tiddlywiki +url: https://github.com/reidgould/tiddlywiki-dropboard + +A TiddlyWiki plugin for kanban-like organization in the style of Trello™ using boards, lists, and cards. + +{{!!url}} + + diff --git a/editions/tw5.com/tiddlers/community/resources/_Dynamic Tables_ by Jed Carty.tid b/editions/tw5.com/tiddlers/community/resources/_Dynamic Tables_ by Jed Carty.tid new file mode 100644 index 000000000..ee9ad516b --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_Dynamic Tables_ by Jed Carty.tid @@ -0,0 +1,10 @@ +created: 20180309160958926 +modified: 20180309160118848 +tags: Resources +title: "Dynamic Tables" by Jed Carty +type: text/vnd.tiddlywiki +url: http://ooktech.com/jed/ExampleWikis/DynamicTables/ + +//''Dynamic Tables''// is a set of macros that allow you to create tables where the rows are created from tiddlers and the columns from the tiddler fields, or where the columns are created from tiddlers and the rows from their fields. Individual cells can be edited on the fly. Row tables can be sorted by columns and column tables can be sorted by rows. + +{{!!url}} \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/community/resources/_Ghostwriter theme by Rory Gibson_ by Riz.tid b/editions/tw5.com/tiddlers/community/resources/_Ghostwriter theme by Rory Gibson_ by Riz.tid new file mode 100644 index 000000000..64544aa1a --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_Ghostwriter theme by Rory Gibson_ by Riz.tid @@ -0,0 +1,14 @@ +created: 20141122093837330 +modified: 20161224230649593 +tags: Resources +title: "Ghostwriter theme by Rory Gibson" adapted for TW5 by Riz +type: text/vnd.tiddlywiki +url: https://ibnishak.github.io/ghostwriter/ + +An adaption of the "Ghostwriter" theme for ~TiddlyWiki. + +{{!!url}} + +<<< +Ghostwriter is a popular, minimalist and mobile responsive theme for the blogging platform ghost. This is an adaptation for ~TiddlyWiki. +<<< diff --git a/editions/tw5.com/tiddlers/community/resources/_Hacks_ by Thomas Elmiger.tid b/editions/tw5.com/tiddlers/community/resources/_Hacks_ by Thomas Elmiger.tid new file mode 100644 index 000000000..0576f083d --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_Hacks_ by Thomas Elmiger.tid @@ -0,0 +1,16 @@ +created: 20161226165024380 +creator: Thomas Elmiger +modified: 20161226193911129 +modifier: Thomas Elmiger +tags: Resources +title: "Hacks" by Thomas Elmiger +url: http://tid.li/tw5/hacks.html + +A collection of helpers by Thomas Elmiger, among them a ''tweet button'' macro, a ''text-stretch'' solution, a ''snippet extraction'' macro and a tiddler that installs a ''scroll-to-top button'' via drag-and-drop. + +{{!!url}} + +<<< +Quick Extensions for ~TiddlyWiki 5 – […] As I take from the community, I am happy if I can give back. You can use my stuff to do whatever you like, but remember to save a back-up first. +<<< Thomas + diff --git a/editions/tw5.com/tiddlers/community/resources/_JD Mobile Layout plugin_ by JD.tid b/editions/tw5.com/tiddlers/community/resources/_JD Mobile Layout plugin_ by JD.tid new file mode 100644 index 000000000..520e87309 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_JD Mobile Layout plugin_ by JD.tid @@ -0,0 +1,11 @@ +created: 20171107181449175 +creator: Ste Willson +modified: 20171107185105718 +tags: Resources +title: "JD Mobile Layout plugin" by JD +type: text/vnd.tiddlywiki +url: http://j.d.simplemobile.tiddlyspot.com + +A plugin that improves the usability of TiddlyWiki on smartphones by [[JD|http://j.d.tiddlyspot.com]]: + +{{!!url}} diff --git a/editions/tw5.com/tiddlers/community/resources/_Lucky Sushi_ online shop by sini-Kit.tid b/editions/tw5.com/tiddlers/community/resources/_Lucky Sushi_ online shop by sini-Kit.tid new file mode 100644 index 000000000..6189c7b89 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_Lucky Sushi_ online shop by sini-Kit.tid @@ -0,0 +1,11 @@ +created: 20141122093837330 +modified: 20161224181607230 +tags: Resources +title: "Lucky Sushi" online shop by sini-Kit +type: text/vnd.tiddlywiki +url: http://luckysushi.ru/habarovsk/heeg35.html#index + +A complete online shop made in ~TiddlyWiki! + +{{!!url}} + diff --git a/editions/tw5.com/tiddlers/community/resources/_MathCell_ by Ste Wilson.tid b/editions/tw5.com/tiddlers/community/resources/_MathCell_ by Ste Wilson.tid new file mode 100644 index 000000000..4275d011d --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_MathCell_ by Ste Wilson.tid @@ -0,0 +1,15 @@ +created: 20161226165024380 +creator: Ste Willson +modified: 20170813162852649 +tags: Resources +title: "MathCell" by Stephen Kimmel +url: http://mathcell.tiddlyspot.com/ + +Mathcell allows spreadsheet-like abilities in a completely contained TiddlyWiki. + +{{!!url}} + +<<< +Mathcell allows spreadsheet-like abilities in a completely contained TiddlyWiki. Additional abilities allow it work as a general math engine. +<<< + diff --git a/editions/tw5.com/tiddlers/community/resources/_Moments-A little color won't hurt_ by Riz.tid b/editions/tw5.com/tiddlers/community/resources/_Moments-A little color won't hurt_ by Riz.tid new file mode 100644 index 000000000..c81056f78 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_Moments-A little color won't hurt_ by Riz.tid @@ -0,0 +1,14 @@ +created: 20141122093837330 +modified: 20161224225452147 +tags: Resources +title: "Moments: A little color won't hurt" by Riz +type: text/vnd.tiddlywiki +url: http://tesseractmoments.surge.sh/ + +An adaption of the "Moments" theme for ~TiddlyWiki. + +{{!!url}} + +<<< +Moments is a beautiful free and responsive theme available for wordpress from here: http://www.s5themes.com/theme/moments/. This is an adaptation of the same for TW5 platform. All the design credits goes to the site and the original designer. If TW5 is going to be here for 25 years, might as well suit up. +<<< diff --git a/editions/tw5.com/tiddlers/community/resources/_Noteself_ by Danielo Rodriguez.tid b/editions/tw5.com/tiddlers/community/resources/_Noteself_ by Danielo Rodriguez.tid new file mode 100644 index 000000000..47456fda6 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_Noteself_ by Danielo Rodriguez.tid @@ -0,0 +1,32 @@ +caption: Noteself +created: 20141122093837330 +delivery: Web Service +description: Free online service that you can also host yourself +method: sync +modified: 20171113132811794 +tags: Saving Resources Android Chrome Firefox InternetExplorer iOS Linux Mac Opera PHP Safari Windows +title: "Noteself" by Danielo Rodríguez +type: text/vnd.tiddlywiki +url: https://noteself.github.io/ + +~NoteSelf is your personal, private, customizable, Evernote-like experience. +You want cloud? Fine! You don't? Fine too! It's all yours, It's your decision! +Why not be a bit selfish? + +https://noteself.github.io/ + +<<< +~NoteSelf is the perfect place to store your ideas, notes, thoughts, tips, tricks, recipes... +whatever you want to put into it! ~NoteSelf will store, index, and make it easily +searchable, so you will find it instantly whenever you need it! + +You already know and love Evernote, we know it. It is comfortable, it syncs, has search capabilities... +Wow, it's almost perfect, but what about: + +* Privacy - Everything is stored on the Evernote's servers! +* Customization - If you don't like the interface of Evernote, there's nothing you can do + +~NoteSelf is built on top of ~TiddlyWiki, a powerful, free, highly customizable and open-source personal wiki. +We took the best of it, it's powerful customization system, and mixed it with one of the best +embedded databases available, [[PouchDb|http://www.pouchdb.com]], for bringing the synchronization capabilities you need. +<<< diff --git a/editions/tw5.com/tiddlers/community/resources/_Slides and Stories_ by Jan.tid b/editions/tw5.com/tiddlers/community/resources/_Slides and Stories_ by Jan.tid new file mode 100644 index 000000000..3e28951d2 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_Slides and Stories_ by Jan.tid @@ -0,0 +1,25 @@ +created: 20141122093837330 +modified: 20170101192254712 +tags: Resources +title: "Slides and Stories" by Jan +type: text/vnd.tiddlywiki +url: http://slidesnstories.tiddlyspot.com + +Slides and Stories is a repository of the tools to optimize TW for scientific research and for presenting and publishing results. + +{{!!url}} + +<<< +!~SlidesnStories +...is a tool to save and reload sets of Tiddlers. This is already working, The aim is to develop a mechanism to transform these into instant slideshows. + +!~MetaTabs +is a tool which gives you the possibility to attach and show specific information in tabs at the bottom of each Tiddler: ideas, notes, tasks, stories and presentations, comments, annotations and footnotes. <br> +It is inspired by ~MagicTabs and Tiddlyscholar by Alberto Molina Pérez, which are very elaborated tools that alas do not seem to be in active development any more. +I wanted to change the behaviour in some ways. For example I wanted show tabs only if they have content. + +!...furthermore there is +* an export-plugin, +* a footnote-plugin, +* and a plugin to rearrange Tiddlers in the ~StoryRiver +<<< \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/community/resources/_Tekan_ Kanban that stays with you_ by Riz.tid b/editions/tw5.com/tiddlers/community/resources/_Tekan_ Kanban that stays with you_ by Riz.tid new file mode 100644 index 000000000..a80cc8655 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_Tekan_ Kanban that stays with you_ by Riz.tid @@ -0,0 +1,16 @@ +created: 20171115160958926 +modified: 20171115161136049 +tags: Resources +title: "Tekan: Kanban that stays with you" by Riz +type: text/vnd.tiddlywiki +url: https://ibnishak.github.io/Tesseract/projects/tekan/Tekan.html + +A Kanban implementation for TiddlyWiki with a familiar look and feel (see the [[demo|https://ibnishak.github.io/Tesseract/projects/tekan/]]). + +{{!!url}} + +<<< +This is Tekan, a TW based kanban. The easiest way to know tekan is to use it. So let us begin, shall we? +<<< + + diff --git a/editions/tw5.com/tiddlers/community/resources/_TiddlyServer_ by Matt Lauber.tid b/editions/tw5.com/tiddlers/community/resources/_TiddlyServer_ by Matt Lauber.tid new file mode 100644 index 000000000..33b4b4629 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_TiddlyServer_ by Matt Lauber.tid @@ -0,0 +1,16 @@ +created: 20161226165024380 +creator: Matt Lauber +modified: 20161226193911129 +tags: Resources +title: "TiddlyServer" by Matt Lauber +url: https://github.com/mklauber/TiddlyServer/releases/ + +TiddlyServer is a special purpose Desktop app, designed to facilitate managing multiple instances of TiddlyWiki running as a server. It does not require internet acess to access the wikis. + +{{!!url}} + +<<< +TiddlyServer can import both TiddlyWiki files and TiddlyFolder wikis. For each wiki, you specify a prefix to serve it with and the source to import from. It will copy the wikis to its own internal store and begin serving them up at http://localhost:8080/{prefix}/. The export button for each wiki will convert it to a single file wiki. + +<<< + diff --git a/editions/tw5.com/tiddlers/community/resources/_TiddlyWiki Knowledge Network_ by Dmitry Sokolov.tid b/editions/tw5.com/tiddlers/community/resources/_TiddlyWiki Knowledge Network_ by Dmitry Sokolov.tid new file mode 100644 index 000000000..127e03f94 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_TiddlyWiki Knowledge Network_ by Dmitry Sokolov.tid @@ -0,0 +1,18 @@ +created: 20141122093837330 +modified: 20170101185203168 +tags: Resources +title: "TiddlyWiki Knowledge Network" by Dmitry Sokolov +type: text/vnd.tiddlywiki +url: http://confocal-manawatu.pbworks.com/w/page/113574373/TiddlyWiki + +A Knowledge Network about ~TiddlyWiki. + +{{!!url}} + +<<< +Interconnected with the visual taxonomy at every node: +http://debategraph.org/Stream.aspx?nid=457381&vt=bubble&dc=focus + +TWKN will be transferred into TWederation/~TiddlyMap format as soon as I am convinced in reliable and secure versioning and multi-user operation in TW format. +Your assistance and support would be highly appreciated. +<<< \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/community/resources/_TiddlyWiki5 Forum on Reddit_ by Riz.tid b/editions/tw5.com/tiddlers/community/resources/_TiddlyWiki5 Forum on Reddit_ by Riz.tid new file mode 100644 index 000000000..9a37d6155 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_TiddlyWiki5 Forum on Reddit_ by Riz.tid @@ -0,0 +1,16 @@ +created: 20141122093837330 +modified: 20161224230649593 +tags: Resources +title: "TiddlyWiki5 Forum on Reddit" by Riz +type: text/vnd.tiddlywiki +url: https://www.reddit.com/r/TiddlyWiki5/ + +A TiddlyWiki5 forum on Reddit. + +{{!!url}} + +<<< +A ~TiddlyWiki5 forum on Reddit. As of 2016, it claims to have the most up-to-date list of plugins available for TW5. +<<< + + diff --git a/editions/tw5.com/tiddlers/community/resources/_X3DOM for TiddlyWiki 5_ by Jamal Wills.tid b/editions/tw5.com/tiddlers/community/resources/_X3DOM for TiddlyWiki 5_ by Jamal Wills.tid new file mode 100644 index 000000000..f0fcf7e19 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_X3DOM for TiddlyWiki 5_ by Jamal Wills.tid @@ -0,0 +1,11 @@ +created: 20171107175718679 +creator: Ste Willson +modified: 20171113155204443 +tags: Resources +title: "X3DOM for TiddlyWiki 5" by Jamal Wills +type: text/vnd.tiddlywiki +url: http://x3dom.tiddlyspot.com/ + +An experiment to embed interactive 3D graphics within TiddlyWiki by [[Jamal Wills|http://zemox.tiddlyspot.com]]. It is based [[X3DOM|https://www.x3dom.org]], an open source JavaScript library. + +{{!!url}} diff --git a/editions/tw5.com/tiddlers/community/resources/_file-backups_ Extension Firefox by pmario.tid b/editions/tw5.com/tiddlers/community/resources/_file-backups_ Extension Firefox by pmario.tid new file mode 100644 index 000000000..bba4660ec --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_file-backups_ Extension Firefox by pmario.tid @@ -0,0 +1,16 @@ +caption: file-backups +created: 201711161655 +delivery: Browser Extension +description: Browser extension for Firefox +method: save +modified: 201711161655 +tags: Firefox Saving Resources plugins +title: "file-backups" Extension for Firefox by pmario +type: text/vnd.tiddlywiki +url: https://github.com/pmario/file-backups + +An extension for Mozilla Firefox that smoothes out some of the friction from ~TiddlyWiki's built-in [[HTML5 fallback saver|Saving with the HTML5 fallback saver]], making it almost as easy to use as ~TiddlyFox. The workflow is intended to work out of the box, without configuration. + +https://github.com/pmario/file-backups which contains links to the documentation and introduction video(s). + +A chrome version is planned! \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/community/resources/_muritest_ by Simon Huber.tid b/editions/tw5.com/tiddlers/community/resources/_muritest_ by Simon Huber.tid new file mode 100644 index 000000000..88385a8d6 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_muritest_ by Simon Huber.tid @@ -0,0 +1,10 @@ +created: 20171219165418434 +modified: 20171219165845495 +tags: Resources +title: "muritest" by Simon Huber +type: text/vnd.tiddlywiki +url: http://muritest.tiddlyspot.com + +A terrific demo of drag and drop, pan and zoom, and other sophisticated touch effects. Based on the [[muuri plugin by Uwe Stuehler|Plugins by Uwe Stuehler]]. + +{{!!url}} diff --git a/editions/tw5.com/tiddlers/community/resources/_savetiddlers_ Extension for Chrome and Firefox by buggyj.tid b/editions/tw5.com/tiddlers/community/resources/_savetiddlers_ Extension for Chrome and Firefox by buggyj.tid new file mode 100644 index 000000000..3a558d283 --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/_savetiddlers_ Extension for Chrome and Firefox by buggyj.tid @@ -0,0 +1,14 @@ +caption: savetiddlers +created: 20171109171935039 +delivery: Browser Extension +description: Browser extension for Chrome and Firefox +method: save +modified: 20171113132624609 +tags: Chrome Firefox Saving Resources plugins +title: "savetiddlers" Extension for Chrome and Firefox by buggyj +type: text/vnd.tiddlywiki +url: https://github.com/buggyj/savetiddlers + +An extension for Google Chrome and Mozilla Firefox that smoothes out some of the friction from TiddlyWiki's built-in [[HTML5 fallback saver|Saving with the HTML5 fallback saver]], making it almost as easy to use as TiddlyFox once it is set up correctly. + +https://github.com/buggyj/savetiddlers diff --git a/editions/tw5.com/tiddlers/community/tutorials/TW5 Mall.tid b/editions/tw5.com/tiddlers/community/tutorials/TW5 Mall.tid deleted file mode 100644 index a972855ad..000000000 --- a/editions/tw5.com/tiddlers/community/tutorials/TW5 Mall.tid +++ /dev/null @@ -1,14 +0,0 @@ -created: 20140315085406905 -modified: 20140321084548184 -tags: Tutorials -title: "TW5 Mall" by David Gifford -type: text/vnd.tiddlywiki -url: http://www.giffmex.org/tw5mall.htm - -Dave Gifford's growing catalogue of tips and tutorials. - -{{!!url}} - -<<< -TiddlyWiki 5 is a great tool for note-taking, bookmarking, blogging, organizing to do lists, writing books, and more. But many of the things that can be done in TiddlyWiki 5 are often hidden to the new user, either because the user doesn't know about it or because the user doesn't know how to do it. TW5 mall is a modest catalog of hacks where you can discover new tricks in TiddlyWiki 5 and also find out in layman's terms how to implement them. -<<< diff --git a/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid b/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid index b52d8913b..75faa41e2 100644 --- a/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid +++ b/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid @@ -26,5 +26,6 @@ Palette tiddlers should have the following fields: |title |Typically starting with `$:/` | |type |`application/x-tiddler-dictionary` | |tags |`$:/tags/Palette` | +|name |Displayed in the palette browser | |description |Displayed in the palette browser | |text |`name: value` colour definitions | diff --git a/editions/tw5.com/tiddlers/concepts/DefaultTiddlers.tid b/editions/tw5.com/tiddlers/concepts/DefaultTiddlers.tid new file mode 100644 index 000000000..751c01e74 --- /dev/null +++ b/editions/tw5.com/tiddlers/concepts/DefaultTiddlers.tid @@ -0,0 +1,12 @@ +created: 20180306113011255 +modified: 20180306161225140 +tags: Concepts +title: DefaultTiddlers +type: text/vnd.tiddlywiki + +"Default tiddlers" refers to the list of tiddlers that is opened at startup in the browser if the address bar does not include a [[permalink|PermaLinks]]). + +At startup, the text of the system tiddler [[$:/DefaultTiddlers]] is retrieved and evaluated as a [[filter expression|Filter Expression]]. The resulting list of titles is then inserted into the [[story river|Story River]]. + +The [[control panel|$:/ControlPanel]] ''info/basics'' tab includes a text box for direct access to [[$:/DefaultTiddlers]]. + diff --git a/editions/tw5.com/tiddlers/concepts/DictionaryTiddlers.tid b/editions/tw5.com/tiddlers/concepts/DictionaryTiddlers.tid index f9d9afe8d..33a0a65cd 100644 --- a/editions/tw5.com/tiddlers/concepts/DictionaryTiddlers.tid +++ b/editions/tw5.com/tiddlers/concepts/DictionaryTiddlers.tid @@ -1,9 +1,9 @@ created: 20141228094500000 -modified: 20141228094500000 +modified: 20180305111822713 tags: Concepts title: DictionaryTiddlers -A dictionary tiddler is a [[data tiddler|DataTiddlers]] containing a simple list of name/value pairs. +A dictionary tiddler is a [[data tiddler|DataTiddlers]] containing a simple list of `name: value` pairs. Its [[ContentType]] is `application/x-tiddler-dictionary`. diff --git a/editions/tw5.com/tiddlers/concepts/Order of Tagged Tiddlers.tid b/editions/tw5.com/tiddlers/concepts/Order of Tagged Tiddlers.tid index 506b1afd0..b2f136b00 100644 --- a/editions/tw5.com/tiddlers/concepts/Order of Tagged Tiddlers.tid +++ b/editions/tw5.com/tiddlers/concepts/Order of Tagged Tiddlers.tid @@ -1,5 +1,5 @@ created: 20150124125646000 -modified: 20150917193522589 +modified: 20170328161702062 tags: Tagging title: Order of Tagged Tiddlers type: text/vnd.tiddlywiki @@ -14,3 +14,5 @@ When ~TiddlyWiki generates a list of the tiddlers that have a particular tag (e. # In each remaining tiddler <<.place T>>, look for a <<.field list-after>> field. If this has a tiddler title as its value, place tiddler <<.place T>> just <<.em after>> that one. # If any tiddlers still remain, place them at the end of the list in ascending alphabetical order of title. The difference between capital and lowercase letters is ignored. + +The ordering of tiddlers with a particular tag can be directly modified using drag and drop within a tag pill dropdown. The underlying [[list-tagged-draggable Macro]] can also be used elsewhere. diff --git a/editions/tw5.com/tiddlers/concepts/PermaLinks.tid b/editions/tw5.com/tiddlers/concepts/PermaLinks.tid index c842c8e2d..3aeca187e 100644 --- a/editions/tw5.com/tiddlers/concepts/PermaLinks.tid +++ b/editions/tw5.com/tiddlers/concepts/PermaLinks.tid @@ -10,11 +10,11 @@ Permalinks allow direct links to individual tiddlers within a TiddlyWiki. The simplest form of permalink ({{$:/core/images/permalink-button}}) is a single target tiddler title appended to the base URL with `#`: -http://tiddlywiki.com/#HelloThere +https://tiddlywiki.com/#HelloThere The tiddler title can contain spaces if required: -[[http://tiddlywiki.com/#Using TiddlyWiki on Node.js]] +[[https://tiddlywiki.com/#Using TiddlyWiki on Node.js]] Note that double square brackets are not required around the target tiddler title; however, if present they are silently removed. @@ -22,17 +22,17 @@ Note that double square brackets are not required around the target tiddler titl The permalink can also specify the story list of tiddlers that should be opened alongside the target tiddler as a [[TiddlerFilter|Filters]]: -[[http://tiddlywiki.com/#TiddlerFields:Tiddlers TiddlerTags TiddlerFields ContentType]] +[[https://tiddlywiki.com/#TiddlerFields:Tiddlers TiddlerTags TiddlerFields ContentType]] If the target tiddler isn't present in the story list then it is automatically inserted at the top. This means that the following two examples both target the tiddler `Tiddlers` within the story sequence `Tiddlers`, `Tags`, `TiddlerFields`: -[[http://tiddlywiki.com/#Tiddlers:Tags TiddlerFields]] +[[https://tiddlywiki.com/#Tiddlers:Tags TiddlerFields]] -[[http://tiddlywiki.com/#Tiddlers:Tiddlers Tags TiddlerFields]] +[[https://tiddlywiki.com/#Tiddlers:Tiddlers Tags TiddlerFields]] It is also possible to specify a story filter without specifying a target tiddler for navigation: -<a href="http://tiddlywiki.com/#:[tags[task]]" rel="noopener noreferrer">~http://tiddlywiki.com/#:[tags[task]]</a> +<a href="https://tiddlywiki.com/#:[tags[task]]" rel="noopener noreferrer">~https://tiddlywiki.com/#:[tags[task]]</a> ! About URL encoding diff --git a/editions/tw5.com/tiddlers/concepts/Pragma.tid b/editions/tw5.com/tiddlers/concepts/Pragma.tid index ee1c49e14..cb932dcf8 100644 --- a/editions/tw5.com/tiddlers/concepts/Pragma.tid +++ b/editions/tw5.com/tiddlers/concepts/Pragma.tid @@ -1,5 +1,5 @@ created: 20150219175930000 -modified: 20150221215112000 +modified: 20170712154519026 tags: Concepts title: Pragma type: text/vnd.tiddlywiki @@ -14,3 +14,5 @@ The following pragmas are available: : for defining a [[macro|Macros]] ;`\rules` : for adjusting the set of rules used to parse the text +;`\whitespace trim` or `\whitespace notrim` +: <<.from-version "5.1.15">> Control whether whitespace is trimmed from the start and end of text runs (the default is ''notrim''). This setting can be useful when the whitespace generated by linebreaks disturbs formatting diff --git a/editions/tw5.com/tiddlers/concepts/Selection Constructors.tid b/editions/tw5.com/tiddlers/concepts/Selection Constructors.tid index badf9b1e6..9aac725a5 100644 --- a/editions/tw5.com/tiddlers/concepts/Selection Constructors.tid +++ b/editions/tw5.com/tiddlers/concepts/Selection Constructors.tid @@ -4,7 +4,7 @@ tags: Filters title: Selection Constructors type: text/vnd.tiddlywiki -The output of a [[filter|Filters]] step depends on its [[operator|Filter Operators]]: +The output of a [[Filter Step]] depends on its [[operator|Filter Operators]]: * Most operators derive their output from their input. For example, many of them output a subset of their input, and thus truly live up to the name of <<.word filters>>, narrowing down the overall output of the containing [[run|Filter Run]]. These operators are called <<.def "selection modifiers">>. diff --git a/editions/tw5.com/tiddlers/concepts/SystemTags.tid b/editions/tw5.com/tiddlers/concepts/SystemTags.tid index 64a9b4d47..d74c113fb 100644 --- a/editions/tw5.com/tiddlers/concepts/SystemTags.tid +++ b/editions/tw5.com/tiddlers/concepts/SystemTags.tid @@ -1,5 +1,5 @@ created: 20130822080600000 -modified: 20160215115150854 +modified: 20180323092909513 tags: Concepts title: SystemTags type: text/vnd.tiddlywiki @@ -10,39 +10,66 @@ System tags are used to give special behaviour to tiddlers. These are the available system tags -* {{$:/tags/AboveStory||$:/core/ui/TagTemplate}} for elements to be placed at the top of the story river -* {{$:/tags/AdvancedSearch||$:/core/ui/TagTemplate}} for search elements -* {{$:/tags/Alert||$:/core/ui/TagTemplate}} for alerts -* {{$:/tags/BelowStory||$:/core/ui/TagTemplate}} for elements to be placed at the bottom of the story river -* {{$:/tags/ControlPanel||$:/core/ui/TagTemplate}} for control panel tabs -* {{$:/tags/ControlPanel/Advanced||$:/core/ui/TagTemplate}} for control panel advanced tabs -* {{$:/tags/ControlPanel/Appearance||$:/core/ui/TagTemplate}} for control panel appearance tabs -* {{$:/tags/ControlPanel/Info||$:/core/ui/TagTemplate}} for control panel info tabs -* {{$:/tags/ControlPanel/Settings||$:/core/ui/TagTemplate}} for control panel settings tabs -* {{$:/tags/ControlPanel/Toolbars||$:/core/ui/TagTemplate}} for control panel toolbar customisation tabs -* {{$:/tags/EditPreview||$:/core/ui/TagTemplate}} for custom preview panes -* {{$:/tags/EditTemplate||$:/core/ui/TagTemplate}} for the edit template -* {{$:/tags/EditToolbar||$:/core/ui/TagTemplate}} for the edit mode tiddler toolbar -* {{$:/tags/Exporter||$:/core/ui/TagTemplate}} for the exporters -* {{$:/tags/Filter||$:/core/ui/TagTemplate}} for filters in advanced seach sample filter dropdown -* {{$:/tags/Image||$:/core/ui/TagTemplate}} for (core) images -* {{$:/tags/Macro||$:/core/ui/TagTemplate}} for global macros -* {{$:/tags/MoreSideBar||$:/core/ui/TagTemplate}} for tabs in the "more" sidebar -* {{$:/tags/PageControls||$:/core/ui/TagTemplate}} for the page control tools in the sidebar -* {{$:/tags/PageTemplate||$:/core/ui/TagTemplate}} for the main page elements -* {{$:/tags/Palette||$:/core/ui/TagTemplate}} for colour palettes -* {{$:/tags/PluginLibrary||$:/core/ui/TagTemplate}} for the plugin library -* {{$:/tags/RawMarkup||$:/core/ui/TagTemplate}} for raw markup to be included in the generated HTML file -* {{$:/tags/SearchResults||$:/core/ui/TagTemplate}} for customised search results -* {{$:/tags/SideBar||$:/core/ui/TagTemplate}} for sidebar tabs -* {{$:/tags/Stylesheet||$:/core/ui/TagTemplate}} to indicate that a tiddler should be applied as a CSS stylesheet -* {{$:/tags/TiddlerInfo||$:/core/ui/TagTemplate}} for tiddler info panel tabs -* {{$:/tags/TiddlerInfo/Advanced||$:/core/ui/TagTemplate}} for tabs under the advanced tiddler tab -* {{$:/tags/ToolbarButtonStyle||$:/core/ui/TagTemplate}} for the style of the buttons -* {{$:/tags/TopLeftBar||$:/core/ui/TagTemplate}} for the top left bar -* {{$:/tags/TopRightBar||$:/core/ui/TagTemplate}} for the top right bar -* {{$:/tags/ViewTemplate||$:/core/ui/TagTemplate}} for the view template -* {{$:/tags/ViewToolbar||$:/core/ui/TagTemplate}} for the view mode tiddler toolbar +|<<tag "$:/tags/AboveStory">> |for elements to be placed at the top of the story river | +|<<tag "$:/tags/AdvancedSearch">> |for search elements | +|<<tag "$:/tags/AdvancedSearch/FilterButton">> |for filter buttons | +|<<tag "$:/tags/Alert">> |for alerts | +|<<tag "$:/tags/BelowStory">> |for elements to be placed at the bottom of the story river | +|<<tag "$:/tags/ControlPanel">> |for control panel tabs | +|<<tag "$:/tags/ControlPanel/Advanced">> |for control panel advanced tabs | +|<<tag "$:/tags/ControlPanel/Appearance">> |for control panel appearance tabs | +|<<tag "$:/tags/ControlPanel/Info">> |for control panel info tabs | +|<<tag "$:/tags/ControlPanel/Saving">> |for saving configurations | +|<<tag "$:/tags/ControlPanel/Settings">> |for control panel settings tabs | +|<<tag "$:/tags/ControlPanel/Toolbars">> |for control panel toolbar customisation tabs | +|<<tag "$:/tags/EditorToolbar">> |for the editor toolbar buttons | +|<<tag "$:/tags/EditPreview">> |for custom preview panes | +|<<tag "$:/tags/EditTemplate">> |for the edit template | +|<<tag "$:/tags/EditToolbar">> |for the edit mode tiddler toolbar | +|<<tag "$:/tags/Exporter">> |for the exporters | +|<<tag "$:/tags/Filter">> |for filters in advanced seach sample filter dropdown | +|<<tag "$:/tags/Image">> |for (core) images | +|<<tag "$:/tags/ImportPreview">> |for preview types for the import listing | +|<<tag "$:/tags/Manager/ItemMain">> |for the tiddler manager. $:/Manager | +|<<tag "$:/tags/Manager/ItemSidebar">> |for the tiddler manager | +|<<tag "$:/tags/Macro">> |for global macros | +|<<tag "$:/tags/MoreSideBar">> |for tabs in the "more" sidebar | +|<<tag "$:/tags/MoreSideBar/Plugins">> |for Sidebar: More: Plugins tab | +|<<tag "$:/tags/PageControls">> |for the page control tools in the sidebar | +|<<tag "$:/tags/PageTemplate">> |for the main page elements | +|<<tag "$:/tags/Palette">> |for colour palettes | +|<<tag "$:/tags/PluginLibrary">> |for the plugin library | +|<<tag "$:/tags/RawMarkup">> |for raw markup to be included in the generated HTML file. To activate the tag, TiddlyWiki needs to be reloaded | +|<<tag "$:/tags/RawMarkupWikified">> |for raw markup to be included in the generated HTML file. To activate the tag, TiddlyWiki needs to be reloaded | +|<<tag "$:/tags/RawStaticContent">> |for "raw" content to be saved into the TW code. Be careful! | +|<<tag "$:/tags/RemoteAssetInfo">> |for plugin import handling | +|<<tag "$:/tags/SearchResults">> |for customised search results | +|<<tag "$:/tags/ServerConnection">> |for plugin import handling | +|<<tag "$:/tags/SideBar">> |for sidebar tabs | +|<<tag "$:/tags/StartupAction">> |startup actions executed on all platforms | +|<<tag "$:/tags/StartupAction/Browser">> |startup actions only executed when running in the browser | +|<<tag "$:/tags/StartupAction/Node">> |startup actions only executed when running under Node.js | +|<<tag "$:/tags/Stylesheet">> |to indicate that a tiddler should be applied as a CSS stylesheet | +|<<tag "$:/tags/TagDropdown">> |for tags dropdown sorting | +|<<tag "$:/tags/Texteditor/Snippet">> |for text snippets | +|<<tag "$:/tags/TiddlerInfo">> |for tiddler info panel tabs | +|<<tag "$:/tags/TiddlerInfo/Advanced">> |for tabs under the advanced tiddler tab | +|<<tag "$:/tags/ToolbarButtonStyle">> |for the style of the buttons | +|<<tag "$:/tags/TopLeftBar">> |for the top left bar | +|<<tag "$:/tags/TopRightBar">> |for the top right bar | +|<<tag "$:/tags/ViewTemplate">> |for the view template | +|<<tag "$:/tags/ViewToolbar">> |for the view mode tiddler toolbar | + +! ~TiddlyWiki plugins + +|<<tag "$:/tags/HelpPanel>> |can be seen at: [[tiddlywiki prerelease|https://tiddlywiki.com/prerelease/]] see: top left page control bubble| +|<<tag "$:/tags/HelpPanel/Videos>> |help panel "videos" tab| +|<<tag "$:/tags/MakeQR>> |can be seen at: [[tiddlywiki prerelease|https://tiddlywiki.com/prerelease/]]. see: Tiddler toolbar | +|<<tag "$:/tags/TranslationGroup>> |used by the [[translators edition|https://tiddlywiki.com/editions/translators/]] | +|<<tag "$:/tags/TwitterUsage>> |twitter plugin | +|<<tag "$:/tags/ViewToolbarButton/QRcode>> |see: [[tiddlywiki prerelease|https://tiddlywiki.com/prerelease/]] | +|<<tag "$:/tags/test-spec>> |tiddlywiki test suite | + ! System tags in use diff --git a/editions/tw5.com/tiddlers/concepts/SystemTiddlers.tid b/editions/tw5.com/tiddlers/concepts/SystemTiddlers.tid index 88b499563..04553e60d 100644 --- a/editions/tw5.com/tiddlers/concepts/SystemTiddlers.tid +++ b/editions/tw5.com/tiddlers/concepts/SystemTiddlers.tid @@ -1,10 +1,14 @@ -title: SystemTiddlers +created: 20180113144350185 +modified: 20180113153832195 tags: Concepts +title: SystemTiddlers +type: text/vnd.tiddlywiki -System tiddlers are any tiddler whose title starts with `$:/`; such tiddlers are automatically hidden from most operations. They don't show up in lists or search results, but linking to one directly works in the usual way. +Tiddlers are classified as system tiddlers if their title starts with the special string `$:/`. The only difference from ordinary tiddlers is that they are hidden from most searches and lists in the sidebar. (In particular, system tiddlers are shown in the "More/System" list). -TiddlyWiki models everything as [[tiddlers|Tiddlers]], including its internal components and configuration. Thus, even an apparently empty TiddlyWiki actually contains dozens of tiddlers that are necessary to enable it function correctly. Using system tiddlers prevents them from confusing casual users. +System tiddlers provide a simple way to hide the internal components of TiddlyWiki so that they don't clutter things up, getting in the way of the users content. -The current system tiddlers are: +Many of the system tiddlers follow the convention of using further slashes to delineate the components of the title. For example: `$:/config/BitmapEditor/LineWidth`. + +You don't need to create your own system tiddlers, but it can be useful when customising TiddlyWiki. For example, if you create a custom palette you might call it `$:/_MyPalette` so that (a) it is hidden from searches/lists and (b) it will appear at the top of the system tiddler list for easy reference. -<$list filter="[is[system]sort[title]]"/> diff --git a/editions/tw5.com/tiddlers/concepts/TextReference.tid b/editions/tw5.com/tiddlers/concepts/TextReference.tid index fded16380..4b9a9d2f7 100644 --- a/editions/tw5.com/tiddlers/concepts/TextReference.tid +++ b/editions/tw5.com/tiddlers/concepts/TextReference.tid @@ -1,12 +1,22 @@ created: 20130827075900000 -modified: 20150518180615650 +modified: 20161216173541948 tags: Concepts title: TextReference type: text/vnd.tiddlywiki -A TextReference identifies a chunk of text from a tiddler that can be retrieved or modified depending on the context. +A TextReference is a general purpose way to describe a fragment of text as either a field of a tiddler, or an index within a [[data tiddler|DataTiddlers]]. -Text references are made up of several parts, most of which can be optional: +In different situations, text references can be used to retrieve values, or to specify a value that should be modified. + +A TextReference consists of several parts: + +* The title of the target tiddler. If omitted, it defaults to the [[Current Tiddler]] +* Either one of: +** The name of a field (marked with `!!`) +** The name of an index within a [[data tiddler|DataTiddlers]] (marked with `##`) +* If both the field and index are omitted, the text field is used as the default + +Most of the parts of a text reference can be optional: * `tiddlerTitle` - the text [[field|TiddlerFields]] of the specified tiddler * `tiddlerTitle!!field` - a [[tiddler field|TiddlerFields]] (eg, `modified`, `modifier`, `type` etc) @@ -16,6 +26,9 @@ Text references are made up of several parts, most of which can be optional: Text references can be used in several places: * As [[indirect parameters|Filter Parameter]] within [[Filters]] (eg, `<$list filter="[tag{MyTag!!name}]"/>`) -* As IndirectAttributes of an element or widget (eg, `<$widget attrib={{Title!!description}}/>`) +* As [[indirect attributes|HTML in WikiText]] of an element or widget (eg, `<$widget attrib={{Title!!description}}/>`) * As the operand of a shortcut transclusion (eg, `{{MyTiddler!!title}}`) * As the `state` attribute of the RevealWidget and the LinkCatcherWidget + +<$macrocall $name=".tip" _="""Note the distinction between a text reference such as `foo!!bar` and a transclusion of a text reference such as `{{foo!!bar}}`"""/> + diff --git a/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid b/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid index 6d6096e81..99073f405 100644 --- a/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid +++ b/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid @@ -24,12 +24,16 @@ The standard fields are: Other fields used by the core are: |!Field Name |!Reference |!Description | +|`class` |ClassField |<<lingo class>> | |`color` |ColorField |<<lingo color>> | |`description` |DescriptionField |<<lingo description>> | |`draft.of` |DraftOfField |<<lingo draft.of>> | |`draft.title` |DraftTitleField |<<lingo draft.title>> | |`footer` |FooterField |<<lingo footer>> | +|`icon` |IconField |<<lingo icon>> | |`library` |LibraryField |<<lingo library>> | +|`list-after` |ListAfterField |<<lingo list-after>> | +|`list-before` |ListBeforeField |<<lingo list-before>> | |`name` |NameField |<<lingo name>> | |`plugin-priority` |PluginPriorityField |<<lingo plugin-priority>> | |`plugin-type` |PluginTypeField |<<lingo plugin-type>> | diff --git a/editions/tw5.com/tiddlers/concepts/TiddlerLinks.tid b/editions/tw5.com/tiddlers/concepts/TiddlerLinks.tid index b5eb221da..55e984d12 100644 --- a/editions/tw5.com/tiddlers/concepts/TiddlerLinks.tid +++ b/editions/tw5.com/tiddlers/concepts/TiddlerLinks.tid @@ -25,4 +25,4 @@ TiddlyWiki5 alters the appearance of tiddler links to convey additional informat |To a shadow tiddler that has not been overridden |[[LikeThis|$:/core/copyright.txt]] | |To a shadow tiddler that has been overridden by an ordinary tiddler |[[LikeThis|$:/SiteTitle]] | -External links are shown like this: http://tiddlywiki.com/ or [[like this|http://tiddlywiki.com/]]. +External links are shown like this: https://tiddlywiki.com/ or [[like this|https://tiddlywiki.com/]]. diff --git a/editions/tw5.com/tiddlers/concepts/TiddlyWiki.tid b/editions/tw5.com/tiddlers/concepts/TiddlyWiki.tid index 2256cd876..8e922fdd0 100644 --- a/editions/tw5.com/tiddlers/concepts/TiddlyWiki.tid +++ b/editions/tw5.com/tiddlers/concepts/TiddlyWiki.tid @@ -1,5 +1,5 @@ created: 20130822170700000 -modified: 20150325222620093 +modified: 20170127221451610 tags: Concepts title: TiddlyWiki type: text/vnd.tiddlywiki @@ -8,6 +8,6 @@ type: text/vnd.tiddlywiki ~TiddlyWiki is designed to fit around your brain, helping you deal with the things that won't fit. The [[fundamental idea|Philosophy of Tiddlers]] is that information is more useful and reusable if we cut it up into the smallest semantically meaningful chunks -- [[tiddlers|Tiddlers]] -- and give them titles so that they can be [[structured|Structuring TiddlyWiki]] with [[links|TiddlerLinks]], [[tags|Tagging]], [[lists|ListField]] and [[macros|Macros]]. Tiddlers use a WikiText notation that concisely represents a wide range of text formatting and hypertext features. ~TiddlyWiki aims to provide a fluid interface for working with tiddlers, allowing them to be aggregated and composed into longer narratives. -People love using ~TiddlyWiki. Because it can be used without any complicated server infrastructure, and because it is [[open source|OpenSource]], it has bought unprecedented freedom to everyone to keep their precious information under their own control. +People love using ~TiddlyWiki. Because it can be used without any complicated server infrastructure, and because it is [[open source|OpenSource]], it has brought unprecedented freedom to everyone to keep their precious information under their own control. -~TiddlyWiki was originally created by JeremyRuston and is now a thriving open source project with a busy [[Community]] of independent developers. +~TiddlyWiki was originally created by JeremyRuston and is now a thriving [[open source|License]] project with a busy [[Community]] of independent developers. diff --git a/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid b/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid index 67f464559..839da5341 100644 --- a/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid +++ b/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid @@ -1,124 +1,40 @@ created: 20130825214200000 -modified: 20150728104424501 +modified: 20161015134454785 tags: [[TiddlyWiki on Node.js]] title: TiddlyWikiFolders type: text/vnd.tiddlywiki As well as traditional single file wikis, [[TiddlyWiki on Node.js]] supports wikis that are stored as a folder of individual tiddler files. -! Wiki folder files and folders +! Wiki Folder Structure Wiki folders can contain the following files and folders: -* ''tiddlywiki.info'' - JSON file containing metadata for the wiki +* ''tiddlywiki.info'' - JSON file containing metadata for the wiki -- see [[tiddlywiki.info Files]] * ''\tiddlers'' - folder containing tiddler files comprising the wiki -* ''\plugins'' - folder containing [[plugin folders|PluginMechanism]] to be included in the wiki +* ''\plugins'' - folder containing [[plugin folders|PluginFolders]] to be included in the wiki +* ''\languages'' - folder containing [[plugin folders|PluginFolders]] for language plugins to be included in the wiki +* ''\themes'' - folder containing [[plugin folders|PluginFolders]] for theme plugins to be included in the wiki -Only the ''tiddlywiki.info'' file is required, the ''tiddlers'' and ''plugins'' folders are optional. Any files and folders not listed above are ignored. +Only the ''tiddlywiki.info'' file is required; everything else is optional. Any files and folders not listed above are ignored. -!! Content of `tiddlywiki.info` file +!! Plugin processing -The `tiddlywiki.info` file in a wiki folder contains a JSON object comprising the following fields: - -* ''plugins'' - an array of plugin names to be included in the wiki -* ''themes'' - an array of theme names to be included in the wiki -* ''languages'' - an array of language names to be included in the wiki -* ''includeWikis'' - an array of references to external wiki folders to be included in the wiki -* ''build'' - a hashmap of named build targets, each defined by an array of command tokens (see BuildCommand) -* ''config'' - an optional hashmap of configuration options (see below) - -!!! ''includeWikis'' - -The entries in the ''includeWikis'' array can be either a string specifying the relative path to the wiki, or an object with the following fields: - -* ''path'' - relative path to wiki folder -* ''read-only'' - set //true// to prevent the tiddlers in the included wiki from being modified. The modifications will be written to the directory specified in ''default-tiddler-location'', described below - -!!! ''build'' - -Note that the build targets of included wikis are merged if a target of that name isn't defined in the current `tiddlywiki.info` file. - -!!! ''config'' - -Configuration options include: - -* ''default-tiddler-location'' - a string path to the default location for the filesystem adaptor to save new tiddlers (resolved relative to the wiki folder) - -* ''retain-original-tiddler-path'' - If true, the server will generate a tiddler [[$:/config/OriginalTiddlerPaths]] containing the original file paths of each tiddler in the wiki - -!!! Example - -For example: +To be usable in the browser, plugins just need to be included in the wiki. For wikis that are generated on the server, TiddlyWikiFolders can contain a [[tiddlywiki.info file|tiddlywiki.info Files]] that identifies the plugins to be included in this wiki: ``` { "plugins": [ - "tiddlywiki/tiddlyweb", - "tiddlywiki/filesystem" - ], - "includeWikis": [ - "../tw5.com" - ], - "build": { - "index": [ - "--rendertiddler","$:/core/save/all","index.html","text/plain"], - "favicon": [ - "--savetiddler","$:/favicon.ico","favicon.ico", - "--savetiddler","$:/green_favicon.ico","static/favicon.ico"] - }, - "config": { - "retain-original-tiddler-path": true - } -} -``` - -!! Content of `tiddlers` folder - -All the TiddlerFiles in the `tiddlers` folder are read into the wiki at startup. Sub-folders are scanned recursively for TiddlerFiles. Newly created tiddlers are stored in TiddlerFiles directly beneath the `tiddlers` folder, unless [[configured otherwise|Customising Tiddler File Naming]]. - -Sub-folders within the `tiddlers` folder can also be given a `tiddlywiki.files` JSON file that overrides the default processing for that folder. The file format is illustrated with this example: - -``` -{ - "tiddlers": [ - { - "file": "d3.min.js", - "fields": { - "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/d3/d3.js", - "module-type": "library" - }, - "prefix": "var d3;if($tw.browser){\n", - "suffix": "}\nexports.d3 = d3;\n" - }, - { - "file": "cloud/d3.layout.cloud.js", - "fields": { - "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/d3/d3.layout.cloud.js", - "module-type": "library" - } - }, - { - "file": "local/mytiddler.tid", - "isTiddlerFile": true, - "fields": { - "title": "A different title" - } - } - ], - "directories": [ - "../../mytiddlers/store" + "tiddlywiki/slider", + "tiddlytools/chooser" ] } ``` -The JSON data consists of an object with a `tiddlers` property that contains an array of information about each tiddler to be loaded into the wiki. That information consists of: +Plugins names refer to plugin folders listed in TiddlyWiki5's root `plugins` folder. Plugins can also be included manually by copying them into the `plugins` subfolder of the wiki. -* The relative or absolute path to the file to include as either: -** `file`: the file containing the tiddler -** `isTiddlerFile`: if `true`, the file will be deserialised to extract the tiddlers. Otherwise, the raw content of the file is assigned to the `text` field without any parsing -* `fields`: an object containing fields that override any provided in the tiddler file -* `prefix` & `suffix`: (optional) specify strings to be prefixed and suffixed to the tiddler file text content +!! Processing of `tiddlers` folder -The ''directories'' property allows a list of directories to be specified. All tiddlers will be recursively loaded from each directory listed. +All the TiddlerFiles in the `tiddlers` folder are read into the wiki at startup. Sub-folders are scanned recursively for TiddlerFiles. Newly created tiddlers are stored in TiddlerFiles directly beneath the `tiddlers` folder, unless [[configured otherwise|Customising Tiddler File Naming]]. + +The default processing for sub-folders within the `tiddlers` folder can be overridden by providing a JSON file called `tiddlywiki.files` -- see [[tiddlywiki.files Files]]. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/customising/Configuring startup tiddlers.tid b/editions/tw5.com/tiddlers/customising/Configuring startup tiddlers.tid new file mode 100644 index 000000000..c1697f55e --- /dev/null +++ b/editions/tw5.com/tiddlers/customising/Configuring startup tiddlers.tid @@ -0,0 +1,25 @@ +created: 20180305174809089 +modified: 20180306161405033 +tags: [[Customise TiddlyWiki]] +title: Configuring startup tiddlers +type: text/vnd.tiddlywiki + +You can configure ~TiddlyWiki to start up using whatever individual or group of tiddlers you want using the [[default tiddlers|DefaultTiddlers]] mechanism. + +In the control panel under the info tab is an input field labeled "Choose which tiddlers are displayed at startup". You can list whatever tiddlers you want to open at startup. Use double square brackets for titles containing spaces. For example: + +``` +FirstTiddler +SecondTiddler +[[Third Tiddler]] +``` + +You can also use [[filter expressions|Filter Expression]] to open more than one tiddler. For example: + +``` +[tag[HelloThere]] +``` + +will open all tiddlers tagged as <<tag HelloThere>>. + +You can also use this technique to [[preserve open tiddlers at startup|Preserving open tiddlers at startup]] \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/definitions/Federatial.tid b/editions/tw5.com/tiddlers/definitions/Federatial.tid new file mode 100644 index 000000000..b2ebdf83b --- /dev/null +++ b/editions/tw5.com/tiddlers/definitions/Federatial.tid @@ -0,0 +1,9 @@ +created: 20130825154900000 +modified: 20170718160846820 +tags: Definitions +title: Federatial +type: text/vnd.tiddlywiki + +Federatial Limited is a software consultancy founded by JeremyRuston, the creator of TiddlyWiki. Federatial helps organisations explore new user interaction concepts through rapid prototyping of sophisticated web-based tools. + +See https://federatial.com/ and https://twitter.com/federatial for more information. diff --git a/editions/tw5.com/tiddlers/definitions/FederatialLimited.tid b/editions/tw5.com/tiddlers/definitions/FederatialLimited.tid deleted file mode 100644 index e7a162755..000000000 --- a/editions/tw5.com/tiddlers/definitions/FederatialLimited.tid +++ /dev/null @@ -1,8 +0,0 @@ -created: 201308251549 -modified: 201308251604 -tags: Definitions -title: FederatialLimited - -Federatial Limited is a software consultancy founded by JeremyRuston specializing in understanding the impact of the web on the way that we work together. - -See http://federatial.com/ and http://twitter.com/federatial for more information. diff --git a/editions/tw5.com/tiddlers/definitions/JeremyRuston.tid b/editions/tw5.com/tiddlers/definitions/JeremyRuston.tid index 7f0a8f04a..1893d58f9 100644 --- a/editions/tw5.com/tiddlers/definitions/JeremyRuston.tid +++ b/editions/tw5.com/tiddlers/definitions/JeremyRuston.tid @@ -1,10 +1,10 @@ created: 20130825162500000 -modified: 20131228084302609 +modified: 20170920131119498 tags: Definitions title: JeremyRuston type: text/vnd.tiddlywiki -I'm the original inventor of TiddlyWiki. You can find me on these services: +I'm the original inventor of TiddlyWiki. You can hire me through [[Federatial]], and find me on these services: * jeremy (at) jermolene (dot) com * [[Jermolene on GitHub|https://github.com/Jermolene]] @@ -16,5 +16,5 @@ I'm the original inventor of TiddlyWiki. You can find me on these services: Further information: * An [[interview with me in The Inquirer|http://www.theinquirer.net/inquirer/feature/2105529/bt-software-engineer-tells-telco-source]] by Wendy Grossman -* A [[hilarious interview with me|http://www.youtube.com/watch?v=auyIhw8MTmQ]] from British television in 1983 +* A [[hilarious interview with me|https://www.youtube.com/watch?v=auyIhw8MTmQ]] from British television in 1983 * Here's a video of a presentation I did in 2007 called [["How to Start an Open Source Project"|http://vimeo.com/856110]]. diff --git a/editions/tw5.com/tiddlers/definitions/Quine.tid b/editions/tw5.com/tiddlers/definitions/Quine.tid index d4f41d453..e33a5ada8 100644 --- a/editions/tw5.com/tiddlers/definitions/Quine.tid +++ b/editions/tw5.com/tiddlers/definitions/Quine.tid @@ -1,6 +1,11 @@ -title: Quine +created: 20171110100048967 +modified: 20171110100146695 tags: Definitions +title: Quine +type: text/vnd.tiddlywiki Wikipedia [[defines a Quine|http://en.wikipedia.org/wiki/Quine_(computing)]] as //a computer program which takes no input and produces a copy of its own source code as its only output//. TiddlyWiki is an unusual example of a practical quine: it is this ability to produce a copy of its own source code that lies at the heart of TiddlyWiki's ability to independently save changes to itself. + +"Quine" is also the name of [[the unofficial TiddlyWiki application for iPhone/iPad|Saving on iPad/iPhone]] \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/definitions/TiddlyDesktop.tid b/editions/tw5.com/tiddlers/definitions/TiddlyDesktop.tid index b324f01fb..9b5791f23 100644 --- a/editions/tw5.com/tiddlers/definitions/TiddlyDesktop.tid +++ b/editions/tw5.com/tiddlers/definitions/TiddlyDesktop.tid @@ -1,19 +1,14 @@ created: 20140126125259638 -modified: 20160107230954643 -tags: Definitions Saving Platforms +modified: 20171113161541234 +tags: Definitions Platforms title: TiddlyDesktop type: text/vnd.tiddlywiki TiddlyDesktop is an app for working with TiddlyWiki files (both TiddlyWikiClassic and TiddlyWiki version 5). It can be installed on Windows, Mac OS X or Linux. It is compatible with TiddlyWiki version 5 and the older TiddlyWikiClassic. -See the [[Introducing TiddlyDesktop Video]] +{{Saving on TiddlyDesktop}} -! Instructions - -# Install the latest release of TiddlyDesktop from https://github.com/Jermolene/TiddlyDesktop/releases -# Run TiddlyDesktop -# Use the browse button to open TiddlyWiki files -# Save changes within TiddlyWiki in the usual way +{{Introducing TiddlyDesktop Video}} ! Source diff --git a/editions/tw5.com/tiddlers/definitions/TiddlyFox.tid b/editions/tw5.com/tiddlers/definitions/TiddlyFox.tid index 9b323ce37..e96057783 100644 --- a/editions/tw5.com/tiddlers/definitions/TiddlyFox.tid +++ b/editions/tw5.com/tiddlers/definitions/TiddlyFox.tid @@ -1,10 +1,12 @@ created: 20130825161100000 -modified: 20160601160149340 +modified: 20171110094548887 tags: Definitions title: TiddlyFox type: text/vnd.tiddlywiki -TiddlyFox is an extension for Firefox that allows standalone TiddlyWiki files to save their changes directly to the file system. TiddlyFox works on both desktop and smartphone versions of [[Firefox]]. See [[Saving with TiddlyFox]] or [[Saving with TiddlyFox on Android]] for detailed instructions. +TiddlyFox is an extension for older versions of Firefox that allows standalone TiddlyWiki files to save their changes directly to the file system. TiddlyFox works on both desktop and smartphone versions of [[Firefox]]. See [[Saving with TiddlyFox]] or [[Saving with TiddlyFox on Android]] for detailed instructions. + +TiddlyFox is now obsolete due to its incompatibility with the latest versions of Firefox - see [[Firefox Apocalypse]]. There are many alternatives to TiddlyFox, but none that work in precisely the same way -- see GettingStarted for details. TiddlyFox can be downloaded from the Mozilla Addons site: diff --git a/editions/tw5.com/tiddlers/definitions/TiddlySpace.tid b/editions/tw5.com/tiddlers/definitions/TiddlySpace.tid index 2e54f0452..7205dffab 100644 --- a/editions/tw5.com/tiddlers/definitions/TiddlySpace.tid +++ b/editions/tw5.com/tiddlers/definitions/TiddlySpace.tid @@ -1,8 +1,9 @@ -created: 201308300842 -modified: 201308300842 +created: 20130830084200000 +modified: 20180421162644074 tags: Definitions title: TiddlySpace +type: text/vnd.tiddlywiki -TiddlySpace is an environment for discourse on the web, built from TiddlyWeb. +TiddlySpace was a public TiddlyWiki hosting service that operated from 2010 until 2016. -TiddlySpace was originally sponsored by [[Osmosoft]] at [[BT]]. +TiddlySpace, and the underlying TiddlyWeb, was originally sponsored by [[Osmosoft]] at [[BT]]. diff --git a/editions/tw5.com/tiddlers/definitions/TiddlyWeb.tid b/editions/tw5.com/tiddlers/definitions/TiddlyWeb.tid index a3ace5398..901cb535f 100644 --- a/editions/tw5.com/tiddlers/definitions/TiddlyWeb.tid +++ b/editions/tw5.com/tiddlers/definitions/TiddlyWeb.tid @@ -1,12 +1,19 @@ created: 201308300841 -modified: 201308300843 +modified: 20170127221451610 tags: Definitions title: TiddlyWeb -TiddlyWeb is a server application that puts [[Tiddlers]] on the web: +TiddlyWeb is a reference implementation for an interface to put [[Tiddlers]] on the web. + +It was created by a team led by Chris Dent at [[Osmosoft]] under [[BT]] from 2008 to 2012. http://tiddlyweb.com/ TiddlyWeb can be used to host TiddlyWiki and TiddlyWiki5 wikis, making the individual tiddlers available over a flexible HTTP API. -TiddlyWeb was originally sponsored by [[Osmosoft]] at [[BT]] (along with TiddlySpace). +Other implementations of the API include: + +* [[TiddlyWiki App Engine Server|https://github.com/rsc/tiddly]], a 300-line Go implementation from Russ Cox +* [[TiddlyWiki 5 server module|https://github.com/Jermolene/TiddlyWiki5/blob/master/core/modules/commands/server.js]], the bare-bones subset of the API implemented in TiddlyWiki version 5 for Node.js + +As of early 2017, none is currently as complete as TiddlyWeb itself. diff --git a/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid b/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid index 6497a7b12..583abf9bc 100644 --- a/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid +++ b/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid @@ -4,10 +4,6 @@ tags: Definitions title: TiddlyWikiClassic type: text/vnd.tiddlywiki -"~TiddlyWiki Classic" refers to versions prior to 5.0, when TiddlyWiki was completely rewritten from the ground up. TiddlyWiki Classic is still being maintained at: +"~TiddlyWiki Classic" refers to versions prior to 5.0, before TiddlyWiki was completely rewritten from the ground up. TiddlyWiki Classic is still being maintained at: -http://classic.tiddlywiki.com/ - -MarioPietsch has started a site comparing the syntax and other changes between TiddlyWikiClassic and TiddlyWiki version 5: - -http://compare-tw2-tw5.tiddlyspace.com +https://classic.tiddlywiki.com/ diff --git a/editions/tw5.com/tiddlers/demonstrations/Apple.tid b/editions/tw5.com/tiddlers/demonstrations/Apple.tid new file mode 100644 index 000000000..becee440d --- /dev/null +++ b/editions/tw5.com/tiddlers/demonstrations/Apple.tid @@ -0,0 +1,6 @@ +created: 20180222072026299 +list: [[Apple 6]] [[Apple 7]] [[Apple 8]] [[Apple 9]] [[Apple 10]] [[Apple 20]] [[Apple 30]] [[Apple 100]] +modified: 20180222072215582 +tags: +title: Apple + diff --git a/editions/tw5.com/tiddlers/demonstrations/GroupedLists.tid b/editions/tw5.com/tiddlers/demonstrations/GroupedLists.tid index 9eaa7ef29..a915f181f 100644 --- a/editions/tw5.com/tiddlers/demonstrations/GroupedLists.tid +++ b/editions/tw5.com/tiddlers/demonstrations/GroupedLists.tid @@ -1,5 +1,5 @@ title: GroupedLists -tags: ListWidget +tags: ListWidget Lists created: 20150106180000000 modified: 20150221230117000 diff --git a/editions/tw5.com/tiddlers/SampleAlert.tid b/editions/tw5.com/tiddlers/demonstrations/SampleAlert.tid similarity index 100% rename from editions/tw5.com/tiddlers/SampleAlert.tid rename to editions/tw5.com/tiddlers/demonstrations/SampleAlert.tid diff --git a/editions/tw5.com/tiddlers/demonstrations/SampleTiddlerFirst.tid b/editions/tw5.com/tiddlers/demonstrations/SampleTiddlerFirst.tid index 97031fa49..8a5a3b037 100644 --- a/editions/tw5.com/tiddlers/demonstrations/SampleTiddlerFirst.tid +++ b/editions/tw5.com/tiddlers/demonstrations/SampleTiddlerFirst.tid @@ -1,4 +1,4 @@ title: SampleTiddlerFirst tags: sampletag1 sampletag2 -This is test tiddler SampleTiddlerFirst. \ No newline at end of file +This is a test tiddler called SampleTiddlerFirst. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/demonstrations/SampleTiddlerSecond.tid b/editions/tw5.com/tiddlers/demonstrations/SampleTiddlerSecond.tid index 5d23288ff..d21ed52ea 100644 --- a/editions/tw5.com/tiddlers/demonstrations/SampleTiddlerSecond.tid +++ b/editions/tw5.com/tiddlers/demonstrations/SampleTiddlerSecond.tid @@ -1,4 +1,4 @@ title: SampleTiddlerSecond tags: sampletag1 sampletag2 -This is test tiddler SampleTiddlerSecond. \ No newline at end of file +This test tiddler is called SampleTiddlerSecond. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/demonstrations/SampleTiddlerThird.tid b/editions/tw5.com/tiddlers/demonstrations/SampleTiddlerThird.tid index 630ca834a..75b0b9e98 100644 --- a/editions/tw5.com/tiddlers/demonstrations/SampleTiddlerThird.tid +++ b/editions/tw5.com/tiddlers/demonstrations/SampleTiddlerThird.tid @@ -1,4 +1,4 @@ title: SampleTiddlerThird tags: sampletag1 sampletag2 -This is test tiddler SampleTiddlerThird. \ No newline at end of file +This tiddler SampleTiddlerThird is the third test tiddler. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExample.tid b/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExample.tid index 3197a0daf..494b28ac4 100644 --- a/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExample.tid +++ b/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExample.tid @@ -1,11 +1,13 @@ created: 20130825213300000 -modified: 20140919161411400 +modified: 20180307153530187 tags: Learning title: TaskManagementExample type: text/vnd.tiddlywiki TiddlyWiki5 can be used as a simple task management system without further customisation. The idea is that tasks be tagged `task`, with those that are completed also tagged `done`. In this way it is straightforward to generate task lists. +<<.tip """There is [[an enhanced version of this demo|TaskManagementExample (Draggable)]] that adds the ability to drag and drop the tasks to re-order them.""">> + ! Outstanding tasks <$list filter="[!has[draft.of]tag[task]!tag[done]sort[created]]"> diff --git a/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExampleDraggable.tid b/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExampleDraggable.tid new file mode 100644 index 000000000..503b1fcaf --- /dev/null +++ b/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExampleDraggable.tid @@ -0,0 +1,23 @@ +created: 20180307153530187 +modified: 20180307153530187 +tags: Learning +title: TaskManagementExample (Draggable) +type: text/vnd.tiddlywiki + +This is a version of the TaskManagementDemo enhanced with the ability to drag and drop the task list to re-order them. + +! Outstanding tasks + +//Drag the tasks to re-order them// + +<<list-tagged-draggable tag:"task" subFilter:"!has[draft.of]!tag[done]" itemTemplate:"TaskManagementExampleDraggableTemplate" emptyMessage:"You don't have any active tasks">> + +! Completed tasks + +//(Listed in reverse order of completion)// + +<$list filter="[!has[draft.of]tag[task]tag[done]sort[created]]"> +<div> +<$checkbox tag="done"> ~~<$link to={{!!title}}><$view field="title"/></$link>~~</$checkbox> +</div> +</$list> diff --git a/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExampleDraggableTemplate.tid b/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExampleDraggableTemplate.tid new file mode 100644 index 000000000..3ccdd98e0 --- /dev/null +++ b/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExampleDraggableTemplate.tid @@ -0,0 +1,7 @@ +created: 20180307153530187 +modified: 20180307153530187 +tags: Learning +title: TaskManagementExampleDraggableTemplate +type: text/vnd.tiddlywiki + +<$checkbox tag="done"> <$link to={{!!title}}><$view field="title"/></$link></$checkbox> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/editions/Full Edition.tid b/editions/tw5.com/tiddlers/editions/Full Edition.tid index beab1652f..22eeb264d 100644 --- a/editions/tw5.com/tiddlers/editions/Full Edition.tid +++ b/editions/tw5.com/tiddlers/editions/Full Edition.tid @@ -8,4 +8,4 @@ The "full" edition of TiddlyWiki consists of all the available languages, themes The full edition can be downloaded from: -http://tiddlywiki.com/editions/full/ +https://tiddlywiki.com/editions/full/ diff --git a/editions/tw5.com/tiddlers/editions/Resume Builder Edition.tid b/editions/tw5.com/tiddlers/editions/Resume Builder Edition.tid index cc0e7da37..ff38a6f16 100644 --- a/editions/tw5.com/tiddlers/editions/Resume Builder Edition.tid +++ b/editions/tw5.com/tiddlers/editions/Resume Builder Edition.tid @@ -6,4 +6,4 @@ type: text/vnd.tiddlywiki The ''Résumé Builder'' edition of TiddlyWiki gets you started with a simple way to create a professional resume that you can save to the web or print. -http://tiddlywiki.com/editions/resumebuilder/ +https://tiddlywiki.com/editions/resumebuilder/ diff --git a/editions/tw5.com/tiddlers/editions/Text Slicer Edition.tid b/editions/tw5.com/tiddlers/editions/Text Slicer Edition.tid index 5d0568a48..7b8cbffa4 100644 --- a/editions/tw5.com/tiddlers/editions/Text Slicer Edition.tid +++ b/editions/tw5.com/tiddlers/editions/Text Slicer Edition.tid @@ -6,4 +6,4 @@ type: text/vnd.tiddlywiki The ''Text-Slicer'' edition of TiddlyWiki contains tools to help advanced users slice long texts up into individual tiddlers. -http://tiddlywiki.com/editions/text-slicer/ +https://tiddlywiki.com/editions/text-slicer/ diff --git a/editions/tw5.com/tiddlers/editions/XLSX Utilities Edition.tid b/editions/tw5.com/tiddlers/editions/XLSX Utilities Edition.tid new file mode 100644 index 000000000..6879a4df4 --- /dev/null +++ b/editions/tw5.com/tiddlers/editions/XLSX Utilities Edition.tid @@ -0,0 +1,9 @@ +created: 20161023202301847 +modified: 20161023202301847 +tags: Editions +title: XLSX Utilities Edition +type: text/vnd.tiddlywiki + +The ''XLSX Utilities'' edition of TiddlyWiki contains tools to work with `.XLSX` spreadsheets generated by applications like Microsoft Excel and Google Sheets. It can be used in the browser or under Node.js. + +https://tiddlywiki.com/editions/xlsx-utils/ diff --git a/editions/tw5.com/tiddlers/features/DateFormat.tid b/editions/tw5.com/tiddlers/features/DateFormat.tid index 0fb417201..b916991ac 100644 --- a/editions/tw5.com/tiddlers/features/DateFormat.tid +++ b/editions/tw5.com/tiddlers/features/DateFormat.tid @@ -1,5 +1,5 @@ created: 20140418142957325 -modified: 20140912145809035 +modified: 20170630223008226 tags: Features title: DateFormat type: text/vnd.tiddlywiki @@ -30,10 +30,13 @@ The ViewWidget accepts a `template` attribute that allows the format of date val |`0mm` |Minutes with leading zero | |`ss` |Seconds | |`0ss` |Seconds with leading zero | +|`XXX` |Milliseconds | +|`0XXX` |Milliseconds with leading zero | |`am` or `pm` |Lower case AM/PM indicator | |`AM` or `PM` |Upper case AM/PM indicator | |`TZD` |Timezone offset | |`\x` |Used to escape a character that would otherwise have special meaning | +|`[UTC]`|Time-shift the represented date to UTC. Must be at very start of format string| Note that other text is passed through unchanged, allowing commas, colons or other separators to be used. diff --git a/editions/tw5.com/tiddlers/features/Drag and Drop.tid b/editions/tw5.com/tiddlers/features/Drag and Drop.tid new file mode 100644 index 000000000..b85063b41 --- /dev/null +++ b/editions/tw5.com/tiddlers/features/Drag and Drop.tid @@ -0,0 +1,29 @@ +created: 20170328143119836 +modified: 20170328173846754 +tags: Features +title: Drag and Drop +type: text/vnd.tiddlywiki + +~TiddlyWiki uses drag and drop to power two separate features: + +* [[Importing Tiddlers]] into ~TiddlyWiki +* Manipulating tiddlers within a ~TiddlyWiki + +Tiddler manipulation via drag and drop is supported by the core user interface in the following contexts: + +* Entries in the "Open" tab of the sidebar can be reordered by drag and drop; new tiddlers can be opened by dragging their titles into the list +* Entries within a tag pill dropdown can be reordered by drag and drop; new tiddlers can be assigned the tag by dragging their titles into the list +* Entries in the [[control panel|$:/ControlPanel]] "Appearance"/"Toolbars" tab can be reordered by drag and drop. (Less usefully, new entries can be added to the toolbars by dragging their titles into the list) + +All tiddler links are draggable by default. They can be dragged within a browser window for manipulating tiddlers, or dragged to a different browser window to initiate an [[import operation|Importing Tiddlers]] + +Tag pills are also draggable, and are equivalent to simultaneously dragging all of the individual tiddlers carrying the tag. + +Some common scenarios for drag and drop tiddler manipulation are available as reusable macros: + +* [[list-links-draggable Macro]] for reordering the entries in a tiddler ListField +* [[list-tagged-draggable Macro]] for reordering the tiddlers that carry a specified tag + +See DragAndDropMechanism for details of how to use the low level drag and drop primitives to build more complex interactions. + +The standard HTML 5 drag and drop APIs used by ~TiddlyWiki are not generally available on mobile browsers on smartphones or tablets. The [[Mobile Drag And Drop Shim Plugin]] adds an open source library that implements partial support on many mobile browsers, including iOS and Android. diff --git a/editions/tw5.com/tiddlers/features/Future Proof.tid b/editions/tw5.com/tiddlers/features/Future Proof.tid index 158d42861..44c599b33 100644 --- a/editions/tw5.com/tiddlers/features/Future Proof.tid +++ b/editions/tw5.com/tiddlers/features/Future Proof.tid @@ -1,8 +1,16 @@ created: 20131213101024997 -modified: 20140912145047817 +modified: 20170329104438386 tags: Features title: Future Proof type: text/vnd.tiddlywiki +From [[Network World|http://www.networkworld.com/article/3028098/open-source-tools/tiddlywiki-a-free-open-source-wiki-revisited.html]] magazine in January 2016: + +<<< +Way back in the mists of time (actually, January 2009) I [[wrote|http://www.networkworld.com/article/2272104/applications/an-amazing-free-microwiki.html]] about a really cool tool called TiddlyWiki, a “non-linear personal web notebook”. Fast forward to today and I just had an out of body experience: Completely by accident I found a TiddlyWiki that I started when I wrote that piece and it still works! + +Finding code that works flawlessly after just two or three years is magical enough but after seven years?! And given that TiddlyWiki is written as a single page Web application and considering how different browsers are now than they were in 2009, the fact that the old version of TiddlyWiki still works is not short of miraculous. +<<< + TiddlyWiki is designed with the long term needs of its users in mind. Because it is OpenSource and needs no infrastructure, we can be confident that all we'll need to access a ~TiddlyWiki file even in the far future is an ordinary HTML browser. If you're starting to use ~TiddlyWiki at the beginning of your career you can be confident that it will carry you through to retirement. diff --git a/editions/tw5.com/tiddlers/features/ImportTiddlers.tid b/editions/tw5.com/tiddlers/features/ImportTiddlers.tid deleted file mode 100644 index dfeda4c63..000000000 --- a/editions/tw5.com/tiddlers/features/ImportTiddlers.tid +++ /dev/null @@ -1,12 +0,0 @@ -created: 20130825162000000 -modified: 20160610073731847 -tags: Features -title: ImportTiddlers -type: text/vnd.tiddlywiki - -You can import content into a TiddlyWiki file in several ways: - -* Use the {{$:/core/images/import-button}} ''import'' button (under the ''Tools'' tab in the sidebar) to select a local file -* Drag and drop files from Windows Explorer or OS X Finder etc. into the TiddlyWiki browser window -* Paste content directly from the clipboard using the menu or keyboard shortcut (control-V or command-V) -** GoogleChrome is currently the only browser to support pasting diff --git a/editions/tw5.com/tiddlers/features/Importing Tiddlers.tid b/editions/tw5.com/tiddlers/features/Importing Tiddlers.tid new file mode 100644 index 000000000..a03082a9f --- /dev/null +++ b/editions/tw5.com/tiddlers/features/Importing Tiddlers.tid @@ -0,0 +1,26 @@ +created: 20130825162000000 +modified: 20170328160211362 +tags: Features +title: Importing Tiddlers +type: text/vnd.tiddlywiki + +You can import tiddlers into a ~TiddlyWiki from external files or directly from another ~TiddlyWiki. + +!! Importing content from external files + +There are several ways to import content from external files: + +* Use the {{$:/core/images/import-button}} ''import'' button (under the ''Tools'' tab in the sidebar) to select a local file +* Drag and drop files from Windows Explorer or OS X Finder etc. into the TiddlyWiki browser window +* Paste content directly from the clipboard using the menu or keyboard shortcut (<kbd>ctrl-V</kbd> or <kbd>cmd-V</kbd>) +** Currently supported in Chrome, Firefox and Edge (but not Internet Explorer) + +Most files are imported as individual tiddlers. The exceptions are: + +* ''.html'' files that are recognised as a ~TiddlyWiki file are parsed to extract the tiddlers within them +* ''.json'' files are parsed to extract the tiddlers within them. They can be created by [[exporting them|How to export tiddlers]] from another ~TiddlyWiki. ~TiddlyWiki accepts JSON files that contain either a single tiddler fields object, or an array of tiddler fields objects + +!! Importing content from other ~TiddlyWiki browser windows + +Tiddlers can be imported from other ~TiddlyWiki browser windows via [[Drag and Drop]]. Drag a tiddler link or tag from one ~TiddlyWiki browser window to another. Dragging a link will import a single tiddler while dragging a tag pill will import all of the tiddlers that carry that tag. + diff --git a/editions/tw5.com/tiddlers/features/SafeMode.tid b/editions/tw5.com/tiddlers/features/SafeMode.tid index 0de5634be..03fa8f00d 100644 --- a/editions/tw5.com/tiddlers/features/SafeMode.tid +++ b/editions/tw5.com/tiddlers/features/SafeMode.tid @@ -12,7 +12,7 @@ Safe mode provides a way to disabling most customisations in TiddlyWiki. This is Safe mode is enabled in the browser by starting TiddlyWiki with the URL hash set to the string `#:safe`. For example: -http://tiddlywiki.com/#:safe +https://tiddlywiki.com/#:safe ! How Safe Mode Works diff --git a/editions/tw5.com/tiddlers/features/StartupActions.tid b/editions/tw5.com/tiddlers/features/StartupActions.tid new file mode 100644 index 000000000..4ae567beb --- /dev/null +++ b/editions/tw5.com/tiddlers/features/StartupActions.tid @@ -0,0 +1,31 @@ +created: 20180323092308399 +modified: 20180323092547312 +tags: Features +title: StartupActions +type: text/vnd.tiddlywiki + +During startup, TiddlyWiki executes any ActionWidgets found in tiddlers with the following system tags: + +* <<tag "$:/tags/StartupAction">> (executed on all platforms) +* <<tag "$:/tags/StartupAction/Browser">> (only executed when running in the browser) +* <<tag "$:/tags/StartupAction/Node">> (only executed when running under Node.js) + +Startup actions are useful for customising TiddlyWiki according to environmental factors such as the screen size. For example, the following action widgets when placed in a tiddler tagged <<tag "$:/tags/StartupAction/Browser">> will cause the sidebar to be hidden by default when the screen width is less than 1000 pixels: + +``` +<$reveal type="lt" state="$:/info/browser/screen/width" text="3000"> +<$action-setfield $tiddler="$:/state/sidebar" $value="no"/> +</$reveal> + +<$reveal type="gteq" state="$:/info/browser/screen/width" text="3000"> +<$action-setfield $tiddler="$:/state/sidebar" $value="yes"/> +</$reveal> +``` + +Note that global macros are not available within startup action tiddlers by default. If you need to access them then you'll need to explicitly include them: + +``` +<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> +...actions that depend upon global macros... +</$importvariables> +``` diff --git a/editions/tw5.com/tiddlers/filters/Filter Operators.tid b/editions/tw5.com/tiddlers/filters/Filter Operators.tid index 22c7245f5..b7818316d 100644 --- a/editions/tw5.com/tiddlers/filters/Filter Operators.tid +++ b/editions/tw5.com/tiddlers/filters/Filter Operators.tid @@ -1,5 +1,5 @@ created: 20140410103123179 -modified: 20150917193612610 +modified: 20161017154031883 tags: Filters title: Filter Operators type: text/vnd.tiddlywiki @@ -7,24 +7,28 @@ type: text/vnd.tiddlywiki \define .operator-rows(filter) <$list filter="$filter$"><tr> <td><$link to={{!!title}}>{{!!caption}}</$link></td> -<td>{{!!op-purpose}} <$list filter="[all[current]tag[Common Operators]]">{{$:/core/images/done-button}}</$list></td> +<td>{{!!op-purpose}}</td> +<td align="center"><$list filter="[all[current]tag[Common Operators]]">✓</$list></td> <td align="center"><$list filter="[all[current]tag[Negatable Operators]]">`!`</$list></td> </tr></$list> \end \define .group-heading(_) -<tr class="doc-table-subheading"><th colspan="3" align="center">$_$</th></tr> +<tr class="doc-table-subheading"><th colspan="4" align="center">$_$</th></tr> \end A <<.def "filter operator">> is a predefined keyword attached to an individual [[step|Filter Step]] of a [[filter|Filters]]. It defines the particular action of that step. -The following table lists all the core operators. The commonest ones are checkmarked. The third column indicates which operators allow <$link to="Filter Step">the <code>!</code> prefix</$link> to reverse their meaning. +''Important:'' Each first [[step|Filter Step]] of a [[filter run|Filter Run]] not given any input titles receives the output of <$link to="all Operator">[all[tiddlers]]</$link> as its input. + +The following table lists all core operators, the most common ones marked ✓. The last column indicates whether an operator allows ''negation'' using the <$link to="Filter Step"><code>!</code> prefix</$link>. For specifics as to each operator's negated output please refer to its documentation. <table> <tr> <th align="left">Operator</th> <th align="left">Purpose</th> -<th align="left">Neg</th> +<th align="center">✓</th> +<th align="center">`!`</th> </tr> <<.operator-rows "[tag[Filter Operators]!tag[Order Operators]!tag[String Operators]!tag[Tag Operators]!tag[Special Operators]sort[]]">> <<.group-heading "Order Operators">> @@ -41,4 +45,4 @@ The following table lists all the core operators. The commonest ones are checkma A typical step is written as `[operator[parameter]]`, although not all of the operators need a [[parameter|Filter Parameter]]. -Most steps process the [[selection of titles|Title Selection]] that are supplied as their input, but a few [[construct an entirely new selection|Selection Constructors]] instead. For the exact rules, see [[Filter Syntax]]. +Most steps process the [[selection of titles|Title Selection]] that are supplied as their input, but a few [[construct an entirely new selection|Selection Constructors]] instead. For the exact rules, see [[Filter Syntax]]. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/filters/all.tid b/editions/tw5.com/tiddlers/filters/all.tid index f74f7f1f1..46e5559c0 100644 --- a/editions/tw5.com/tiddlers/filters/all.tid +++ b/editions/tw5.com/tiddlers/filters/all.tid @@ -1,18 +1,18 @@ +caption: all created: 20140410103123179 -modified: 20150220160957000 +modified: 20161128185445034 +op-input: ignored, unless the parameter is empty +op-output: the titles that belong to all the specified categories +op-parameter: zero or more categories +op-purpose: find all titles of a fundamental category tags: [[Filter Operators]] [[Common Operators]] [[Selection Constructors]] title: all Operator type: text/vnd.tiddlywiki -caption: all -op-purpose: find all titles of a fundamental category -op-input: ignored, unless the parameter is empty -op-parameter: zero or more categories -op-output: the titles that belong to all the specified categories The parameter specifies zero or more fundamental categories using the following syntax: <$railroad text=""" -[{: ("current" | "missing" |: "orphans" | "shadows" | "tiddlers" ) +"+" }] +[{: ("current" | "missing" |: "orphans" | "shadows" | "tags" | "tiddlers" ) +"+" }] """/> |!Category |!Members |!Sorted | @@ -20,6 +20,7 @@ The parameter specifies zero or more fundamental categories using the following |^`missing` |all non-existent tiddlers to which there is at least one [[hard link|Hard and Soft Links]] |^no | |^`orphans` |all tiddlers to which there are <<.em no>> hard links |^by title | |^`shadows` |all the [[shadow tiddlers|ShadowTiddlers]] that exist, including any that have been overridden with non-shadow tiddlers |^no | +|^`tags` |all the tags in use on non-shadow tiddlers |no | |^`tiddlers` |all the non-shadow tiddlers that exist |no | If the parameter specifies more than one category, they are processed from left to right. The overall output is initially empty, and each category's output is [[dominantly appended|Dominant Append]] to it in turn. Unrecognised categories contribute nothing to the output. diff --git a/editions/tw5.com/tiddlers/filters/count_Operator.tid b/editions/tw5.com/tiddlers/filters/count_Operator.tid new file mode 100644 index 000000000..d0b2fa51e --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/count_Operator.tid @@ -0,0 +1,13 @@ +caption: count +created: 20170208200553517 +modified: 20170208200900081 +op-input: a [[selection of titles|Title Selection]] +op-output: a new list containing the number of items in the input list as a decimal string +op-purpose: count the number of entries in a list +tags: [[Filter Operators]] [[Group Operators]] +title: count Operator +type: text/vnd.tiddlywiki + +The number of the entries in the input list is counted and a decimal representation returned as a single string. + +<<.operator-examples "count">> diff --git a/editions/tw5.com/tiddlers/filters/days.tid b/editions/tw5.com/tiddlers/filters/days.tid index 8ca1b2baf..53dd59416 100644 --- a/editions/tw5.com/tiddlers/filters/days.tid +++ b/editions/tw5.com/tiddlers/filters/days.tid @@ -3,14 +3,14 @@ title: days Operator type: text/vnd.tiddlywiki caption: days op-input: a [[selection of titles|Title Selection]] -op-neg-output: those input tiddlers in which field <<.place F>> is at least <<.place D>> days in the { future | past }, where <<.place D>> is { positive | negative } -op-output: those input tiddlers in which field <<.place F>> is <<.place D>> days in the { future | past } or any time { before | after } that, including { past | future }, where <<.place D>> is { positive | negative } -op-parameter: a number of days, defaulting to 0 +op-neg-output: those input tiddlers in which field <<.place F>> is at least <<.place D>> days in the { future | past } +op-output: those input tiddlers in which field <<.place F>> is <<.place D>> days in the { future | past } or any time { before | after } that, including { past | future } +op-parameter: a number of days, defaulting to 0 { positive | negative } op-parameter-name: D op-purpose: filter the input by date op-suffix: the name of a [[date field|Date Fields]], defaulting to <<.field modified>> op-suffix-name: F -Select tiddlers where a specified date field (default "modified") is withing a specified date range. Time portion is ignored. +Select tiddlers where a specified date field (default "modified") is within a specified date range. Time portion is ignored. <<.operator-examples "days">> diff --git a/editions/tw5.com/tiddlers/filters/decodehtml_Operator.tid b/editions/tw5.com/tiddlers/filters/decodehtml_Operator.tid new file mode 100644 index 000000000..f5f2eadba --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/decodehtml_Operator.tid @@ -0,0 +1,22 @@ +caption: decodehtml +created: 20161017152925704 +modified: 20161017152951209 +op-input: a [[selection of titles|Title Selection]] +op-output: the input with HTML decoding applied +op-parameter: +op-parameter-name: +op-purpose: apply HTML decoding to a string +tags: [[Filter Operators]] [[String Operators]] +title: decodehtml Operator +type: text/vnd.tiddlywiki +from-version: 5.1.14 + +"HTML decoding" means replacing HTML entities that represent special characters with that character: + +* `&` replaced with `&` +* ` ` replaced with ` ` (non breaking space) +* `<` replaced with `<` +* `>` replaced with `>` +* `"` replaced with `"` + +<<.operator-examples "decodehtml">> diff --git a/editions/tw5.com/tiddlers/filters/decodeuri_Operator.tid b/editions/tw5.com/tiddlers/filters/decodeuri_Operator.tid new file mode 100644 index 000000000..f9a9c3513 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/decodeuri_Operator.tid @@ -0,0 +1,16 @@ +caption: decodeuri +created: 20161017152854460 +modified: 20161017152914038 +op-input: a [[selection of titles|Title Selection]] +op-output: the input with URI decoding applied +op-parameter: +op-parameter-name: +op-purpose: apply URI decoding to a string +tags: [[Filter Operators]] [[String Operators]] +title: decodeuri Operator +type: text/vnd.tiddlywiki +from-version: 5.1.14 + +See Mozilla Developer Network for details of the [[decodeURI|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURI]] operation. + +<<.operator-examples "decodeuri">> diff --git a/editions/tw5.com/tiddlers/filters/decodeuricomponent_Operator.tid b/editions/tw5.com/tiddlers/filters/decodeuricomponent_Operator.tid new file mode 100644 index 000000000..2dd731bd5 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/decodeuricomponent_Operator.tid @@ -0,0 +1,16 @@ +caption: decodeuricomponent +created: 20161017152454726 +modified: 20161017152630625 +op-input: a [[selection of titles|Title Selection]] +op-output: the input with URI component decoding applied +op-parameter: +op-parameter-name: +op-purpose: apply URI component decoding to a string +tags: [[Filter Operators]] [[String Operators]] +title: decodeuricomponent Operator +type: text/vnd.tiddlywiki +from-version: 5.1.14 + +See Mozilla Developer Network for details of the [[decodeURIComponent|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURIComponent]] operation. + +<<.operator-examples "decodeuricomponent">> diff --git a/editions/tw5.com/tiddlers/filters/each.tid b/editions/tw5.com/tiddlers/filters/each.tid index 8a48fb122..2bfbdac3d 100644 --- a/editions/tw5.com/tiddlers/filters/each.tid +++ b/editions/tw5.com/tiddlers/filters/each.tid @@ -1,5 +1,5 @@ created: 20140410103123179 -modified: 20150203184257000 +modified: 20170103175939836 tags: [[Filter Operators]] [[Group Operators]] title: each Operator type: text/vnd.tiddlywiki @@ -14,10 +14,10 @@ op-output: a selection containing the first input title encountered for each dis Each input title is processed in turn. The value of field <<.place F>> in the corresponding tiddler is examined. ;each -:As long as the field's value has not been encountered before, the title is appended to the output. +:As long as the value of the field is unique (i.e. has not been encountered before), the title is appended to the output. ;each:list-item :The value is treated as a [[title list|Title List]]. Each title in the list considered in turn. If it has not been encountered before, it is appended to the output. -If a tiddler doesn't contain field <<.place F>>, it is treated as if the field's value was empty. +If a tiddler does not contain field <<.place F>>, it is treated as if the value of the field were empty. <<.operator-examples "each">> diff --git a/editions/tw5.com/tiddlers/filters/encodehtml_Operator.tid b/editions/tw5.com/tiddlers/filters/encodehtml_Operator.tid new file mode 100644 index 000000000..fda1ad331 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/encodehtml_Operator.tid @@ -0,0 +1,21 @@ +caption: encodehtml +created: 20161017152953211 +modified: 20161017153015687 +op-input: a [[selection of titles|Title Selection]] +op-output: the input with HTML encoding applied +op-parameter: +op-parameter-name: +op-purpose: apply HTML encoding to a string +tags: [[Filter Operators]] [[String Operators]] +title: encodehtml Operator +type: text/vnd.tiddlywiki +from-version: 5.1.14 + +"HTML encoding" means replacing special HTML characters with the corresponding HTML entity: + +* `&` replaced with `&` +* `<` replaced with `<` +* `>` replaced with `>` +* `"` replaced with `"` + +<<.operator-examples "encodehtml">> diff --git a/editions/tw5.com/tiddlers/filters/encodeuri_Operator.tid b/editions/tw5.com/tiddlers/filters/encodeuri_Operator.tid new file mode 100644 index 000000000..77143a657 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/encodeuri_Operator.tid @@ -0,0 +1,16 @@ +caption: encodeuri +created: 20161017152827112 +modified: 20161017152845585 +op-input: a [[selection of titles|Title Selection]] +op-output: the input with URI encoding applied +op-parameter: +op-parameter-name: +op-purpose: apply URI encoding to a string +tags: [[Filter Operators]] [[String Operators]] +title: encodeuri Operator +type: text/vnd.tiddlywiki +from-version: 5.1.14 + +See Mozilla Developer Network for details of the [[encodeURI|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURI]] operation. + +<<.operator-examples "encodeuri">> diff --git a/editions/tw5.com/tiddlers/filters/encodeuricomponent_Operator.tid b/editions/tw5.com/tiddlers/filters/encodeuricomponent_Operator.tid new file mode 100644 index 000000000..8aa961a96 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/encodeuricomponent_Operator.tid @@ -0,0 +1,16 @@ +caption: encodeuricomponent +created: 20161017152747386 +modified: 20161017152809900 +op-input: a [[selection of titles|Title Selection]] +op-output: the input with URI component encoding applied +op-parameter: +op-parameter-name: +op-purpose: apply URI component encoding to a string +tags: [[Filter Operators]] [[String Operators]] +title: encodeuricomponent Operator +type: text/vnd.tiddlywiki +from-version: 5.1.14 + +See Mozilla Developer Network for details of the [[encodeURIComponent|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent]] operation. + +<<.operator-examples "encodeuricomponent">> diff --git a/editions/tw5.com/tiddlers/filters/enlist Operator.tid b/editions/tw5.com/tiddlers/filters/enlist Operator.tid new file mode 100644 index 000000000..f148edde7 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/enlist Operator.tid @@ -0,0 +1,24 @@ +caption: enlist +created: 20170221144241063 +modified: 20170221151340420 +op-input: ignored +op-neg-input: a [[selection of titles|Title Selection]] +op-neg-output: those input titles that are <<.em not>> listed in <<.place L>> +op-output: the titles stored as a [[title list|Title List]] at <<.place L>> +op-parameter: a [[title list|Title List]] +op-parameter-name: L +op-purpose: select titles from the operand interpreted as a [[title list|Title List]] +tags: [[Filter Operators]] [[Field Operators]] [[Selection Constructors]] [[Negatable Operators]] +title: enlist Operator +type: text/vnd.tiddlywiki + +<<.tip " Literal filter operands cannot contain square brackets but you can work around the issue by using a variable:">> + +``` +<$set name="myList" value="first [[second with a space]] third"> +<$list filter="[enlist<myList>]"> +... +``` + + +<<.operator-examples "enlist">> diff --git a/editions/tw5.com/tiddlers/filters/escaperegexp_Operator.tid b/editions/tw5.com/tiddlers/filters/escaperegexp_Operator.tid new file mode 100644 index 000000000..e8ad42211 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/escaperegexp_Operator.tid @@ -0,0 +1,16 @@ +caption: escaperegexp +created: 20161017153116372 +modified: 20161017153230962 +op-input: a [[selection of titles|Title Selection]] +op-output: the input with escaping applied to special regular expression characters +op-parameter: +op-parameter-name: +op-purpose: escape special characters used in regular expressions +tags: [[Filter Operators]] [[String Operators]] +title: escaperegexp Operator +type: text/vnd.tiddlywiki +from-version: 5.1.14 + +See Mozilla Developer Network for details of the [[regular expression syntax|https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/RegExp]]. + +<<.operator-examples "escaperegexp">> diff --git a/editions/tw5.com/tiddlers/filters/examples/count_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/count_Operator_(Examples).tid new file mode 100644 index 000000000..fb230c8f5 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/count_Operator_(Examples).tid @@ -0,0 +1,7 @@ +created: 20170208200912602 +modified: 20170208201020488 +tags: [[each Operator]] [[Operator Examples]] +title: count Operator (Examples) +type: text/vnd.tiddlywiki + +<<.operator-example 1 "[tag[HelloThere]count[]]">> diff --git a/editions/tw5.com/tiddlers/filters/examples/days.tid b/editions/tw5.com/tiddlers/filters/examples/days.tid index c4cc2bf16..12c336e8d 100644 --- a/editions/tw5.com/tiddlers/filters/examples/days.tid +++ b/editions/tw5.com/tiddlers/filters/examples/days.tid @@ -11,7 +11,9 @@ The filter can be used to highlight new items in a list. For example: <ul> <$list filter="[tag[ReleaseNotes]!<currentTiddler>!sort[modified]]"> <li> - <$link><$view field="title"/></$link><$list filter="[<currentTiddler>days[-120]]"> @@color:red;^^new^^@@</$list> + <$link><$view field="title"/></$link> + <$list filter="[<currentTiddler>days[-180]]"> @@color:red;^^new^^@@</$list> + <$list filter="[<currentTiddler>days[-500]!days[-180]]"> @@color:black;^^recent^^@@</$list> </li> </$list> </ul> diff --git a/editions/tw5.com/tiddlers/filters/examples/decodehtml_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/decodehtml_Operator_(Examples).tid new file mode 100644 index 000000000..8bc44a122 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/decodehtml_Operator_(Examples).tid @@ -0,0 +1,8 @@ +created: 20161017154848886 +modified: 20161017155350389 +tags: [[Operator Examples]] [[decodehtml Operator]] +title: decodehtml Operator (Examples) +type: text/vnd.tiddlywiki + +<<.operator-example 1 "[[Title with < angle brackets >]] +[decodehtml[]]">> +<<.operator-example 2 "[[Title with an & ampersand]] +[decodehtml[]]">> diff --git a/editions/tw5.com/tiddlers/filters/examples/decodeuri_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/decodeuri_Operator_(Examples).tid new file mode 100644 index 000000000..4d6377d3d --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/decodeuri_Operator_(Examples).tid @@ -0,0 +1,8 @@ +created: 20161017154558573 +modified: 20161017155350399 +tags: [[Operator Examples]] [[decodeuri Operator]] +title: decodeuri Operator (Examples) +type: text/vnd.tiddlywiki + +<<.operator-example 1 "[[Title%20with%20Space]] +[decodeuri[]]">> +<<.operator-example 2 "[[Title%20with%20Space]] [[Another%20title%20with%20Space]] +[decodeuri[]]">> diff --git a/editions/tw5.com/tiddlers/filters/examples/decodeuricomponent_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/decodeuricomponent_Operator_(Examples).tid new file mode 100644 index 000000000..3fb6005ca --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/decodeuricomponent_Operator_(Examples).tid @@ -0,0 +1,8 @@ +created: 20161017153616709 +modified: 20161017155350393 +tags: [[Operator Examples]] [[decodeuricomponent Operator]] +title: decodeuricomponent Operator (Examples) +type: text/vnd.tiddlywiki + +<<.operator-example 1 "[[Title%20with%20Space]] +[decodeuricomponent[]]">> +<<.operator-example 2 "[[Title%20with%20Space]] [[Another%20title%20with%20Space]] +[decodeuricomponent[]]">> diff --git a/editions/tw5.com/tiddlers/filters/examples/each.tid b/editions/tw5.com/tiddlers/filters/examples/each.tid index f6e2ed23b..4c6a746ed 100644 --- a/editions/tw5.com/tiddlers/filters/examples/each.tid +++ b/editions/tw5.com/tiddlers/filters/examples/each.tid @@ -7,5 +7,7 @@ type: text/vnd.tiddlywiki <<.operator-example 1 "[each[color]]">> <<.operator-example 2 "[sort[title]each[type]]" "the alphabetically first tiddler of each type">> <<.operator-example 3 "[each:list-item[list]]" "all tiddlers listed anywhere in the core list field">> +<<.operator-example 4 "[[Non existing]] [[GettingStarted]] +[each:value[]]" "Compare this to `+[each[]]` below">> +<<.operator-example 5 "[[Non existing]] [[GettingStarted]] +[each[]]" "Compare this to `+[each:value[]]` above">> For an example of using the <<.op each>> operator to generate a two-tier list of groups and members, see [[GroupedLists]]. diff --git a/editions/tw5.com/tiddlers/filters/examples/encodehtml_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/encodehtml_Operator_(Examples).tid new file mode 100644 index 000000000..5bc807284 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/encodehtml_Operator_(Examples).tid @@ -0,0 +1,8 @@ +created: 20161017154758523 +modified: 20161017155350391 +tags: [[Operator Examples]] [[encodehtml Operator]] +title: encodehtml Operator (Examples) +type: text/vnd.tiddlywiki + +<<.operator-example 1 "[[Title with <angle brackets>]] +[encodehtml[]]">> +<<.operator-example 2 "[[Title with an & ampersand]] +[encodehtml[]]">> diff --git a/editions/tw5.com/tiddlers/filters/examples/encodeuri_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/encodeuri_Operator_(Examples).tid new file mode 100644 index 000000000..cecc26652 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/encodeuri_Operator_(Examples).tid @@ -0,0 +1,8 @@ +created: 20161017154702282 +modified: 20161017155350397 +tags: [[Operator Examples]] [[encodeuri Operator]] +title: encodeuri Operator (Examples) +type: text/vnd.tiddlywiki + +<<.operator-example 1 "[[Title with Space]] +[encodeuri[]]">> +<<.operator-example 2 "[[Title with Space]] [[Another title with Space]] +[encodeuri[]]">> diff --git a/editions/tw5.com/tiddlers/filters/examples/encodeuricomponent_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/encodeuricomponent_Operator_(Examples).tid new file mode 100644 index 000000000..86507ab92 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/encodeuricomponent_Operator_(Examples).tid @@ -0,0 +1,8 @@ +created: 20161017154451373 +modified: 20161017155350395 +tags: [[Operator Examples]] [[encodeuricomponent Operator]] +title: encodeuricomponent Operator (Examples) +type: text/vnd.tiddlywiki + +<<.operator-example 1 "[[Title with Space]] +[encodeuricomponent[]]">> +<<.operator-example 2 "[[Title with Space]] [[Another title with Space]] +[encodeuricomponent[]]">> diff --git a/editions/tw5.com/tiddlers/filters/examples/enlist Operator (Examples).tid b/editions/tw5.com/tiddlers/filters/examples/enlist Operator (Examples).tid new file mode 100644 index 000000000..a3f9a289a --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/enlist Operator (Examples).tid @@ -0,0 +1,8 @@ +created: 20170221144328467 +modified: 20170221151620898 +tags: [[enlist Operator]] [[Operator Examples]] +title: enlist Operator (Examples) +type: text/vnd.tiddlywiki + +<<.operator-example 1 "[enlist[one two three]addsuffix[!]]">> +<<.operator-example 2 "[enlist{$:/StoryList!!list}]">> diff --git a/editions/tw5.com/tiddlers/filters/examples/escaperegexp_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/escaperegexp_Operator_(Examples).tid new file mode 100644 index 000000000..da0fa5ad6 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/escaperegexp_Operator_(Examples).tid @@ -0,0 +1,7 @@ +created: 20161017155417183 +modified: 20161017155520892 +tags: [[Operator Examples]] [[escaperegexp Operator]] +title: escaperegexp Operator (Examples) +type: text/vnd.tiddlywiki + +<<.operator-example 1 """[[Title with dots . and dollars $]] +[escaperegexp[]]""">> diff --git a/editions/tw5.com/tiddlers/filters/examples/getindex.tid b/editions/tw5.com/tiddlers/filters/examples/getindex.tid index b0512507b..780c09946 100644 --- a/editions/tw5.com/tiddlers/filters/examples/getindex.tid +++ b/editions/tw5.com/tiddlers/filters/examples/getindex.tid @@ -1,7 +1,8 @@ created: 20150203140000000 -modified: 20150203140000000 +modified: 20170608150301791 tags: [[getindex Operator]] [[Operator Examples]] title: getindex Operator (Examples) +type: text/vnd.tiddlywiki <<.operator-example 1 "[[$:/palettes/Vanilla]getindex[background]]" "returns the value at index ''background'' of the [[DataTiddler|DataTiddlers]] [[$:/palettes/Vanilla]]">> -<<.operator-example 2 "[tag[$:/tags/Palette]getindex[background]]" "returns all background colors defined in any of the ColourPalettes">> \ No newline at end of file +<<.operator-example 2 "[all[shadows+tiddlers]tag[$:/tags/Palette]getindex[background]]" "returns all background colors defined in any of the ColourPalettes">> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/filters/examples/has.tid b/editions/tw5.com/tiddlers/filters/examples/has.tid index 7691d9fc4..57941bd94 100644 --- a/editions/tw5.com/tiddlers/filters/examples/has.tid +++ b/editions/tw5.com/tiddlers/filters/examples/has.tid @@ -1,9 +1,11 @@ -created: 20150118165921000 -modified: 20150118183219000 +created: 20151111150157416 +emptyfield: +modified: 20151111150201093 tags: [[has Operator]] [[Operator Examples]] title: has Operator (Examples) type: text/vnd.tiddlywiki <<.operator-example 1 "[has[color]]">> <<.operator-example 2 "[tag[Concepts]!has[modified]]">> - +<<.operator-example 3 "[has:field[emptyfield]]">> +<<.operator-example 4 "[all[current]!has:field[doesntexist]]">> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/filters/examples/is.tid b/editions/tw5.com/tiddlers/filters/examples/is.tid index d81a9bf77..29310bcbf 100644 --- a/editions/tw5.com/tiddlers/filters/examples/is.tid +++ b/editions/tw5.com/tiddlers/filters/examples/is.tid @@ -11,3 +11,4 @@ type: text/vnd.tiddlywiki <<.operator-example 5 "[all[shadows]is[system]tag[$:/tags/Stylesheet]]" "shadow system stylesheets">> <<.operator-example 6 "[is[shadow]]" "overridden shadow tiddlers">> <<.operator-example 7 "[is[missing]]" "empty because its input contains only tiddlers that exist">> +<<.operator-example 8 "[all[tiddlers+shadows]is[tiddler+shadow]]" "contains the entire input list">> diff --git a/editions/tw5.com/tiddlers/filters/examples/jsonstringify Operator (Examples).tid b/editions/tw5.com/tiddlers/filters/examples/jsonstringify Operator (Examples).tid new file mode 100644 index 000000000..20f7bff75 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/jsonstringify Operator (Examples).tid @@ -0,0 +1,7 @@ +created: 20171029155046637 +modified: 20171029155227382 +tags: [[Operator Examples]] [[stringify Operator]] +title: jsonstringify Operator (Examples) +type: text/vnd.tiddlywiki + +<<.operator-example 1 """[[Title with "double quotes" and single ' and \backslash]] +[jsonstringify[]]""">> diff --git a/editions/tw5.com/tiddlers/filters/examples/lookup Operator (Examples).tid b/editions/tw5.com/tiddlers/filters/examples/lookup Operator (Examples).tid new file mode 100644 index 000000000..052e1d2bd --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/lookup Operator (Examples).tid @@ -0,0 +1,7 @@ +created: 20170907144257037 +modified: 20170907144559822 +title: lookup Operator (Examples) +type: text/vnd.tiddlywiki + +<<.operator-example 1 "[all[shadows+tiddlers]tag[$:/tags/PageControls]lookup[$:/config/PageControlButtons/Visibility/]]" "Retrieve the visibility status of each page control button">> +<<.operator-example 2 "[all[shadows+tiddlers]tag[$:/tags/PageControls]lookup:show[$:/config/PageControlButtons/Visibility/]]" "Retrieve the visibility status of each page control button, this time with a default value">> diff --git a/editions/tw5.com/tiddlers/filters/examples/minlength.tid b/editions/tw5.com/tiddlers/filters/examples/minlength.tid new file mode 100644 index 000000000..fcad1bd50 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/minlength.tid @@ -0,0 +1,11 @@ +created: 20161011074235805 +modified: 20161011074235805 +tags: [[Operator Examples]] [[minlength Operator]] +title: minlength Operator (Examples) +type: text/vnd.tiddlywiki + +<<.using-days-of-week>> + +<<.operator-example 1 "[list[Days of the Week]minlength[7]]">> +<<.operator-example 2 "[list[Days of the Week]minlength[1]]">> + diff --git a/editions/tw5.com/tiddlers/filters/examples/sortan.tid b/editions/tw5.com/tiddlers/filters/examples/sortan.tid new file mode 100644 index 000000000..d50c526f1 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/sortan.tid @@ -0,0 +1,12 @@ +created: 20180222071947788 +modified: 20180222072601161 +tags: [[sortan Operator]] [[Operator Examples]] +title: sortan Operator (Examples) +type: text/vnd.tiddlywiki + +These examples make use of the [[Apple]] tiddler. + +<<.operator-example 1 "[list[Apple]sortan[]]">> +<<.operator-example 2 "[list[Apple]!sortan[]]">> +<<.operator-example 3 "App-10-A App-9-B App-10-B App-9-A +[sortan[]]">> + diff --git a/editions/tw5.com/tiddlers/filters/examples/stringify_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/stringify_Operator_(Examples).tid new file mode 100644 index 000000000..1378287f5 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/stringify_Operator_(Examples).tid @@ -0,0 +1,7 @@ +created: 20161017154944352 +modified: 20171029155233487 +tags: [[Operator Examples]] [[stringify Operator]] +title: stringify Operator (Examples) +type: text/vnd.tiddlywiki + +<<.operator-example 1 """[[Title with "double quotes" and single ' and \backslash]] +[stringify[]]""">> diff --git a/editions/tw5.com/tiddlers/filters/examples/subtiddlerfields Operator (Examples).tid b/editions/tw5.com/tiddlers/filters/examples/subtiddlerfields Operator (Examples).tid new file mode 100644 index 000000000..5c7e4697c --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/subtiddlerfields Operator (Examples).tid @@ -0,0 +1,8 @@ +created: 20180403164143915 +modified: 20180403164257147 +tags: [[plugintiddlers Operator]] [[Operator Examples]] +title: subtiddlerfields Operator (Examples) +type: text/vnd.tiddlywiki + +<<.operator-example 1 "[[$:/core/copyright.txt]subtiddlerfields[$:/core]]">> + diff --git a/editions/tw5.com/tiddlers/filters/getindex.tid b/editions/tw5.com/tiddlers/filters/getindex.tid index e4b35e733..89ddabb83 100644 --- a/editions/tw5.com/tiddlers/filters/getindex.tid +++ b/editions/tw5.com/tiddlers/filters/getindex.tid @@ -3,7 +3,7 @@ modified: 20150203140000000 tags: [[Filter Operators]] [[Field Operators]] title: getindex Operator caption: getindex -purpose: select all values of a data property in the input titles +op-purpose: select all values of a data property in the input titles <$macrocall $name=".operator-def" input="a [[selection of titles|Title Selection]]" @@ -14,4 +14,4 @@ output="the values of property <<.place P>> in each of the input titles" Each input title is processed in turn, and is ignored if it does not denote a [[data tiddler|DataTiddlers]]. If the tiddler contains property <<.place P>>, the value of that property is [[dominantly appended|Dominant Append]] to the output. -<<.operator-examples "getindex">> \ No newline at end of file +<<.operator-examples "getindex">> diff --git a/editions/tw5.com/tiddlers/filters/has.tid b/editions/tw5.com/tiddlers/filters/has.tid index 65be9505e..c04370944 100644 --- a/editions/tw5.com/tiddlers/filters/has.tid +++ b/editions/tw5.com/tiddlers/filters/has.tid @@ -1,14 +1,16 @@ +caption: has created: 20140410103123179 -modified: 20150203191843000 +modified: 20151111150117431 +op-input: a [[selection of titles|Title Selection]] +op-neg-output: ''without suffix'' or with ''suffix `value`''<br>» those input tiddlers in which field <<.place F>> does <<.em not>> exist or has an empty value<br>''suffix `field`''<br>» those input tiddlers in which field <<.place F>> does <<.em not>> exist +op-output: ''without suffix'' or with ''suffix `value`''<br>» those input tiddlers in which field <<.place F>> has a non-empty value<br>''suffix `field`''<br>» those input tiddlers in which field <<.place F>> exists +op-parameter: the name of a [[field|TiddlerFields]] +op-parameter-name: F +op-purpose: filter the input by field existence +op-suffix: <<.from-version "5.1.14">> optionally, the name of a [[field|TiddlerFields]] +op-suffix-name: F tags: [[Filter Operators]] [[Common Operators]] [[Field Operators]] [[Negatable Operators]] title: has Operator type: text/vnd.tiddlywiki -caption: has -op-purpose: filter the input by field existence -op-input: a [[selection of titles|Title Selection]] -op-parameter: the name of a [[field|TiddlerFields]] -op-parameter-name: F -op-output: those input tiddlers in which field <<.place F>> has a non-empty value -op-neg-output: those input tiddlers in which field <<.place F>> does <<.em not>> exist or has an empty value -<<.operator-examples "has">> +<<.operator-examples "has">> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/filters/insertbefore Operator.tid b/editions/tw5.com/tiddlers/filters/insertbefore Operator.tid new file mode 100644 index 000000000..822f7f323 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/insertbefore Operator.tid @@ -0,0 +1,15 @@ +caption: insertbefore +created: 20170406090122441 +modified: 20170406091248994 +op-input: a [[selection of titles|Title Selection]] +op-output: the input tiddler list with the new entry inserted +op-parameter: the title of the tiddler to insert +op-parameter-name: T +op-purpose: insert an item <<.place T>> into a list immediately before an item <<.place B>> +op-suffix: the name of a variable containing the title of the tiddler before which this one should be inserted +op-suffix-name: B +tags: [[Filter Operators]] [[Order Operators]] [[Listops Operators]] +title: insertbefore Operator +type: text/vnd.tiddlywiki + +If the item <<.place B>> isn't present in the input list then the new item is inserted at the end of the list. diff --git a/editions/tw5.com/tiddlers/filters/is.tid b/editions/tw5.com/tiddlers/filters/is.tid index c274e3a86..bd33d11a6 100644 --- a/editions/tw5.com/tiddlers/filters/is.tid +++ b/editions/tw5.com/tiddlers/filters/is.tid @@ -1,5 +1,5 @@ created: 20140410103123179 -modified: 20150220161001000 +modified: 20161127142329969 tags: [[Filter Operators]] [[Common Operators]] [[Negatable Operators]] title: is Operator type: text/vnd.tiddlywiki @@ -16,14 +16,14 @@ The parameter <<.place C>> is one of the following fundamental categories: |!Category |!Matches any tiddler that... | |^`current` |is the [[current tiddler|Current Tiddler]] | |^`image` |has an image ContentType | -|^`missing` |does not exist (other than possibly as a shadow tiddler), regardless of whether there are any links it | +|^`missing` |does not exist (other than possibly as a shadow tiddler), regardless of whether there are any links to it | |^`orphan` |has no [[hard links|Hard and Soft Links]] to it | |^`shadow` |is a [[shadow tiddler|ShadowTiddlers]], regardless of whether it has been overridden with a non-shadow tiddler | |^`system` |is a [[system tiddler|SystemTiddlers]], i.e. its title starts with `$:/` | |^`tag` |is in use as a tag | |^`tiddler` |exists as a non-shadow tiddler | -If <<.place C>> is anything else, the output is an error message. +If <<.place C>> is anything else an error message is returned. <<.from-version "5.1.14">> if <<.place C>> is blank, the output is passed through unchanged (in earlier versions an error message was returned). `!is[tiddler]` is a synonym for `is[missing]`, and vice versa. @@ -31,4 +31,4 @@ When <<.op is[missing]>> is the first operator in a [[run|Filter Run]], its outp The <<.olink all>> operator is similar, but its scope is the whole wiki. -<<.operator-examples "is">> +<<.operator-examples "is">> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/filters/jsonstringify Operator.tid b/editions/tw5.com/tiddlers/filters/jsonstringify Operator.tid new file mode 100644 index 000000000..9031b158f --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/jsonstringify Operator.tid @@ -0,0 +1,27 @@ +caption: jsonstringify +created: 20171029155051467 +from-version: 5.1.14 +modified: 20171029155143797 +op-input: a [[selection of titles|Title Selection]] +op-output: the input with JSON string encodings applied +op-parameter: +op-parameter-name: +op-purpose: apply JSON string encoding to a string +tags: [[Filter Operators]] [[String Operators]] +title: jsonstringify Operator +type: text/vnd.tiddlywiki + +The following substitutions are made: + +|!Character |!Replacement | +|`\` |`\\` | +|`"` |`\\` | +|`'` |`\\` | +|`\r` (carriage return) |`\\r` | +|`\n` (line feed) |`\\n` | +|Characters from 0x00 to 0x1f |`\\x##` where ## is two hex digits | +|Characters from 0x80 to 0xffff |`\\u####` where #### is four hex digits | + +Also see the [[stringify Operator]]. + +<<.operator-examples "jsonstringify">> diff --git a/editions/tw5.com/tiddlers/filters/lookup Operator.tid b/editions/tw5.com/tiddlers/filters/lookup Operator.tid new file mode 100644 index 000000000..9cbd6d5b5 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/lookup Operator.tid @@ -0,0 +1,24 @@ +caption: lookup +created: 20170907103639431 +modified: 20170907144703051 +op-input: a [[selection of titles|Title Selection]] +op-output: the lookup values corresponding to each input title +op-parameter: prefix applied to input titles to yield title of lookup tiddler from which value is retrieved +op-parameter-name: P +op-purpose: applies a prefix to each input title to yield the title of a tiddler from which the final value is retrieved +op-suffix: the default value to be used for missing lookups +op-suffix-name: D +tags: [[Filter Operators]] +title: lookup Operator +type: text/vnd.tiddlywiki + +<<.from-version "5.1.15">> + +The action of this operator is as follows: + +* Apply the specified prefix to each input tiddler title, yielding a new list of tiddler titles +* Transclude the value of each of those tiddlers +** Substitute the default value for missing or empty tiddlers +* Return the list of values + +<<.operator-examples "lookup">> diff --git a/editions/tw5.com/tiddlers/filters/minlength.tid b/editions/tw5.com/tiddlers/filters/minlength.tid new file mode 100644 index 000000000..d450df35f --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/minlength.tid @@ -0,0 +1,14 @@ +caption: minlength +created: 20161011074235805 +modified: 20161011074235805 +op-input: a list of items +op-output: those items at least as long as the specified minimum length +op-parameter: the minimum length for items +op-parameter-name: minlength +op-purpose: filter items shorter than the specified minimum length +from-version: 5.1.14 +tags: [[Filter Operators]] +title: minlength Operator +type: text/vnd.tiddlywiki + +<<.operator-examples "minlength">> diff --git a/editions/tw5.com/tiddlers/filters/order_Operator.tid b/editions/tw5.com/tiddlers/filters/order_Operator.tid new file mode 100644 index 000000000..57c240b85 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/order_Operator.tid @@ -0,0 +1,15 @@ +caption: order +created: 20161128185907280 +modified: 20161128191251557 +op-input: a [[selection of titles|Title Selection]] +op-output: the input, with the order reversed if <<.field F>> is the special value `reverse` +op-parameter: Either the string `reverse` or another value +op-parameter-name: F +op-purpose: selectively reverse the input list +tags: [[Filter Operators]] [[Common Operators]] [[Field Operators]] [[Order Operators]] +title: order Operator +type: text/vnd.tiddlywiki + +Either reverses or preserves the order of the input list according to whether the parameter is the special value `reverse`. + +<<.operator-examples "order">> diff --git a/editions/tw5.com/tiddlers/filters/remove.tid b/editions/tw5.com/tiddlers/filters/remove.tid index 172948345..ed41c3db4 100644 --- a/editions/tw5.com/tiddlers/filters/remove.tid +++ b/editions/tw5.com/tiddlers/filters/remove.tid @@ -1,13 +1,13 @@ caption: remove created: 20151017144531676 -modified: 20151108052035773 +modified: 20170125200005000 op-input: a list of items op-neg-output: items removed from current list that appear at the tail of the operand array op-output: items removed from current list that appear at the head of the operand array op-parameter: an array of items to remove op-parameter-name: array op-prefix: causes N items from the end of the array to be removed -op-purpose: remove a range of items in an array from the current list +op-purpose: remove a list of titles specified in the operand from the input op-suffix: an integer N, defaulting to all tags: [[Filter Operators]] [[Order Operators]] [[Listops Operators]] title: remove Operator diff --git a/editions/tw5.com/tiddlers/filters/search.tid b/editions/tw5.com/tiddlers/filters/search.tid index 6e8799788..481ac77d0 100644 --- a/editions/tw5.com/tiddlers/filters/search.tid +++ b/editions/tw5.com/tiddlers/filters/search.tid @@ -10,7 +10,7 @@ op-suffix: optionally, the name of a [[field|TiddlerFields]] op-suffix-name: F op-parameter: one or more search terms, separated by spaces op-output: those input tiddlers in which <<.em all>> of the search terms can be found in the value of field <<.place F>> -op-neg-output: those input tiddlers in which <<.em not>> all of the search terms can be so found +op-neg-output: those input tiddlers in which <<.em not>> all of the search terms can be found When used with a suffix, the <<.op search>> operator is similar to <<.olink regexp>> but less powerful. diff --git a/editions/tw5.com/tiddlers/filters/sortan.tid b/editions/tw5.com/tiddlers/filters/sortan.tid new file mode 100644 index 000000000..b6674c75b --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/sortan.tid @@ -0,0 +1,16 @@ +caption: sortan +created: 20180222071605739 +modified: 20180223012553446 +op-input: a [[selection of titles|Title Selection]] +op-neg-output: the input, likewise sorted into descending order +op-output: the input, sorted into ascending order by field <<.field F>>, treating field values as alphanumerics +op-parameter: the name of a [[field|TiddlerFields]], defaulting to <<.field title>> +op-parameter-name: F +op-purpose: sort the input by text field considering them as alphanumerics +tags: [[Filter Operators]] [[Common Operators]] [[Field Operators]] [[Order Operators]] [[Negatable Operators]] +title: sortan Operator +type: text/vnd.tiddlywiki + +The difference between uppercase and lowercase letters is ignored. + +<<.operator-examples "sortan">> diff --git a/editions/tw5.com/tiddlers/filters/stringify_Operator.tid b/editions/tw5.com/tiddlers/filters/stringify_Operator.tid new file mode 100644 index 000000000..a1ab600ad --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/stringify_Operator.tid @@ -0,0 +1,28 @@ +caption: stringify +created: 20161017153038029 +modified: 20171029155143797 +op-input: a [[selection of titles|Title Selection]] +op-output: the input with ~JavaScript string encodings applied +op-parameter: +op-parameter-name: +op-purpose: apply ~JavaScript string encoding to a string +tags: [[Filter Operators]] [[String Operators]] +title: stringify Operator +type: text/vnd.tiddlywiki +from-version: 5.1.14 + +The following substitutions are made: + +|!Character |!Replacement | +|`\` |`\\` | +|`"` |`\\` | +|`\r` (carriage return) |`\\r` | +|`\n` (line feed) |`\\n` | +|`\x08` (backspace) |`\\b` | +|`\x0c` (form feed) |`\\f` | +|`\t` (tab) |`\\t` | +|Characters from 0x00 to 0x1f and characters from 0x80 to 0xffff |`\\u####` where #### is four hex digits | + +Also see the [[jsonstringify Operator]]. + +<<.operator-examples "stringify">> diff --git a/editions/tw5.com/tiddlers/filters/subtiddlerfields Operator.tid b/editions/tw5.com/tiddlers/filters/subtiddlerfields Operator.tid new file mode 100644 index 000000000..786bd887b --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/subtiddlerfields Operator.tid @@ -0,0 +1,13 @@ +caption: subtiddlerfields +created: 20180403164138703 +modified: 20180403164644231 +op-input: a [[selection|Title Selection]] of tiddler titles +op-output: all field names present in the selected tiddlers within the plugin named <<.place P>> +op-parameter: the title of a plugin +op-parameter-name: P +op-purpose: select all fields present in the selected tiddlers within a plugin +tags: [[Filter Operators]] [[Special Operators]] +title: subtiddlerfields Operator +type: text/vnd.tiddlywiki + +<<.operator-examples "subtiddlerfields">> diff --git a/editions/tw5.com/tiddlers/filters/syntax/Filter Expression.tid b/editions/tw5.com/tiddlers/filters/syntax/Filter Expression.tid index 694f44dc2..430a900cd 100644 --- a/editions/tw5.com/tiddlers/filters/syntax/Filter Expression.tid +++ b/editions/tw5.com/tiddlers/filters/syntax/Filter Expression.tid @@ -1,5 +1,5 @@ created: 20150124182421000 -modified: 20150124184900000 +modified: 20171212073225103 tags: [[Filter Syntax]] title: Filter Expression type: text/vnd.tiddlywiki @@ -14,15 +14,35 @@ type: text/vnd.tiddlywiki A <<.def "filter expression">> is the outermost level of the [[filter syntax|Filter Syntax]]. It consists of one or more [[runs|Filter Run]]. -A run's input is normally a list of all the non-[[shadow|ShadowTiddlers]] tiddler titles in the wiki (in no particular order). But the `+` prefix can change this. +If a run has: -* If a run has no `+` or `-` prefix, its output titles are [[dominantly appended|Dominant Append]] to the filter's output. -* If a run has a `-` prefix, its output titles are <<.em removed>> from the filter's output (if they were present). -* If a run has a `+` prefix, it receives the filter's output so far as its input. The filter's output is then completely <<.em replaced>> by the run's output. Any subsequent run reverts to receiving all tiddler titles as its input, unless it too has a `+` prefix. +* no prefix, its output titles are [[dominantly appended|Dominant Append]] to the filter's output +* the prefix `-`, output titles are <<.em removed>> from the filter's output (if such tiddlers exist) +* the prefix `+`, it receives the filter output so far as its input; its output then <<.em "replaces">> all filter ouput so far and forms the input for the next run -In concise technical terms: +In technical / logical terms: |!Run |!Interpretation |!Output | |`run` |union of sets |... OR run | |`+run` |intersection of sets |... AND run | |`-run` |difference of sets |... AND NOT run | + +A run's input is normally a list of all the non-[[shadow|ShadowTiddlers]] tiddler titles in the wiki (in no particular order). But the `+` prefix can change this: + +|Prefix|Input|h +|`-` or none| <$link to="all Operator">`[all[]]`</$link> tiddler titles, unless otherwise determined by the first [[filter operator|Filter Operators]]| +|`+`|the filter output of all previous runs so far| + +Precisely because of varying inputs, be aware that both prefixes `-` and `+` do not behave inverse to one another! + +For example, in both of the following, `$:/baz` will only be removed if it actually exists: + +* <$link to="is Operator"> `foo bar $:/baz -[is[system]]`</$link> +* <$link to="prefix Operator">`foo bar $:/baz -[prefix[$:/]]`</$link> + +To understand why, consider the input for both final runs with their `-` prefix. + +In order to remove `$:/baz` in any case, existing or not, simply use the `+` prefix with [[negated filter operators|Filter Operators]]: + +* <$link to="is Operator">`foo bar $:/baz +[!is[system]]`</$link> +* <$link to="prefix Operator">`foo bar $:/baz +[!prefix[$:/]]`</$link> diff --git a/editions/tw5.com/tiddlers/filters/tag.tid b/editions/tw5.com/tiddlers/filters/tag.tid index 995cae7b1..929464b15 100644 --- a/editions/tw5.com/tiddlers/filters/tag.tid +++ b/editions/tw5.com/tiddlers/filters/tag.tid @@ -1,18 +1,23 @@ +caption: tag created: 20140410103123179 -modified: 20150203191853000 +modified: 20161126122900712 +op-input: a [[selection of titles|Title Selection]] +op-neg-output: those input tiddlers that do <<.em not>> have tag <<.place T>> +op-output: those input tiddlers that have tag <<.place T>> +op-parameter: the title of a [[tag|Tagging]] +op-parameter-name: T +op-purpose: filter the input by tag +op-suffix: <<.from-version "5.1.14">> optional `strict` flag +op-suffix-name: S tags: [[Filter Operators]] [[Common Operators]] [[Tag Operators]] [[Negatable Operators]] title: tag Operator type: text/vnd.tiddlywiki -caption: tag -op-purpose: filter the input by tag -op-input: a [[selection of titles|Title Selection]] -op-parameter: the title of a [[tag|Tagging]] -op-parameter-name: T -op-output: those input tiddlers that have tag <<.place T>> -op-neg-output: those input tiddlers that do <<.em not>> have tag <<.place T>> The output is [[sorted|Order of Tagged Tiddlers]] using the tag's <<.field list>> field and the tiddlers' <<.field list-before>> and <<.field list-after>> fields. -If <<.place T>> is empty, the output of `tag` is empty, and the output of `!tag` is a copy of the input. +The behaviour when <<.place T>> is empty depends on the settings of the <<.place S>> optional suffix: + +* if <<.place T>> is missing and <<.place S>> is either missing or set to "loose", then the output of `tag` is empty, and the output of `!tag` is a copy of the input. +* <<.from-version "5.1.14">> if <<.place T>> is missing and <<.place S>> is set to "strict", then the output of both `tag` and `!tag` is a copy of the input <<.operator-examples "tag">> diff --git a/editions/tw5.com/tiddlers/gettingstarted/GettingStarted - Online.tid b/editions/tw5.com/tiddlers/gettingstarted/GettingStarted - Online.tid new file mode 100644 index 000000000..81c665728 --- /dev/null +++ b/editions/tw5.com/tiddlers/gettingstarted/GettingStarted - Online.tid @@ -0,0 +1,13 @@ +caption: Online +created: 20160216191710789 +modified: 20170222152427476 +tags: +title: GettingStarted - Online +type: text/vnd.tiddlywiki + +TiddlyWiki can also be hosted on online services such as Dropbox and Cloudant. + +;Dropbox (syncs the entire HTML file) +:To edit files stored in your Dropbox, go to http://tiny.cc/tw5inthesky/. This will allow you to open any HTML files found. +;Cloudant (or another CouchDB-type server) (syncs individual tiddlers) +:http://noteself.github.io/ \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/gettingstarted/GettingStarted - WebDAV.tid b/editions/tw5.com/tiddlers/gettingstarted/GettingStarted - WebDAV.tid deleted file mode 100644 index b368a8888..000000000 --- a/editions/tw5.com/tiddlers/gettingstarted/GettingStarted - WebDAV.tid +++ /dev/null @@ -1,22 +0,0 @@ -caption: WebDAV -created: 20160216191710789 -modified: 20160216204613016 -tags: -title: GettingStarted - WebDAV -type: text/vnd.tiddlywiki - -TiddlyWiki will use [[WebDAV|https://en.wikipedia.org/wiki/WebDAV]] to save changes if the server supports it. The main difficulty with this method is setting up a server. - -!! Servers - -[[dav-server|https://github.com/edrex/dav-server]] is a quick way to serve up a folder of HTML ~TiddlyWikis. - -[[webdav server|https://play.google.com/store/apps/details?id=com.theolivetree.webdavserver&hl=en]] for Android lets you put wikis in your pocket. You can share with other devices on the local network too. - -!! Existing Wikis - -~WebDAV support was added Feb 16 2016. If you created your wiki before that, you'll need to [[Upgrade|Upgrading]] to enable ~WebDAV. - -!! Free Hosting - -None of the ~WebDAV hosting services tested (~~box.com~~, ~~swissdisk.com~~) support accessing HTML files via a webbrowser, so they won't work with ~TiddlyWiki. Maybe someday soon there will be a free ~WebDAV hosting service for ~TiddlyWikis. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/gettingstarted/GettingStarted.tid b/editions/tw5.com/tiddlers/gettingstarted/GettingStarted.tid index cfbe7af6a..ad6d00bca 100644 --- a/editions/tw5.com/tiddlers/gettingstarted/GettingStarted.tid +++ b/editions/tw5.com/tiddlers/gettingstarted/GettingStarted.tid @@ -1,35 +1,13 @@ created: 20131129090249275 -modified: 20160622111349475 +modified: 20171113162547685 tags: [[Working with TiddlyWiki]] title: GettingStarted type: text/vnd.tiddlywiki -\define default-platform() -GettingStarted - $(browser-name)$ -\end -Brief instructions for getting started on the different platforms and configurations that TiddlyWiki supports. See the [[A Gentle Guide to TiddlyWiki]] for a more leisurely introduction. +Click here to download an empty copy of TiddlyWiki: {{$:/editions/tw5.com/snippets/download-empty-button}} -<$set name="browser-name" value={{$:/info/browser/name}}> -<$macrocall $name="tabs" state="$:/state/tabs/platform" tabsList="[prefix[GettingStarted - ]]" default=<<default-platform>> class="tc-vertical"/> -</$set> +The next step is to choose a method for saving changes. There's a wide variety of methods available, with different features and limitations. Click on the badge for a method to see more information about it. You can also click on one of the platform filters to restrict the listing to methods that work with that platform. -Troubleshooting: +<<.warning "Don't attempt to use the browser ''File''/''Save'' menu option to save changes (it doesn't work)">> -* Don't attempt to use the browser ''File''/''Save'' menu option to save changes (it doesn't work) - -See also: - -* [[Encryption]] explains how to use TiddlyWiki's built-in encryption to protect your content with a password -* [[Saving on TiddlySpot]], a free service that lets you use TiddlyWiki online -* Saving on TiddlyDesktop, a custom desktop application for working with TiddlyWiki -* You can also download this full TiddlyWiki including all the documentation: - -<<< -{{$:/snippets/download-wiki-button}} - -If the button doesn't work save this link: - -<a href="http://tiddlywiki.com/index.html" download="index.html" rel="noopener noreferrer">~http://tiddlywiki.com/index.html</a> - -Your browser may ask you to accept the download before it begins -<<< +{{Saving}} diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid index c50518574..ba09ab537 100644 --- a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid +++ b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid @@ -1,6 +1,6 @@ created: 20130822170200000 -list: [[A Gentle Guide to TiddlyWiki]] [[Discover TiddlyWiki]] [[Some of the things you can do with TiddlyWiki]] [[Ten reasons to switch to TiddlyWiki]] Examples [[What happened to the original TiddlyWiki?]] -modified: 20160725084810809 +list: [[A Gentle Guide to TiddlyWiki]] [[Discover TiddlyWiki]] [[Some of the things you can do with TiddlyWiki]] [[Ten reasons to switch to TiddlyWiki]] Examples [[What happened to the original TiddlyWiki?]] [[HelloThumbnail - TWEUM2017]] +modified: 20180512104329616 tags: TableOfContents title: HelloThere type: text/vnd.tiddlywiki @@ -15,13 +15,13 @@ Use it to keep your [[to-do list|TaskManagementExample]], to plan an [[essay or <<list-thumbnails filter:"[tag[HelloThumbnail]]" width:"168" height:"95">> </div> -Unlike conventional online services, TiddlyWiki lets you choose where to keep your data, guaranteeing that in the decades to come you will still be able to use the notes you take today. +Unlike conventional online services, TiddlyWiki lets you choose where to keep your data, guaranteeing that in the decades to come you will [[still be able to use|Future Proof]] the notes you take today. <div style="font-size:0.7em;text-align:center;margin-top:3em;margin-bottom:3em;"> <a href="http://groups.google.com/group/TiddlyWiki" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank" rel="noopener noreferrer"> -{{$:/core/images/mail}} ~TiddlyWiki Mailing List +{{$:/core/images/help}} ~TiddlyWiki Forum </a> -<a href="http://www.youtube.com/c/JeremyRuston" class="tc-btn-big-green" style="background-color:#e52d27;" target="_blank" rel="noopener noreferrer"> +<a href="https://www.youtube.com/c/JeremyRuston" class="tc-btn-big-green" style="background-color:#e52d27;" target="_blank" rel="noopener noreferrer"> {{$:/core/images/video}} ~TiddlyWiki on ~YouTube </a> <a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="background-color:#5E9FCA;" target="_blank" rel="noopener noreferrer"> @@ -31,3 +31,9 @@ Unlike conventional online services, TiddlyWiki lets you choose where to keep yo {{$:/core/images/github}} ~TiddlyWiki on ~GitHub </a> </div> + +<<<.tc-big-quote +''~TiddlyWiki gets a Gearhead rating of 6 out of 5 (it's that good).'' + +Finding code that works flawlessly after just two or three years is magical enough but after seven years?! +<<< [[Mark Gibbs, Network World|http://www.networkworld.com/article/3028098/open-source-tools/tiddlywiki-a-free-open-source-wiki-revisited.html]] diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid b/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid index 7c22c8ecc..f97b16ea6 100644 --- a/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid +++ b/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid @@ -1,5 +1,5 @@ created: 20150414070451144 -list: [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - Gentle Guide]] [[HelloThumbnail - HelpingTiddlyWiki]] [[HelloThumbnail - Developers]] [[HelloThumbnail - TWEUM2016]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - Classic]] +list: [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - Gentle Guide]] [[HelloThumbnail - Firefox Apocalypse]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - TiddlyMap]] [[HelloThumbnail - HelpingTiddlyWiki]] [[HelloThumbnail - Developers]] [[HelloThumbnail - Classic]] modified: 20150414070948246 title: HelloThumbnail type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/hellothere/Some of the things you can do with TiddlyWiki.tid b/editions/tw5.com/tiddlers/hellothere/Some of the things you can do with TiddlyWiki.tid index 4f8619e24..8ca09ca71 100644 --- a/editions/tw5.com/tiddlers/hellothere/Some of the things you can do with TiddlyWiki.tid +++ b/editions/tw5.com/tiddlers/hellothere/Some of the things you can do with TiddlyWiki.tid @@ -17,4 +17,4 @@ type: text/vnd.tiddlywiki * Use familiar web user interface elements such as lightboxes - see SampleWizard * Create a slideshow presentation * Set up an entire local or online knowledgebase, with a central ~TiddlyWiki file linking to other ~TiddlyWiki files (http://recursos.giffmex.org is a Spanish online example of this) -* Set up a data visualisation using tiddlers as data (see the visualisations at http://tiddlywiki.com/plugins/tiddlywiki/d3/) +* Set up a data visualisation using tiddlers as data (see the visualisations at https://tiddlywiki.com/plugins/tiddlywiki/d3/) diff --git a/editions/tw5.com/tiddlers/hellothere/What happened to the original TiddlyWiki.tid b/editions/tw5.com/tiddlers/hellothere/What happened to the original TiddlyWiki.tid index 871943179..9441bf64a 100644 --- a/editions/tw5.com/tiddlers/hellothere/What happened to the original TiddlyWiki.tid +++ b/editions/tw5.com/tiddlers/hellothere/What happened to the original TiddlyWiki.tid @@ -3,12 +3,12 @@ tags: HelloThere created: 201409040851 modified: 201409040851 -<a class="tc-float-right tc-bordered-image" href="http://classic.tiddlywiki.com/" target="_blank" rel="noopener noreferrer">[img width="200" [TiddlyWiki Classic.png]]</a> +<a class="tc-float-right tc-bordered-image" href="https://classic.tiddlywiki.com/" target="_blank" rel="noopener noreferrer">[img width="200" [TiddlyWiki Classic.png]]</a> The original [[Classic|TiddlyWikiClassic]] version of TiddlyWiki is still available at: -http://classic.tiddlywiki.com. +https://classic.tiddlywiki.com. Note that the [[current version|TiddlyWiki5]] of TiddlyWiki is not fully backwards compatible with TiddlyWikiClassic. Content can be imported but will need massaging to adapt to the new WikiText format. A ''tw2parser'' plugin is under development that will allow faithful display of most content created for TiddlyWikiClassic: -http://tiddlywiki.com/plugins/tiddlywiki/tw2parser/ +https://tiddlywiki.com/plugins/tiddlywiki/tw2parser/ diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TWEUM2016.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TWEUM2016.tid deleted file mode 100644 index de852ba10..000000000 --- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TWEUM2016.tid +++ /dev/null @@ -1,6 +0,0 @@ -title: HelloThumbnail - TWEUM2016 -tags: HelloThumbnail -color: #D5B7EA -image: TWEUM2016 Thumbnail.jpg -caption: European Meetup 2016 -link: TiddlyWiki European Meetup 2016 diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TWEUM2017.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TWEUM2017.tid new file mode 100644 index 000000000..658ada797 --- /dev/null +++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TWEUM2017.tid @@ -0,0 +1,8 @@ +title: HelloThumbnail - TWEUM2017 +tags: HelloThumbnail-disabled +color: #fff +background-color: #000 +icon: <span style="font-size:3.5em;font-weight:bold;text-shadow:1px 1px 3px rgba(0,0,0,1);">2017</span> +image: TWEUM Thumbnail.jpg +caption: European Meetup 2017 +link: TiddlyWiki European Meetup 2017 diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyFox Apocalypse.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyFox Apocalypse.tid new file mode 100644 index 000000000..0410f4f19 --- /dev/null +++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyFox Apocalypse.tid @@ -0,0 +1,7 @@ +title: HelloThumbnail - TiddlyFox Apocalypse +tags: HelloThumbnail +color: #B7D5EA +background-color: #fff +caption: ~TiddlyFox Apocalypse +link: TiddlyFox Apocalypse +image: TiddlyFox Apocalypse.png diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyMap.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyMap.tid new file mode 100644 index 000000000..26feee0d9 --- /dev/null +++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyMap.tid @@ -0,0 +1,6 @@ +title: HelloThumbnail - TiddlyMap +tags: HelloThumbnail +color: #D5B7EA +image: TiddlyMap.png +caption: ~TiddlyMap Plugin +link: TiddlyMap Plugin by Felix Küppers diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SearchMinLength.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SearchMinLength.tid new file mode 100644 index 000000000..1fdcbbcbb --- /dev/null +++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SearchMinLength.tid @@ -0,0 +1,11 @@ +created: 20161011074235805 +modified: 20161011074235805 +tags: [[Hidden Settings]] +title: Hidden Setting: Search Minimum Length +type: text/vnd.tiddlywiki + +<<.from-version "5.1.14">> Controls the minimum length of a search string before results are displayed. + +Defaults to "3". + +$:/config/Search/MinLength diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting TagsMinLength.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting TagsMinLength.tid new file mode 100644 index 000000000..138ff135a --- /dev/null +++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting TagsMinLength.tid @@ -0,0 +1,11 @@ +created: 201712032331 +modified: 201712032331 +tags: [[Hidden Settings]] +title: Hidden Setting: Tags Minimum Length +type: text/vnd.tiddlywiki + +<<.from-version "5.1.16">> Tag Dropdown: Controls the minimum length of an input string before results are displayed. + +Defaults to "0". + +$:/config/Tags/MinLength diff --git a/editions/tw5.com/tiddlers/howtos/Adding a Table of Contents to the Sidebar.tid b/editions/tw5.com/tiddlers/howtos/Adding_a_table_of_contents_to_the_sidebar.tid similarity index 91% rename from editions/tw5.com/tiddlers/howtos/Adding a Table of Contents to the Sidebar.tid rename to editions/tw5.com/tiddlers/howtos/Adding_a_table_of_contents_to_the_sidebar.tid index 73e93f819..c69ba8839 100644 --- a/editions/tw5.com/tiddlers/howtos/Adding a Table of Contents to the Sidebar.tid +++ b/editions/tw5.com/tiddlers/howtos/Adding_a_table_of_contents_to_the_sidebar.tid @@ -1,7 +1,7 @@ created: 20160424150551727 -modified: 20160608122742084 +modified: 20170204191234906 tags: [[Customise TiddlyWiki]] -title: Adding a Table of Contents to the Sidebar +title: Adding a table of contents to the sidebar type: text/vnd.tiddlywiki A customisable [[table of contents|Table-of-Contents Macros]] can be added to the sidebar with the following steps: diff --git a/editions/tw5.com/tiddlers/howtos/Concatenating text and variables using macro substitution.tid b/editions/tw5.com/tiddlers/howtos/Concatenating text and variables using macro substitution.tid new file mode 100644 index 000000000..de4bebc70 --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/Concatenating text and variables using macro substitution.tid @@ -0,0 +1,62 @@ +created: 20160424150551727 +modified: 20170101020235437 +tags: Learning +title: Concatenating text and variables using macro substitution +type: text/vnd.tiddlywiki + + +It's a frequent use case in ~TiddlyWiki that you will want to put the results of variables together with various bits of strings of text. This process in some programming languages is often referred to as "concatenating" text. + +You might, for instance want to set up a template for your customer database, where links will automatically refer to additional contact information about your customer. Inside your tiddler, you might try something like this: + + +|warning|k +|@@font-size:1.5em;⚠@@ Warning:<br/> Don't do it this way!| `[[Additional Info|<<currentTiddler>>-Contact]]` | + +But that won't work. If you try this, the link will be interpreted very literally, and will attempt to take you to: + +``` +<<currentTiddler>>-Contact +``` + +The solution is to use a macro to put the rendered value of `<<currentTiddler>>` together with the bit of additional text, `-Contact`. + +Create a macro either at the top of the tiddler or in a global tiddler (see [[Macros]]) like this: + +``` +\define linkup(link) [[Additional Info|$link$-Contact]] +``` + +You might be tempted to invoke the new macro like this: + +|warning|k +|@@font-size:1.5em;⚠@@ Warning:<br/> Don't do it this way!| `<<linkup <<currentTiddler>> >>` | + + +But if you do, you will find that `<<currentTiddler>>` doesn't get rendered, but instead gets passed literally. + +Instead, you could use the [[MacroCallWidget]] widget, like this: + +``` +<$macrocall $name="linkup" link=<<currentTiddler>> /> +``` + +In this case, we passed the value of a variable directly to our macro. This is often a general way to go about this task. If you wanted to create more links based on other variables you could re-use the macro for each situation. + +If, as in this case, the only variable you are using is `currentTiddler` then you could write a simple macro, like this: + +``` +\define linkup() [[Additional Info|$(currentTiddler)$-Contact]] +``` + +Notice that in this case we don't pass an argument. Instead, we reference the variable using the special syntax `$(variable)$`. Since we don't pass an argument, we can invoke it without the `<$macrocall>` widget more simply, like this: + +``` +<<linkup>> +``` + +<style> +.warning code {background-color:#ffff80} +table.warning {background-color:#ffff80;} + +</style> diff --git a/editions/tw5.com/tiddlers/howtos/Custom Styles by title.tid b/editions/tw5.com/tiddlers/howtos/Custom Styles by title.tid new file mode 100644 index 000000000..c3730d6d7 --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/Custom Styles by title.tid @@ -0,0 +1,39 @@ +created: 201804111739 +modified: 201804111739 +tags: [[How to apply custom styles]] +title: Custom styles by data-tiddler-title +type: text/vnd.tiddlywiki + +! Attribute: data-tiddler-title + +<<.from-version "5.1.16">> + +The ~TiddlyWiki core adds several `attributes` to the rendered content. With those attributes it's possible to apply custom styles to the tiddler content. + +For example this tiddler is named: "{{!!title}}" so the attribute looks like this: + +``` +data-tiddler-title="Custom styles by title" +``` + +!! Examples + +The following CSS is defined in [[Custom data-styles]] and creates a blue border for exactly this tiddler. + +``` +[data-tiddler-title="Custom styles by title"] { + border: 1px solid blue; +} +``` + +To create a green border for every tiddler that starts with `$:/` aka system tiddlers, you'd need to use CSS like so: (not applied here but you can experiment with it! ) + +``` +[data-tiddler-title^="$:/"] { + border: 1px solid green; +} +``` + +!! More Possibilities + +{{Attribute Selectors}} diff --git a/editions/tw5.com/tiddlers/howtos/Custom Styles by userClass.tid b/editions/tw5.com/tiddlers/howtos/Custom Styles by userClass.tid new file mode 100644 index 000000000..9a1d4c609 --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/Custom Styles by userClass.tid @@ -0,0 +1,26 @@ +created: 201804111739 +modified: 201804111739 +title: Custom styles by user-class +tags: [[How to apply custom styles]] +type: text/vnd.tiddlywiki + +''Tiddler Field: `class`'' <<.from-version "5.1.16">> + +The [[tag manager|$:/TagManager]] allows us to set a tiddler `color` field, that is used to define the "tag-pill" colour. Since: <<.from-version "5.1.16">> we can define a `class` field, that is directly inserted into the [[ViewTemplate|$:/core/ui/ViewTemplate]] and it can be used for styling: + +""" +title: `anyName` +tags: `$:/tags/Stylesheet` +class: `myClass` +""" + +Every tiddler, that has a `class` field can be styled that way! + +``` +.myClass { + border: 2px solid blue; +} + +``` + +Learn more at: [[How to apply custom styles]] \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/howtos/Custom_Attribute_Selectors.tid b/editions/tw5.com/tiddlers/howtos/Custom_Attribute_Selectors.tid new file mode 100644 index 000000000..e5e36d4ec --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/Custom_Attribute_Selectors.tid @@ -0,0 +1,31 @@ +created: 20170126152839462 +modified: 201804111739 +tags: [[Custom data-styles]] +title: Attribute Selectors +type: text/vnd.tiddlywiki + +;[attr] +:Represents an element with an attribute name of attr. + +;[attr="value"] +:Represents an element with an attribute name of attr and whose value is exactly "value". + +;[attr~="value"] +:Represents an element with an attribute name of attr whose value is a whitespace-separated list of words, one of which is exactly "value". + +;[attr|="value"] +:Represents an element with an attribute name of attr. Its value can be exactly “value” or can begin with “value” immediately followed by “-” (U+002D). It can be used for language subcode matches. + +;[attr^="value"] +:Represents an element with an attribute name of attr and whose first value is prefixed by "value". + +;[attr$="value"] +:Represents an element with an attribute name of attr and whose last value is suffixed by "value". + +;[attr*="value"] +:Represents an element with an attribute name of attr and whose value contains at least one occurrence of string "value" as substring. + +;[attr "operator value" i] +:Adding an i (or I) before the closing bracket causes the value to be compared case-insensitively (for characters within the ASCII range). + +Learn more at: [[Attribute selectors - CSS|https://developer.mozilla.org/en-US/docs/Web/CSS/Attribute_selectors]] or [[CSS-Specification|https://www.w3.org/TR/CSS22/selector.html#attribute-selectors]] \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/howtos/Custom_Styles_FAQ.tid b/editions/tw5.com/tiddlers/howtos/Custom_Styles_FAQ.tid new file mode 100644 index 000000000..6fb06c86f --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/Custom_Styles_FAQ.tid @@ -0,0 +1,9 @@ +modified: 201804111739 +created: 201804111739 +title: Custom Styles FAQ +tags: [[How to apply custom styles]] FAQ-group +type: text/vnd.tiddlywiki + +<<.from-version "5.1.16">> + +<<list-links "[tag[Custom Styles FAQ]]">> diff --git a/editions/tw5.com/tiddlers/howtos/Custom_data-styles.tid b/editions/tw5.com/tiddlers/howtos/Custom_data-styles.tid new file mode 100644 index 000000000..884dab36a --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/Custom_data-styles.tid @@ -0,0 +1,35 @@ +created: 201804111739 +modified: 201804111739 +tags: data-tags-styles [[How to apply custom styles]] $:/tags/Stylesheet +title: Custom data-styles +type: text/vnd.tiddlywiki + +[data-tiddler-title="Custom styles by title"] { + border: 1px solid blue; +} + +[data-tags*="example-test"] { + border: 2px solid pink; +} + +[data-tags*="example-hardlinebreaks"] .tc-tiddler-body { + word-break: normal; + word-wrap: break-word; + white-space: pre-wrap; +} + +[data-tags*="data-tags-styles"] .tc-tiddler-body { + display: block; + padding: 14px; + margin-top: 1em; + margin-bottom: 1em; + word-break: normal; + word-wrap: break-word; + white-space: pre-wrap; + background-color: #f5f5f5; + border: 1px solid #cccccc; + padding: 0 3px 2px; + border-radius: 3px; + font-family: Monaco, Consolas, "Lucida Console", "DejaVu Sans Mono", monospace; +} + diff --git a/editions/tw5.com/tiddlers/howtos/Custom_styles_by_data-tags.tid b/editions/tw5.com/tiddlers/howtos/Custom_styles_by_data-tags.tid new file mode 100644 index 000000000..62df8bdcb --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/Custom_styles_by_data-tags.tid @@ -0,0 +1,60 @@ +created: 20170124132500000 +modified: 201804111739 +tags: example-test [[How to apply custom styles]] +title: Custom styles by data-tags +type: text/vnd.tiddlywiki + +! Attribute: data-tags + +<<.from-version "5.1.16">> + +The ~TiddlyWiki core adds several `attributes` to the rendered content. With those attributes it's possible to apply custom styles to the tiddler content. + +For example this tiddler is tagged: <<tag "How to apply custom styles">> and <<tag "example-test">> so the attribute looks like this: + +``` +data-tags="[[How to apply custom styles]] example-test" +``` + +''Important:'' Tiddler tags are ''not'' sorted, so the order in the rendered output may be different! + +!! Examples + +The following CSS is defined in [[Custom data-styles]] and creates a pink border for exactly this tiddler. + +``` +[data-tags*="example-test"] { + border: 2px solid pink; +} +``` + +!!! Styling Stylesheets + +So to display tiddlers tagged: `data-tags-styles` in a decent way we can use the following code. (I could have used: `$:/tags/Stylesheet`, but that would affect all stylesheets in this wiki, which is not intended. amt ;) + +''Important:'' Don't forget the `.tc.tiddler.body`, otherwise the whole tiddler, including the title will be changed! see: [[Custom data-styles]] + +``` +[data-tags*="data-tags-styles"] .tc-tiddler-body { + display: block; + padding: 14px; + margin-top: 1em; + margin-bottom: 1em; + word-break: normal; + word-wrap: break-word; + white-space: pre-wrap; + background-color: #f5f5f5; + border: 1px solid #cccccc; + padding: 0 3px 2px; + border-radius: 3px; + font-family: Monaco, Consolas, "Lucida Console", "DejaVu Sans Mono", monospace; +} +``` + +!! Hard Linebreaks + +This mechanism may be handy for users, who want to write prose text! see: [[Hard Linebreaks with CSS]] + +!! More Possibilities + +{{Attribute Selectors}} diff --git a/editions/tw5.com/tiddlers/howtos/Formatting List Results as Tables with CSS - Specified Columns Methods.tid b/editions/tw5.com/tiddlers/howtos/Formatting List Results as Tables with CSS - Specified Columns Methods.tid new file mode 100644 index 000000000..bae7414ca --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/Formatting List Results as Tables with CSS - Specified Columns Methods.tid @@ -0,0 +1,57 @@ +created: 20161209172820513 +modified: 20161220161653258 +tags: Learning +title: Formatting List Results as Tables with CSS - Specified Columns Methods +type: text/vnd.tiddlywiki + +Sometimes you want the results of a ``<$list>`` widget to be formatted in the form of multiple columns, instead of just one straight listing. This method uses ~CSS to set up listing as columns and assumes that you know how many columns you want. The method here is to create a style that reflects the number of columns you want your table to be in, and then apply that style to the resulting list output. + +For other table-making techniques see also: + +* [[Formatting List Results as Tables with CSS - Variable Column Method]] +* [[Formatting List Results as Tables (no CSS)]] + + +!!! 1) Create a tiddler for the columns tagged with `$:/tags/Stylesheet`, containing: + +``` +/* FOUR COLUMN MODE */ +.fourcolumns { + display:block; + -moz-column-count:4; + -moz-column-gap:1em; + -webkit-column-count: 4; + -webkit-column-gap:1em; +} +``` + +Note the various places you need to indicate the number of columns + +!!! 2) Then format your output like this: + +``` +@@.fourcolumns +<$list filter="[tag[Filter Operators]]" variable="foo"><br> +<<foo>> +</$list> +@@ +``` + +!! Example showing partial list of filter operators + +<style> +.fourcolumns { + display:block; + -moz-column-count:4; + -moz-column-gap:1em; + -webkit-column-count: 4; + -webkit-column-gap:1em; +} +</style> + + +@@.fourcolumns +<$list filter="[tag[Filter Operators]limit[24]]" variable="foo"><br> +<<foo>> +</$list> +@@ diff --git a/editions/tw5.com/tiddlers/howtos/Formatting List Results as Tables with CSS - Variable Column Method.tid b/editions/tw5.com/tiddlers/howtos/Formatting List Results as Tables with CSS - Variable Column Method.tid new file mode 100644 index 000000000..b5aa12c1b --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/Formatting List Results as Tables with CSS - Variable Column Method.tid @@ -0,0 +1,84 @@ +created: 20161209172820513 +modified: 20161220162845058 +tags: Learning +title: Formatting List Results as Tables with CSS - Variable Column Method +type: text/vnd.tiddlywiki + +Sometimes you want the results of a ``<$list>`` widget to be formatted in the form of multiple columns, instead of just one straight listing. This method uses CSS to set up listing as columns. It is responsive, that is, re-positioning to display fewer columns if the window is too small. + +You don't directly specify a fixed number of columns but instead specify the max-width for the list (which could be a transclusion of the tiddler width) and the width for each item. It lists from left to right, then wraps to a new row. + +For other table-making techniques see also: + +* [[Formatting List Results as Tables with CSS - Specified Columns Methods]] +* [[Formatting List Results as Tables (no CSS)]] + + +!! Example listing using 50 existing ~TiddlyWiki tags + +``` +<div class="dynamic-table"> + <$list filter="[has[tags]tags[]sort[title]first[50]]"> + <span class="item"> + <$transclude tiddler="$:/core/ui/TagTemplate"/> + </span> + </$list> +</div> +``` + +!! Example stylesheet to use with listing + +``` +<style> +.dynamic-table { + max-width:700px; /* could transclude tiddler width instead */ + -ms-box-orient: vertical; /* might be unnecessary */ + display: -webkit-box; + display: -moz-box; + display: -ms-flexbox; + display: -moz-flex; + display: -webkit-flex; + display: inline-flex; + -webkit-flex-wrap: wrap; + flex-wrap: wrap; + flex-direction: row; +} + +.item { + max-width:160px; min-width:160px; + flex: 0 0 2em; /* -grow, -shrink, -basis */ +} +</style> +``` + +!! Results + +<div class="dynamic-table"> + <$list filter="[has[tags]tags[]sort[title]first[50]]"> + <span class="item"> + <$transclude tiddler="$:/core/ui/TagTemplate"/> + </span> + </$list> +</div> + +<style> +.dynamic-table { + max-width:700px; /* could transclude tiddler width instead */ + -ms-box-orient: vertical; + display: -webkit-box; + display: -moz-box; + display: -ms-flexbox; + display: -moz-flex; + display: -webkit-flex; + display: inline-flex; + -webkit-flex-wrap: wrap; + flex-wrap: wrap; + flex-direction: row; +} + +.item { + max-width:160px; min-width:160px; + flex: 0 0 2em; /* -grow, -shrink, -basis */ +} +</style> + diff --git a/editions/tw5.com/tiddlers/howtos/Formatting_List_Results_as_Tables_(no_CSS).tid b/editions/tw5.com/tiddlers/howtos/Formatting_List_Results_as_Tables_(no_CSS).tid new file mode 100644 index 000000000..796901d63 --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/Formatting_List_Results_as_Tables_(no_CSS).tid @@ -0,0 +1,50 @@ +created: 20161220154952676 +modified: 20161220161706470 +tags: Learning +title: Formatting List Results as Tables (no CSS) +type: text/vnd.tiddlywiki + +Sometimes you want the results of a ``<$list>`` widget to be formatted in the form of multiple columns instead of just one straight listing. The following method creates an actual table structure and uses the [[nth operator|nth Operator]] to provide break points for the rows. It is not responsive, that is, it doesn't re-position to display fewer columns if the window is too small. + +In the first, outer list structure you must provide a count to indicate at item number rows should occur. So, in the following example, each row breaks after 4 items, so the sequence is 1,5,9, etc. Note that this requires you to know in advance the maximum number of items there will be. There is also an internal limit that is set to n-1 items, where n is the number of columns you want. + +Note also that you need to repeat the driving filter operator inside of the internal `<$list>` widget. Obviously this technique lends itself to a macro implementation. + +For other table-making techniques see also: + +* [[Formatting List Results as Tables with CSS - Variable Column Method]] +* [[Formatting List Results as Tables with CSS - Specified Columns Methods]] + + +!! Example code for a four-column table with fewer than 70 items + +``` +<table> +<$list filter="1 5 9 13 17 21 25 29 33 37 41 45 49 53 57 61 65" variable ="rows"> + <$list filter="[tag[Filter Operators]limit[50]] +[nth<rows>]" variable="cell"> + <tr> + <td> <<cell>> </td> + <$list filter="[tag[Filter Operators]limit[50]] +[allafter<cell>limit[3]]" variable="this"> + <td> <<this>> </td> + </$list> + </tr> + </$list> +</$list> +</table> +``` + +!! Result + +<table> +<$list filter="1 5 9 13 17 21 25 29 33 37 41 45 49 53 57 61 65" variable ="rows"> + <$list filter="[tag[Filter Operators]limit[50]] +[nth<rows>]" variable="cell"> + <tr> + <td> <<cell>> </td> + <$list filter="[tag[Filter Operators]limit[50]] +[allafter<cell>limit[3]]" variable="this"> + <td> <<this>> </td> + </$list> + </tr> + </$list> +</$list> +</table> + diff --git a/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid b/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid index 772b07493..972942c59 100644 --- a/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid +++ b/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid @@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki TiddlyWiki5 can be used to generate static HTML representations of a TiddlyWiki that doesn't need JavaScript. -There is much flexibility in how the static HTML is generated. The following scenarios are all illustrated on http://tiddlywiki.com. +There is much flexibility in how the static HTML is generated. The following scenarios are all illustrated on https://tiddlywiki.com. ! Wiki Snapshots and Tiddler Snapshots diff --git a/editions/tw5.com/tiddlers/howtos/Hard_Linebreaks_with_CSS.tid b/editions/tw5.com/tiddlers/howtos/Hard_Linebreaks_with_CSS.tid new file mode 100644 index 000000000..200ed14be --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/Hard_Linebreaks_with_CSS.tid @@ -0,0 +1,26 @@ +created: 20170126174506507 +modified: 20170126211042714 +tags: [[Hard Linebreaks in WikiText]] +title: Hard Linebreaks with CSS +type: text/vnd.tiddlywiki + +Since TiddlyWiki Version 5.1.16, it's possible to apply customs styles with `data-` attributes. see: [[How to apply custom styles]] + +The [[Custom data-styles]] stylesheet tiddler contains the following definition: + +``` +[data-tags*="example-hardlinebreaks"] .tc-tiddler-body { + word-break: normal; + word-wrap: break-word; + white-space: pre-wrap; +} +``` + +If rendered without the tag, the content of "Hard Linebreaks with CSS - Example" will be shown like this: + +>{{Hard Linebreaks with CSS - Example}} + +---- + +Open the tiddler to see the custom CSS rules applied: [[Hard Linebreaks with CSS - Example]] + diff --git a/editions/tw5.com/tiddlers/howtos/Hard_Linebreaks_with_CSS_-_Example.tid b/editions/tw5.com/tiddlers/howtos/Hard_Linebreaks_with_CSS_-_Example.tid new file mode 100644 index 000000000..895a920c9 --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/Hard_Linebreaks_with_CSS_-_Example.tid @@ -0,0 +1,14 @@ +created: 20170126161803543 +modified: 20170126211025840 +tags: example-hardlinebreaks [[Hard Linebreaks in WikiText]] +title: Hard Linebreaks with CSS - Example +type: text/vnd.tiddlywiki + +The following text is rendered without any special WikiText syntax. So most of the ~WikiText functionality will be accessible. + +This is a line +and this is a new line +while this is yet another line +and this is the final one +apart from this one + diff --git a/editions/tw5.com/tiddlers/howtos/How to add a banner for GitHub contributions.tid b/editions/tw5.com/tiddlers/howtos/How to add a banner for GitHub contributions.tid index 4e03ee322..086b45a64 100644 --- a/editions/tw5.com/tiddlers/howtos/How to add a banner for GitHub contributions.tid +++ b/editions/tw5.com/tiddlers/howtos/How to add a banner for GitHub contributions.tid @@ -3,7 +3,7 @@ modified: 20141123094403948 created: 20141123094403948 tags: Learning -When you edit a tiddler on http://tiddlywiki.com you will see a small ribbon inviting you to edit the source of the tiddler on GitHub. +When you edit a tiddler on https://tiddlywiki.com you will see a small ribbon inviting you to edit the source of the tiddler on GitHub. If you are using Node.js, you can replicate this feature for your own TiddlyWiki-based site as follows: diff --git a/editions/tw5.com/tiddlers/howtos/How to apply custom styles by tag.tid b/editions/tw5.com/tiddlers/howtos/How to apply custom styles by tag.tid index ebf07df78..bc6c2ccf2 100644 --- a/editions/tw5.com/tiddlers/howtos/How to apply custom styles by tag.tid +++ b/editions/tw5.com/tiddlers/howtos/How to apply custom styles by tag.tid @@ -1,9 +1,14 @@ +caption: {{!!title}} - ^^deprecated^^ created: 20141001132300000 -modified: 20151005074702387 -tags: Learning +modified: 201804111739 +tags: [[How to apply custom styles]] $:/deprecated title: How to apply custom styles by tag type: text/vnd.tiddlywiki +<<.deprecated-since "5.1.16 <- click" "Custom styles by data-tags">>. Also see: [[How to apply custom styles]] + +---- + You can apply custom styles to tiddlers that have a particular tag by defining a CSS class with the name `tc-tagged-<Tag Name>`. For example, to make tiddlers tagged "NightReader" appear in a special colour scheme suitable for night-time reading, [[create a stylesheet|Using Stylesheets]] defining the class `tc-tagged-NightReader` like this: diff --git a/editions/tw5.com/tiddlers/howtos/How to apply custom styles.tid b/editions/tw5.com/tiddlers/howtos/How to apply custom styles.tid new file mode 100644 index 000000000..df347f002 --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/How to apply custom styles.tid @@ -0,0 +1,10 @@ +created: 20141001132300000 +list: [[Custom styles by data-tags]] [[Custom styles by title]] +modified: 201804111740 +tags: [[Customise TiddlyWiki]] +title: How to apply custom styles +type: text/vnd.tiddlywiki + +At the moment there are several ways to apply custom styles. + +<<list-links filter:"[tag[How to apply custom styles]]">> diff --git a/editions/tw5.com/tiddlers/howtos/How to change the sort order of sub-branches in a TOC macro.tid b/editions/tw5.com/tiddlers/howtos/How to change the sort order of sub-branches in a TOC macro.tid new file mode 100644 index 000000000..76dbfcbf6 --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/How to change the sort order of sub-branches in a TOC macro.tid @@ -0,0 +1,27 @@ +created: 20161209172820513 +modified: 20161209174234840 +tags: Learning +title: How to change the sort order of sub-branches in a TOC macro +type: text/vnd.tiddlywiki + +Imagine that you are using a [[Table of Contents|Table-of-Contents Macros]] macro similar to this: + +``` +<<toc-selective-expandable "TableOfContents" "sort[title]" >> +``` + +The sorting is fine for most cases, but you would like all your items tagged `Journal` to be sorted by the `created` field. How can you apply a separate sort order to just those sub-items tagged `Journal`? + +The trick is to add a field to the parent tagging tiddler (i.e. `Journal`) that points to a different sort criteria. Let's call the field `fuzzy`, and populate it with the value `created` (`created `is the name of the field that contains a tiddler's creation date). + +Now change your [[Table of Contents|Table-of-Contents Macros]] to look like this: + +``` +<<toc-selective-expandable "TableOfContents" "sort{fuzzy}" >> +``` + +Now your Table of Contents will sort by title everywhere, except for the children of the `Journal` tiddler, which will sort by the `created `date. + +The downside to this trick is that you can't apply a reverse sort based on just one special field. If you reverse the sort order, it will be reversed everywhere. + + diff --git a/editions/tw5.com/tiddlers/howtos/How to embed PDF and other documents.tid b/editions/tw5.com/tiddlers/howtos/How to embed PDF and other documents.tid new file mode 100644 index 000000000..a77bf08f0 --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/How to embed PDF and other documents.tid @@ -0,0 +1,35 @@ +created: 20141117000000000 +modified: 20161229175752081 +tags: Learning +title: How to embed PDF and other documents +type: text/vnd.tiddlywiki + +!!! Note about embedding versus external linking + +''Note:'' Before we dive into how you can embed files of a certain type, you may want to consider not embedding and instead simply linking to external resources like this: + +``` +[ext[title|path/to/that.file]] +``` + +Then let your browser decide how to handle the resource. The advantage to this approach is that it is simple and quick. The disadvantage is that the file doesn't actually travel with the TW5 file and that you can't use `node.js` with method #2 below to quickly file paths. + +!! Two ways to embed a PDF in your TW5 file. + +!!! 1. Embedding with Drag and Drop + +One is to drag and drop the file onto your TW5 file. Wait for the green bar to appear at the top, drop, and then import from the import tiddler. This actually embeds the contents of your imported PDF (or other file) into your TW5 file. + +This method be OK as long as your PDF is not too big. There can be concerns if your TW5 file becomes too big. + +!!! 2. Embedding with '_canonical_uri' + +The other way is to create a tiddler link to the external file. In this method the file is not actually incorporated into your TW5 file, but can be accessed with the `{{My Image File.jpg}}` transclusion syntax just like an embedded file. The location address of the file can also be changed under [[node.js]]. See [[ExternalImages]] for details of using external images with node.js. + +Create a tiddler with a field `_canonical_uri`. Put in the local address to the external file. Set the `type` field to `application/pdf`. + +With either way, with an appropriately configured browser, you should see your embedded PDF file. + +!!! Other File Types + +There's only so many file formats that TW5 knows about. There is a list at [[ContentType]]. If your browser and/or TW5 doesn't know what to do with a particular file format, then you can only the use the second method to embed and then download a file. When you edit the tiddler a link is presented. You can right click on the link in order to download the file. diff --git a/editions/tw5.com/tiddlers/howtos/How to hide the authors and other fields with CSS.tid b/editions/tw5.com/tiddlers/howtos/How to hide the authors and other fields with CSS.tid new file mode 100644 index 000000000..2b6066477 --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/How to hide the authors and other fields with CSS.tid @@ -0,0 +1,31 @@ +created: 20180309232911422 +modified: 20180310201216266 +tags: Learning +title: How to hide the author's and other fields with CSS +type: text/vnd.tiddlywiki + +Sometimes you might want to save some screen space by hiding away the author's name in all tiddlers. Here's a quick way to do it: + +* Create a new tiddler with any title you want. +* Give the tiddler the tag `$:/tags/Stylesheet` +* In the text field of the tiddler put: + +``` +.tc-subtitle .tc-tiddlylink {display:none;} +``` + +* Save the tiddler. The author's name field should no longer appear. + +Similarly, the entire subtitle field including author and date can be removed with: + +``` +.tc-subtitle {display:none;} +``` + +Unfortunately, you can't hide just the date without also hiding the author using CSS. + +And finally, for a truly minimalist look, you can remove the title with: + +``` +h2.tc-title {display:none;) +``` diff --git a/editions/tw5.com/tiddlers/howtos/How to widen tiddlers (aka story river).tid b/editions/tw5.com/tiddlers/howtos/How to widen tiddlers (aka story river).tid new file mode 100644 index 000000000..abecb391a --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/How to widen tiddlers (aka story river).tid @@ -0,0 +1,15 @@ +created: 20161208000000000 +modified: 20161208000000000 +tags: Learning [[Customise TiddlyWiki]] +title: How to widen tiddlers (aka storyriver) +type: text/vnd.tiddlywiki + +You can change the width of the main column of tiddlers (also known as the story river) by: + +* Clicking on the settings cog to open the control panel +* In the control panel select "Appearance" and then "Theme Tweaks". +* Under Theme tweaks, scroll down. + +There you will see settings for `story right`, `story width`, and `tiddler width`. By setting these numbers to something larger, you can widen the tiddlers. In general, `story right` and `story width` should be the same size, and `tiddler width` a little bit smaller. You could even use percentages for tiddler width. You will also probably want to change the sidebar breakpoint to something larger than the story river, unless you don't mind the sidebar floating to the top of the page. + + diff --git a/editions/tw5.com/tiddlers/howtos/How to Add A New Tab to the Sidebar.tid b/editions/tw5.com/tiddlers/howtos/How_to_add_a_new_tab_to_the_sidebar.tid similarity index 96% rename from editions/tw5.com/tiddlers/howtos/How to Add A New Tab to the Sidebar.tid rename to editions/tw5.com/tiddlers/howtos/How_to_add_a_new_tab_to_the_sidebar.tid index b55b289a4..f027df232 100644 --- a/editions/tw5.com/tiddlers/howtos/How to Add A New Tab to the Sidebar.tid +++ b/editions/tw5.com/tiddlers/howtos/How_to_add_a_new_tab_to_the_sidebar.tid @@ -1,5 +1,5 @@ created: 20141117000000000 -modified: 20150221193924000 +modified: 20170204191253218 tags: Learning [[Customise TiddlyWiki]] title: How to add a new tab to the sidebar type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/howtos/How_to_turn_off_camel_case_linking.tid b/editions/tw5.com/tiddlers/howtos/How_to_turn_off_camel_case_linking.tid new file mode 100644 index 000000000..dca2be398 --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/How_to_turn_off_camel_case_linking.tid @@ -0,0 +1,19 @@ +created: 20161209172820513 +modified: 20170204191306382 +tags: [[Customise TiddlyWiki]] Learning +title: How to turn off camel case linking +type: text/vnd.tiddlywiki + +CamelCase is used in most Wikis, but it can interfere with text presentation in some situations. + +!! Turning off Camel Case locally + +To turn off a particular instance of a CamelCase text, simply put a tilde (~) in front of the word, like this: + +``` +~CamelCase +``` + +!! Turning off Camel Case globally + +To turn off CamelCase in all tiddlers, navigate to the [[Control Panel|$:/ControlPanel]]. Select the `Settings` tab and then scroll or read down to the ``Camel Case Wiki Links`` section and unselect ``Enable automatic CamelCase linking``. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid b/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid index 2a4d4d7fc..6692f7e1e 100644 --- a/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid +++ b/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid @@ -10,4 +10,9 @@ Keyboard shortcuts are available for common editing operations: * Abandoning changes to the draft tiddler containing the keyboard focus (defaults to <kbd>escape</kbd>) * Formatting operations from the tiddler editing toolbar (see the tooltips) -The current shortcuts can be inspected and customised in the "Keyboard Shortcuts" tab of [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}}. \ No newline at end of file +The current shortcuts can be inspected and customised in the "Keyboard Shortcuts" tab of [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}}. + +!! Special Keys + +; adding tags in the editor +: <<.from-version 5.1.14>>: if you hit <kbd>Enter</kbd> in the new tag input, the tag will be added diff --git a/editions/tw5.com/tiddlers/howtos/Making a custom journal button.tid b/editions/tw5.com/tiddlers/howtos/Making a custom journal button.tid new file mode 100644 index 000000000..ed0d8ca68 --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/Making a custom journal button.tid @@ -0,0 +1,41 @@ +created: 20160424150551727 +modified: 20171114215846324 +tags: [[Customise TiddlyWiki]] +title: Making a custom journal button +type: text/vnd.tiddlywiki + +To get your own ''//custom//'' Journal button, start by cloning the [[New Journal|$:/core/ui/Buttons/new-journal]] button. + +Then create your own config tiddlers, eg: + +* ``$:/config/myNewTiddler/Tags`` and ... +* ``$:/config/myNewTiddler/Title`` and ... +* ``$:/config/myNewTiddler/Text`` + + +Edit your custom button and "search and replace" the config tiddler names. + +Change the following lines, near the end of the tiddler +from + +``` +<$set name="journalTitleTemplate" value={{$:/config/NewJournal/Title}}> +<$set name="journalTags" value={{$:/config/NewJournal/Tags}}> +<$set name="journalText" value={{$:/config/NewJournal/Text}}> +``` + +to + +``` +<$set name="journalTitleTemplate" value={{$:/config/myNewTiddler/Title}}> +<$set name="journalTags" value={{$:/config/myNewTiddler/Tags}}> +<$set name="journalText" value={{$:/config/myNewTiddler/Text}}> +``` + +if you want to see your config tiddlers in the sidebar use: + +``` +<$set name="journalTitleTemplate" value={{config/myNewTiddler/Title}}> +<$set name="journalTags" value={{config/myNewTiddler/Tags}}> +<$set name="journalText" value={{config/myNewTiddler/Text}}> +``` diff --git a/editions/tw5.com/tiddlers/howtos/Simple ways to write protect tiddlers.tid b/editions/tw5.com/tiddlers/howtos/Simple ways to write protect tiddlers.tid new file mode 100644 index 000000000..0e2ffc8db --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/Simple ways to write protect tiddlers.tid @@ -0,0 +1,31 @@ +created: 20180310002601813 +modified: 20180310003428093 +tags: Learning +title: Simple ways to write protect tiddlers +type: text/vnd.tiddlywiki + +Sometimes you want to protect individual tiddlers from accidental changes, either from yourself or guests to your ~TiddlyWiki file. Here's a couple simple approaches. Note that these do not provide hardened protection against a wilful attack. + +!! Using a stylesheet to lock tiddlers by tag name + +Create a tiddler with the following contents and tag it as `$:/tags/Stylesheet` : + +``` +.tc-tagged-Locked button[title="Edit this tiddler"] {display: none;} + +``` + +If your TW language isn't English, then you'll need to change the text in 'title="...."' to whatever the text is when you hover over the edit button. + +Now any tiddler you tag as "Locked" will have the edit button hidden. To get it back you will need to open the stylesheet tiddler and change "none" to "inline". + +!! Using transclusion to hide your tiddler in a system tiddler + +* Open your tiddler for editing. +* Select the title and copy. +* Select all the tiddler text. +* Click on the excise tool. +* In the title box, type `$:/` and then paste the original title. +* Use the defaults to excise and and leave a transclusion + +Now you can view the contents of your original tiddler, but to edit them your will have to find the the tiddler with the `$:/` prefix. diff --git a/editions/tw5.com/tiddlers/howtos/Upgrading.tid b/editions/tw5.com/tiddlers/howtos/Upgrading.tid index 0f62b8fa9..45ba13fee 100644 --- a/editions/tw5.com/tiddlers/howtos/Upgrading.tid +++ b/editions/tw5.com/tiddlers/howtos/Upgrading.tid @@ -21,7 +21,7 @@ When upgrading, please remember the [[The First Rule of Using TiddlyWiki]]: This process will work on most desktop browsers. Note that none of your personal data leaves your browser with this process. # Locate your TiddlyWiki file in the file system (i.e. using Windows Explorer, the Finder on Mac OS X, or your file manager on Linux) -# Visit http://tiddlywiki.com/upgrade.html in your browser +# Visit https://tiddlywiki.com/upgrade.html in your browser # Drag your old TiddlyWiki HTML file into the browser window #* If the file is encrypted you will be prompted for the password @@ -33,7 +33,7 @@ This will download a file called ''upgrade.html'' to your computer. This file is ! Offline upgrading -You can also download http://tiddlywiki.com/upgrade.html locally and perform the same drag-and-drop procedure to upgrade your files. +You can also download https://tiddlywiki.com/upgrade.html locally and perform the same drag-and-drop procedure to upgrade your files. ! Problems with Upgrades @@ -49,7 +49,7 @@ Error:NS_ERROR_DOM_BAD_URI: Access to restricted URI denied The upgrade operation falls foul of a security restriction in Firefox. Until this can be resolved, we suggest either using the offline upgrader, or using Chrome to perform the upgrade: -# Use Chrome to open http://tiddlywiki.com/upgrade.html, then drag the TiddlyWiki HTML file to be upgraded into the upgrader window, as described above in ''Online upgrading'' +# Use Chrome to open https://tiddlywiki.com/upgrade.html, then drag the TiddlyWiki HTML file to be upgraded into the upgrader window, as described above in ''Online upgrading'' # After you've saved your upgraded file, you should be able to open it in Firefox and [[save using TiddlyFox|Saving with TiddlyFox]] again !! Incompatible Customisations diff --git a/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid b/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid index 135db06e8..d9cf73041 100644 --- a/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid +++ b/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid @@ -1,28 +1,51 @@ created: 20140305091244145 -modified: 20150221175658000 +modified: 201804111739 tags: [[Customise TiddlyWiki]] title: Using Stylesheets type: text/vnd.tiddlywiki -The first steps to changing the appearance of TiddlyWiki are to choose and apply one of the available themes, or to modify the [[colour palette|ColourPalettes]]. +\define tv-config-toolbar-text() yes -In addition, custom [[CSS stylesheets|http://www.w3schools.com/css]] can be defined by tagging a tiddler `$:/tags/Stylesheet`. Try creating a custom stylesheet now with the following content in order to change the page background colour to red: +\define openCpTheme() +<$action-setfield $tiddler="$:/state/tab-1749438307" $value="$:/core/ui/ControlPanel/Appearance"/> +<$action-setfield $tiddler="$:/state/tab--1963855381" $value="$:/core/ui/ControlPanel/Theme"/> +<$action-navigate $to="$:/ControlPanel"/> +\end + +! Theme and Colorpalette + +The first steps to changing the appearance of ~TiddlyWiki are to choose and apply: + +* One of the available themes: <span class="tc-btn-standard"> {{$:/core/ui/Buttons/theme}} </span> +* Modify the colour palette: <span class="tc-btn-standard"> {{$:/core/ui/Buttons/palette}} </span> +* Experiment with the <$button actions=<<openCpTheme>> >{{$:/core/images/options-button}} ControlPanel</$button> + +! Work with Stylesheets + +In addition to the control panel, custom styles can be defined by tagging a tiddler `$:/tags/Stylesheet`. Try creating a custom stylesheet now with the following content in order to change the page background colour to red: ``` -html body.tc-body { +body.tc-body { background: red; } ``` +!! Additional Resrouces + +* [[Cascading Style Sheets (CSS) at mozilla|https://developer.mozilla.org/en-US/docs/Web/CSS]] +* [[Cascading Style Sheets (CSS) at w3scools|http://www.w3schools.com/css]] + ! Overriding Theme Settings -Custom stylesheets are applied independently from theme stylesheets. Therefore, it is often necessary for the css rules in your custom stylesheet to be more specific than those of the theme you want to override. For example, `html body.tc-body` is more specific than `body.tc-body`. +Custom stylesheets are applied independently from theme stylesheets. Therefore, it is often necessary for the css rules in your custom stylesheet to be more specific than those of the theme you want to override. For example, `html body.tc-body` is more specific than `body.tc-body`. + +<<.tip "''You should always start with the least specific value that works!''<br><br>">> ! Stylesheet Types -Usually it is best to use the type `text/css` for stylesheets. This treats them as plain stylesheets, and ensures that TiddlyWiki doesn't apply any wiki processing to them. +Usually it is best to use the type `text/css` for stylesheets. This treats them as plain stylesheets, and ensures that ~TiddlyWiki doesn't apply any wiki processing to them. -If you wish to use macros and transclusions in your stylesheets you should instead use the default WikiText type `text/vnd.tiddlywiki`. This allows full WikiText processing to be performed. Here is an example: +If you wish to use macros and transclusions in your stylesheets you should instead use the default WikiText type `text/vnd.tiddlywiki`. This allows full ~WikiText processing to be performed. Here is an example: ``` \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline html @@ -32,7 +55,7 @@ body.tc-body pre { } ``` -The `\rules` pragma at the top of the tiddler restricts the WikiText to just allow macros and transclusion. This avoids mistakenly triggering unwanted WikiText processing. +The `\rules` pragma at the top of the tiddler restricts the ~WikiText to just allow macros and transclusion. This avoids mistakenly triggering unwanted ~WikiText processing. A stylesheet tiddler is processed such that it is first wikified and then the text portion of the ouput is extracted to apply as the CSS. Any HTML tags you will use in your stylesheet are thus ignored. For example, HTML elements generated by the RevealWidget will not affect the output. As in the following example, you can wrap CSS rules in `<pre>` tags to display them as a codeblock without affecting processing, including handling the inner macro. diff --git a/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub project documentation.tid b/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub project documentation.tid index 2ed09a0f6..9150b7f04 100644 --- a/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub project documentation.tid +++ b/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub project documentation.tid @@ -21,7 +21,7 @@ It saves the tiddler ReadMe to the file `./readme.md` in the `text/html` format. By default, tiddler links will be rendered as `<a>` links to a relative URI consisting of the title of the tiddler. This behaviour can be overridden by defining the macro `tv-wikilink-template`, as is done at the top of the tiddler ReadMe: ``` -\define tv-wikilink-template() http://tiddlywiki.com/static/$uri_doubleencoded$.html +\define tv-wikilink-template() https://tiddlywiki.com/static/$uri_doubleencoded$.html ``` See the LinkWidget for more details. diff --git a/editions/tw5.com/tiddlers/howtos/Windows HTA Hack.tid b/editions/tw5.com/tiddlers/howtos/Windows HTA Hack.tid index d0ffdf5bb..803ff4fa4 100644 --- a/editions/tw5.com/tiddlers/howtos/Windows HTA Hack.tid +++ b/editions/tw5.com/tiddlers/howtos/Windows HTA Hack.tid @@ -1,6 +1,10 @@ +caption: HTA Hack created: 20131212223146250 -modified: 20140912141040479 -tags: [[Saving on InternetExplorer]] +delivery: DIY +description: Manual method to let Internet Explorer save changes directly +method: save +modified: 20171113160539299 +tags: Saving Windows title: Windows HTA Hack type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/howtos/faq/csFAQ_dynamic_stylesheet.tid b/editions/tw5.com/tiddlers/howtos/faq/csFAQ_dynamic_stylesheet.tid new file mode 100644 index 000000000..50d29777e --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/faq/csFAQ_dynamic_stylesheet.tid @@ -0,0 +1,8 @@ +created: 201804111739 +modified: 201804111739 +title: Q: Is there a way to create dynamic stylesheets? +tags: [[Custom Styles FAQ]] + +''Answer:'' <<.from-version "5.1.16">> + +Yes, see: [[Q: How can I use a custom field to style a tiddler?]] diff --git a/editions/tw5.com/tiddlers/howtos/faq/csFAQ_how_can_i_use_custom_field.tid b/editions/tw5.com/tiddlers/howtos/faq/csFAQ_how_can_i_use_custom_field.tid new file mode 100644 index 000000000..0a1d7d0cc --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/faq/csFAQ_how_can_i_use_custom_field.tid @@ -0,0 +1,30 @@ +created: 201804111739 +modified: 201804111739 +title: Q: How can I use a custom field to style a tiddler? +tags: [[Custom Styles FAQ]] + + +''Consider the following usecase:'' <<.from-version "5.1.16">> + +There is a field named: `rank`, which can hold different values eg: `species`. + +''Answer:'' + +The idea is now: We dynamically create the stylesheet. The style-sheet can look like this: + +""" +title: `myStyles` +tags: `$:/tags/Stylesheet` +""" + +``` +<$list filter="[rank[species]]"> +[data-tiddler-title^="<$view field=title/>"] .tc-tiddler-body { + column-count: 2; +} +</$list> +``` + +This creates a CSS rule for every tiddler-title, that has a field `rank` and value `species`. + +[[Learn more about possible attributes!|Attribute Selectors]] \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/howtos/faq/csFAQ_what_if_tiddler_has_no_tags.tid b/editions/tw5.com/tiddlers/howtos/faq/csFAQ_what_if_tiddler_has_no_tags.tid new file mode 100644 index 000000000..2f35a01ae --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/faq/csFAQ_what_if_tiddler_has_no_tags.tid @@ -0,0 +1,19 @@ +created: 201804111739 +modified: 201804111739 +title: Q: What if a tiddler has no tags? +tags: [[Custom Styles FAQ]] + +''Answer:'' <<.from-version "5.1.16">> + +* If a tiddler has no tags, but needs styling use: `data-tiddler-title` as CSS selector +** There is only one tiddler + +* If a user wants to style system tiddlers in a custom way: use: `[data-tiddler-title^="$:"/]` as a selector +** using the TW namespace functionality + +* If the user wants special behaviour for tagged tiddlers. eg: Learning +** use: `[data-tags*="Learning"]` as CSS selector. + +The names I'm using are only used for documentation purpose, without changing the existing wiki. I don't want, that the docs has side effects. + +[[Learn more about possible attributes!|Attribute Selectors]] \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/howtos/faq/csFAQ_what_this_and_that_tag.tid b/editions/tw5.com/tiddlers/howtos/faq/csFAQ_what_this_and_that_tag.tid new file mode 100644 index 000000000..6911f3dac --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/faq/csFAQ_what_this_and_that_tag.tid @@ -0,0 +1,33 @@ +created: 201804111739 +modified: 201804111739 +title: Q: How can I style a tiddler if it has "this" AND "that" tag? +tags: [[Custom Styles FAQ]] + +''Answer:'' <<.from-version "5.1.16">> + +If tiddler has both: `this` AND tag `that` create an orange border. + +``` +[data-tags*="bar"][data-tags*="froz"] { + border: 2px solid orange; +} +``` + +''If your CSS looks like this: '' + +``` +[data-tags~="this"] { + border: 2px solid blue; +} + +[data-tags~="that"] { + border: 2px solid red; +} +``` + +`this` creates a blue border +`that` creates a red border +If you swap positions, you get it the other way around. + + +[[Learn more about possible attributes!|Attribute Selectors]] \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/howtos/faq/csFAQ_what_this_or_that_tag.tid b/editions/tw5.com/tiddlers/howtos/faq/csFAQ_what_this_or_that_tag.tid new file mode 100644 index 000000000..8eada2456 --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/faq/csFAQ_what_this_or_that_tag.tid @@ -0,0 +1,17 @@ +created: 201804111739 +modified: 201804111739 +title: Q: How can I style a tiddler if it has "this" OR "that" tag? +tags: [[Custom Styles FAQ]] + +''Answer:'' <<.from-version "5.1.16">> + +Either tag `this` or tag `that` create a red border. + +``` +[data-tags~="this"], +[data-tags~="that"] { + border: 2px solid red; +} +``` + +[[Learn more about possible attributes!|Attribute Selectors]] \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/images/New Release Banner.png b/editions/tw5.com/tiddlers/images/New Release Banner.png index 25573e05e..fffd0e4b7 100644 Binary files a/editions/tw5.com/tiddlers/images/New Release Banner.png and b/editions/tw5.com/tiddlers/images/New Release Banner.png differ diff --git a/editions/tw5.com/tiddlers/images/TWEUM2016 Thumbnail.jpg b/editions/tw5.com/tiddlers/images/TWEUM Thumbnail.jpg similarity index 100% rename from editions/tw5.com/tiddlers/images/TWEUM2016 Thumbnail.jpg rename to editions/tw5.com/tiddlers/images/TWEUM Thumbnail.jpg diff --git a/editions/tw5.com/tiddlers/images/TWEUM2016 Thumbnail.jpg.meta b/editions/tw5.com/tiddlers/images/TWEUM Thumbnail.jpg.meta similarity index 50% rename from editions/tw5.com/tiddlers/images/TWEUM2016 Thumbnail.jpg.meta rename to editions/tw5.com/tiddlers/images/TWEUM Thumbnail.jpg.meta index afbc0ab9f..8d35840cf 100644 --- a/editions/tw5.com/tiddlers/images/TWEUM2016 Thumbnail.jpg.meta +++ b/editions/tw5.com/tiddlers/images/TWEUM Thumbnail.jpg.meta @@ -1,3 +1,3 @@ -title: TWEUM2016 Thumbnail.jpg +title: TWEUM Thumbnail.jpg type: image/jpeg tags: picture diff --git a/editions/tw5.com/tiddlers/images/Tiddler Poster.png.meta b/editions/tw5.com/tiddlers/images/Tiddler Poster.png.meta index ac4a47b31..2466871f0 100644 --- a/editions/tw5.com/tiddlers/images/Tiddler Poster.png.meta +++ b/editions/tw5.com/tiddlers/images/Tiddler Poster.png.meta @@ -1,4 +1,4 @@ title: Tiddler Poster.png type: image/png -source: http://tiddlywiki.com/poster +source: https://tiddlywiki.com/poster tags: picture diff --git a/editions/tw5.com/tiddlers/images/TiddlyFox Apocalypse.png b/editions/tw5.com/tiddlers/images/TiddlyFox Apocalypse.png new file mode 100644 index 000000000..259eb7c9c Binary files /dev/null and b/editions/tw5.com/tiddlers/images/TiddlyFox Apocalypse.png differ diff --git a/editions/tw5.com/tiddlers/images/TiddlyFox Apocalypse.png.meta b/editions/tw5.com/tiddlers/images/TiddlyFox Apocalypse.png.meta new file mode 100644 index 000000000..2c3e7bab3 --- /dev/null +++ b/editions/tw5.com/tiddlers/images/TiddlyFox Apocalypse.png.meta @@ -0,0 +1,3 @@ +title: TiddlyFox Apocalypse.png +type: image/png +tags: picture diff --git a/editions/tw5.com/tiddlers/images/TiddlyMap.png b/editions/tw5.com/tiddlers/images/TiddlyMap.png new file mode 100644 index 000000000..bed2ab345 Binary files /dev/null and b/editions/tw5.com/tiddlers/images/TiddlyMap.png differ diff --git a/editions/tw5.com/tiddlers/images/TiddlyMap.png.meta b/editions/tw5.com/tiddlers/images/TiddlyMap.png.meta new file mode 100644 index 000000000..986f25906 --- /dev/null +++ b/editions/tw5.com/tiddlers/images/TiddlyMap.png.meta @@ -0,0 +1,3 @@ +title: TiddlyMap.png +type: image/png +tags: picture diff --git a/editions/tw5.com/tiddlers/languages/Castellano (Espana) Edition.tid b/editions/tw5.com/tiddlers/languages/Castellano (Espana) Edition.tid index 9931beae4..4c835daef 100644 --- a/editions/tw5.com/tiddlers/languages/Castellano (Espana) Edition.tid +++ b/editions/tw5.com/tiddlers/languages/Castellano (Espana) Edition.tid @@ -8,5 +8,5 @@ type: text/vnd.tiddlywiki La edición española de ~TiddlyWiki se encuentra aquí: -* ''Documentación'' : http://tiddlywiki.com/languages/es-ES/index.html -* ''~TiddlyWiki en blanco'' : http://tiddlywiki.com/languages/es-ES/empty.html +* ''Documentación'' : https://tiddlywiki.com/languages/es-ES/index.html +* ''~TiddlyWiki en blanco'' : https://tiddlywiki.com/languages/es-ES/empty.html diff --git a/editions/tw5.com/tiddlers/languages/Chinese (Simplified) Edition.tid b/editions/tw5.com/tiddlers/languages/Chinese (Simplified) Edition.tid index 09d397f33..a6f550332 100644 --- a/editions/tw5.com/tiddlers/languages/Chinese (Simplified) Edition.tid +++ b/editions/tw5.com/tiddlers/languages/Chinese (Simplified) Edition.tid @@ -7,7 +7,7 @@ type: text/vnd.tiddlywiki TiddlyWiki 的简体中文翻译版本： -<!-- * ''文件'': http://tiddlywiki.com/languages/zh-Hans/index.html --> -* ''空白版本'': http://tiddlywiki.com/languages/zh-Hans/empty.html +<!-- * ''文件'': https://tiddlywiki.com/languages/zh-Hans/index.html --> +* ''空白版本'': https://tiddlywiki.com/languages/zh-Hans/empty.html 另请参阅 [[中文 (正體) 版|Chinese (Traditional) Edition]]。 diff --git a/editions/tw5.com/tiddlers/languages/Chinese (Traditional) Edition.tid b/editions/tw5.com/tiddlers/languages/Chinese (Traditional) Edition.tid index 358ab599c..c56951c2b 100644 --- a/editions/tw5.com/tiddlers/languages/Chinese (Traditional) Edition.tid +++ b/editions/tw5.com/tiddlers/languages/Chinese (Traditional) Edition.tid @@ -7,7 +7,7 @@ type: text/vnd.tiddlywiki TiddlyWiki 的正體中文翻譯版本： -<!-- * ''文件'': http://tiddlywiki.com/languages/zh-Hant/index.html --> -* ''空白版本'': http://tiddlywiki.com/languages/zh-Hant/empty.html +<!-- * ''文件'': https://tiddlywiki.com/languages/zh-Hant/index.html --> +* ''空白版本'': https://tiddlywiki.com/languages/zh-Hant/empty.html 另請參閱 [[中文 (简体) 版|Chinese (Simplified) Edition]]。 diff --git a/editions/tw5.com/tiddlers/languages/French (France) Edition.tid b/editions/tw5.com/tiddlers/languages/French (France) Edition.tid index d46a65b52..9eac63c92 100644 --- a/editions/tw5.com/tiddlers/languages/French (France) Edition.tid +++ b/editions/tw5.com/tiddlers/languages/French (France) Edition.tid @@ -7,5 +7,5 @@ type: text/vnd.tiddlywiki La traduction en Français (France) de TiddlyWiki démarre ici : -* ''documentation'' : http://tiddlywiki.com/languages/fr-FR/index.html -* ''empty'' : http://tiddlywiki.com/languages/fr-FR/empty.html +* ''documentation'' : https://tiddlywiki.com/languages/fr-FR/index.html +* ''empty'' : https://tiddlywiki.com/languages/fr-FR/empty.html diff --git a/editions/tw5.com/tiddlers/languages/German (Austria) Edition.tid b/editions/tw5.com/tiddlers/languages/German (Austria) Edition.tid index e225332be..6a530c6f5 100644 --- a/editions/tw5.com/tiddlers/languages/German (Austria) Edition.tid +++ b/editions/tw5.com/tiddlers/languages/German (Austria) Edition.tid @@ -7,7 +7,7 @@ type: text/vnd.tiddlywiki Die österreichische Übersetzung von TiddlyWiki ist verfügbar unter: -* ''Dokumentation'': http://tiddlywiki.com/languages/de-AT/index.html -* ''Leer'': http://tiddlywiki.com/languages/de-AT/empty.html +* ''Dokumentation'': https://tiddlywiki.com/languages/de-AT/index.html +* ''Leer'': https://tiddlywiki.com/languages/de-AT/empty.html Siehe auch: [[Deutsch (Deutschland) Edition]]. diff --git a/editions/tw5.com/tiddlers/languages/German (Germany) Edition.tid b/editions/tw5.com/tiddlers/languages/German (Germany) Edition.tid index 82d93fd92..fbdf8f60f 100644 --- a/editions/tw5.com/tiddlers/languages/German (Germany) Edition.tid +++ b/editions/tw5.com/tiddlers/languages/German (Germany) Edition.tid @@ -7,7 +7,7 @@ type: text/vnd.tiddlywiki Die deutsche Übersetzung von TiddlyWiki ist verfügbar unter: -* ''Dokumentation'': http://tiddlywiki.com/languages/de-DE/index.html -* ''Leer'': http://tiddlywiki.com/languages/de-DE/empty.html +* ''Dokumentation'': https://tiddlywiki.com/languages/de-DE/index.html +* ''Leer'': https://tiddlywiki.com/languages/de-DE/empty.html Siehe auch: [[Deutsch (Österreich) Edition]]. diff --git a/editions/tw5.com/tiddlers/languages/Korean (Korea Republic) Edition.tid b/editions/tw5.com/tiddlers/languages/Korean (Korea Republic) Edition.tid index d9f144d2a..649196d19 100644 --- a/editions/tw5.com/tiddlers/languages/Korean (Korea Republic) Edition.tid +++ b/editions/tw5.com/tiddlers/languages/Korean (Korea Republic) Edition.tid @@ -7,5 +7,5 @@ type: text/vnd.tiddlywiki 티들리위키 한국어 번역은 다음에서 사용할 수 있습니다: -<!--* ''설명문서'' : http://tiddlywiki.com/languages/ko-KR/index.html--> -* ''빈 위키'' : http://tiddlywiki.com/languages/ko-KR/empty.html +<!--* ''설명문서'' : https://tiddlywiki.com/languages/ko-KR/index.html--> +* ''빈 위키'' : https://tiddlywiki.com/languages/ko-KR/empty.html diff --git a/editions/tw5.com/tiddlers/languages/LanguageGallery.tid b/editions/tw5.com/tiddlers/languages/LanguageGallery.tid index 437fdaa6a..8a0ccd5d3 100644 --- a/editions/tw5.com/tiddlers/languages/LanguageGallery.tid +++ b/editions/tw5.com/tiddlers/languages/LanguageGallery.tid @@ -1,10 +1,10 @@ created: 20151231083708980 modified: 20151231084132703 tags: -title: LanguageGallery +title: LanguageGallery Example type: text/vnd.tiddlywiki -Here is an example of using the ListWidget and the TranscludeWidget to show a grid of all language icons (ie, tiddlers tagged [[Language]] and [[Icon]]). +Here is an example of using the ListWidget and the TranscludeWidget to show a grid of all of Language Icons which are tiddlers [[tagged|Tagging]] <<tag Language>>and <<tag Icon>> <style> .language-gallery img { diff --git a/editions/tw5.com/tiddlers/learning/Introduction to Lists.tid b/editions/tw5.com/tiddlers/learning/Introduction to Lists.tid new file mode 100644 index 000000000..dd2a0269c --- /dev/null +++ b/editions/tw5.com/tiddlers/learning/Introduction to Lists.tid @@ -0,0 +1,56 @@ +created: 20171212175130471 +modified: 20171212175139631 +tags: Learning +title: Introduction to Lists +type: text/vnd.tiddlywiki + +Making lists of items plays a central role in working with TiddlyWiki. The following is a brief run-through of some of the more common techniques. + +~TiddlyWiki [[uses|The Extended Listops Filters]] lists [[internally|ListField]] for many purposes so the word can have several meanings. Here we are concerned with displaying sequences of items, but not necessarily presented as a conventional bullet list. + +! Manually Typed Lists + +!! ~WikiText + +WikiText lists are manually typed lists that use a special character to specify what sort of list it is and how it should be displayed. + +Examples include bullet lists created with asterisks (*) and numbered lists (#). Behind the scenes, ~WikiText lists are based on the standard `<ul>` and `<li>` HTML elements. For more information see [[Lists in WikiText]]. + +An example of a typed list in WikiText: + +<<wikitext-example-without-html """* Greatest Movies of All Time +** Casa Blanca +** Pride and Prejudice and Zombies""">> + +! Generated Lists + +Lists can be automatically generated with the ListWidget using [[filters|Filters]] in which [[filter operators|Filter Operators]] +specify criteria for selecting which tiddlers are desired as output. Shortcut macros are provided for some common types of list. + +!! ~ListWidget + +The ListWidget is the most powerful tool for creating lists. It allows the filtered output to be manipulated and styled into forms that may not seem to resemble lists at all, for example tables or complex texts. For more details, see [[ListWidget]]. + +An example to show all tiddlers tagged with "HelloThere" might look like: + +<<wikitext-example-without-html """<$list filter="[tag[HelloThere]]"><$view field="title"/><br/></$list>""">> + +<<.tip """Even tiddlers themselves are made with the ~ListWidget. The [[ViewTemplate|$:/core/ui/ViewTemplate]] makes use of the ListWidget to fetch all specified templates that are used to show a tiddlers title, tags, text and more.""">> + +!! Filtered transclusion + +The syntax for filtered transclusion `{{{...}}}` takes a filter as input and outputs a linked list of matching titles. You can also apply a [[template|Transclusion with Templates]], for example: + +<<wikitext-example-without-html """{{{ [tag[HelloThere]] || $:/core/ui/TagTemplate }}}""">> + +!! list-links Macro + +The [[list-links|list-links Macro]] macro gives a preformatted list, typically a bullet list, in a more simplified way than by using the ListWidget. Behind the scenes it really is the ListWidget applying a default template to each list item. + +<$macrocall $name="wikitext-example-without-html" src="""<<list-links "[tag[HelloThere]]">>"""/> + +!Other “list related” features + +[[list|ListField]], [[list-before|Order of Tagged Tiddlers]] and [[list-after|Order of Tagged Tiddlers]] are all field names to control the position of tiddlers in a list. [[Fields|TiddlerFields]] are a way to add additional bits of structured information to a tiddler such as date, quantity, category, etc. + +[[list|list Operator]] and [[listed|listed Operator]] are //filter operators// to, respectively, select and find titles in lists. diff --git a/editions/tw5.com/tiddlers/learning/Learning.tid b/editions/tw5.com/tiddlers/learning/Learning.tid index 3c6cd603f..3dafacdb1 100644 --- a/editions/tw5.com/tiddlers/learning/Learning.tid +++ b/editions/tw5.com/tiddlers/learning/Learning.tid @@ -1,5 +1,5 @@ created: 20140912140047779 -list: Videos [[Introduction to Filters]] [[Sharing a TiddlyWiki on Dropbox]] [[Sharing your tiddlers with others]] [[Copying tiddlers between TiddlyWiki files]] [[Creating SubStories]] [[Editing Tiddlers with Emacs]] [[ImageGallery Example]] [[Making curved text with SVG]] TaskManagementExample [[Adding a Twitter Follow button]] [[Philosophy of Tiddlers]] [[Adopt a Titles Policy]] +list: Videos [[Introduction to filter notation]] [[Sharing a TiddlyWiki on Dropbox]] [[Sharing your tiddlers with others]] [[Copying tiddlers between TiddlyWiki files]] [[Creating SubStories]] [[Editing Tiddlers with Emacs]] [[ImageGallery Example]] [[Making curved text with SVG]] TaskManagementExample [[Adding a Twitter Follow button]] [[Philosophy of Tiddlers]] [[Adopt a Titles Policy]] modified: 20140919161721584 tags: TableOfContents title: Learning diff --git a/editions/tw5.com/tiddlers/macros/ListMacro.tid b/editions/tw5.com/tiddlers/macros/ListMacro.tid index 20383c1a5..5ab99f8f3 100644 --- a/editions/tw5.com/tiddlers/macros/ListMacro.tid +++ b/editions/tw5.com/tiddlers/macros/ListMacro.tid @@ -1,8 +1,9 @@ -created: 20140917083515996 -modified: 20150221223214000 -title: list-links Macro -tags: Macros [[Core Macros]] caption: list-links +created: 20140917083515996 +modified: 20180109171310659 +tags: Macros [[Core Macros]] +title: list-links Macro +type: text/vnd.tiddlywiki The <<.def list-links>> [[macro|Macros]] returns a formatted list of links to a [[selection of tiddlers|Title Selection]]. @@ -18,5 +19,7 @@ If a tiddler has a <<.field caption>> field, this is shown instead of the tiddle : An HTML element to use for each item in the list, defaulting to `li` ;class : A [[CSS|Cascading Style Sheets]] class for the overall list element +;emptyMessage +: Optional wikitext to display if there are no tiddlers with the specified tag <<.macro-examples "list-links">> diff --git a/editions/tw5.com/tiddlers/macros/NowMacro.tid b/editions/tw5.com/tiddlers/macros/NowMacro.tid index 6f34f680e..f3f0ddf57 100644 --- a/editions/tw5.com/tiddlers/macros/NowMacro.tid +++ b/editions/tw5.com/tiddlers/macros/NowMacro.tid @@ -1,6 +1,6 @@ caption: now created: 20141008141616791 -modified: 20150221170300000 +modified: 20170630223406157 tags: Macros [[Core Macros]] title: now Macro type: text/vnd.tiddlywiki @@ -14,4 +14,7 @@ The value doesn't update automatically, like a ticking clock. It updates wheneve ;format : A string specifying the desired [[format|DateFormat]], defaulting to `0hh:0mm, DDth MMM YYYY` +''Note'': The format string `[UTC]YYYY0MM0DD0hh0mm0ssXXX` will return a date string representing the UTC time-stamp as it is used in the ~TiddlyWiki `created` and `modified` time-stamp fields. + + <<.macro-examples "now">> diff --git a/editions/tw5.com/tiddlers/macros/TabsMacro.tid b/editions/tw5.com/tiddlers/macros/TabsMacro.tid index 0119afda2..16b67fa98 100644 --- a/editions/tw5.com/tiddlers/macros/TabsMacro.tid +++ b/editions/tw5.com/tiddlers/macros/TabsMacro.tid @@ -1,6 +1,6 @@ caption: tabs created: 20131228162203521 -modified: 20150221211706000 +modified: 20180408084453861 tags: Macros [[Core Macros]] title: tabs Macro type: text/vnd.tiddlywiki @@ -23,9 +23,19 @@ By default the tabs are arranged horizontally above the content. To get vertical : Additional [[CSS|Cascading Style Sheets]] classes for the generated `div` elements. Multiple classes can be separated with spaces ;template : Optionally, the title of a tiddler to use as a [[template|TemplateTiddlers]] for transcluding the content of the selected tab +;buttonTemplate +: Optionally, the title of a tiddler to use as a [[template|TemplateTiddlers]] for transcluding the content of the button for the selected tab +;retain +: Optionally, "yes" specifies that the content of the tabs should be retained when switching to another tab, avoiding re-rendering it (this can be useful to avoid video or audio sources unexpectedly resetting) Within the template, the title of the selected tab is available in the <<.var currentTab>> variable. -The <<.vlink currentTiddler>> variable is not affected by the <<.var tabs>> macro. +The <<.vlink currentTiddler>> variable is not affected by the <<.var tabs>> macro. This can put you in trouble if the list of tabs includes tiddlers that depend on the value of the <<.vlink currentTiddler>>, for example tiddlers listing children based on its own name. To overcome this problem you can use a [[TemplateTiddler|TemplateTiddlers]] like the following: + +``` +<$tiddler tiddler=<<currentTab>>> +<$transclude mode="block" /> +</$tiddler> +``` <<.macro-examples "tabs">> diff --git a/editions/tw5.com/tiddlers/macros/TimelineMacro.tid b/editions/tw5.com/tiddlers/macros/TimelineMacro.tid index 355604fca..977b101a8 100644 --- a/editions/tw5.com/tiddlers/macros/TimelineMacro.tid +++ b/editions/tw5.com/tiddlers/macros/TimelineMacro.tid @@ -1,8 +1,9 @@ -created: 20150220180357000 -modified: 20150221224401000 -title: timeline Macro -tags: Macros [[Core Macros]] caption: timeline +created: 20150220180357000 +modified: 20170223033633361 +tags: Macros [[Core Macros]] +title: timeline Macro +type: text/vnd.tiddlywiki The <<.def timeline>> [[macro|Macros]] returns a list of tiddlers in reverse chronological order of modification (or some other [[date field|Date Fields]]), grouped by day. @@ -19,6 +20,6 @@ The <<.def timeline>> [[macro|Macros]] returns a list of tiddlers in reverse chr The tiddlers are selected by means of a [[filter expression|Filter Expression]], into which the <<.param subfilter>> and <<.param limit>> parameters are spliced as follows: -> `[!is[system]$subfilter$has[modified]!sort[modified]limit[$limit$]eachday[modified]]` +> `[!is[system]$subfilter$has[$dateField$]!sort[$dateField$]limit[$limit$]eachday[$dateField$]]` <<.macro-examples "timeline">> diff --git a/editions/tw5.com/tiddlers/macros/copy-to-clipboard Macro.tid b/editions/tw5.com/tiddlers/macros/copy-to-clipboard Macro.tid new file mode 100644 index 000000000..4877745ff --- /dev/null +++ b/editions/tw5.com/tiddlers/macros/copy-to-clipboard Macro.tid @@ -0,0 +1,19 @@ +caption: copy-to-clipboard +created: 20171216104754967 +modified: 20171216104941967 +tags: Macros [[Core Macros]] +title: copy-to-clipboard Macro +type: text/vnd.tiddlywiki + +The <<.def copy-to-clipboard>> [[macro|Macros]] displays a button that copies specified text to the clipboard. A notification is displayed if the operation is successful; some browsers do not permit the operation. + +!! Parameters + +;src +: The text to be copied to the clipboard +;class +: Optional CSS classes to be assigned to the button (defaults to `tc-btn-invisible`) +;style +: Optional CSS styles to be assigned to the button + +<<.macro-examples "copy-to-clipboard">> diff --git a/editions/tw5.com/tiddlers/macros/examples/copy-to-clipboard Macro (Examples).tid b/editions/tw5.com/tiddlers/macros/examples/copy-to-clipboard Macro (Examples).tid new file mode 100644 index 000000000..098bac367 --- /dev/null +++ b/editions/tw5.com/tiddlers/macros/examples/copy-to-clipboard Macro (Examples).tid @@ -0,0 +1,8 @@ +created: 20171216104946277 +modified: 20171216105109641 +tags: [[copy-to-clipboard Macro]] [[Macro Examples]] +title: copy-to-clipboard Macro (Examples) +type: text/vnd.tiddlywiki + +<$macrocall $name=".example" n="1" eg="""<<copy-to-clipboard "Mary had a little lamb">>"""/> +<$macrocall $name=".example" n="2" eg="""<$macrocall $name="copy-to-clipboard" src={{$:/SiteTitle}}/>"""/> diff --git a/editions/tw5.com/tiddlers/macros/examples/list-links-draggable Macro (Examples).tid b/editions/tw5.com/tiddlers/macros/examples/list-links-draggable Macro (Examples).tid new file mode 100644 index 000000000..861196fc5 --- /dev/null +++ b/editions/tw5.com/tiddlers/macros/examples/list-links-draggable Macro (Examples).tid @@ -0,0 +1,7 @@ +created: 20170328211011767 +modified: 20170328211211799 +tags: [[list-links-draggable Macro]] [[Macro Examples]] +title: list-links-draggable Macro (Examples) +type: text/vnd.tiddlywiki + +<$macrocall $name=".example" n="1" eg="""<<list-links-draggable tiddler:"Days of the Week">>"""/> diff --git a/editions/tw5.com/tiddlers/macros/examples/list-tagged-draggable Macro (Examples).tid b/editions/tw5.com/tiddlers/macros/examples/list-tagged-draggable Macro (Examples).tid new file mode 100644 index 000000000..5ae5a0af4 --- /dev/null +++ b/editions/tw5.com/tiddlers/macros/examples/list-tagged-draggable Macro (Examples).tid @@ -0,0 +1,7 @@ +created: 20170329093300835 +modified: 20170329093346982 +tags: [[list-tagged-draggable Macro]] [[Macro Examples]] +title: list-tagged-draggable Macro (Examples) +type: text/vnd.tiddlywiki + +<$macrocall $name=".example" n="1" eg="""<<list-tagged-draggable tag:"Features">>"""/> diff --git a/editions/tw5.com/tiddlers/macros/examples/tree Macro (Examples).tid b/editions/tw5.com/tiddlers/macros/examples/tree Macro (Examples).tid new file mode 100644 index 000000000..ed19fa528 --- /dev/null +++ b/editions/tw5.com/tiddlers/macros/examples/tree Macro (Examples).tid @@ -0,0 +1,8 @@ +created: 20170628164706364 +modified: 20170628164823552 +tags: [[tree Macro]] [[Macro Examples]] +title: tree Macro (Examples) +type: text/vnd.tiddlywiki + +<$macrocall $name=".example" n="1" +eg="""<<tree prefix:"$:/">>"""/> diff --git a/editions/tw5.com/tiddlers/macros/import/tv-get-export-image-link.tid b/editions/tw5.com/tiddlers/macros/import/tv-get-export-image-link.tid index bb8e0a1d5..56a3b9dd7 100644 --- a/editions/tw5.com/tiddlers/macros/import/tv-get-export-image-link.tid +++ b/editions/tw5.com/tiddlers/macros/import/tv-get-export-image-link.tid @@ -3,4 +3,4 @@ modified: 20150228123921000 title: $:/editions/tw5.com/macro-examples/tv-get-export-image-link type: text/vnd.tiddlywiki -\define tv-get-export-image-link(src) http://www.tiddlywiki.com/$src$ +\define tv-get-export-image-link(src) https://www.tiddlywiki.com/$src$ diff --git a/editions/tw5.com/tiddlers/macros/jsontiddler Macro.tid b/editions/tw5.com/tiddlers/macros/jsontiddler Macro.tid new file mode 100644 index 000000000..f3a0f67c2 --- /dev/null +++ b/editions/tw5.com/tiddlers/macros/jsontiddler Macro.tid @@ -0,0 +1,13 @@ +caption: jsontiddler +created: 20170317140130417 +modified: 20170317140226040 +tags: Macros [[Core Macros]] +title: jsontiddler Macro +type: text/vnd.tiddlywiki + +The <<.def jsontiddler>> [[macro|Macros]] returns the fields of a single tiddler in [[JSON|JavaScript Object Notation]] form. + +!! Parameters + +;title +: The title of a tiddler diff --git a/editions/tw5.com/tiddlers/macros/list-links-draggable Macro.tid b/editions/tw5.com/tiddlers/macros/list-links-draggable Macro.tid new file mode 100644 index 000000000..426fbdd7e --- /dev/null +++ b/editions/tw5.com/tiddlers/macros/list-links-draggable Macro.tid @@ -0,0 +1,27 @@ +caption: list-links-draggable +created: 20170328204925306 +modified: 20170329093008550 +tags: Macros [[Core Macros]] +title: list-links-draggable Macro +type: text/vnd.tiddlywiki + +The <<.def list-links-draggable>> [[macro|Macros]] renders the ListField of a tiddler as a list of links that can be reordered via [[drag and drop|Drag and Drop]]. + +!! Parameters + +;tiddler +: The title of the tiddler containing the list +;field +: The name of the field containing the list (defaults to `list`) +;type +: The element tag to use for the list wrapper (defaults to `ul`) +;subtype +: The element tag to use for the list items (defaults to `li`) +;class +: Optional space separated classes to add to the wrapper element +;itemTemplate +: Optional title of a tiddler to use as the template for rendering list items + +If the `itemTemplate` parameter is not provided then the list items are rendered as simple links. Within the `itemTemplate`, the [[currentTiddler Variable]] refers to the current list item. + +<<.macro-examples "list-links-draggable">> diff --git a/editions/tw5.com/tiddlers/macros/list-tagged-draggable Macro.tid b/editions/tw5.com/tiddlers/macros/list-tagged-draggable Macro.tid new file mode 100644 index 000000000..b0e4bbbed --- /dev/null +++ b/editions/tw5.com/tiddlers/macros/list-tagged-draggable Macro.tid @@ -0,0 +1,25 @@ +caption: list-tagged-draggable +created: 20170329092723939 +modified: 20180109171254045 +tags: Macros [[Core Macros]] +title: list-tagged-draggable Macro +type: text/vnd.tiddlywiki + +The <<.def list-tagged-draggable>> [[macro|Macros]] renders the tiddlers with a particular tag as a list of links that can be reordered via [[drag and drop|Drag and Drop]]. + +!! Parameters + +;tag +: The title of the tag +;subFilter +: An optional subfilter to filter out unwanted items (eg `!tag[done]`) +;itemTemplate +: Optional title of a tiddler to use as the template for rendering list items +;emptyMessage +: Optional wikitext to display if there are no tiddlers with the specified tag + +Note that the [[ordering|Order of Tagged Tiddlers]] is accomplished by assigning a new list to the `list` field of the tag tiddler. Any `list-before` or `list-after` fields on any of the other tiddlers carrying the tag are also removed to ensure the `list` field is respected. + +If the `itemTemplate` parameter is not provided then the list items are rendered as simple links. Within the `itemTemplate`, the [[currentTiddler Variable]] refers to the current list item. + +<<.macro-examples "list-tagged-draggable">> diff --git a/editions/tw5.com/tiddlers/macros/tag-picker_Macro.tid b/editions/tw5.com/tiddlers/macros/tag-picker_Macro.tid new file mode 100644 index 000000000..b2d9cb9f0 --- /dev/null +++ b/editions/tw5.com/tiddlers/macros/tag-picker_Macro.tid @@ -0,0 +1,15 @@ +caption: tag-picker +created: 20161128191316701 +modified: 20161128191435641 +tags: Macros [[Core Macros]] +title: tag-picker Macro +type: text/vnd.tiddlywiki + +The <<.def tag-picker>> [[macro|Macros]] generates a combination of a text box and a button that allows a tag to be selected and added. + +!! Parameters + +;actions +: Action widgets to be triggered when the pill is clicked. Within the text, the variable ''tag'' contains the title of the selected tag. + +<<.macro-examples "tag-picker">> diff --git a/editions/tw5.com/tiddlers/macros/tag-pill_Macro.tid b/editions/tw5.com/tiddlers/macros/tag-pill_Macro.tid new file mode 100644 index 000000000..73ea08058 --- /dev/null +++ b/editions/tw5.com/tiddlers/macros/tag-pill_Macro.tid @@ -0,0 +1,21 @@ +caption: tag-pill +created: 20161128190930538 +modified: 20161128191220364 +tags: Macros [[Core Macros]] +title: tag-pill Macro +type: text/vnd.tiddlywiki + +The <<.def tag-pill>> [[macro|Macros]] generates a static tag pill showing a specified tag, but without the dropdown action provided by the [[tag Macro]]. + +!! Parameters + +;tag +: The title of the tag +;element-tag +: The element name to be used for the pill (defaults to "span") +;element-attributes +: Additional attributes for the pill element +;actions +: Action widgets to be triggered when the pill is clicked. Within the text, the macro parameter ''tag'' contains the title of the selected tag. + +<<.macro-examples "tag-pill">> diff --git a/editions/tw5.com/tiddlers/macros/tree Macro.tid b/editions/tw5.com/tiddlers/macros/tree Macro.tid new file mode 100644 index 000000000..8f6892071 --- /dev/null +++ b/editions/tw5.com/tiddlers/macros/tree Macro.tid @@ -0,0 +1,15 @@ +caption: tree +created: 20170628164534981 +modified: 20170628164654430 +tags: Macros [[Core Macros]] +title: tree Macro +type: text/vnd.tiddlywiki + +The <<.def tree>> [[macro|Macros]] renders an expandable tree view based on tiddler titles. + +!! Parameters + +;prefix +: The prefix from which to generate the tree, e.g. `$:/` + +<<.macro-examples "tree">> diff --git a/editions/tw5.com/tiddlers/mechanisms/DragAndDropMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/DragAndDropMechanism.tid new file mode 100644 index 000000000..d069448a0 --- /dev/null +++ b/editions/tw5.com/tiddlers/mechanisms/DragAndDropMechanism.tid @@ -0,0 +1,25 @@ +created: 20170328161210552 +modified: 20170406085836682 +tags: [[Importing Tiddlers]] [[Drag and Drop]] Mechanisms +title: DragAndDropMechanism +type: text/vnd.tiddlywiki + +This tiddler discusses the internal mechanisms that are used to implement drag and drop features in ~TiddlyWiki. See [[Drag and Drop]] for a general description of the features. + +<<.warning """ +~TiddlyWiki uses the [[standard HTML 5 drag and drop APIs|https://www.w3.org/TR/2010/WD-html5-20101019/dnd.html]]. However, this is an area that is rightly notorious for cross-browser compatibility problems. Therefore, some features that you might expect to work won't necessarily work in all browsers. In particular, +""">> + +The following widgets are concerned with drag and drop features: + +* The DraggableWidget creates a draggable element that represents one or more tiddlers for dragging +** The ButtonWidget and LinkWidget incorporate the functionality of the DraggableWidget +* The DroppableWidget creates an area into which tiddlers can be dragged to trigger customisable actions +* The DropzoneWidget handles importing external tiddlers from files or by drag and drop from another browser window + +The general sequence of a drag and drop operation is as follows: + +# The user clicks down and drags the pointer on a draggable element such as the DraggableWidget, ButtonWidget or LinkWidget +# The draggable element moves with the mouse pointer until the click is released +# Moving the pointer over droppable elements such as the DroppableWidget displays a highlight indicating that the item can be dropped +# The configured actions are performed if the drag ends on a droppable element diff --git a/editions/tw5.com/tiddlers/mechanisms/InfoMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/InfoMechanism.tid index ab709f1ed..3187bea2f 100644 --- a/editions/tw5.com/tiddlers/mechanisms/InfoMechanism.tid +++ b/editions/tw5.com/tiddlers/mechanisms/InfoMechanism.tid @@ -1,14 +1,27 @@ created: 20140720164948099 -modified: 20140720165248031 +modified: 20161017122011379 tags: Mechanisms title: InfoMechanism type: text/vnd.tiddlywiki +\define example(name) +<$transclude tiddler="""$:/info/url/$name$""" mode="inline"/> +\end + System tiddlers in the namespace `$:/info/` are used to expose information about the system (including the current browser) so that WikiText applications can adapt themselves to available features. ! Information Tiddlers |!Title |!Description | |[[$:/info/browser]] |Running in the browser? ("yes" or "no") | +|[[$:/info/browser/screen/width]] |Screen width in pixels | +|[[$:/info/browser/screen/height]] |Screen height in pixels | |[[$:/info/node]] |Running under [[Node.js]]? ("yes" or "no") | - +|[[$:/info/url/full]] |<<.from-version "5.1.14">> Full URL of wiki (eg, ''<<example full>>'') | +|[[$:/info/url/host]] |<<.from-version "5.1.14">> Host portion of URL of wiki (eg, ''<<example host>>'') | +|[[$:/info/url/hostname]] |<<.from-version "5.1.14">> Hostname portion of URL of wiki (eg, ''<<example hostname>>'') | +|[[$:/info/url/origin]] |<<.from-version "5.1.14">> Origin portion of URL of wiki (eg, ''<<example origin>>'') | +|[[$:/info/url/pathname]] |<<.from-version "5.1.14">> Pathname portion of URL of wiki (eg, ''<<example pathname>>'') | +|[[$:/info/url/port]] |<<.from-version "5.1.14">> Port portion of URL of wiki (eg, ''<<example port>>'') | +|[[$:/info/url/protocol]] |<<.from-version "5.1.14">> Protocol portion of URL of wiki (eg, ''<<example protocol>>'') | +|[[$:/info/url/search]] |<<.from-version "5.1.14">> Search portion of URL of wiki (eg, ''<<example search>>'') | diff --git a/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid index 84440cf3e..5b1a4ef27 100644 --- a/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid +++ b/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid @@ -1,14 +1,16 @@ created: 20130826122000000 -modified: 20141029221758239 +modified: 20161015122959346 tags: Mechanisms title: PluginMechanism type: text/vnd.tiddlywiki -[[Plugins]] are bundles of tiddlers that are distributed and managed as a single unit by being packed into a single JSON tiddler. If a tiddler isn't found in the main store, then the registered plugins are searched for it instead. +! Introduction -Tiddlers within plugins behave something like shadow tiddlers in classic TiddlyWiki: they can be freely overwritten by creating a tiddler with the same title, but deleting that tiddler restores the underlying tiddler value from the plugin. +[[Plugins]] are bundles of tiddlers that are distributed and managed as a single unit by being packed into a single JSON tiddler. Users can install them with drag and drop, or using the [[plugin library|Installing a plugin from the plugin library]]. -Plugins have a `plugin-type` field that may be (see the table below): +The tiddlers within registered plugins behave as ShadowTiddlers: they can be freely overwritten by creating a tiddler with the same title, but deleting that tiddler restores the underlying tiddler value from the plugin. + +Plugins have a `plugin-type` field that may take the following values: * `plugin` //(default)// - a plain plugin * `theme` - a theme plugin (see ThemeMechanism) @@ -18,103 +20,9 @@ Plugins can be used to package ordinary content, or can include JavaScript [[mod Plugins conventionally have a title of the form `$:/plugins/publisher/name`. Plugins that are part of the core TiddlyWiki distribution have titles of the form `$:/plugins/tiddlywiki/name`. -Plugins that define macros, views or other named entities are expected to prefix the name with their publisher identifier, for example: `tiddlytools.slider`. +When [[running TiddlyWiki under Node.js|TiddlyWiki on Node.js]], plugins can also be stored as individual tiddler files in [[PluginFolders]]. -! Plugin fields +! More information -Plugins are stored as tiddlers with the following fields: +<<list-links "[tag[PluginMechanism]]">> -|!Field |!Description | -|title |Title of plugin | -|description |Description of plugin | -|author |Author of plugin | -|version |Version string (must conform to SemanticVersioning convention) | -|source |Source URL of plugin | -|type |Must be ''application/json'' | -|plugin-type |Can be ''plugin'' (default), ''language'' or ''theme'' | -|text |JSON encoding of the list of tiddlers comprising the plugin | -|list |Names of exposed plugin information tiddlers (see below) | -|name |Name of the theme (only for themes) | -|dependents |List of dependent plugins (currently only implemented for themes) | - -! Plugin folders - -On the server, plugins can be stored as ordinary JSON tiddlers but it is often more convenient to store them as separate tiddler files within folders. Plugin folders must contain a `plugin.info` file that contains the metadata for the plugin. It can also optionally identify files external to the plugin folder that should be loaded as tiddlers. - -The `plugin.info` file should contain the following JSON structure: - -The JSON structure for plugin tiddlers is as follows: - -``` -{ - "title": "$:/plugins/publisher/name", - "description": "An exemplary plugin for demonstration purposes", - "author": "JeremyRuston", - "version": "1.2.3-alpha3", - "core-version": ">=5.0.0", - "source": "http://tiddlywiki.com/MyPlugin", - "plugin-type": "plugin", - "list": "readme license history" -} -``` - -By convention, the titles of the individual tiddlers are prefixed with the title of the containing plugin, but they are not restricted to do so. - -Note that if the `version` field is omitted from a `plugin.info` file when the plugin folder is packed then it is automatically filled in by the core to the current core version number. This is to ensure that all the core plugins carry the correct version number. Generally plugin authors will want to ensure that they do explicitly specify a version number. - -! Plugin library - -The standard distribution of TiddlyWiki includes a number of standard plugins in the `plugins` directory. - -! Including plugins in a wiki - -To be usable in the browser, plugins just need to be included in the wiki. For wikis that are generated on the server, TiddlyWikiFolders can contain a `tiddlywiki.info` file that identifies the plugins to be included in this wiki: - -``` -{ - "plugins": [ - "tiddlywiki/slider", - "tiddlytools/chooser" - ] -} -``` - -Plugins names refer to plugin folders listed in TiddlyWiki5's root `plugins` folder. - -Plugins can also be included manually by copying them into the `plugins` subfolder of the wiki. - -! Plugin processing - -The wiki object keeps track of all of the currently loaded plugins. If a request for a tiddler isn't in the store then the wiki looks through the cascade of plugins to find the requested tiddler. It is a similar idea to the way that shadow tiddlers are implemented in classic TiddlyWiki. - -In the browser, any constituent tiddlers that are JavaScript modules (ie shadow tiddlers of content type `application/javascript` and possessing the field `module-type`) are executed during startup processing. - -!! Disabling Plugins - -Plugins can be disabled by creating a tiddler titled `$:/config/Plugins/Disabled/` concatenated with the plugin title, and setting its text to `yes`. - -For example, to disable the plugin `$:/plugins/tiddlywiki/highlight`, the title would be: - -``` -$:/config/Plugins/Disabled/$:/plugins/tiddlywiki/highlight -``` - -! Information Tiddlers for Plugins - -Plugin authors are encouraged to provide special information and documentation tiddlers that TiddlyWiki can include as plugin information tabs in the [[control panel|$:/ControlPanel]]. - -Plugins should provide an icon contained in a tiddler with the title formed of `<plugin-name>/icon` (for example, [[$:/core/icon]]). - -Plugins expose the names of the individual information tabs that they wish to display in the `list` field of the plugin tiddler. By convention, some or all of the following should be provided: - -* ''readme'': basic information about the plugin -* ''license'': the license under which the plugin is published - -The title of the associated information tiddler must be formed as follows: - -# `$:/<plugin-name>/<current-language>/<tab-name>` (for example, ''$:/core/en-GB/readme'') -# `$:/<plugin-name>/<tab-name>` (for example, ''$:/core/readme'') - -Thus, plugins can provide language-specific versions of each information tiddler. - -Note that information tiddlers should not reference other tiddlers within the plugin. This is because plugins containing themes or languages are dynamically switched in and out as they are selected, and so their information tiddlers may not be available for viewing. The control panel uses the 'subtiddler' attribute of the TranscludeWidget to access these tiddlers, which works independently of the plugin switching mechanism. diff --git a/editions/tw5.com/tiddlers/mechanisms/SavingMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/SavingMechanism.tid index 5bda7eb7d..ba988e685 100644 --- a/editions/tw5.com/tiddlers/mechanisms/SavingMechanism.tid +++ b/editions/tw5.com/tiddlers/mechanisms/SavingMechanism.tid @@ -4,7 +4,7 @@ tags: Mechanisms title: SavingMechanism type: text/vnd.tiddlywiki -The SavingMechanism is the mechanism by which TiddlyWiki generates a new HTML file and stores it. It is different from the sync mechanism, which is concerned with synchronising changes to individual tiddlers back to a server (see http://tiddlywiki.com/dev/#SyncAdaptorModules for more details). +The SavingMechanism is the mechanism by which TiddlyWiki generates a new HTML file and stores it. It is different from the sync mechanism, which is concerned with synchronising changes to individual tiddlers back to a server (see https://tiddlywiki.com/dev/#SyncAdaptorModules for more details). The following steps are involved: @@ -16,4 +16,4 @@ The following steps are involved: #* The template includes a reference to `$(publishFilter)$` that allows the filter to be customised via a global variable # The [[tm-save-wiki|WidgetMessage: tm-save-wiki]] handler renders the template to generate the HTML file # The message handler chooses the highest priority "saver" module that can handle saving the file -#* See http://tiddlywiki.com/dev/#Saver for more details +#* See https://tiddlywiki.com/dev/#Saver for more details diff --git a/editions/tw5.com/tiddlers/mechanisms/TranslationMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/TranslationMechanism.tid index bebc26d8c..c6ae895da 100644 --- a/editions/tw5.com/tiddlers/mechanisms/TranslationMechanism.tid +++ b/editions/tw5.com/tiddlers/mechanisms/TranslationMechanism.tid @@ -4,7 +4,7 @@ tags: Mechanisms title: TranslationMechanism type: text/vnd.tiddlywiki -The translation mechanism of TiddlyWiki manages and switches between language plugins that provide translations of the TiddlyWiki user interface. The developer site at http://tiddlywiki.com/dev/ explains how translators can create and submit translations for TiddlyWiki. +The translation mechanism of TiddlyWiki manages and switches between language plugins that provide translations of the TiddlyWiki user interface. The developer site at https://tiddlywiki.com/dev/ explains how translators can create and submit translations for TiddlyWiki. The title of the current language plugin is read from the tiddler [[$:/language]]. If the selected plugin changes then any displayed translateable text automatically changes. diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-copy-to-clipboard.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-copy-to-clipboard.tid new file mode 100644 index 000000000..70cf2a24a --- /dev/null +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-copy-to-clipboard.tid @@ -0,0 +1,25 @@ +caption: tm-copy-to-clipboard +created: 20171215150056004 +modified: 20171215150600888 +tags: Messages +title: WidgetMessage: tm-copy-to-clipboard +type: text/vnd.tiddlywiki + +The "copy to clipboard" message attempts to copy the specified text to the clipboard. If it succeeds, the tiddler [[$:/language/Notifications/CopiedToClipboard/Succeeded]] is displayed as a notification. If the browser doesn't permit the operation, the tiddler [[$:/language/Notifications/CopiedToClipboard/Failed]] is displayed instead. + +It requires the following properties on the `event` object: + +|!Name |!Description | +|param |Text to be copied to the clipboard | + +This message is usually generated with the ButtonWidget. It is handled by the TiddlyWiki core. + +! Example + +This example copies the current time to the clipboard: + +<$macrocall $name='wikitext-example-without-html' +src='<$button message="tm-copy-to-clipboard" param=<<now>>> +Copy date to clipboard +</$button>'/> + diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-load-plugin-from-library.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-load-plugin-from-library.tid index c20f91eeb..2a5076af9 100644 --- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-load-plugin-from-library.tid +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-load-plugin-from-library.tid @@ -17,7 +17,7 @@ The following snippet will install the CodeMirror plugin from the official plugi ``` <$button> -<$action-sendmessage $message="tm-load-plugin-from-library" title="$:/plugins/tiddlywiki/codemirror" url="http://tiddlywiki.com/library/v5.1.11/index.html"/> +<$action-sendmessage $message="tm-load-plugin-from-library" title="$:/plugins/tiddlywiki/codemirror" url="https://tiddlywiki.com/library/v5.1.11/index.html"/> Install CodeMirror </$button> ``` diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-load-plugin-library.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-load-plugin-library.tid index 14bfc2449..2c2c653cb 100644 --- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-load-plugin-library.tid +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-load-plugin-library.tid @@ -17,7 +17,7 @@ The following snippet will load the official plugin library: ``` <$button> -<$action-sendmessage $message="tm-load-plugin-library" infoTitlePrefix="$:/temp/RemoteAssetInfo/" url="http://tiddlywiki.com/library/v5.1.11/index.html"/> +<$action-sendmessage $message="tm-load-plugin-library" infoTitlePrefix="$:/temp/RemoteAssetInfo/" url="https://tiddlywiki.com/library/v5.1.11/index.html"/> Load official plugin library </$button> ``` diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-print.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-print.tid new file mode 100644 index 000000000..c114811ef --- /dev/null +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-print.tid @@ -0,0 +1,10 @@ +created: 20161008085627406 +modified: 20161008085627406 +tags: Messages +title: WidgetMessage: tm-print +type: text/vnd.tiddlywiki +caption: tm-print + +<<.from-version "5.1.14">> The `tm-print` message causes the browser to display the print dialog for the current page. It does not require any properties on the `event` object. + +The print message is usually generated with the ButtonWidget and is handled by the core. diff --git a/editions/tw5.com/tiddlers/nodejs/Customising Tiddler File Naming.tid b/editions/tw5.com/tiddlers/nodejs/Customising Tiddler File Naming.tid index 0b047b934..8bd4d121c 100644 --- a/editions/tw5.com/tiddlers/nodejs/Customising Tiddler File Naming.tid +++ b/editions/tw5.com/tiddlers/nodejs/Customising Tiddler File Naming.tid @@ -6,18 +6,20 @@ type: text/vnd.tiddlywiki By default, a [[TiddlyWiki on Node.js]] instance using a [[wiki folder|TiddlyWikiFolders]] will create new tiddler files by using the sanitised and disambiguated title as filename. -This can be customised by creating a tiddler [[$:/config/FileSystemPaths]] containing one or more [[filter expressions|Filter Syntax]], each on a line of its own. Newly created tiddlers are matched to each filter in turn, and the first output of the first filter to produce any output is taken as a logical path to be used for the tiddler file. Logical paths don't include the `.tid` extension, and they always use `/` as directory separator (when generating the physical path, this is replaced by the correct separator for the platform ~TiddlyWiki is running on). If none of the filters matches, the logical path is simply the title with all occurences of `/` replaced by `_` (for backwards compatibility). +This can be customised by creating a tiddler [[$:/config/FileSystemPaths]] containing one or more [[filter expressions|Filter Syntax]], each on a line of its own. Newly created tiddlers are matched to each filter in turn, and the first output of the first filter to produce any output is taken as a logical path to be used for the tiddler file. Logical paths don't include the `.tid` extension, and they can use `/` or `\` as directory separator (when generating the physical path, this is replaced by the correct separator for the platform ~TiddlyWiki is running on). If none of the filters matches, the logical path is simply the title with all occurences of `/` replaced by `_` (for backwards compatibility). -In both cases, the characters `<>:"\|?*^ ` are replaced by `_` in order to guarantee that the resulting path is legal on all supported platforms. +In both cases, the characters `<>:"\|?*^` are replaced by `_` in order to guarantee that the resulting path is legal on all supported platforms. !! Example ``` [is[system]removeprefix[$:/]addprefix[_system/]] -[tag[task][addprefix[mytasks/]] +[tag[task]addprefix[mytasks/]] [!has[draft.of]] ``` This will store newly created system tiddlers in `tiddlers/_system` (after stripping the `$:/` prefix), tiddlers tagged [[task]] in a subdirectory `tiddlers/mytasks`, and also create subdirectory structures for all other non-draft tiddlers. Thus, $:/config/FileSystemPaths itself will end up in `tiddlers/_system/config/FileSystemPaths.tid` or `tiddlers\_system\config\FileSystemPaths.tid`, depending on the platform. + +The final `[!has[draft.of]]` will match all remaining non-draft tiddlers. Because there was a match, any `/` or `\` in the tiddler title is mapped to a path separator. Thus, `some/thing/entirely/new` will be saved to `tiddlers/some/thing/entirely/new.tid` (ie, the file `new.tid` in a directory called `entirely`). diff --git a/editions/tw5.com/tiddlers/nodejs/Environment Variables on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Environment Variables on Node.js.tid index 3aac0412f..7585f4d9a 100644 --- a/editions/tw5.com/tiddlers/nodejs/Environment Variables on Node.js.tid +++ b/editions/tw5.com/tiddlers/nodejs/Environment Variables on Node.js.tid @@ -4,13 +4,15 @@ tags: [[TiddlyWiki on Node.js]] title: Environment Variables on Node.js type: text/vnd.tiddlywiki -[[TiddlyWiki on Node.js]] supports the following OS environment variables for specifying a colon-delimited list of paths to search for plugins and editions: +[[TiddlyWiki on Node.js]] supports the following OS environment variables for specifying a delimited list of paths to search for plugins and editions: * `TIDDLYWIKI_PLUGIN_PATH` - Search path for ordinary plugins * `TIDDLYWIKI_THEME_PATH` - Search path for themes * `TIDDLYWIKI_LANGUAGE_PATH` - Search path for languages * `TIDDLYWIKI_EDITION_PATH` - Search path for editions (used by the InitCommand) +''Note'': The delimiter may vary between operating systems. While on Windows a semicolon `;` is used, Linux implements a colon `:`. + The additional paths should each point to folders structured like the equivalent directories in the TiddlyWiki5 GitHub repository: the plugin, theme and language directories contain `publisher/pluginname/<files>` while the edition directories contain `editionname/<files>` For example: @@ -19,4 +21,3 @@ For example: TIDDLYWIKI_PLUGIN_PATH=~/MyPluginStore tiddlywiki mywiki --build index ``` - diff --git a/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki Prerelease on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki Prerelease on Node.js.tid index 4ec405c12..ab4712a7e 100644 --- a/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki Prerelease on Node.js.tid +++ b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki Prerelease on Node.js.tid @@ -1,5 +1,5 @@ created: 20150926162849519 -modified: 20150926163219630 +modified: 20161215160531991 tags: [[Installing TiddlyWiki on Node.js]] title: Installing TiddlyWiki Prerelease on Node.js type: text/vnd.tiddlywiki @@ -7,6 +7,7 @@ type: text/vnd.tiddlywiki # Clone a local copy of the TiddlyWiki5 GitHub repository from https://github.com/Jermolene/TiddlyWiki5 # Open a command line terminal and change the current working directory to the root of the TiddlyWiki5 repo # Type `npm link` (Windows) or `sudo npm link` (Mac/Linux) to tell [[npm]] to use this copy of the repo as the globally installed one +# Inside the root, you can launch ~TiddlyWiki like this: <br/>``tiddlywiki editions/tw5.com-server --server 8080 $:/core/save/all text/plain text/html`` After this procedure you can work with TiddlyWiki5 via [[npm]] as though it had been installed in the usual way with `npm install -g tiddlywiki`. diff --git a/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid index bdd90dc91..4f047c3ed 100644 --- a/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid +++ b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid @@ -1,11 +1,15 @@ +caption: Node.js created: 20131219100608529 -modified: 20160520090217678 -tags: [[TiddlyWiki on Node.js]] +delivery: DIY +description: Flexible hosting on your own machine or in the cloud +method: sync +modified: 20171115174105090 +tags: Saving [[TiddlyWiki on Node.js]] Windows Mac Linux title: Installing TiddlyWiki on Node.js type: text/vnd.tiddlywiki # Install [[Node.js]] -#* either from your favourite package manager: typically `apt-get install nodejs` on Debian/Ubuntu Linux or Termux for Android, or `brew install node` on a Mac +#* either from your favourite package manager: typically `apt-get install nodejs` on Debian/Ubuntu Linux or [[Termux for Android|Serving TW5 from Android]], or `brew install node` on a Mac #* or directly from http://nodejs.org # Open a command line terminal and type: #> `npm install -g tiddlywiki` @@ -21,11 +25,15 @@ type: text/vnd.tiddlywiki ## Try editing and creating tiddlers # Optionally, make an offline copy: #* click the {{$:/core/images/save-button}} ''save changes'' button in the sidebar, ''OR'' -#* `tiddlywiki --build index` - +#* `tiddlywiki mynewwiki --build index` The `-g` flag causes TiddlyWiki to be installed globally. Without it, TiddlyWiki will only be available in the directory where you installed it. If you are using Debian or Debian-based Linux and you are receiving a `node: command not found` error though node.js package is installed, you may need to create a symbolic link between `nodejs` and `node`. Consult your distro's manual and `whereis` to correctly create a link. See github [[issue 1434|http://github.com/Jermolene/TiddlyWiki5/issues/1434]] Example Debian v8.0: `sudo ln -s /usr/bin/nodejs /usr/bin/node` + +You can also install prior versions like this: + +> npm install -g tiddlywiki@5.1.13 + diff --git a/editions/tw5.com/tiddlers/nodejs/Naming of System Tiddlers.tid b/editions/tw5.com/tiddlers/nodejs/Naming of System Tiddlers.tid index 11938db16..f677c6cee 100644 --- a/editions/tw5.com/tiddlers/nodejs/Naming of System Tiddlers.tid +++ b/editions/tw5.com/tiddlers/nodejs/Naming of System Tiddlers.tid @@ -27,6 +27,6 @@ The system tiddlers provided as part of the core are named according to the foll In the format column: * ''hyphen-case'' refers to joining multiple lowercase words with hyphens -* ''~CamelCase'' refers to joining mulitple initial capitaled words with hyphens +* ''~CamelCase'' refers to directly joining multiple lowercase words with initial uppercase letters * ''lowercase'' refers to directly joining multiple lowercase words * ''inconsistent'' marks namespaces that are currently titled inconsistently diff --git a/editions/tw5.com/tiddlers/nodejs/Scripts for TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Scripts for TiddlyWiki on Node.js.tid index 8c0c250e1..d31974f80 100644 --- a/editions/tw5.com/tiddlers/nodejs/Scripts for TiddlyWiki on Node.js.tid +++ b/editions/tw5.com/tiddlers/nodejs/Scripts for TiddlyWiki on Node.js.tid @@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki ! Script Files -The TiddlyWiki5 repository contains several scripts in the `bin` folder that you can use to automate common tasks, or as a useful starting point for your own scripts. See [[Scripts for building tiddlywiki.com]] for details of the scripts used to build and release http://tiddlywiki.com/. +The TiddlyWiki5 repository contains several scripts in the `bin` folder that you can use to automate common tasks, or as a useful starting point for your own scripts. See [[Scripts for building tiddlywiki.com]] for details of the scripts used to build and release https://tiddlywiki.com/. All the scripts expect to be run from the root folder of the repository. diff --git a/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid index 05fb965ce..fe4615a3a 100644 --- a/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid +++ b/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid @@ -10,6 +10,12 @@ Running TiddlyWiki on [[Node.js]] brings several important benefits over and abo * Individual tiddlers are stored in separate files, which you can organise as you wish * The ability to build multiple wikis that blend different combinations of shared and unique content +There are a few file system limitations you should be aware of that are related to how TiddlyWiki was designed: + +* The best, most general way to interact with a running wiki is via the HTTP or JavaScript API, rather than manipulating the file store directly +* Any modification to the contents of the wiki folder (e.g. images) might thus sometimes require that your restart the node.js server +* TiddlyWiki might support manipulating the file store directly in the future + For more information see: * [[Installing TiddlyWiki on Node.js]] diff --git a/editions/tw5.com/tiddlers/nodejs/tiddlywiki.files_Files.tid b/editions/tw5.com/tiddlers/nodejs/tiddlywiki.files_Files.tid new file mode 100644 index 000000000..294c8f260 --- /dev/null +++ b/editions/tw5.com/tiddlers/nodejs/tiddlywiki.files_Files.tid @@ -0,0 +1,95 @@ +created: 20161015114118243 +modified: 20161015170604353 +tags: TiddlyWikiFolders +title: tiddlywiki.files Files +type: text/vnd.tiddlywiki + +! Introduction + +A `tiddlywiki.files` JSON file in a sub-folder within [[a TiddlyWiki folder|TiddlyWikiFolders]] overrides the usual logic for recursively scanning the folder for tiddler files. Instead, the `tiddlywiki.files` file specifies instructions for loading tiddlers from specific files and folders. + +The format of the file is an object with two optional properties: + +* ''tiddlers'' - an array of objects describing external files with the ability to override or modify any of the fields read from the file +* ''directories'' - an array of objects describing external directories, a filter determining which files within those directories should be processed, and the ability to override or modify any of the fields read from the file + +Note that significant enhancements to `tiddlywiki.files` processing were introduced in [[Release 5.1.14]]. + +!! Field overrides + +Both the ''tiddlers'' and ''directories'' sections of `tiddlywiki.files` files include the ability to override or customise the values of fields with a `fields` object. + +Each field can be specified as either a ''string'' or ''array'' value to be assigned directly to the field, or <<.from-version "5.1.14">> an ''object'' describing how to generate the value for the field. The object contains the following properties: + +* ''source'' - (optional) a string specifying the source value for the field. If not specified, the existing value is used +** //filename// the filename of the file containing the tiddler +** //filename-uri-decoded// the filename of the file containing the tiddler, with [[URI decoding|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURIComponent]] applied +** //basename// the filename of the file containing the tiddler without any extension +** //basename-uri-decoded// the filename of the file containing the tiddler without any extension, with [[URI decoding|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURIComponent]] applied +** //extname// the extension of the filename of the file containing the tiddler +** //created// the creation date/time of the file containing the tiddler +** //modified// the modification date/time of the file containing the tiddler +* ''prefix'' - (optional) a string to be prepended to the value of the field +* ''suffix'' - (optional) a string to be appended to the value of the field + +! Tiddlers section + +The file specifications in the `tiddlers` array support the following properties: + +* ''file'': (required) the absolute or relative path to the file containing the tiddler data (relative paths are interpreted relative to the path of the `tiddlywiki.files` file) +* ''isTiddlerFile'': (optional) if `true`, the file will be treated as a [[tiddler file|TiddlerFiles]] and deserialised to extract the tiddlers. Otherwise, the raw content of the file is assigned to the `text` field without any parsing +* ''fields'': (optional) an object containing values that override or customise the fields provided in the tiddler file (see above) +* ''prefix'' & ''suffix'': (optional) strings to be prefixed and suffixed to the tiddler `text` field +*> Note that providing a ''prefix'' here is equivalent to setting the `text` field of the ''fields'' object to `{"prefix":"<prefixvalue>"}`. + +! Directories section + +Directory specifications in the `directories` array may take the following forms: + +* a ''string'' literal, specifying the absolute or relative path to the directory containing the tiddler files (relative paths are interpreted relative to the path of the `tiddlywiki.files` file). The directory is recursively searched for tiddler files +* <<.from-version "5.1.14">> an ''object'' with the following properties: +** ''path'' - (required) the absolute or relative path to the directory containing the tiddler files (relative paths are interpreted relative to the path of the `tiddlywiki.files` file). Note that the directory is not recursively searched; sub-directories are ignored +** ''filesRegExp'' - (optional) a [[regular expression|https://developer.mozilla.org/en/docs/Web/JavaScript/Guide/Regular_Expressions]] that matches the filenames of the files that should be processed within the directory +** ''isTiddlerFile'' - (required) if `true`, the file will be treated as a [[tiddler file|TiddlerFiles]] and deserialised to extract the tiddlers. Otherwise, the raw content of the file is assigned to the `text` field without any parsing +** ''fields'' - (required) an object containing values that override or customise the fields provided in the tiddler file (see above) + +Fields can be overridden for particular files by creating a file with the same name plus the suffix `.meta` -- see TiddlerFiles. + +! Examples + +These example `tiddlywiki.files` must be placed in their own sub-directory of the [[wiki folder|TiddlyWikiFolders]]. + +There are also several examples of `tiddlywiki.files` files in the main [[TiddlyWiki 5 GitHub repository|https://github.com/Jermolene/TiddlyWiki5]]. + +!! Importing a folder of PDFs + +This example retrieves all the files with the extension `.pdf` from a folder specified by a relative path. Each tiddler is set up for LazyLoading with the following fields: + +* ''title'' - set to the URI decoded base filename of the PDF file. [[URI decoding|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURIComponent]] allows characters like "/" to be included in titles by URI encoding them as "%2F" +* ''created'' - set to the creation date/time of the PDF file +* ''modified'' - set to the modification date/time of the PDF file +* ''type'' - set to `application/pdf` +* ''tags'' - set to `$:/tags/AttachedFile` +* ''text'' - set to an empty string +* ''_canonical_uri'' - set to the string "pdfs/" concatenated with the filename + +``` +{ + "directories": [ + { + "path": "../../../input/pdfs", + "filesRegExp": "^.*\\.pdf$", + "isTiddlerFile": false, + "fields": { + "title": {"source": "basename-uri-decoded"}, + "created": {"source": "created"}, + "modified": {"source": "modified"}, + "type": "application/pdf", + "tags": ["$:/tags/AttachedFile"], + "text": "", + "_canonical_uri": {"source": "filename", "prefix": "pdfs/"} + } + } + ] +} +``` diff --git a/editions/tw5.com/tiddlers/nodejs/tiddlywiki.info_Files.tid b/editions/tw5.com/tiddlers/nodejs/tiddlywiki.info_Files.tid new file mode 100644 index 000000000..58dfaed68 --- /dev/null +++ b/editions/tw5.com/tiddlers/nodejs/tiddlywiki.info_Files.tid @@ -0,0 +1,59 @@ +created: 20161015114042793 +modified: 20161015121622327 +tags: TiddlyWikiFolders +title: tiddlywiki.info Files +type: text/vnd.tiddlywiki + +[[TiddlyWikiFolders]] are configured with a single `tiddlywiki.info` file in the root of the wiki folder. It should contain a JSON object comprising the following properties: + +* ''plugins'' - an array of plugin names to be included in the wiki +* ''themes'' - an array of theme names to be included in the wiki +* ''languages'' - an array of language names to be included in the wiki +* ''includeWikis'' - an array of references to external wiki folders to be included in the wiki +* ''build'' - a hashmap of named build targets, each defined by an array of command tokens (see BuildCommand) +* ''config'' - an optional hashmap of configuration options (see below) + +!!! ''includeWikis'' + +The entries in the ''includeWikis'' array can be either a string specifying the relative path to the wiki, or an object with the following fields: + +* ''path'' - relative path to wiki folder +* ''read-only'' - set //true// to prevent the tiddlers in the included wiki from being modified. The modifications will be written to the directory specified in ''default-tiddler-location'', described below + +!!! ''build'' + +Note that the build targets of included wikis are merged if a target of that name isn't defined in the current `tiddlywiki.info` file. + +!!! ''config'' + +Configuration options include: + +* ''default-tiddler-location'' - a string path to the default location for the filesystem adaptor to save new tiddlers (resolved relative to the wiki folder) + +* ''retain-original-tiddler-path'' - If true, the server will generate a tiddler [[$:/config/OriginalTiddlerPaths]] containing the original file paths of each tiddler in the wiki + +!!! Example + +For example: + +``` +{ + "plugins": [ + "tiddlywiki/tiddlyweb", + "tiddlywiki/filesystem" + ], + "includeWikis": [ + {"path": "../tw5.com", "read-only": true} + ], + "build": { + "index": [ + "--rendertiddler","$:/core/save/all","index.html","text/plain"], + "favicon": [ + "--savetiddler","$:/favicon.ico","favicon.ico", + "--savetiddler","$:/green_favicon.ico","static/favicon.ico"] + }, + "config": { + "retain-original-tiddler-path": true + } +} +``` diff --git a/editions/tw5.com/tiddlers/platforms/Beaker_Browser.tid b/editions/tw5.com/tiddlers/platforms/Beaker_Browser.tid new file mode 100644 index 000000000..1d43928aa --- /dev/null +++ b/editions/tw5.com/tiddlers/platforms/Beaker_Browser.tid @@ -0,0 +1,21 @@ +created: 20161229113910984 +modified: 20171113110222980 +title: Beaker Browser +type: text/vnd.tiddlywiki + +From [[Beaker Browser website|https://beakerbrowser.com/]]: + +> Beaker is a Peer-to-Peer Web Browser, made for users to run applications independently of hosts. Using P2P Hypermedia, Beaker separates frontend apps from backend services, so that users are completely in control of their software and data. Read more. + +Beaker is a fork of the open source Chromium browser (which is the core engine powering Google's Chrome browser). + +Beaker adds the ability to host sites within the browser, and browse to those sites via the `dat://` protocol. The extraordinary thing is that if you are running Beaker then you can also browse to sites hosted by other users, without needing any server in between. + +Further, you can opt to host a site belonging to somebody else, forming part of a Bittorrent-like swarm of peers serving the content to other browsers. You can also //fork// a site, making your own copy that you can change as you need. + +The main disadvantage is that mainstream browsers cannot use `dat://` sites. + +Most of the magic is accomplished by the underlying [[Dat protocol|https://datproject.org/]]. + +<<.from-version "5.1.14">> TiddlyWiki incorporates a special saver module permitting changes to be saved directly from Beaker browser. See [[Saving on Beaker Browser]] for instructions. + diff --git a/editions/tw5.com/tiddlers/platforms/TiddlyFox Apocalypse.tid b/editions/tw5.com/tiddlers/platforms/TiddlyFox Apocalypse.tid new file mode 100644 index 000000000..9cf4867d6 --- /dev/null +++ b/editions/tw5.com/tiddlers/platforms/TiddlyFox Apocalypse.tid @@ -0,0 +1,45 @@ +created: 20171109170823847 +modified: 20171113161750857 +tags: Platforms +title: TiddlyFox Apocalypse +type: text/vnd.tiddlywiki + +! Summary + +On 14th November 2017 Mozilla [[released Firefox 57|https://blog.mozilla.org/blog/2017/09/26/firefox-quantum-beta-developer-edition/]], a major new version with many improvements and security enhancements. However, in amongst those improvements are ''some fundamental changes to Firefox's security model with the unfortunate effect of making it impossible for ~TiddlyFox to function''. + +TiddlyFox will remain available for people who [[continue to use older versions of Firefox|https://groups.google.com/d/topic/tiddlywiki/OJQ0yRq4zog/discussion]], but anyone upgrading to the new version will need to choose a new way to handle saving changes with TiddlyWiki. + +Happily, several new ways of working with TiddlyWiki now exist so that users have many alternative choices -- see GettingStarted for details. The demise of TiddlyFox has provoked several of these recent developments and thus may well ultimately be good for the community. + +There is a [[discussion thread|https://groups.google.com/d/topic/tiddlywiki/LcldXzPlTK0/discussion]] on the TiddlyWiki forums about these developments. + +! Background + +Firefox was first released in November 2004, a few months after the first version of TiddlyWiki. It was in many ways the Millenium Falcon to Microsoft's Death Star (in the shape of Internet Explorer). IE had by then enjoyed more than 5 years as the dominant browser, leading many in the web community to be frustrated that Microsoft's self-serving extensions to HTML had become de facto standards at the expense of innovation that might benefit the web community as a whole. + +Firefox quickly became successful because it managed to render web pages with close enough compatibly with Internet Explorer while offering a superior user experience. A large part of the promise of that user experience was the ability for any user to customise every aspect of the browser. Two innovations were behind this: + +* The entire user interface of the browser was constructed in [[XUL|https://en.wikipedia.org/wiki/XUL]], effectively an extension of HTML that enabled it to render conventional user interfaces (at the time, HTML was largely restricted to simple document-oriented layouts). Tweaking a few lines of XUL code could make wholesale changes to the user interface of the browser +* The Mozilla add-on architecture gave full privileges to add-ons, enabling them to observe and interact deeply with the browser engine itself, and the file system of the computer on which it was running + +These two conditions enabled a vibrant ecosystem of Firefox add-ons, many of them extremely popular. In many cases, innovations that were first seen in browser add-ons later became integrated into the browser itself, most notably the web debugger [[Firebug|https://en.wikipedia.org/wiki/Firebug_(software)]] which was eventually cloned by all the browser manufacturers. + +Firefox continued to be extremely popular until Google joined the development of the rival ~WebKit browser to make Chrome. Google took a very different approach to the trade offs of making a browser, focusing on improving security at the expense of almost all other considerations. They pioneered approaches such as isolating each tab in its own process that were quickly adopted by all other major browsers. + +Google's approach precluded them adopting Mozilla's free-for-all approach to add-ons. Instead of having access to the entire browser environment and filing system, add-ons in Chrome see only a restricted subset of what is going on within the browser, and enjoy little or no access to the resources of the host machine. + +It was inevitable that Mozilla would eventually adopt Google's approach to [[browser security vis-a-vis add-ons|https://support.mozilla.org/en-US/kb/firefox-add-technology-modernizing]]. There is a point at which it wouldn't be responsible for Mozilla to be releasing a browser that had knowingly worse security than the market leader. + +! Lessons + +Some of the fecundity of the TiddlyWiki ecosystem stems from the adoption of the above two principles from Firefox: + +* Making the application user interface out of the same primitives as the application content +* Giving add-ons free rein to observe and interact with all of the internal logic of the application + +Those two characteristics present similar security challenges to TiddlyWiki as they did to Firefox. A TiddlyWiki that was primarily focused on security would need to curtail those abilities. + +! The Future + +Innovation on new browser-based user interfaces and capabilities has now shifted from browser extensions to a new generation of frameworks that simplify creation of a custom browser based on an off-the-shelf open source HTML rendering engine. TiddlyDesktop uses [[nwjs|https://nwjs.io]], while [[Beaker Browser]] uses an alternative called [[Electron|https://electron.atom.io/]]. diff --git a/editions/tw5.com/tiddlers/plugins/Amazon Web Services Plugin.tid b/editions/tw5.com/tiddlers/plugins/Amazon Web Services Plugin.tid new file mode 100644 index 000000000..d5cc22fa5 --- /dev/null +++ b/editions/tw5.com/tiddlers/plugins/Amazon Web Services Plugin.tid @@ -0,0 +1,10 @@ +created: 20170703193252423 +modified: 20170703193353918 +tags: OfficialPlugins +title: Amazon Web Services Plugin +type: text/vnd.tiddlywiki + +The Amazon Web Services Plugin provides several tools for working with Amazon Web Services: + +* Templates for saving a TiddlyWiki as a single JavaScript file in a ZIP file that can be executed as an AWS Lambda function. In this form, TiddlyWiki is a self contained single file containing both code and data, just like the standalone HTML file configuration +* Commands that can be used to interact with AWS services, under both the Node.js and Lambda configurations of TiddlyWiki diff --git a/editions/tw5.com/tiddlers/plugins/CodeMirror Plugin.tid b/editions/tw5.com/tiddlers/plugins/CodeMirror Plugin.tid index 82b830e9e..a6c44e7cc 100644 --- a/editions/tw5.com/tiddlers/plugins/CodeMirror Plugin.tid +++ b/editions/tw5.com/tiddlers/plugins/CodeMirror Plugin.tid @@ -1,10 +1,10 @@ created: 20160107223435497 list: -modified: 20160107223725809 -tags: [[Plugin Editions]] +modified: 20170228102537972 +tags: OfficialPlugins [[Plugin Editions]] title: CodeMirror Plugin type: text/vnd.tiddlywiki The CodeMirror plugin adds a sophisticated web-based editor to TiddlyWiki. -See http://tiddlywiki.com/plugins/tiddlywiki/codemirror/ +See https://tiddlywiki.com/plugins/tiddlywiki/codemirror/ for the latest official release, or https://tiddlywiki.com/prerelease/plugins/tiddlywiki/codemirror/ for the latest prerelease. diff --git a/editions/tw5.com/tiddlers/plugins/D3 Plugin.tid b/editions/tw5.com/tiddlers/plugins/D3 Plugin.tid index 210be4f4e..589ae9396 100644 --- a/editions/tw5.com/tiddlers/plugins/D3 Plugin.tid +++ b/editions/tw5.com/tiddlers/plugins/D3 Plugin.tid @@ -1,10 +1,10 @@ created: 20160107223425581 list: -modified: 20160107223725807 -tags: [[Plugin Editions]] +modified: 20170228102531138 +tags: OfficialPlugins [[Plugin Editions]] title: D3 Plugin type: text/vnd.tiddlywiki The D3 plugin integrates the D3 visualisation library with TiddlyWiki. -See http://tiddlywiki.com/plugins/tiddlywiki/d3/ +See https://tiddlywiki.com/plugins/tiddlywiki/d3/ diff --git a/editions/tw5.com/tiddlers/plugins/Disabling_Plugins.tid b/editions/tw5.com/tiddlers/plugins/Disabling_Plugins.tid new file mode 100644 index 000000000..12c11a112 --- /dev/null +++ b/editions/tw5.com/tiddlers/plugins/Disabling_Plugins.tid @@ -0,0 +1,15 @@ +created: 20161015121727194 +modified: 20161015121728291 +tags: PluginMechanism +title: Disabling Plugins +type: text/vnd.tiddlywiki + +!! Disabling Plugins + +Plugins can be disabled by creating a tiddler titled `$:/config/Plugins/Disabled/` concatenated with the plugin title, and setting its text to `yes`. + +For example, to disable the plugin `$:/plugins/tiddlywiki/highlight`, the title would be: + +``` +$:/config/Plugins/Disabled/$:/plugins/tiddlywiki/highlight +``` \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/plugins/Dynaview Plugin.tid b/editions/tw5.com/tiddlers/plugins/Dynaview Plugin.tid new file mode 100644 index 000000000..c591ab6a0 --- /dev/null +++ b/editions/tw5.com/tiddlers/plugins/Dynaview Plugin.tid @@ -0,0 +1,10 @@ +created: 20180111122953142 +modified: 20180111123045403 +tags: OfficialPlugins +title: Dynaview Plugin +type: text/vnd.tiddlywiki + +The Dynaview Plugin makes it possible to build user interfaces that dynamically respond to changes in the browser viewport via scrolling or zooming: + +* CSS classes that allow rendering to be deferred until the output is scrolled into view +* CSS classes that allow the opacity of DOM elements to vary according to the current zoom level diff --git a/editions/tw5.com/tiddlers/plugins/External Attachments Plugin.tid b/editions/tw5.com/tiddlers/plugins/External Attachments Plugin.tid new file mode 100644 index 000000000..def927043 --- /dev/null +++ b/editions/tw5.com/tiddlers/plugins/External Attachments Plugin.tid @@ -0,0 +1,11 @@ +created: 20171031172325817 +list: +modified: 20171031172440017 +tags: OfficialPlugins [[Plugin Editions]] +title: External Attachments Plugin +type: text/vnd.tiddlywiki + +The External Attachments Plugin provides support for importing tiddlers as external attachments. That means that instead of importing binary files as self-contained tiddlers, they are imported as "skinny" tiddlers that reference the original file via the ''_canonical_uri'' field. This reduces the size of the wiki and thus improves performance. However, it does mean that the wiki is no longer fully self-contained. + +This plugin only works when using TiddlyWiki with platforms such as TiddlyDesktop that support the ''path'' attribute for imported/dragged files. + diff --git a/editions/tw5.com/tiddlers/plugins/Highlight Plugin.tid b/editions/tw5.com/tiddlers/plugins/Highlight Plugin.tid index d914cfd7c..c311cf3e8 100644 --- a/editions/tw5.com/tiddlers/plugins/Highlight Plugin.tid +++ b/editions/tw5.com/tiddlers/plugins/Highlight Plugin.tid @@ -1,10 +1,10 @@ created: 20160107223417655 list: -modified: 20160107223725805 -tags: [[Plugin Editions]] +modified: 20170228102525208 +tags: OfficialPlugins [[Plugin Editions]] title: Highlight Plugin type: text/vnd.tiddlywiki The Highlight plugin provides the ability to apply syntax colouring to text. -See http://tiddlywiki.com/plugins/tiddlywiki/highlight/ +See https://tiddlywiki.com/plugins/tiddlywiki/highlight/ diff --git a/editions/tw5.com/tiddlers/plugins/KaTeX Plugin.tid b/editions/tw5.com/tiddlers/plugins/KaTeX Plugin.tid index c76ae917c..d106aae4e 100644 --- a/editions/tw5.com/tiddlers/plugins/KaTeX Plugin.tid +++ b/editions/tw5.com/tiddlers/plugins/KaTeX Plugin.tid @@ -1,10 +1,10 @@ created: 20160107223410181 list: -modified: 20160107223725803 -tags: [[Plugin Editions]] +modified: 20170228102517666 +tags: OfficialPlugins [[Plugin Editions]] title: KaTeX Plugin type: text/vnd.tiddlywiki This plugin adds the ability to display mathematical notation written in ~LaTeX. -See http://tiddlywiki.com/plugins/tiddlywiki/katex/ +See https://tiddlywiki.com/plugins/tiddlywiki/katex/ diff --git a/editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid b/editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid index 3d9a9335c..6b52fe33c 100644 --- a/editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid +++ b/editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid @@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki # Create a backup of your current TiddlyWiki HTML file ([[just in case|The First Rule of Using TiddlyWiki]]) # Open your TiddlyWiki in a browser -# In another browser window, find a link to the plugin, e.g. [[$:/plugins/tiddlywiki/example]]. You will typically find these links on the home page of the plugin (for example, http://tiddlywiki.com/plugins/tiddlywiki/katex/) +# In another browser window, find a link to the plugin, e.g. [[$:/plugins/tiddlywiki/example]]. You will typically find these links on the home page of the plugin (for example, https://tiddlywiki.com/plugins/tiddlywiki/katex/) # Drag the link [[$:/plugins/tiddlywiki/example]] to the browser window containing your TiddlyWiki # Save your TiddlyWiki ({{$:/core/images/save-button}}) # ''Refresh the page so that TiddlyWiki loads the new plugin'' ({{$:/core/images/refresh-button}}) diff --git a/editions/tw5.com/tiddlers/plugins/Markdown Plugin.tid b/editions/tw5.com/tiddlers/plugins/Markdown Plugin.tid index f16ffbf98..74bed9434 100644 --- a/editions/tw5.com/tiddlers/plugins/Markdown Plugin.tid +++ b/editions/tw5.com/tiddlers/plugins/Markdown Plugin.tid @@ -1,10 +1,10 @@ created: 20160107223401584 list: -modified: 20160107223725801 -tags: [[Plugin Editions]] +modified: 20170228102511347 +tags: OfficialPlugins [[Plugin Editions]] title: Markdown Plugin type: text/vnd.tiddlywiki The Markdown plugin enables you to use tiddlers that are written in standard Markdown markup. -See http://tiddlywiki.com/plugins/tiddlywiki/markdown/ +See https://tiddlywiki.com/plugins/tiddlywiki/markdown/ diff --git a/editions/tw5.com/tiddlers/plugins/Mobile Drag And Drop Shim Plugin.tid b/editions/tw5.com/tiddlers/plugins/Mobile Drag And Drop Shim Plugin.tid new file mode 100644 index 000000000..9ce97e21d --- /dev/null +++ b/editions/tw5.com/tiddlers/plugins/Mobile Drag And Drop Shim Plugin.tid @@ -0,0 +1,7 @@ +created: 20170328173820802 +modified: 20170328174328792 +tags: OfficialPlugins +title: Mobile Drag And Drop Shim Plugin +type: text/vnd.tiddlywiki + +The Mobile Drag And Drop Shim Plugin provides a "shim" that enables HTML 5 compatible drag and drop operations on mobile browsers, including iOS and Android. The shim was created by Tim Ruffles and is published at https://github.com/timruffles/ios-html5-drag-drop-shim. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/plugins/OfficialPlugins.tid b/editions/tw5.com/tiddlers/plugins/OfficialPlugins.tid new file mode 100644 index 000000000..7ba5a258e --- /dev/null +++ b/editions/tw5.com/tiddlers/plugins/OfficialPlugins.tid @@ -0,0 +1,9 @@ +created: 20170210075109635 +modified: 20170210075709809 +tags: Plugins +title: OfficialPlugins +type: text/vnd.tiddlywiki + +The official TiddlyWiki plugin library contains the plugins that are part of the [[main TiddlyWiki 5 GitHub repository|Working with the TiddlyWiki5 repository]]. Install them from [[the plugin library|Installing a plugin from the plugin library]]. Plugins from the official plugin library are automatically updated as part of the [[upgrade process|UpgradeMechanism]]. + +<<list-links "[tag[OfficialPlugins]]">> diff --git a/editions/tw5.com/tiddlers/plugins/PluginFolders.tid b/editions/tw5.com/tiddlers/plugins/PluginFolders.tid new file mode 100644 index 000000000..d842affc1 --- /dev/null +++ b/editions/tw5.com/tiddlers/plugins/PluginFolders.tid @@ -0,0 +1,28 @@ +created: 20161015113519246 +modified: 20161015113833256 +tags: PluginMechanism +title: PluginFolders +type: text/vnd.tiddlywiki + +On the server, plugins can be stored as ordinary JSON tiddlers but it is often more convenient to store them as separate tiddler files within folders. Plugin folders must contain a `plugin.info` file that contains the metadata for the plugin. It can also optionally identify files external to the plugin folder that should be loaded as tiddlers. + +The `plugin.info` file should contain the following JSON structure: + +The JSON structure for plugin tiddlers is as follows: + +``` +{ + "title": "$:/plugins/publisher/name", + "description": "An exemplary plugin for demonstration purposes", + "author": "JeremyRuston", + "version": "1.2.3-alpha3", + "core-version": ">=5.0.0", + "source": "https://tiddlywiki.com/MyPlugin", + "plugin-type": "plugin", + "list": "readme license history" +} +``` + +By convention, the titles of the individual tiddlers are prefixed with the title of the containing plugin, but they are not restricted to do so. + +Note that if the `version` field is omitted from a `plugin.info` file when the plugin folder is packed then it is automatically filled in by the core to the current core version number. This is to ensure that all the core plugins carry the correct version number. Generally plugin authors will want to ensure that they do explicitly specify a version number. diff --git a/editions/tw5.com/tiddlers/plugins/Plugin_Fields.tid b/editions/tw5.com/tiddlers/plugins/Plugin_Fields.tid new file mode 100644 index 000000000..86636179e --- /dev/null +++ b/editions/tw5.com/tiddlers/plugins/Plugin_Fields.tid @@ -0,0 +1,22 @@ +created: 20161015122718559 +modified: 20161015122719647 +tags: PluginMechanism +title: Plugin Fields +type: text/vnd.tiddlywiki + +! Plugin fields + +Plugins are stored as tiddlers with the following fields: + +|!Field |!Description | +|title |Title of plugin | +|description |Description of plugin | +|author |Author of plugin | +|version |Version string (must conform to [ext[SemanticVersioning|http://semver.org/]] convention) | +|source |Source URL of plugin | +|type |Must be ''application/json'' | +|plugin-type |Can be ''plugin'' (default), ''language'' or ''theme'' | +|text |JSON encoding of the list of tiddlers comprising the plugin | +|list |Names of exposed plugin information tiddlers (see below) | +|name |Name of the theme (only for themes) | +|dependents |List of dependent plugins (currently only implemented for themes) | \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/plugins/Plugin_Information_Tiddlers.tid b/editions/tw5.com/tiddlers/plugins/Plugin_Information_Tiddlers.tid new file mode 100644 index 000000000..0c0f168c6 --- /dev/null +++ b/editions/tw5.com/tiddlers/plugins/Plugin_Information_Tiddlers.tid @@ -0,0 +1,25 @@ +created: 20161015121708376 +modified: 20161015121709477 +tags: PluginMechanism +title: Plugin Information Tiddlers +type: text/vnd.tiddlywiki + +! Information Tiddlers for Plugins + +Plugin authors are encouraged to provide special information and documentation tiddlers that TiddlyWiki can include as plugin information tabs in the [[control panel|$:/ControlPanel]]. + +Plugins should provide an icon contained in a tiddler with the title formed of `<plugin-name>/icon` (for example, [[$:/core/icon]]). + +Plugins expose the names of the individual information tabs that they wish to display in the `list` field of the plugin tiddler. By convention, some or all of the following should be provided: + +* ''readme'': basic information about the plugin +* ''license'': the license under which the plugin is published + +The title of the associated information tiddler must be formed as follows: + +# `$:/<plugin-name>/<current-language>/<tab-name>` (for example, ''$:/core/en-GB/readme'') +# `$:/<plugin-name>/<tab-name>` (for example, ''$:/core/readme'') + +Thus, plugins can provide language-specific versions of each information tiddler. + +Note that information tiddlers should not reference other tiddlers within the plugin. This is because plugins containing themes or languages are dynamically switched in and out as they are selected, and so their information tiddlers may not be available for viewing. The control panel uses the 'subtiddler' attribute of the TranscludeWidget to access these tiddlers, which works independently of the plugin switching mechanism. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/plugins/Railroad Plugin.tid b/editions/tw5.com/tiddlers/plugins/Railroad Plugin.tid index 288c9d50b..a08a7b8c3 100644 --- a/editions/tw5.com/tiddlers/plugins/Railroad Plugin.tid +++ b/editions/tw5.com/tiddlers/plugins/Railroad Plugin.tid @@ -1,7 +1,7 @@ created: 20160107223348621 list: -modified: 20160107223725798 -tags: [[Plugin Editions]] +modified: 20170228102501706 +tags: OfficialPlugins [[Plugin Editions]] title: Railroad Plugin type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/plugins/SaveTrail Plugin.tid b/editions/tw5.com/tiddlers/plugins/SaveTrail Plugin.tid new file mode 100644 index 000000000..8d9202d92 --- /dev/null +++ b/editions/tw5.com/tiddlers/plugins/SaveTrail Plugin.tid @@ -0,0 +1,16 @@ +created: 20170210074840860 +modified: 20170328173912704 +tags: OfficialPlugins +title: SaveTrail Plugin +type: text/vnd.tiddlywiki + +This plugin causes TiddlyWiki to continuously download (as a JSON file) the contents of any tiddler that is manually changed by any of several means: + +* Confirming an edit +* Deleting tiddlers +* Imports +* Renames/relinks +* Optionally, typing in draft tiddlers can trigger a download + +Where appropriate, separate 'before' and 'after' files are downloaded. Configured correctly, the browser will download the files silently in the background, and they can be used as a backup in case of accidental data loss. + diff --git a/editions/tw5.com/tiddlers/plugins/TW2Parser Plugin.tid b/editions/tw5.com/tiddlers/plugins/TW2Parser Plugin.tid index a2c473877..3000e5a73 100644 --- a/editions/tw5.com/tiddlers/plugins/TW2Parser Plugin.tid +++ b/editions/tw5.com/tiddlers/plugins/TW2Parser Plugin.tid @@ -1,10 +1,10 @@ created: 20160107223340750 list: -modified: 20160107223725794 -tags: [[Plugin Editions]] +modified: 20170228102455677 +tags: OfficialPlugins [[Plugin Editions]] title: TW2Parser Plugin type: text/vnd.tiddlywiki This experimental plugin adds the ability to display WikiText written for the original Classic version of TiddlyWiki. -See http://tiddlywiki.com/plugins/tiddlywiki/tw2parser/ +See https://tiddlywiki.com/plugins/tiddlywiki/tw2parser/ diff --git a/editions/tw5.com/tiddlers/plugins/Twitter Plugin.tid b/editions/tw5.com/tiddlers/plugins/Twitter Plugin.tid new file mode 100644 index 000000000..ef4da3e72 --- /dev/null +++ b/editions/tw5.com/tiddlers/plugins/Twitter Plugin.tid @@ -0,0 +1,11 @@ +created: 20170227223209558 +modified: 20170328173919702 +tags: OfficialPlugins +title: Twitter Plugin +type: text/vnd.tiddlywiki + +This plugin adds a `<$twitter>` widget that can embed a variety of entities from twitter.com: + +* Individual tweets and conversation threads +* Buttons to tweet a hashtag/account, follow/like an account, or share a URL +* Timelines showing tweets from a user, hashtag, list or collection diff --git a/editions/tw5.com/tiddlers/readme/ContributingTemplate.tid b/editions/tw5.com/tiddlers/readme/ContributingTemplate.tid index b012a7d52..eb675a829 100644 --- a/editions/tw5.com/tiddlers/readme/ContributingTemplate.tid +++ b/editions/tw5.com/tiddlers/readme/ContributingTemplate.tid @@ -2,7 +2,7 @@ created: 201308251449 modified: 201308251449 title: ContributingTemplate -\define tv-wikilink-template() http://tiddlywiki.com/static/$uri_doubleencoded$.html +\define tv-wikilink-template() https://tiddlywiki.com/static/$uri_doubleencoded$.html ! Contributing to TiddlyWiki5 {{Contributing}} diff --git a/editions/tw5.com/tiddlers/readme/ReadMe.tid b/editions/tw5.com/tiddlers/readme/ReadMe.tid index 1d025b371..efbe009c3 100644 --- a/editions/tw5.com/tiddlers/readme/ReadMe.tid +++ b/editions/tw5.com/tiddlers/readme/ReadMe.tid @@ -3,7 +3,7 @@ modified: 20140920135213536 title: ReadMe type: text/vnd.tiddlywiki -\define tv-wikilink-template() http://tiddlywiki.com/static/$uri_doubleencoded$.html +\define tv-wikilink-template() https://tiddlywiki.com/static/$uri_doubleencoded$.html <$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> @@ -11,9 +11,9 @@ Welcome to TiddlyWiki, a non-linear personal web notebook that anyone can use an TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText. -Learn more and see it in action at http://tiddlywiki.com/ +Learn more and see it in action at https://tiddlywiki.com/ -Developer documentation is in progress at http://tiddlywiki.com/dev/ +Developer documentation is in progress at https://tiddlywiki.com/dev/ ! Installing TiddlyWiki on Node.js diff --git a/editions/tw5.com/tiddlers/readme/ReadMeBinFolder.tid b/editions/tw5.com/tiddlers/readme/ReadMeBinFolder.tid index c7aaae0e0..0d85a99b1 100644 --- a/editions/tw5.com/tiddlers/readme/ReadMeBinFolder.tid +++ b/editions/tw5.com/tiddlers/readme/ReadMeBinFolder.tid @@ -3,5 +3,5 @@ modified: 20140908150853120 title: ReadMeBinFolder type: text/vnd.tiddlywiki -\define tv-wikilink-template() http://tiddlywiki.com/static/$uri_doubleencoded$.html +\define tv-wikilink-template() https://tiddlywiki.com/static/$uri_doubleencoded$.html {{Scripts for TiddlyWiki on Node.js}} diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.10.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.10.tid index a224a3a14..3b72acd96 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.10.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.10.tid @@ -88,7 +88,7 @@ Revert * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/7b8928886bf101b0cf4a8cc2d2dd2e576ec1c8d8]] new utility method `$tw.utils.tagToCssSelector(tagName)` for converting tag titles into a form suitable for matching the `tc-tagged-*` [[classes generated by TiddlyWiki|How to apply custom styles by tag]] * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/99df9f46f7cc4c1d3aa0320347f9b6c1bc458c60]] support for tiddlers containing mp4 videos * [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/fd997c45814e6bb5b576137bf62bad5575b0a28c]] the ActionSetFieldWidget to enable it to be used to delete a field or indexed property -* [[Made|https://github.com/Jermolene/TiddlyWiki5/commit/746aab2cf6bbe3c1905efd5caf80e40e23b914b0]] the tw5.com documentation available as a plugin and an [[edition|http://tiddlywiki.com/editions/tw5.com-docs/index.html]], simplifying some scenarios for re-using it +* [[Made|https://github.com/Jermolene/TiddlyWiki5/commit/746aab2cf6bbe3c1905efd5caf80e40e23b914b0]] the tw5.com documentation available as a plugin and an [[edition|https://tiddlywiki.com/editions/tw5.com-docs/index.html]], simplifying some scenarios for re-using it * [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/0035a0046315ee0203b1adfb75efdbb0e854a7f6]] rendering of "More" sidebar tab gradients in the "Snow White" theme * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/33563d01baed4b4092fc834eb6a1df55e1671418]] option in [[control panel|$:/ControlPanel]] to enable the display of detailed performance instrumentation in the browser developer console * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/bc0cbf907063ccd484da7d56c8e42cf5e90489b8]] a LazyLoading template for all non-system tiddlers diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.14.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.14.tid new file mode 100644 index 000000000..57a2cc6f7 --- /dev/null +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.14.tid @@ -0,0 +1,194 @@ +caption: 5.1.14 +created: 20170426160031661 +modified: 20170426160031661 +released: 20170426160031661 +tags: ReleaseNotes +title: Release 5.1.14 +type: text/vnd.tiddlywiki + +//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.13...v5.1.14]]// + +!! New and Improved Plugins + +* Added [[SaveTrail Plugin]] that continuously downloads edited tiddlers in the background, providing a trail of backups +* Added XLSX Utilities plugin for importing Excel-compatible spreadsheets. See the [[XLSX Utilities Edition]] for details +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/22c1b04ee79a5ccc25cbc33cc91bf5daac1df831]] QR code generator plugin +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/7f11c151f06cd039d1887a6940075237ccb4b7a9]] ~BibTeX importer plugin +* [[Updated|https://github.com/Jermolene/TiddlyWiki5/commit/c16f96626e2ff9d849563eeba7d8ef5cf8e4ed4b]] Google Analytics plugin to the latest version +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/e30330d4be0e0b9b04ea807a034c8d9fa3d13fea]] [[Twitter Plugin]] for embedding tweets etc +* [[Updated|https://github.com/Jermolene/TiddlyWiki5/commit/c0f7f18f0a268087e51813bfbba1b796478d0bb1]] [[KaTeX Plugin]] to [[v0.7.1 of KaTeX|https://github.com/Khan/KaTeX/releases]] + +!! Improved Support for Drag and Drop + +There are several improvements to [[Drag and Drop]]: + +* Ability to rearrange the "Open" sidebar panel and the tag dropdown (and new tiddlers can be opened by dragging them to the list) +* Ability to reorder entries in tag dropdowns +* Dragging a tag pill is now equivalent to dragging all of the tagged tiddlers together +* Entries in the control panel "Appearance"/"Toolbars" tab can be reordered by drag and drop +* The image shown while dragging now reflects the dragged item, instead of being a generic drag pill + +!! New "Heavier" Theme + +A new theme called "Heavier" thickens TiddlyWiki's default lightweight fonts. A variant "Tight-Heavier" combines the "Heavier" theme with the existing "Tight" theme: + +<$button> +<$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/heavier"/> +Try out the "Heavier" theme +</$button> <$button> +<$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/tight-heavier"/> +Try out the "Tight-Heavier" theme +</$button> <$button> +<$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/snowwhite"/> +Revert +</$button> + +!! New Tiddler Manager + +[[Added|https://github.com/Jermolene/TiddlyWiki5/commit/16bb65d17f5a20a0076320c6b1305b7b139d7375]] new [[tiddler manager|$:/Manager]] to support tasks such as: + +* Reviewing and applying tags to a large number of tiddlers +* Tweaking the custom colours and icons for a large number of tiddlers + +The tiddler manager will be extended in the future to increase flexibility and to add support for bulk operations. + +!! Performance Improvements + +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/989cee50594a76a0f30d1d2124ce9e5e5808c6cf]] search mechanism to require the search string to be a minimum length + +!! Translation Improvements + +* [[Improvements|https://github.com/Jermolene/TiddlyWiki5/tree/master/languages]] to Danish, Dutch, French, German, Portuguese and Chinese translations +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b96377099a7377e4c77582800cac78103a08b066]] new Hebrew translation +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/e20bce5450f40c8db891893fa0674c493bba7f11]] preliminary support for right-to-left (RTL) languages + +!! Usability Improvements + +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/3197f9a639761e1e56b2f5b18b5f7cf5c3d992da]] a select all/none checkbox to the header of the import panel +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/2072]] "close plugin library" button +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/2592]] support for adding tags using the <kbd>enter</kbd> key +* [[Improved|https://github.com/Jermolene/TiddlyWiki5/pull/2590]] handling of <kbd>ctrl-Enter</kbd> to add partially completed tags and fields +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/e8bb897e263feea1a671ce035af68d0c6bc246b5]] support for relinking references to renamed tiddlers +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/0b76c327c217251e2eb8e318e3f2d4637192581a]] new "print page" page control button {{$:/core/ui/Buttons/print}} (and [[added|https://github.com/Jermolene/TiddlyWiki5/commit/c4e13bc94afb022e40aaa70b06464084188acfea]] associated [[icon|$:/core/images/print-button]]) +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/d1121787c090ec8f5fc592b83c3dbad1075fe0ec]] new page control button to temporarily suspend timestamps {{$:/core/ui/Buttons/timestamp}} +* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/7a6d7e2a1567ce04330939b3926b21b88796b4c9]] access to plugin information: +** Refactored the display of plugin tiddlers to use the same format as the control panel, adding the shadow tiddler listing as an overridable extension tab +** Added a new tab in the “More” sidebar providing quick access to all installed plugins +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2616]] height of preview pane to use a scrollbar when fixed height layout is selected +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/4eed18496fe2f4f67ad6a382b813b5c5371d3930]] editor "link" button to create external links and missing links +* [[Increased|https://github.com/Jermolene/TiddlyWiki5/commit/2d9aa12aa867d1b7c983e21de2ed60abf6f5a1bc]] size of icons in the "Filter" tab of $:/AdvancedSearch +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2381]] problem with multiple copies of a tiddler appearing in the story river +* [[Improved|https://github.com/Jermolene/TiddlyWiki5/pull/2585]] dropdown for new field names with typeahead search +* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/c02c3a06e09baaa7746a26dffebb97ef8ec1ff6e]] the ordering of groups in the tiddler editor content type dropdown +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b3273bcbda6bcb9f3a0670b79ea598c3674c5012]] "sticky" mode for tiddler info panel. See "Settings" in [[control panel|$:/ControlPanel]] +* [[Increased|https://github.com/Jermolene/TiddlyWiki5/commit/5bf238fc8698a6b750dd0f577ab745a4db714a17]] boldness of tag pill text +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/ee66d1a1afb939c0cba8c2257b8300921831c716]] documentation marker to indicate the version in which a new feature was released +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b1a5afbf158fab9e224978c81a10aca15d30d91a]] an entry to the advanced search filter drop down for exporting the current story (minus advanced search) + +!! New and Improved Filter Operators + +* [[Added|https://github.com/Jermolene/TiddlyWiki5/issues/2767]] new [[enlist Operator]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b4b77d1681023d4ccc0e157df1ce67d0d388cd5a]] several new filter operators for string encoding/decoding: +** [[decodehtml Operator]] +** [[decodeuri Operator]] +** [[decodeuricomponent Operator]] +** [[encodehtml Operator]] +** [[encodeuri Operator]] +** [[encodeuricomponent Operator]] +** [[escaperegexp Operator]] +** [[stringify Operator]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/ffcbcbfa82cb8f1044c57967117aeae0978579f0]] new [[minlength Operator]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/9a386421414aacd23e21bc9cb1a116b905fb39ff]] new [[order Operator]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/c65d08240b1f69078c8b3129cb9b00df56ada1d3]] strict mode to [[tag Operator]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/a3dc3b4b98f424d12019550df52639224100316f]] new ''tags'' option to the [[all Operator]] +* [[Changed|https://github.com/Jermolene/TiddlyWiki5/commit/c460cc03a49be2c41157814f5a1fc25c4bc3fe41]] [[is Operator]] to pass through arguments if the operand is blank +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/2066]] "field" suffix for [[has Operator]] +* [[Improved|https://github.com/Jermolene/TiddlyWiki5/pull/2193]] [[wikiparserrules Operator]] to return all available parse rules + +!! Hackability Improvements + +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/d9f301f7556ce899840dab0ebc31c040d9c7a72b]] support for "formattedtext" output type to the WikifyWidget +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/a20da9f5303fdd52a54d61b231450c2aa35d3804]] a saver for the peer-to-peer Beaker browser; see [[TiddlyWiki on Beaker Browser]] for details +* [[Refactored|https://github.com/Jermolene/TiddlyWiki5/commit/f07e0f981a1cded691227146e0281f7c4f06d55c]] the tag templates and macros to make them more reusable +* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/87fa7f972cae859c466dea8a531d50f060e7d910]] modals and notifications so that global macros are available +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/b35544bf4946596e60f7b0c7f0a55fa490ac2a24]] the SetWidget to allow a single result to be selected from a filtered result list +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/2f590a365e5b6bfecc1170fdbeaaf398795a2feb]] new `$:/info/url/*` [[information tiddlers|InfoMechanism]] providing document location information +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/3bceb98119c6f1fbbed76c977c601a930b0bcac9]] support for the ''actions'' attribute to the CheckboxWidget +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/pull/2104]] CheckboxWidget to support data tiddlers via the `index` attribute +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b1a5afbf158fab9e224978c81a10aca15d30d91a]] new entry to the advanced search filtered export menu for exporting the current story river +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/1b339e17bc0c67ff7eb3e8f7f299588ecf8848ee]] `tag` attribute to the KeyboardWidget +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/2614]] overwrite protection to the ~WebDAV saver +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/202ffd9c51d71b469eff968ae63b56a985a3c6bf]] new "big block quote" style for [[Block Quotes in WikiText]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/c25a44756b1a4a08a29fbe02a908ef57a6a193bf]] customisable template text for new journal tiddlers, accessible the control panel +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/779e62a30fc5e61cee893eabc0f268e7fb959639]] support for `.json` tiddler files containing a single tiddler object, instead of an array of tiddlers + +!! Node.js Improvements + +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commits/master/plugins/tiddlywiki/filesystem/filesystemadaptor.js]] multiple issues the creation of new tiddler files by the filesystem adaptor +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/0d0ece63777a22422ab2ddae7dee996b28f62c5e]] new FetchCommand for retrieving tiddlers over http/https +* [[Enhanced|https://github.com/Jermolene/TiddlyWiki5/commit/6f93ce6ea790427fe1e6e11a062d64f14449bfa3]] RenderTiddlerCommand to add support for an additional variable + +!! Bug Fixes + +* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/b1ecf81b0c0727db2245cfeba78cc46a33c3a814]] Node.js support for the HighlightPlugin +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/2650]] problem with recursion errors in the [[Table-of-Contents Macros]] +* [[Prevented|https://github.com/Jermolene/TiddlyWiki5/commit/f97c1226aac9f3a5b563fc8d95bfeff91b8ab810]] email addresses from being mis-recognised as HTML tags +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/2572]] issue with `$tw.utils.strEndsWith()` +* [[Partially fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2599]] problem with action widgets being invoked independently of refresh cycle +* [[Revised|https://github.com/Jermolene/TiddlyWiki5/issues/2522]] handling of `syncAdaptor.isReady()` method to improve compatibility with older adaptors +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2517]] problem with unsafe use of `String.prototype.replace()`, corrupting fields containing dollar signs +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/8b60dbb81d3495aa8be1f160e4f31bcae995f400]] problem with page background colour not showing through transparent background images +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2514]] sync problem with skinny tiddlers not being loaded +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/06b7de415cd2cef3848f2ef2516200ee79afd130]] problem with "Cancel" button in login dialogue also submitting the form +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2579]] typo affecting created/creator fields when deleting a field +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2595]] issue with system links containing international characters not being recognised +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2076]] issue with single line macro definitions without a terminating line break +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/cf28eeb2a120fe3f263235c35fe5603013f88049]] issue with empty strings and the CheckboxWidget +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/b759d82f4ce2bf44da0bcce0c08550870f3216f8]] problem with calculation of week numbers +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2312]] problem with [[move Operator]] not wrapping correctly +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/f0ff1f993e94d6928f0aa249b7f6f5e5624ebb69]] problem preventing customisation of textarea background colours + +!! Developer Bug Fixes and Improvements + +* [[Updated|https://github.com/Jermolene/TiddlyWiki5/commit/25b2e846cea0f560b259296263a98e3287e5f311]] Stanford JavaScript Library to version v1.0.6 +* [[Updated|https://github.com/Jermolene/TiddlyWiki5/commit/c16f96626e2ff9d849563eeba7d8ef5cf8e4ed4b]] Google Analytics plugin to latest version of Google's code +* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/3c715c5e0d1117ca32760d4da6578cd27af06172]] Common/JS compatibility by adding support for implicitly adding `/index.js` to a require target +* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/1b41b4468495bbe66f99345ee94a67346176deb7]] support for bulk loading tiddler files via [[tiddlywiki.files Files]] within TiddlyWikiFolders +* [[Refactored|https://github.com/Jermolene/TiddlyWiki5/pull/2627]] server mechanism to make it simpler to integrate TiddlyWiki into [[ExpressJS|http://expressjs.com/]] apps +* [[Refactored|https://github.com/Jermolene/TiddlyWiki5/pull/2626]] the TiddlyFox saver module to make it easier to use it with other saving mechanisms +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/2397f0aa6f7af305807b61ccb1d435c2e6a789ab]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/daf703b67fae0dd029eeaa4317b721fa8c284648]]) several new UI hooks, and [[improved|https://github.com/Jermolene/TiddlyWiki5/commit/6b2ab9072111cb87508f83a385b0885fb196cbcf]] the hook mechanism; see <a href="./dev/index.html#:[search:title[hook]]" target="_blank">developer docs</a> + +! Contributors + +[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki: + +* [[@beniquezsd|https://github.com/beniquezsd]] +* [[@BramChen|https://github.com/BramChen]] +* [[@crypdick|https://github.com/crypdick]] +* [[@danielo515|https://github.com/danielo515]] +* [[@dedioste|https://github.com/dedioste]] +* [[@DoronTzur|https://github.com/DoronTzur]] +* [[@duarteframos|https://github.com/duarteframos]] +* [[@FND|https://github.com/FND]] +* [[@gernert|https://github.com/gernert]] +* [[@hchaase|https://github.com/hchaase]] +* [[@ibnishak|https://github.com/ibnishak]] +* [[@jest|https://github.com/jest]] +* [[@jrgetsin|https://github.com/jrgetsin]] +* [[@nameanyone|https://github.com/nameanyone]] +* [[@Marxsal|https://github.com/Marxsal]] +* [[@mklauber|https://github.com/mklauber]] +* [[@nmota|https://github.com/nmota]] +* [[@pmario|https://github.com/pmario]] +* [[@roma0104|https://github.com/roma0104]] +* [[@Serj-Aleks|https://github.com/Serj-Aleks]] +* [[@stevesunypoly|https://github.com/stevesunypoly]] +* [[@sukima|https://github.com/sukima]] +* [[@sycom|https://github.com/sycom]] +* [[@tejjyid|https://github.com/tejjyid]] +* [[@telmiger|https://github.com/telmiger]] +* [[@tobibeer|https://github.com/tobibeer]] +* [[@twMat|https://github.com/twMat]] +* [[@xcazin|https://github.com/xcazin]] +* [[@zakrec|https://github.com/zakrec]] + \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.15.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.15.tid new file mode 100644 index 000000000..a3db96697 --- /dev/null +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.15.tid @@ -0,0 +1,86 @@ +caption: 5.1.15 +created: 20170426172144552 +modified: 20171113161124237 +released: 20171113161124237 +tags: ReleaseNotes +title: Release 5.1.15 +type: text/vnd.tiddlywiki + +//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.14...v5.1.15]]// + +!! New and Improved Plugins + +* New [[Amazon Web Services Plugin]] with primitives for running TiddlyWiki in the cloud +* New [[External Attachments Plugin]] that allows automatic creation of [[ExternalImages]] for TiddlyDesktop + +!! Translation Improvements + +New and improved translations: + +* New Persian translation +* Updated Chinese and Greek translations + +Another improvement that benefits users of translations is the addition of about 800 new //transliteration pairs//. These are substitutions that are performed when converting a tiddler title into a filename, such as the two characters "oe" for the single character "œ". See [[the commit|https://github.com/Jermolene/TiddlyWiki5/commit/5cdf86b3072604f8c556c84f266767be5b8e75c3]] for more details. The result is that automatically generated filenames are much more readable. + +!! Usability Improvements + +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/1e9d214f67906e63758f8665091bc0ef6651f10d]] new "Explorer" tab to "More" sidebar and underlying [[tree Macro]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/cee7baa1831a8f236c46d8c438c2a4d9bda8a0e2]] configuration option in [[theme tweaks|$:/themes/tiddlywiki/vanilla/themetweaks]] for the editor font + +!! Hackability Improvements + +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/aa417fe899d0983ad8a3fe1fdfe9cac42364b2b6]] new [[lookup Operator]] to simplify use of lookup tables +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/5dd3d97760083f7c6ba9a6cd6186525edb3fb836]] the SetWidget with ''tiddler'', ''field'' and ''index'' attributes +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/d966583854d7c7f4a7df25c0e2a8d6b9e217a12c]] new ''whitespace'' [[Pragma]] allowing whitespace to be selectively ignored within wikitext +* [[Updated|https://github.com/Jermolene/TiddlyWiki5/commit/ef9efbc3995248d72148423bee10a1374c842926]] support for saving in [[Beaker Browser]] +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/4db950cc450ef1ea87ce8f480fe882f2b108cdb4]] [[date formatting|DateFormat]] to support milliseconds and UTC dates +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/dc295b2536cdf411893e15b6dc0d62107f50a08d]] LinkCatcherWidget to make the target tiddler available within the action string +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/596dfa1d5058e030a318e4a0f23d078500c3d154]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/a4d919f45caae393f99018e0d797980b3667867f]]) the DropzoneWidget and BrowseWidget to allow the deserializer to be manually specified +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/523280362b529ee73229001a1bcd79272f483908]] new `tc-btn-*` classes to toolbar buttons allowing easier custom styling +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/8293a77c6e6870960956dcf1501c687d2f88ea3c]] new ''mode'' attribute to the ViewWidget, allowing control over the parsing mode for wikified output formats +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/d7a6816307f4fd47df29cb8e0343ea39c079a2b0]] new [[jsonstringify Operator]] + +!! Node.js Improvements + +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/35a7a66b019f2ea0532ba65cd5475f5cfe46a860]] SaveCommand and RenderCommand, intended as more flexible replacements for RenderTiddlerCommand, RenderTiddlersCommand, SaveTiddlerCommand and SaveTiddlersCommand +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/51b1ead5c9aa5a754e7fdc0bfbf241dd98db5f7c]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/1b7d9d65f42e77fdceb11b0b0b9ab9a63f6762e9]]) more colour to command line output +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/c179dc93cbd8947f92a8007d28c497b70efc4204]] new "raw" options to the FetchCommand +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/e951047461c3c2c273484a759ce5fc2c388fb684]] new ImportCommand + +!! Bug Fixes + +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/2821]] problem with "new journal" button clearing the text field +* [[Removed|https://github.com/Jermolene/TiddlyWiki5/commit/c069d48a2a690b333c0733328f3574ae8a76e435]] extraneous URI encoding of filename with PUT saver +* [[Restored|https://github.com/Jermolene/TiddlyWiki5/pull/2940]] ability to use sub-filter with image-picker macro +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/ccac0258af9b6d8c93d41b1f170e20dbf2efe3f3]] problem with the download saver and filenames containing spaces, accents or other characters that need URL encoding +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2850]] problem with importing JSON tiddlers with leading or trailing spaces in the title +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/683285d44943db2d993bd574ed2d2f8a07dfc816]] plugin display so that "contents" tab is shown even if no other tabs are provided +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/2842]] problem with `allbefore:include` filter operator +* [[Updated|https://github.com/Jermolene/TiddlyWiki5/commit/e471bd54d42226d3b6d070b8561f8883f44df68a]] Update Stanford JavaScript Library to version 1.0.7 + +!! Developer Bug Fixes and Improvements + +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/0bc325025a61c265dafe7ce8750ea8deed2be51b]] `$tw.boot.boot()` to add a callback parameter +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/d89010752a8b169a4917bde9a9028ddd871e743d]] navigation handling to pass original event data +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/518f57f4bbc747c3675260eb3ffde1dc7468c805]] new `th-importing-files` hook + +! Contributors + +[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki: + +* [[@0mp|https://github.com/0mp]] +* [[@Arlen22|https://github.com/Arlen22]] +* [[@BramChen|https://github.com/BramChen]] +* [[@cjhunt|https://github.com/cjhunt]] +* [[@danielo515|https://github.com/danielo515]] +* [[@hoelzro|https://github.com/hoelzro]] +* [[@Marxsal|https://github.com/Marxsal]] +* [[@maxthomax|https://github.com/maxthomax]] +* [[@morosanuae|https://github.com/morosanuae]] +* [[@pmario|https://github.com/pmario]] +* [[@rubaboo|https://github.com/rubaboo]] +* [[@saqimtiaz|https://github.com/saqimtiaz]] +* [[@telmiger|https://github.com/telmiger]] +* [[@twMat|https://github.com/twMat]] +* [[@xcazin|https://github.com/xcazin]] + \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.16.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.16.tid new file mode 100644 index 000000000..03754dbb6 --- /dev/null +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.16.tid @@ -0,0 +1,156 @@ +caption: 5.1.16 +created: 20171114142602640 +modified: 20180425155658451 +released: 20180425155658451 +tags: ReleaseNotes +title: Release 5.1.16 +type: text/vnd.tiddlywiki + +//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.15...v5.1.16]]// + +!! Improved ~CodeMirror Plugins + +The ~CodeMirror plugin has undergone a substantial rewrite, with many new improvements: + +* Upgrade to ~CodeMirror version v5.37.0 +* Now modularised into: +** Base plugin: basic lightweight configuration, approximately 240KB +** Add-on plugins: +*** Search and Replace +*** Auto-completion +*** Fullscreen editing +*** Auto-close brackets +*** Auto-close tags +*** ~SublimeText keymap +*** Emacs keymap +*** Vim keymap +*** Highlighting modes: Javascript, Xml, Html (htmlmixed), Html (htmlembedded), Css, Markdown, X-Tiddlywiki +* Automatic configuration (the configuration tiddler is not needed anymore) +*** ~CodeMirror (engine.js) builds the configuration using information within the installed ~CodeMirror plugins +* New control panel configuration tab: +** Line numbers +** Theme: +*** Editor font family (same as native TiddlyWiki) +*** Cursor settings +*** Line wrapping +** Active line highlighting +*** Autocompletion on/off (if installed) +** Keymap + +!! Other New and Improved Plugins + +* New [[Dynaview Plugin]] makes it possible to build user interfaces that dynamically respond to changes in scrolling or zooming +* Improved [[Text-Slicer Plugin|Text-Slicer Edition]] with customisable JSON rules +* Updated [[KaTeX Plugin]] to latest v0.9.0 + +!! Translation Improvements + +New and improved translations: + +* New Slovenian translation +* New Português (Brasil) translation +* Improved Dutch translation +* Improved French translation +* Improved German translation +* Improved Traditional and Simplified Chinese translations +** These translations now also reset the minimum search length to one character + +!! Privacy Improvements + +Prompted by the [[General Data Protection Regulation (GDPR)|https://en.wikipedia.org/wiki/General_Data_Protection_Regulation]], we've [[removed all third party cookies from tiddlywiki.com|https://github.com/Jermolene/TiddlyWiki5/pull/3106]]. + +!! Usability Improvements + +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/3112]] new DiffTextWidget, and integrated it into the import listing and as a preview pane +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/9e03264ebe141a5dc4d37dcb62f3bbf2f740d983]] selectable previews to the import listing +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/3155]] new editor toolbar buttons for wrapping the selection with double square and curly brackets +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/3134]] new [[sortan Operator]] for sorting alphanumeric values such as "Apple 6", "Apple 7", "Apple 8", "Apple 9", "Apple 10", "Apple 20", "Apple 30", "Apple 100" +* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/da0ffce2d66f16ad14587fbe58b8d7a5c8d36657]] default fonts for readability as advised by [[GitHub|http://markdotto.com/2018/02/07/github-system-fonts/]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/3131]] an editor toolbar button for stamping fragments of formulae for the [[KaTeX Plugin]] +* [[Simplified|https://github.com/Jermolene/TiddlyWiki5/commit/1c8170463c80a18c0753783aa0b32a0ff2f9028c]] the page scrolling behaviour: navigating to a tiddler now scrolls the top of the tiddler to the top of the viewport +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/d2ff164c07788818ded9826c9e3811599272e69c]] [[WidgetMessage: tm-copy-to-clipboard]] and [[also|https://github.com/Jermolene/TiddlyWiki5/commit/1b6a06a4d79ad5c58593a7844e306c25848979ea]] [[copy-to-clipboard Macro]] for copying text directly to the clipboard +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/3040]] a hint to the field list dropdown +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/3135]] a control panel setting for the default tab in the More sidebar +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/3149]] a control panel setting for the titles of new tiddlers +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/c0569849d22f99623423d349c0d96ecae11ffbe8]] "rotate left" button to bitmap editor toolbar +* [[Improved|https://github.com/Jermolene/TiddlyWiki5/pull/3180]] criteria under which certain editor toolbar buttons are displayed +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/3190]] support for a minimum length for the new tag field before the dropdown is shown +* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/02529a51d0be47477e62cd52dd5e4989a4993663]] consistency and reusability of the palette, language and theme switchers +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/ea763d0eaba7edf928ae247563deb95278504e9f]] support for retaining tab content in the [[tabs Macro]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/2703]] support for adding links via the <kbd>enter</kbd> key + +!! Hackability Improvements + +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/033feda02d7f5cdf27a9393b8229f22219cdab88]] support for comparison operators to the RevealWidget +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/1c6942402ee7b6d938f01bad23130ebe75b109f2]] support for StartupActions to execute action widgets at startup +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/f4fd5e76f8da8555bb9056725f11e0c0c91649f7]] ServerCommand to allow the port number to be specified as an environment variable +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/28e713caac1582e30b9ab8f7364ac8a564f4ffd7]] screen width/height to [[platform information exposed at startup|InfoMechanism]] +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/pull/3167]] DroppableWidget to pass modifier keys in a variable +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/pull/3203]] DraggableWidget with actions for drag start and drag end +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/7cb54f32c6ee2d98f3f13ddda39f92281d419afd]] a new [[TaskManagementExample (Draggable)]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/460a07ca03a501009530a57352d6bec0e3cf49cd]] new 'Stylesheets' tab to control panel +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b4c7c59d5d1bc5282fcfed58abbf087b9f65b86c]] new 'emptyMessage' parameter to [[list-links Macro]] and [[list-tagged-draggable Macro]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/de4eb5ca89132db136c8f5fb3103f289f25fe98a]] new `th-page-refreshed` hook +* [[Enhanced|https://github.com/Jermolene/TiddlyWiki5/pull/3063]] macro evaluation by making parameters available as variables - see "Parameters as Variables" in [[Macro Definitions in WikiText]] +* [[Enhanced|https://github.com/Jermolene/TiddlyWiki5/pull/3052]] LinkWidget to allow better customisation of CSS classes +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/3124]] new "value" suffix for the [[each Operator]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/0d354fe57f7424c1751a5c0cf5fbf1203803f3c8]] new ''subtiddler'' attribute to the SetWidget +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/47cdf5513391742c3410bb80b36107ab17b0476d]] new [[subtiddlerfields Operator]] for extracting the fields from tiddlers within plugins +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/3182]] ability to trigger actions on unchecking the CheckboxWidget +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/2182]] support for a checked class to the RadioWidget +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/pull/2982]] the [[is Operator]] to allow multiple types to be specified +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/3209]] data attributes to ViewTemplate (see [[Custom data-styles]]) +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/2988]] new RangeWidget + +!! Bug Fixes + +* [[Removed|https://github.com/Jermolene/TiddlyWiki5/pull/3043]] superfluous list item at the end of list-links-draggable macro +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/7e71fcfab80bed9aed4389eea386fb2036cc4a85]] problem with the content area of vertical tabs sometimes overflowing their right hand margin +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3079]] problem with double quotes within the new journal template +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3070]] problem with dragging inside a textarea +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3099]] usage of "default" attribute of SelectWidget when "index" attribute is used +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3093]] problem with crash when dragging over TiddlyWiki on some browsers +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3079]] issue with new journal button +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3164]] problem with ''filter'' and ''value'' attributes of SetWidget +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3190]] problem with numeric operands in the [[The Extended Listops Filters]] +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/df1f7e9798b5f6c3d2c3fd82e438cbc9713ade04]] problem with "put" saver and 412 return codes +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3048]] problem with variable references in field values in the edit template +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/pull/3219]] behaviour of list-after field so that the tiddler is placed at the end of the list if the list-after field is present but empty + +!! Developer Bug Fixes and Improvements + +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/1dc764764055243acd07d0c4f480e6e912be6870]] ''plugin-priority'' field to core plugins +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3113]] problems with plugin ordering +* Several optimisations to the tiddler store: +** [[Avoiding slow Object.keys calls|https://github.com/Jermolene/TiddlyWiki5/commit/254e1ca7f7a5fe9d2deef72692ada2b7637f34ce]] - saving 50% of some operations +** [[Optimising the tag filter|https://github.com/Jermolene/TiddlyWiki5/commit/e4b10d42f9480c0505862a93f0b97d1c4270ed65]] - saving 50% on some tag operations +** [[Minor improvements to tiddler deletion|https://github.com/Jermolene/TiddlyWiki5/commit/358d4165260311446f2b433591762dd667250975]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/2990]] support for custom boot paths +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/3206]] new navigation hooks: `th-cancelling-tiddler`, `th-new-tiddler` and `th-renaming-tiddler` +* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/3024]] new hook when the HTTP server starts `th-server-command-post-start` + + +! Contributors + +[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki: + +* [[@alexhough|https://github.com/alexhough]] +* [[@anavarre|https://github.com/anavarre]] +* [[@BramChen|https://github.com/BramChen]] +* [[@BurningTreeC|https://github.com/BurningTreeC]] +* [[@diego898|https://github.com/diego898]] +* [[@flibbles|https://github.com/flibbles]] +* [[@furicle|https://github.com/furicle]] +* [[@gernert|https://github.com/gernert]] +* [[@ibnishak|https://github.com/ibnishak]] +* [[@inmysocks|https://github.com/inmysocks]] +* [[@Marxsal|https://github.com/Marxsal]] +* [[@metebalci|https://github.com/metebalci]] +* [[@mklauber|https://github.com/mklauber]] +* [[@pmario|https://github.com/pmario]] +* [[@Skeeve|https://github.com/Skeeve]] +* [[@TheDiveO|https://github.com/TheDiveO]] +* [[@tobibeer|https://github.com/tobibeer]] +* [[@twMat|https://github.com/twMat]] +* [[@xcazin|https://github.com/xcazin]] + \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.17.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.17.tid new file mode 100644 index 000000000..99cc96e52 --- /dev/null +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.17.tid @@ -0,0 +1,49 @@ +caption: 5.1.17 +created: 20180512104329616 +modified: 20180512104329616 +released: 20180512104329616 +tags: ReleaseNotes +title: Release 5.1.17 +type: text/vnd.tiddlywiki + +//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.16...v5.1.17]]// + +!! Reversions + +After encountering significant problems we've reluctantly decided to [[remove support|https://github.com/Jermolene/TiddlyWiki5/commit/737e9ae4cb136ca3f473624f64142bd83e532b9b]] for multiple sub-operators with the [[is Operator]] that was added in v5.1.16. + +!! Usability Improvements + +* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/7468ad7acf1ca2280ad89ee014484928e160f54b]] appearance of ~TiddlyWiki's "red screen of embarrassment" + +!! Bug Fixes + +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/e6466b2c320cdab46a74aa343b6c56c5783e3f94]] problem with extraneous space in new journal titles +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/b95aa6ec6ad51672e9ed26ab94d7fe799698782c]] problem with repeated use of "new journal" with text set +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/f9be417204695d26d5f458fbc53870b2adb9a372]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/46e8e4343acba876b9540b9fc77a5c85faa10939]]) problem with Etag handling +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3240]] problem with [[is Operator]] introduced in 5.1.16 +* [[Restored|https://github.com/Jermolene/TiddlyWiki5/commit/b2173d11ea550ba4a5f2fd89b1388b392e37dd51]] default of the preview pane being hidden +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/3245]] incorrect plugin library location +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3226]] animation timing problem with reveal widget that sometimes caused the sidebar not to show when requested +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/3244]] problem with saving with non-Dat URI schemes +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/4c89bbabbe5f5665e92258b560ed7380ae06d9e8]] deletion of `$:/status/UserName` when logged out + +!! Node.js Improvements + +* [[Stopped|https://github.com/Jermolene/TiddlyWiki5/pull/2893]] clearing [[$:/status/UserName]] when logged out +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/ab5e5795e88892b5687885c8ead8d6959082399b]] bug with attempting to lazy load tiddlers that do not qualify for syncing +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/2c7f467514cb75aefa87912620575deabde1a530]] support for `/*\` style metadata comments at the top of `*.CSS` files + +! Contributors + +[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki: + +* [[@BramChen|https://github.com/BramChen]] +* [[@BurningTreeC|https://github.com/BurningTreeC]] +* [[@danielo515|https://github.com/danielo515]] +* [[@icarito|https://github.com/icarito]] +* [[@ldorigo|https://github.com/ldorigo]] +* [[@mklauber|https://github.com/mklauber]] +* [[@sukima|https://github.com/sukima]] +* [[@tobibeer|https://github.com/tobibeer]] +* [[@twMat|https://github.com/twMat]] diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.5.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.5.tid index 462fad812..4d19b0be1 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.5.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.5.tid @@ -43,7 +43,7 @@ released: 20141126153016142 * [[Updated|https://github.com/Jermolene/TiddlyWiki5/commit/8260d000be1cf1caf35a557f6cd54a0fb8ccf4f0]] the <<.olink search>> operator to allow a field to be specified * [[Updated|https://github.com/Jermolene/TiddlyWiki5/commit/73491f14dd63612d527632210d2c3873eb81188f]] the highlight plugin to display tabs as spaces * [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/91a7c397911726e391ca368f96b50fbe1687d56a]] modal handling to permit variables to be passed to the modal (see [[WidgetMessage: tm-modal]]) -* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/853f5fd06402b16e271e8f119ef380de485aeff2]] simple logging to help track down drop/paste issues (see http://tiddlywiki.com/dev/#ImportLogging) +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/853f5fd06402b16e271e8f119ef380de485aeff2]] simple logging to help track down drop/paste issues (see https://tiddlywiki.com/dev/#ImportLogging) * [[Updated|https://github.com/Jermolene/TiddlyWiki5/commit/b520efdeb83f6ac7536a69cf5af2bab3f94cf77f]] [[WidgetMessage: tm-download-file]] and [[WidgetMessage: tm-save-wiki]] to allow variables to be specified for the rendering * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/f5055c0205d24102a36b9cf3a9dd9306e148a1f0]] [[Example Table of Contents: Tabbed Internal]] * [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/79e428757b5562bd4a925b9b0428ea4ba70ad05a]] RevealWidget so that it can be used without specifying a state tiddler diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid index f3e4eb654..8ab977572 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid @@ -6,6 +6,10 @@ title: Release 5.1.9 type: text/vnd.tiddlywiki released: 20150703153725652 +\define custom-colour-picker(tiddler,colour) +<$edit-text tiddler="""$tiddler$""" index="""$colour$""" type="color" tag="input"/> +\end + //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.8...v5.1.9]]// ! Major Improvements @@ -52,12 +56,12 @@ An experimental new tiddler toolbar button opens a single tiddler in a separate <$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/vanilla"/> <$action-setfield $tiddler="$:/palette" text="$:/palettes/ContrastDark"/> Dark palette -</$button>. Foreground: <<colour-picker "$:/palettes/ContrastDark" "foreground">>, Background: <<colour-picker "$:/palettes/ContrastDark" "background">> +</$button>. Foreground: <<custom-colour-picker "$:/palettes/ContrastDark" "foreground">>, Background: <<custom-colour-picker "$:/palettes/ContrastDark" "background">> ** <$button> <$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/vanilla"/> <$action-setfield $tiddler="$:/palette" text="$:/palettes/ContrastLight"/> Light palette -</$button>. Foreground: <<colour-picker "$:/palettes/ContrastLight" "foreground">>, Background: <<colour-picker "$:/palettes/ContrastLight" "background">> +</$button>. Foreground: <<custom-colour-picker "$:/palettes/ContrastLight" "foreground">>, Background: <<custom-colour-picker "$:/palettes/ContrastLight" "background">> ** <$button> <$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/snowwhite"/> <$action-setfield $tiddler="$:/palette" text="$:/palettes/Vanilla"/> diff --git a/editions/tw5.com/tiddlers/releasenotes/TiddlyWiki Releases.tid b/editions/tw5.com/tiddlers/releasenotes/TiddlyWiki Releases.tid index b93744fba..3fbe6347f 100644 --- a/editions/tw5.com/tiddlers/releasenotes/TiddlyWiki Releases.tid +++ b/editions/tw5.com/tiddlers/releasenotes/TiddlyWiki Releases.tid @@ -1,11 +1,15 @@ caption: ~TiddlyWiki created: 20131109105400007 -modified: 20150419163355790 +modified: 20171113161419656 tags: Releases title: TiddlyWiki Releases type: text/vnd.tiddlywiki -Here are the details of recent releases of TiddlyWiki5. See [[TiddlyWiki5 Versioning]] for details of how releases are named. +Here are the details of recent releases of TiddlyWiki5. See [[TiddlyWiki5 Versioning]] for details of how releases are named. Note that archived versions of release source files are available at https://github.com/Jermolene/TiddlyWiki5/releases + +If you are using node.js, you can also install prior versions like this: + +> npm install -g tiddlywiki@5.1.13 (BetaReleases and AlphaReleases are listed separately). diff --git a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.13beta.tid b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.13beta.tid index 764ce3937..d2c64c035 100644 --- a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.13beta.tid +++ b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.13beta.tid @@ -26,7 +26,7 @@ This release includes a number of features designed to improve the experience of * [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/f131c378934a86b741ab5b808437c95694dc5503]] behaviour of `text/html` tiddlers so that they are displayed within an HTML iframe element * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/9b576f2a8d39dcca37bcb709183a8f9b27f33ccf]] group headings to the content type dropdown in edit mode * [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/4d70d5780e51cf0918fba15954cd47549e4e1a9f]] advanced navigation settings in [[$:/ControlPanel]] to use radio buttons -* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/f7b8813a27141a78980eefa03df70a4a2de9d10b]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/3f25db0abe8cd28712c020f218506710cec004b6]]) behaviour of PermaLinks so that now [ext[http://tiddlywiki.com/#HelloThere]] just opens the single specified tiddler +* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/f7b8813a27141a78980eefa03df70a4a2de9d10b]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/3f25db0abe8cd28712c020f218506710cec004b6]]) behaviour of PermaLinks so that now [ext[https://tiddlywiki.com/#HelloThere]] just opens the single specified tiddler * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/0c48502e8ed214cee23537d06e7e87efd53592c7]] support for triple-quoted multi-line attributes with [[macros|Macros in WikiText]], [[widgets|Widgets in WikiText]] and [[HTML elements|HTML in WikiText]] * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/32099b85d3b12f9e590274cb7550e3e531131706]] TableOfContents tab for tw5.com edition @@ -38,7 +38,7 @@ This release includes a number of features designed to improve the experience of * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/305617b632fd6ecf25cd4be85f4dfb5a5a65dfef]] new SaveTiddlersCommand * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/f14ecf4eb8965f2e407ccac51d4277330221efe3]] support for system tag [[$:/tags/RawMarkup]] * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/0bdc5b5c70fbbf34aa459afcf0499fc9c8ae6374]] editor type mappings to control panel advanced tab -* [[Refactored|https://github.com/Jermolene/TiddlyWiki5/commit/1717c93d001ad184a08ca66d1bffb33fb5d32b3a]] CodeMirror (http://tiddlywiki.com/codemirrordemo.html) plugin for simpler configuration +* [[Refactored|https://github.com/Jermolene/TiddlyWiki5/commit/1717c93d001ad184a08ca66d1bffb33fb5d32b3a]] CodeMirror (https://tiddlywiki.com/codemirrordemo.html) plugin for simpler configuration * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b2e48d00e9ea068a22b5ac5c0a4c93e8ddbb4a8a]] support for [[Environment Variables on Node.js]] * [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/eee3a0cf8e5aa047f8596df06e28194409f38b01]] ServerCommand to allow a path prefix * [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/4238af2a405c14d22937d7c47a70bfb3d4e6f22d]] the <<.olink listed>> operator to use any list field diff --git a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.14beta.tid b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.14beta.tid index fc98fe6fe..68cb1a855 100644 --- a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.14beta.tid +++ b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.14beta.tid @@ -30,7 +30,7 @@ There are two components: *** The [[plugin upgrader|$:/core/modules/upgraders/plugins.js]] module handles version checking of plugins and upgrading them from a special UpgradeLibrary plugin tiddler *** The [[system upgrader|$:/core/modules/upgraders/system.js]] module is responsible for suppressing the importing of certain system tiddlers (currently [[$:/StoryList]] and [[$:/HistoryList]]) *** The [[themetweak upgrader|$:/core/modules/upgraders/themetweaks.js]] module handles migrating theme tweaks from their pre-5.0.14-beta format (see below) -* An UpgradePlugin and associated edition that provides a custom, single-purpose user interface for upgrading standalone TiddlyWiki files - see http://tiddlywiki.com/upgrade.html +* An UpgradePlugin and associated edition that provides a custom, single-purpose user interface for upgrading standalone TiddlyWiki files - see https://tiddlywiki.com/upgrade.html !!! Improvements to CamelCase Recognition diff --git a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.16beta.tid b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.16beta.tid index d9b55bb34..e5572d196 100644 --- a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.16beta.tid +++ b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.16beta.tid @@ -21,7 +21,7 @@ released: 20140902124037214 This release includes a preliminary version of a new plugin that provides compatibility with content created for TiddlyWikiClassic: -http://tiddlywiki.com/classicparserdemo.html +https://tiddlywiki.com/classicparserdemo.html Subsequent releases will include end-user documentation with step-by-step instructions for migrating content. diff --git a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.17beta.tid b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.17beta.tid index a374dcaab..92d342750 100644 --- a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.17beta.tid +++ b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.17beta.tid @@ -45,7 +45,7 @@ The goal is to make the TiddlyWiki repository easier to comprehend for newcomers !! Hackability Improvements -* Moved developer documentation to http://tiddlywiki.com/dev +* Moved developer documentation to https://tiddlywiki.com/dev * [[Improvements|https://github.com/Jermolene/TiddlyWiki5/commit/872e6fc2532012f0f9acfb29aa24a9cd5f340b9d]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/c8a131ffd4716f2b99ab508567422ff463f2849d]]) to `serve.sh`/`serve.cmd` scripts * [[Disable|https://github.com/Jermolene/TiddlyWiki5/commit/ac54fe33263cbe48bc294f9c14257ccc146be38e]] plugins when in SafeMode * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/c1de85838f3d0d3e6a207152ecc9d61ff08a4b05]] new <<.mlink timeline>> macro diff --git a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.6beta.tid b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.6beta.tid index 6b2678444..84398b70f 100644 --- a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.6beta.tid +++ b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.6beta.tid @@ -16,7 +16,7 @@ caption: 5.0.6-beta * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/3d79eb87d1c609195b8c518c08e167994b20a346]] an [[$:/AdvancedSearch]] * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/bd7db62da052ec6262c3319eaa11f00e5c452a7b]] support for specifying hostname for the ServerCommand * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b9e80a270b7f67db816e9b06e2f71f9c9dd86c17]] a first pass at generating an all-in-one static HTML representation of a wiki, complete with internal anchor links for wiki links -** See http://tiddlywiki.com/alltiddlers.html +** See https://tiddlywiki.com/alltiddlers.html * [[Hide|https://github.com/Jermolene/TiddlyWiki5/commit/44568dc6ef64be8c1370df8f682777c2c805fee7]] encryption features when running on the server * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/2ee50939447cf2948e49e5905520943ea4075975]] [[double backticks|Formatting in WikiText]] as an alternative for delimitting inline code (thanks to StephanHradek) diff --git a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.7beta.tid b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.7beta.tid index 85dc81773..859c41011 100644 --- a/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.7beta.tid +++ b/editions/tw5.com/tiddlers/releasenotes/beta/Release 5.0.7beta.tid @@ -29,8 +29,8 @@ These are changes that might affect users upgrading from previous betas. * Added several new [[filter operators|TiddlerFilters]], including ''reverse'', ''first'', ''last'', ''butlast'', ''rest'', ''nth'' * Extend ''list'' filter operator to allow other fields to be used via a TextReference * Added shortcut in [[$:/ControlPanel]] ''Basics'' tab for setting [[$:/DefaultTiddlers]] to retain tiddler story ordering -* Added emacs and vim keymapping support to the [[CodeMirror plugin|http://tiddlywiki.com/codemirrordemo.html]], (thanks to João Bolila, @jbolila on GitHub) -* Added the [[highlight.js|http://highlightjs.org/]] syntax highlighting plugin: http://tiddlywiki.com/highlightdemo.html (thanks to João Bolila, @jbolila on GitHub) +* Added emacs and vim keymapping support to the [[CodeMirror plugin|https://tiddlywiki.com/codemirrordemo.html]], (thanks to João Bolila, @jbolila on GitHub) +* Added the [[highlight.js|http://highlightjs.org/]] syntax highlighting plugin: https://tiddlywiki.com/highlightdemo.html (thanks to João Bolila, @jbolila on GitHub) * Added the first export option to the ''Tools'' tab of the [[control panel|$:/ControlPanel]] * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/ffcc215e8f8896be96093579abc5bcfb76335e66]] an ellipsis for [[advanced search|$:/AdvancedSearch]] next to the search box in the sidebar * [[Adjusted|https://github.com/Jermolene/TiddlyWiki5/commit/b326315b0e9959096b85aa716dd613f21605705a]] the password dialogue to make it narrower for smaller screens diff --git a/editions/tw5.com/tiddlers/saving/Emergency Tiddler Export.tid b/editions/tw5.com/tiddlers/saving/Emergency Tiddler Export.tid new file mode 100644 index 000000000..060fa14c9 --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/Emergency Tiddler Export.tid @@ -0,0 +1,29 @@ +caption: Emergency Export +created: 20180309211328412 +delivery: Saver +description: Awkward but useful emergency technique for saving tiddlers +method: save +modified: 20180309221402430 +tags: Mac Android Windows Linux Saving Chrome Safari Firefox Opera InternetExplorer +title: Emergency Tiddler Export +type: text/vnd.tiddlywiki + + +This method is useful if, for any reason, you should find your current TiddlyWiki instance is not saving (e.g. a plugin or a server has stopped working). It should work on just about any platform. + +* Go to advanced search {{$:/core/ui/Buttons/advanced-search}} +** Goto the filter tab +** Enter the following filter text: + + +``` +[!is[system]!sort[modified]limit[25]] +``` +* Check the list of tiddlers. +* Adjust the number "25" in the filter to make sure you found all your recently modified tiddlers +* Press the bucket with the up arrow [<button class="tc-btn-invisible" disabled>{{$:/core/images/export-button}}</button>] which appears on the right +* A dialogue window will ask for a location to download a file called tiddler.json on your local drive, or depending on browser configuration, just alert you that such a file will be downloaded. Press save. +* The `tiddlers.json` file can be imported (tools in sidebar) or drag and drop the file on the top line of the story river of another TW . +** You can (de)select specific tiddlers. +** Finally, press `import`. + diff --git a/editions/tw5.com/tiddlers/saving/Example config-tiddlyweb-host for IIS.txt b/editions/tw5.com/tiddlers/saving/Example config-tiddlyweb-host for IIS.txt new file mode 100644 index 000000000..e30d38eb6 --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/Example config-tiddlyweb-host for IIS.txt @@ -0,0 +1,2 @@ +title: $:/config/tiddlyweb/host +text: $protocol$//$host$/MyApp/ diff --git a/editions/tw5.com/tiddlers/saving/Example config-tiddlyweb-host for IIS.txt.meta b/editions/tw5.com/tiddlers/saving/Example config-tiddlyweb-host for IIS.txt.meta new file mode 100644 index 000000000..e57cb2484 --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/Example config-tiddlyweb-host for IIS.txt.meta @@ -0,0 +1,5 @@ +title: Example config-tiddlyweb-host for IIS +created: 20180328145039530 +modified: 20180328145234871 +tags: +type: text/plain diff --git a/editions/tw5.com/tiddlers/saving/Example package.json for IIS.txt b/editions/tw5.com/tiddlers/saving/Example package.json for IIS.txt new file mode 100644 index 000000000..bfe3b8c1a --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/Example package.json for IIS.txt @@ -0,0 +1,8 @@ +{ + "name": "MyStuff", + "description": "A description of this wiki", + "dependencies": { + "sax": "1.2.4", + "tiddlywiki": "*" + } +} \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/saving/Example package.json for IIS.txt.meta b/editions/tw5.com/tiddlers/saving/Example package.json for IIS.txt.meta new file mode 100644 index 000000000..2aba3f4bc --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/Example package.json for IIS.txt.meta @@ -0,0 +1,5 @@ +created: 20180328145039530 +modified: 20180328145234871 +tags: +title: Example package.json for IIS +type: text/plain diff --git a/editions/tw5.com/tiddlers/saving/Example tiddlywiki.info for IIS.txt b/editions/tw5.com/tiddlers/saving/Example tiddlywiki.info for IIS.txt new file mode 100644 index 000000000..1ba78a6c9 --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/Example tiddlywiki.info for IIS.txt @@ -0,0 +1,11 @@ +{ + "description": "My wiki", + "plugins": [ + "tiddlywiki/tiddlyweb", + "tiddlywiki/filesystem" + ], + "themes": [ + "tiddlywiki/vanilla", + "tiddlywiki/snowwhite" + ] +} diff --git a/editions/tw5.com/tiddlers/saving/Example tiddlywiki.info for IIS.txt.meta b/editions/tw5.com/tiddlers/saving/Example tiddlywiki.info for IIS.txt.meta new file mode 100644 index 000000000..e1728156e --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/Example tiddlywiki.info for IIS.txt.meta @@ -0,0 +1,5 @@ +created: 20180328151124878 +modified: 20180328151214616 +tags: +title: Example tiddlywiki.info for IIS +type: text/plain diff --git a/editions/tw5.com/tiddlers/saving/Example web.config for IIS.txt b/editions/tw5.com/tiddlers/saving/Example web.config for IIS.txt new file mode 100644 index 000000000..9a26b76a7 --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/Example web.config for IIS.txt @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<configuration> + <system.webServer> + <handlers> + <add + name="httpplatformhandler" + path="*" + verb="*" + modules="httpPlatformHandler" + resourceType="Unspecified" + requireAccess="Script" /> + </handlers> + <httpPlatform + stdoutLogEnabled="true" + stdoutLogFile=".\node.log" + startupTimeLimit="20" + processPath="C:\Program Files\nodejs\node.exe" + arguments=".\node_modules\tiddlywiki\tiddlywiki.js ./wiki --server PORT $:/core/save/all text/plain text/html "" "" 127.0.0.1 /MyApp"> + <environmentVariables> + <environmentVariable name="PORT" value="%HTTP_PLATFORM_PORT%" /> + <environmentVariable name="NODE_ENV" value="Production" /> + </environmentVariables> + </httpPlatform> + </system.webServer> +</configuration> diff --git a/editions/tw5.com/tiddlers/saving/Example web.config for IIS.txt.meta b/editions/tw5.com/tiddlers/saving/Example web.config for IIS.txt.meta new file mode 100644 index 000000000..757d70318 --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/Example web.config for IIS.txt.meta @@ -0,0 +1,5 @@ +created: 20180328145259455 +modified: 20180328151038658 +tags: +title: Example web.config for IIS +type: text/plain diff --git a/editions/tw5.com/tiddlers/saving/Installing TiddlyWiki on Microsoft Internet Information Server.tid b/editions/tw5.com/tiddlers/saving/Installing TiddlyWiki on Microsoft Internet Information Server.tid new file mode 100644 index 000000000..7d8b91bba --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/Installing TiddlyWiki on Microsoft Internet Information Server.tid @@ -0,0 +1,68 @@ +caption: Internet Information Services +created: 20180328120356008 +delivery: DIY +description: Windows' built-in web server +method: sync +modified: 20180328151441294 +tags: Saving [[TiddlyWiki on Node.js]] Windows +title: Installing TiddlyWiki on Microsoft Internet Information Server +type: text/vnd.tiddlywiki + +\define example-file(title) +<$transclude tiddler="$title$" mode="block"/> <$macrocall $name="copy-to-clipboard" src={{$title$}}/> +\end + +Microsoft's [[Internet Information Server|https://en.wikipedia.org/wiki/Internet_Information_Services]] (IIS) is the built-in web server for Windows. It can be useful to host TiddlyWiki within IIS in order to take advantage of IIS features like URL rewriting, static file hosting and automatic restarts after a crash. + +! 1. Enable IIS + +# In Windows, access the Control Panel and click ''Add or Remove Programs'' +# In the Add or Remove Programs window, click ''Add/Remove Windows Components''. +# Select the ''Internet Information Services (IIS)'' check box +# Click ''Next'', then click ''Finish'' + +! 2. Install the required tools + +# Install the IIS module ~HttpPlatformHandler from https://www.iis.net/downloads/microsoft/httpplatformhandler +# Install [[Node.js]] from https://nodejs.org/ +# Install Git from https://git-scm.com/ +#* //optional; only required when using the latest TiddlyWiki release pulled directly from ~GitHub -- see below// + +! 3. Install TiddlyWiki and setup a new wiki + +# Create a convenient directory for the wiki (e.g. `C:\MyStuff`) +# Within it, create a file called `C:\MyStuff\package.json` with the content: +#> <<example-file "Example package.json for IIS">> +# Also create a file called `C:\MyStuff\web.config` with the content: +#> <<example-file "Example web.config for IIS">> +# Create a subdirectory called "wiki" (i.e. `C:\MyStuff\wiki`) +# Create a file called `C:\MyStuff\wiki\tiddlywiki.info` with the content: +#> <<example-file "Example tiddlywiki.info for IIS">> +# Create a subdirectory called "tiddlers" (i.e. `C:\MyStuff\wiki\tiddlers`) +# Within it, create a file called `C:\MyStuff\wiki\tiddlers\config-tiddlyweb-host.tid` with the content: +#> <<example-file "Example config-tiddlyweb-host for IIS">> +#* (See [[the documentation|https://docs.microsoft.com/en-us/iis/extensions/httpplatformhandler/httpplatformhandler-configuration-reference]] for details of the configuration fields for ~HttpPlatformHandler +# Execute the command `npm install` within the `C:/MyStuff` directory + +! 4. Setup the application in IIS + +* In Windows, run the IIS Manager application (use the start menu to run `inetmgr.exe`) +* Locate the server in the ''Connections'' column on the left, and click the disclosure triangle to show its content +* Open the ''Sites'' folder +* Right click on the ''Default Web Site'' entry, and select ''Add application..'' from the menu +* Enter the following information in the dialogue box: +*# ''Alias'': `MyApp` +*# ''Physical path'': `C:\MyStuff` +* Click ''OK'' + +! 5. Test the application + +Test the app by visiting http://localhost/MyApp/ in a browser. + +! Notes + +* If you require authentication, specify a username and password in the `--server` command in `web.config`. For example: +** `arguments=".\node_modules\tiddlywiki\tiddlywiki.js ./wiki-server --server PORT $:/core/save/all text/plain text/html "username" "password" 127.0.0.1 /MyApp">` +** Take note of the need to HTML encode the double quotes around the username and password into `"` +* If you change the settings in the `web.config` file, or modify the app code, then you'll need to restart the server using the IIS manager application + diff --git a/editions/tw5.com/tiddlers/saving/Saving on Android.tid b/editions/tw5.com/tiddlers/saving/Saving on Android.tid index 4fb483b16..6be8d5508 100644 --- a/editions/tw5.com/tiddlers/saving/Saving on Android.tid +++ b/editions/tw5.com/tiddlers/saving/Saving on Android.tid @@ -1,6 +1,10 @@ +caption: ~AndTidWiki created: 20130825161400000 -modified: 20160601162226948 -tags: Saving +delivery: App +description: Android app for saving changes locally to device storage +method: save +modified: 20171113105950965 +tags: Saving Android title: Saving on Android type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/saving/Saving on Beaker Browser.tid b/editions/tw5.com/tiddlers/saving/Saving on Beaker Browser.tid new file mode 100644 index 000000000..d6ea9aa37 --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/Saving on Beaker Browser.tid @@ -0,0 +1,33 @@ +caption: Beaker Browser +created: 20161229121316912 +delivery: App +description: Powerful new browser for Mac, Windows and Linux +method: save +modified: 20171113110603084 +tags: Saving Windows Linux Mac +title: Saving on Beaker Browser +type: text/vnd.tiddlywiki + +<<.from-version "5.1.14">> TiddlyWiki incorporates a saver module that allows it to save changes directly with the [[Beaker Browser]], an experimental peer-to-peer browser. + +! Instructions + +# Download and install the Beaker Browser from https://beakerbrowser.com/ +# Run Beaker, and if necessary open a tab to beaker:start +# Click the "New site" button at the top left of the page +# Enter the details of your site +# Click the link “Add files” and upload your TiddlyWiki index.html file +# View the site by clicking on the link to index.html; it should open in a new tab +# Try out creating tiddlers, and saving changes + +At this point, the wiki is entirely private, and other users cannot see the content even if they have the URL. To share the wiki with other users: + +# Publish your changes +## Visit the "Library" page in Beaker Browser via the system menu +## Select your site in the list +## Look for a box mentioning "n unpublished changes". If not present, skip to the next step +## Click the "Review changes" button +## Click the "Publish" button +# Share the dat: URL +## Copy the URL of your site from the address bar and share it with other users +## Other users should be able to access your site but they won't be able to make changes unless they fork their own copy diff --git a/editions/tw5.com/tiddlers/saving/Saving on InternetExplorer.tid b/editions/tw5.com/tiddlers/saving/Saving on InternetExplorer.tid deleted file mode 100644 index d44a2455e..000000000 --- a/editions/tw5.com/tiddlers/saving/Saving on InternetExplorer.tid +++ /dev/null @@ -1,10 +0,0 @@ -created: 20131212182652334 -modified: 20140912141027012 -tags: Saving -title: Saving on InternetExplorer -type: text/vnd.tiddlywiki - -By default, TiddlyWiki saves changes on InternetExplorer 10 and above using a saver module that downloads the newly modified file, rather than saving it directly. There are two alternatives that both save changes directly to the file: - -* [[Use the TiddlyIE browser extension|Saving with TiddlyIE]] -* Use the [[Windows HTA Hack]] by renaming the TiddlyWiki HTML file to have the extension `*.hta`. diff --git a/editions/tw5.com/tiddlers/saving/Saving on Safari.tid b/editions/tw5.com/tiddlers/saving/Saving on Safari.tid deleted file mode 100644 index e04967b9e..000000000 --- a/editions/tw5.com/tiddlers/saving/Saving on Safari.tid +++ /dev/null @@ -1,23 +0,0 @@ -created: 20140811171304926 -modified: 20160520090313926 -tags: Saving -title: Saving on Safari -type: text/vnd.tiddlywiki - -This method of saving changes is clunky because it requires manual intervention for each save. - -# [[Download]] an empty TiddlyWiki by clicking this button: -#> {{$:/editions/tw5.com/snippets/download-empty-button}} -#> If the button doesn't work save this link: http://tiddlywiki.com/empty.html -#> Your browser may ask you to accept the download before it begins -# Locate the file you just downloaded -#* You may rename it, but be sure to keep the `.html` or `.htm` extension -# Open the file in Safari -# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button -# Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar -# A popup "Download changes" window is displayed that includes a link labelled //Right-click to save changes// -# Right-click on the link and select "Download Linked File As..." from the popup menu -# Navigate to the folder containing your wiki HTML file and select the existing file -# Click the "Save" button -# Click "Replace" to confirm replacing the existing file -# Verify that your changes have been saved correctly diff --git a/editions/tw5.com/tiddlers/saving/Saving on TiddlyDesktop.tid b/editions/tw5.com/tiddlers/saving/Saving on TiddlyDesktop.tid new file mode 100644 index 000000000..717190137 --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/Saving on TiddlyDesktop.tid @@ -0,0 +1,16 @@ +caption: ~TiddlyDesktop +created: 20171112085137764 +delivery: App +description: Custom desktop application for working with TiddlyWiki +method: save +modified: 20171113105959509 +tags: Saving Mac Windows Linux +title: Saving on TiddlyDesktop +type: text/vnd.tiddlywiki + +See the [[Introducing TiddlyDesktop Video]] + +# Install the latest release of TiddlyDesktop from https://github.com/Jermolene/TiddlyDesktop/releases +# Run TiddlyDesktop +# Use the browse button to open TiddlyWiki files +# Save changes within TiddlyWiki in the usual way diff --git a/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid b/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid index 9fc47f865..607ae87ae 100644 --- a/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid +++ b/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid @@ -1,8 +1,12 @@ created: 20130825213500000 modified: 20160610082610879 -tags: Saving +tags: Saving Android Chrome Firefox InternetExplorer iOS Linux Mac Opera PHP Safari Windows title: Saving on TiddlySpot type: text/vnd.tiddlywiki +delivery: Service +method: save +caption: TiddlySpot +description: Free online service for hosting TiddlyWiki files TiddlySpot is a free hosting service for TiddlyWiki documents from Simon and Daniel Baird. The easiest way to get started is to sign up for a new wiki at http://tiddlyspot.com - by default you'll get the latest release of TiddlyWiki Classic. @@ -39,4 +43,4 @@ The upgrade operation falls foul of a security restriction in Firefox. Until thi * After you've uploaded your local document once, further editing and saving of the online version hosted on TiddlySpot should work with any modern browser of your choice. ** Don't forget to fill in the TiddlySpot wikiname and password in your TiddlySpot TiddlyWiki control panel for any new browser you want to use for saving changes -* //See also : [[Upgrading]]// +* //See also : [[Upgrading]]// \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/saving/Saving on a PHP Server.tid b/editions/tw5.com/tiddlers/saving/Saving on a PHP Server.tid index 9867f260f..e6e78fbfb 100644 --- a/editions/tw5.com/tiddlers/saving/Saving on a PHP Server.tid +++ b/editions/tw5.com/tiddlers/saving/Saving on a PHP Server.tid @@ -1,15 +1,20 @@ +caption: PHP created: 20140111091844267 -modified: 20160610082607695 -tags: Saving +delivery: DIY +description: DIY script you can install on your own server +method: save +modified: 20171115171431733 +tags: Saving PHP title: Saving on a PHP Server type: text/vnd.tiddlywiki -The built-in TiddlySpot saver can also be used to save changes to a simple PHP script that you can run on most hosting providers. +The built-in `TiddlySpot `saver can also be used to save changes to a simple PHP script that you can run on most hosting providers. //These are preliminary instructions that need verification// -# Download a copy of ''store.php'' from: -#* https://code.google.com/p/bidix/source/browse/trunk/TiddlyHome/_th/lib/store.php +# Download a copy of `TiddlyHome_0.1.2.zip` from https://code.google.com/archive/p/bidix/downloads +# Unzip. +# Extract a copy of `store.php` from under the unzipped subdirectory `_th\lib` # Edit your copy of ''store.php'' to add your username(s) and password(s). Find the line `$USERS = array( 'UserName1'=>'Password1', etc)` and replace Username1 and Password1 with your desired username and password #* Make sure you leave all the punctuation and code, such as the single quotes, intact # Save the file @@ -27,3 +32,16 @@ The control panel ''Saving'' tab includes the following configuration options: |Upload filename |The filename used to save the TiddlyWiki (defaults to ''index.html'') | |Upload directory |The relative path from ''store.php'' to the directory used for saving the file | |Backup directory |The relative path from ''store.php'' to the directory used for backups | + +!!! Note about maximum size + +As your TW file increases in size, you may need to modify your `.htaccess` or `htaccess` file (depending on system) to increase the value of the maximum upload and/or post size. Check with your Web Host Provider for your particular settings. Be sure also to make backups before experiementing. On some systems, the settings might look like: + +``` +php_value upload_max_filesize 4M +php_value post_max_size 6M +``` + +!!! Note about possible error message + +If you get an error message regarding `split()`, you may need to change references to `split` in ''store.php'' to function `explode` . diff --git a/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid b/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid index 926cb62f6..194e28eea 100644 --- a/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid +++ b/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid @@ -1,22 +1,30 @@ +caption: Quine created: 20131129101027725 -modified: 20160602024857740 -tags: Saving +delivery: App +description: iPad/iPhone app for working with TiddlyWiki +method: save +modified: 20171113105954683 +tags: Saving iOS title: Saving on iPad/iPhone type: text/vnd.tiddlywiki -The iPad/iPhone app ''TWEdit'' makes it possible to edit and save changes to TiddlyWiki5, including working offline without a network connection. [[Download it here|https://itunes.apple.com/gb/app/twedit/id409607956?mt=8]]. +The iPad/iPhone app ''Quine'' makes it possible to edit and save changes to TiddlyWiki5, including working offline without a network connection. [[Download it here|https://itunes.apple.com/us/app/quine/id1228682923?mt=8]]. Instructions for use: -# Open TWEdit -# Touch the title in the centre of the toolbar in order -#* A text box should appear allowing you to enter a URL -# Enter the URL `http://tiddlywiki.com/empty.html` -# When the empty TiddlyWiki has loaded, touch the ''save'' icon (it's the second icon from the right on the top toolbar) -#* An alert box should appear allowing you to enter a local filename -# Enter the filename you wish to use for the document (ending with `.html`) -# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button +# Open Quine +# On iPad +#* Touch the file button (<) or swipe from the left of the screen to open the file list +# On iPhone +#* The file list will show automatically unless a wiki is already open +# Touch the new file button (+) in the file list window to create a new TiddlyWiki5 file +# Swipe any file item from the right to see a list of additional "actions" possible for that file +# Touch any listed file item or folder to open it - wikis will open in Quine's custom browser +# When you have an open TiddlyWiki5: +# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar +# Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button # Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar #* A confirmation message should appear at the top right of the window +# Touch "Done" when done editing a wiki -//Note that TWEdit is published independently of TiddlyWiki// \ No newline at end of file +//Note that Quine is published independently of TiddlyWiki// diff --git a/editions/tw5.com/tiddlers/saving/Saving via WebDAV.tid b/editions/tw5.com/tiddlers/saving/Saving via WebDAV.tid new file mode 100644 index 000000000..6eb7292da --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/Saving via WebDAV.tid @@ -0,0 +1,31 @@ +caption: WebDAV +created: 20160216191710789 +delivery: Protocol +description: Standard web protocol available on products such as Sharepoint +method: save +modified: 20171113160440615 +tags: Saving Android Chrome Firefox InternetExplorer iOS Linux Mac Opera PHP Safari Windows +title: Saving via WebDAV +type: text/vnd.tiddlywiki + +If hosted on a [[WebDAV|https://en.wikipedia.org/wiki/WebDAV]]-enabled server, TiddlyWiki will automatically save changes via HTTP. + +!! Servers + +Many [[NAS|https://en.wikipedia.org/wiki/NAS]] or [[Subversion|https://en.wikipedia.org/wiki/Apache_Subversion]] servers support WebDAV out of the box. Setting up your own server might take some effort though: + +[[dav-server|https://github.com/edrex/dav-server]] is a quick way to serve up a folder of HTML ~TiddlyWikis. + +[[webdav server|https://play.google.com/store/apps/details?id=com.theolivetree.webdavserver&hl=en]] for Android lets you put wikis in your pocket. You can share with other devices on the local network too. + +!! Existing Wikis + +~WebDAV support was added Feb 16 2016. If you created your wiki before that, you'll need to [[Upgrade|Upgrading]] to enable ~WebDAV. + +!! Video HowTo's + +[[Mario Pietsch||"Wikilabs" by PMario]] did [[create several videos|https://www.youtube.com/watch?v=tpkQhKyqPzc&list=PLuiC_HFhI4OwoVDb-B-VK0ydj-mBPNn-1]], that show, how to prepare Microsoft Internet Information Service (IIS) to host a local TiddlyWiki using ~WebDav + +!! Free Hosting + +None of the ~WebDAV hosting services tested (~~box.com~~, ~~swissdisk.com~~) support accessing HTML files via a webbrowser, so they won't work with ~TiddlyWiki. Maybe someday soon there will be a free ~WebDAV hosting service for ~TiddlyWikis. diff --git a/editions/tw5.com/tiddlers/saving/Saving via minimal Ruby server.tid b/editions/tw5.com/tiddlers/saving/Saving via minimal Ruby server.tid new file mode 100644 index 000000000..6b5222013 --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/Saving via minimal Ruby server.tid @@ -0,0 +1,17 @@ +caption: Ruby Server +created: 20180514011710789 +delivery: Server-side Script +description: DIY script you can run as a server +method: save +modified: 20180513222628883 +tags: Saving Android Chrome Firefox InternetExplorer iOS Linux Mac Opera Safari Windows +title: Saving via a Minimal Ruby Server +type: text/vnd.tiddlywiki + +This is a minimal server using Ruby Webrick. It just serves up files from the same folder and handles saving. + +Once running, just point your web browser at http://localhost:8000 to view the folder listing, and click on your wiki html file. + +See the script at: + +https://gist.github.com/jimfoltz/ee791c1bdd30ce137bc23cce826096da diff --git a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid index 5c3c238af..6b2d3d384 100644 --- a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid +++ b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid @@ -1,6 +1,6 @@ created: 20140103134551508 -modified: 20160601160224998 -tags: Saving +modified: 20171113131640857 +tags: [[Saving with TiddlyFox]] title: Saving with TiddlyFox on Android type: text/vnd.tiddlywiki @@ -13,7 +13,7 @@ type: text/vnd.tiddlywiki # Install this extension to be able to save the TiddlyWiki file locally: #* https://addons.mozilla.org/en-GB/android/addon/save-link-menus/ # [[Download]] an empty TiddlyWiki by saving this link: -#* http://tiddlywiki.com/empty.html +#* https://tiddlywiki.com/empty.html #> (to save the link, ensure you've installed the "save-link-menus" extension and then long-press on the link and choose "Save link") # When the file has downloaded, click on it within the notification tray or the download manager application # Choose to open the file in Firefox (rather than the default Android viewer) diff --git a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid index fa9aaa4dd..90a627c31 100644 --- a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid +++ b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid @@ -1,13 +1,16 @@ +caption: ~TiddlyFox created: 20131221085742684 -modified: 20160601160211867 -tags: Saving +delivery: Browser Extension +description: Browser extension for older versions of Firefox +method: save +modified: 20171118230504315 +tags: Saving Firefox title: Saving with TiddlyFox type: text/vnd.tiddlywiki If you're using [[Firefox for Android]], see the instructions for [[Saving with TiddlyFox on Android]]. -# Ensure you have the latest version of [[Firefox]] -#* http://getfirefox.com +# Ensure you have a version of Firefox before version 57. ~TiddlyFox will not work with Firefox 57 and on. For Firefox 57 and on, consider using the following instead: <<list-links filter:"[tag[Firefox]delivery[Browser Extension]] -[[Saving with TiddlyFox]]">> # Install the latest release of the TiddlyFox extension from: #* https://addons.mozilla.org/en-GB/firefox/addon/tiddlyfox/ # Restart [[Firefox]] @@ -16,7 +19,9 @@ If you're using [[Firefox for Android]], see the instructions for [[Saving with # Locate the file you just downloaded #* You may rename it, but be sure to keep the `.html` or `.htm` extension # Open the file in [[Firefox]] -# Click ''OK'' in response to the prompt from TiddlyFox that asks whether to enable saving for this file +#* If you are using TiddlyFox v1.x.x, you will need to click ''OK'' in response to the prompt from TiddlyFox that asks whether to enable saving for this file +#* If you are using TiddlyFox v2.x.x you will need to click on the icon of a kitten standing on a blue globe to activate saving. There is no prompt in v2.0.1. +#** For TiddlyFox v2.0.1, you can not be using Private Browsing mode nor can you be using "Never Remember History". # Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button # Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar #* Look for the yellow notification ''Saved wiki'' at the top right of the window diff --git a/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid b/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid index c059078ff..3106e6daf 100644 --- a/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid +++ b/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid @@ -1,6 +1,10 @@ +caption: ~TiddlyIE created: 20131211220000000 -modified: 20160601111802610 -tags: [[Saving on InternetExplorer]] +delivery: Browser Extension +description: Browser extension for Internet Explorer +method: save +modified: 20171113110036278 +tags: Saving InternetExplorer title: Saving with TiddlyIE type: text/vnd.tiddlywiki @@ -9,7 +13,7 @@ type: text/vnd.tiddlywiki # Restart Internet Explorer. IE will prompt you to enable the TiddlyIE add-on. #> You may also see a prompt to enable the //Microsoft Script Runtime// # [[Download]] an empty TiddlyWiki by saving this link: -#> http://tiddlywiki.com/empty.html +#> https://tiddlywiki.com/empty.html # Locate the file you just downloaded #* You may rename it, but be sure to keep the `.html` or `.htm` extension # Open the file in Internet Explorer diff --git a/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid b/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid index e69362044..dae52cdf1 100644 --- a/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid +++ b/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid @@ -1,6 +1,10 @@ +caption: Download Saver created: 20131129092604900 -modified: 20160520090349774 -tags: Saving +delivery: Saver +description: Slightly awkward but universal technique that works on almost every browser +method: save +modified: 20171113110022987 +tags: Saving Chrome Safari Firefox Opera InternetExplorer title: Saving with the HTML5 fallback saver type: text/vnd.tiddlywiki @@ -8,7 +12,7 @@ This method of saving changes is clunky because it requires manual intervention # [[Download]] an empty TiddlyWiki by clicking this button: #> {{$:/editions/tw5.com/snippets/download-empty-button}} -#> If the button doesn't work save this link: http://tiddlywiki.com/empty.html +#> If the button doesn't work save this link: https://tiddlywiki.com/empty.html #> Your browser may ask you to accept the download before it begins # Locate the file you just downloaded #* You may rename it, but be sure to keep the `.html` or `.htm` extension diff --git a/editions/tw5.com/tiddlers/saving/Saving.tid b/editions/tw5.com/tiddlers/saving/Saving.tid index 6268ca4ca..4c669c765 100644 --- a/editions/tw5.com/tiddlers/saving/Saving.tid +++ b/editions/tw5.com/tiddlers/saving/Saving.tid @@ -1,9 +1,37 @@ created: 20140912140651119 -modified: 20140912140736112 +list: [[Saving with the HTML5 fallback saver]] [[Installing TiddlyWiki on Node.js]] [[TiddlyServer by Arlen Beiler]] [[Saving on TiddlyDesktop]] [[Saving on Beaker Browser]] [[Saving on iPad/iPhone]] [["savetiddlers" Extension for Chrome and Firefox by buggyj]] [["file-backups" Extension for Firefox by pmario]] [["Noteself" by Danielo Rodríguez]] [[TiddlyDrive Add-on for Google Drive by Joshua Stubbs]] [[TiddlyWiki in the Sky for Dropbox]] [[Saving on a PHP Server]] [[Saving via WebDAV]] [[Saving on Android]] [[Saving with TiddlyFox]] [[Saving with TiddlyIE]] [[Windows HTA Hack]] +modified: 20171113135847405 tags: [[Working with TiddlyWiki]] title: Saving type: text/vnd.tiddlywiki +\define filter-button(caption,filter) +<$reveal type="nomatch" state="$:/SavingDetailsFilter" text="""$filter$""" tag="span"> +<$button class="tc-btn-invisible tc-btn-unpushed" set="$:/SavingDetailsFilter" setTo="""$filter$"""> +<$text text="""$caption$"""/> +</$button> +</$reveal> +<$reveal type="match" state="$:/SavingDetailsFilter" text="""$filter$""" tag="span"> +<$button class="tc-btn-invisible tc-btn-pushed"> +<$text text="""$caption$"""/> {{$:/core/images/done-button}} +</$button> +</$reveal> +\end + +\define filter-maker() +[tag[Saving]tag[$(currentTiddler)$]] +\end + Available methods for saving changes with TiddlyWiki: -<<list-links "[tag[Saving]]">> +<div class="tc-thumbnail-tabs"> +<div style="font-size:0.9em;"> +PLATFORMS: +<<filter-button caption:"All" filter:"[tag[Saving]]">> +<$list filter="Android Chrome Firefox InternetExplorer iOS Linux Mac Opera PHP Safari Windows"> +<$macrocall $name="filter-button" caption=<<currentTiddler>> filter=<<filter-maker>>/> +</$list> +</div> +<br/> +<$macrocall $name="tabs" tabsList={{$:/SavingDetailsFilter}} template="$:/SavingDetailsTemplate" buttonTemplate="$:/SavingThumbnailsTemplate"/> +</div> diff --git a/editions/tw5.com/tiddlers/saving/SavingDetailsFilter.tid b/editions/tw5.com/tiddlers/saving/SavingDetailsFilter.tid new file mode 100644 index 000000000..8f8d26e96 --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/SavingDetailsFilter.tid @@ -0,0 +1,6 @@ +created: 20171113131257109 +modified: 20171113162326513 +title: $:/SavingDetailsFilter +type: text/vnd.tiddlywiki + +[tag[Saving]] \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/saving/SavingDetailsTemplate.tid b/editions/tw5.com/tiddlers/saving/SavingDetailsTemplate.tid new file mode 100644 index 000000000..e1a132e91 --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/SavingDetailsTemplate.tid @@ -0,0 +1,21 @@ +title: $:/SavingDetailsTemplate + +\define platforms() +<$set name="platforms" tiddler=<<currentTab>> field="platforms"> +<$list filter="[<currentTab>tags[]sort[]] -Resources -Saving -plugins" variable="platform"> +<span class="tc-saving-details-platform"> +<$text text=<<platform>>/> +</span> +</$list> +</$set> +\end + +<h1><$link to=<<currentTab>>><$view tiddler=<<currentTab>> field="title"/></$link></h1> + +|!Method |<$view tiddler=<<currentTab>> field="method"/> | +|!Delivery |<$view tiddler=<<currentTab>> field="delivery"/> | +|!Platforms: |<<platforms>> | + +<$tiddler tiddler=<<currentTab>>> +<$transclude tiddler=<<currentTab>> field="text" mode="block"/> +</$tiddler> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/saving/SavingThumbnailsStyles.tid b/editions/tw5.com/tiddlers/saving/SavingThumbnailsStyles.tid new file mode 100644 index 000000000..70e5d19b5 --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/SavingThumbnailsStyles.tid @@ -0,0 +1,73 @@ +title: $:/SavingThumbnailsStyles +tags: $:/tags/Stylesheet + +.tc-thumbnail-tabs .tc-tab-buttons { + background: <<color message-background>>; + text-align: center; +} + +.tc-thumbnail-tabs .tc-tab-buttons button { + display: table-cell; + width: 140px; + height: 80px; + vertical-align: top; + margin: 0.3em; + border: 2px solid <<color message-background>>; + background: <<color message-background>>; + color: <<colour message-foreground>>; + padding: 0; + font-weight: normal; +} + +.tc-thumbnail-tabs .tc-tab-buttons button.tc-tab-selected { + border: 2px solid <<colour foreground>>; + background: <<color background>>; +} + +.tc-thumbnail-tabs .tc-tab-buttons button:hover { + background: <<colour message-foreground>>; + color: <<colour message-background>>; +} + +.tc-thumbnail-tabs .tc-tab-divider { + border: none; +} + +.tc-thumbnail-tabs .tc-saving-thumbnail-wrapper { + vertical-align: top; + height: inherit; +} + +.tc-thumbnail-tabs .tc-saving-thumbnail-caption { + font-weight: bold; + background: <<color foreground>>; + color: <<color background>>; + padding: 2px 8px; +} + +.tc-thumbnail-tabs .tc-saving-thumbnail-description { + padding: 2px 8px; + font-style: italic; + font-size: 0.85em; +} + +.tc-thumbnail-tabs .tc-saving-details-platform, +.tc-thumbnail-tabs .tc-btn-unpushed, +.tc-thumbnail-tabs .tc-btn-pushed { + display: inline-block; + padding: 0.16em 0.7em; + font-size: 0.9em; + font-weight: 400; + line-height: 1.2em; + color: <<colour message-background>>; + white-space: nowrap; + vertical-align: baseline; + background-color: <<colour message-foreground>>; + border-radius: 1em; +} + +.tc-thumbnail-tabs .tc-btn-pushed { + background-color: <<colour foreground>>; + fill: <<color background>>; +} + diff --git a/editions/tw5.com/tiddlers/saving/SavingThumbnailsTemplate.tid b/editions/tw5.com/tiddlers/saving/SavingThumbnailsTemplate.tid new file mode 100644 index 000000000..5d19fda5f --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/SavingThumbnailsTemplate.tid @@ -0,0 +1,12 @@ +title: $:/SavingThumbnailsTemplate + +<div class="tc-saving-thumbnail-wrapper"> +<div class="tc-saving-thumbnail-caption"> +<$transclude tiddler=<<currentTab>> field="caption"> +<$view tiddler=<<currentTab>> field="title"/> +</$transclude> +</div> +<div class="tc-saving-thumbnail-description"> +<$view tiddler=<<currentTab>> field="description"/> +</div> +</div> diff --git a/editions/tw5.com/tiddlers/saving/TiddlyWiki in the Sky for Dropbox.tid b/editions/tw5.com/tiddlers/saving/TiddlyWiki in the Sky for Dropbox.tid new file mode 100644 index 000000000..15995e1c1 --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/TiddlyWiki in the Sky for Dropbox.tid @@ -0,0 +1,16 @@ +caption: ~TiddlyWiki in the Sky for Dropbox +created: 20171113135053055 +delivery: Web Service +description: Online service for editing TiddlyWiki documents in Dropbox +method: save +modified: 20180410115910048 +tags: Saving Android Chrome Firefox InternetExplorer iOS Linux Mac Opera PHP Safari Windows +title: TiddlyWiki in the Sky for Dropbox +type: text/vnd.tiddlywiki +url: https://twcloud.github.io/tw5-dropbox/ + +Originally built by Jeremy Ruston and now maintained by Arlen Beiler, TiddlyWiki in the Sky for Dropbox is an online service that lets you edit TiddlyWiki documents directly in your own Dropbox using just a browser. + +It works with TiddlyWiki 5 and Classic. + +https://twcloud.github.io/tw5-dropbox/ \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/styleguide/Typography.tid b/editions/tw5.com/tiddlers/styleguide/Typography.tid index 05ee65f79..8f3a7d542 100644 --- a/editions/tw5.com/tiddlers/styleguide/Typography.tid +++ b/editions/tw5.com/tiddlers/styleguide/Typography.tid @@ -1,7 +1,6 @@ created: 20141226192500000 modified: 20150117152559000 title: Typography -tags: documenting Use the [[documentation macros|Documentation Macros]] to keep the text maintainable in the face of change. diff --git a/editions/tw5.com/tiddlers/system/Deprecated.tid b/editions/tw5.com/tiddlers/system/Deprecated.tid new file mode 100644 index 000000000..c8370cb8e --- /dev/null +++ b/editions/tw5.com/tiddlers/system/Deprecated.tid @@ -0,0 +1,8 @@ +created: 20170126143833588 +modified: 201804111739 +title: $:/deprecated +type: text/vnd.tiddlywiki + +<<< +In several fields, deprecation is the discouragement of use of some feature, design or practice; typically because it has been superseded or is no longer considered safe – but without completely removing it or prohibiting its use. +<<< [[wikipedia|https://en.wikipedia.org/wiki/Deprecation]] diff --git a/editions/tw5.com/tiddlers/system/Deprecated_-_What_does_it_mean.tid b/editions/tw5.com/tiddlers/system/Deprecated_-_What_does_it_mean.tid new file mode 100644 index 000000000..37f98c3f1 --- /dev/null +++ b/editions/tw5.com/tiddlers/system/Deprecated_-_What_does_it_mean.tid @@ -0,0 +1,16 @@ +created: 20170126142116898 +modified: 201804111739 +title: Deprecated - What does it mean +type: text/vnd.tiddlywiki + +First of all: ''Keep calm!'' + +{{$:/deprecated}} + +For ~TiddlyWiki it means, that you should not use this mechanism for new content anymore! ''AND you should update your existing content''! + +Deprecated features have a marker. see: [[Custom styles by tag]] + +''Tiddlers tagged `$:/deprecated`'' + +><<list-links "[tag[$:/deprecated]]">> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/system/GoogleAnalyticsAccount.tid b/editions/tw5.com/tiddlers/system/GoogleAnalyticsAccount.tid deleted file mode 100644 index 1e0f77e7c..000000000 --- a/editions/tw5.com/tiddlers/system/GoogleAnalyticsAccount.tid +++ /dev/null @@ -1,3 +0,0 @@ -title: $:/GoogleAnalyticsAccount - -UA-32839735-1 \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/system/GoogleAnalyticsDomain.tid b/editions/tw5.com/tiddlers/system/GoogleAnalyticsDomain.tid deleted file mode 100644 index ee2e3f723..000000000 --- a/editions/tw5.com/tiddlers/system/GoogleAnalyticsDomain.tid +++ /dev/null @@ -1,3 +0,0 @@ -title: $:/GoogleAnalyticsDomain - -tiddlywiki.com \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/system/Sources.tid b/editions/tw5.com/tiddlers/system/Sources.tid index e0c331d78..eef3fa85d 100644 --- a/editions/tw5.com/tiddlers/system/Sources.tid +++ b/editions/tw5.com/tiddlers/system/Sources.tid @@ -2,27 +2,36 @@ title: $:/editions/tw5.com/TiddlerInfo/Sources tags: $:/tags/TiddlerInfo caption: Sources -\define makeStaticLink() -http://tiddlywiki.com/static/<$view tiddler=<<currentTiddler>> field="title" format="doubleurlencoded"/>.html +\define static-link-base() +https://tiddlywiki.com/static/$(title)$.html \end -\define outerMakeStaticLink() -<$macrocall $name="makeStaticLink" $output="text/plain"/> -\end -\define makeGitHubLink() -https://github.com/Jermolene/TiddlyWiki5/blob/master/editions/tw5.com/tiddlers/$(githubLink)$ -\end -\define outerMakeGitHubLink() -<$set name="githubLink" value={{$:/config/OriginalTiddlerPaths##$(currentTiddler)$}}> -<a href=<<makeGitHubLink>> class="tc-tiddlylink-external" target="_blank" rel="noopener noreferrer"><$text text=<<makeGitHubLink>>/></a> + +\define make-static-link() +<$set name="title" filter="[<currentTiddler>encodeuricomponent[]encodeuricomponent[]]" select="0"> +<a href=<<static-link-base>> class="tc-tiddlylink-external" target="_blank" rel="noopener noreferrer"><$text text=<<static-link-base>>/></a> </$set> \end + +\define github-link-base() +https://github.com/Jermolene/TiddlyWiki5/blob/master/editions/tw5.com/tiddlers/$(title)$ +\end + +\define make-github-link() +<$set name="title" value={{$:/config/OriginalTiddlerPaths##$(currentTiddler)$}}> +<$set name="title" filter="[<title>encodeuricomponent[]]" select="0"> +<a href=<<github-link-base>> class="tc-tiddlylink-external" target="_blank" rel="noopener noreferrer"><$text text=<<github-link-base>>/></a> +</$set> +</$set> +\end + <$list filter="[all[current]!is[system]!is[shadow]]"> A static HTML representation of this tiddler is available at the URL: -* <<outerMakeStaticLink>> +* <<make-static-link>> Help us to improve the documentation by sending a ~GitHub pull request for this tiddler: -* <<outerMakeGitHubLink>> -</$list> \ No newline at end of file +* <<make-github-link>> + +</$list> diff --git a/editions/tw5.com/tiddlers/system/StaticBanner.tid b/editions/tw5.com/tiddlers/system/StaticBanner.tid index ef5d23019..9a9ae9bfb 100644 --- a/editions/tw5.com/tiddlers/system/StaticBanner.tid +++ b/editions/tw5.com/tiddlers/system/StaticBanner.tid @@ -1,3 +1,3 @@ title: $:/StaticBanner -<div class="tc-static-alert"><div class="tc-static-alert-inner">This page is part of a static HTML representation of the ~TiddlyWiki at http://tiddlywiki.com/</div></div> +<div class="tc-static-alert"><div class="tc-static-alert-inner">This page is part of a static HTML representation of the ~TiddlyWiki at https://tiddlywiki.com/</div></div> diff --git a/editions/tw5.com/tiddlers/system/doc-macros.tid b/editions/tw5.com/tiddlers/system/doc-macros.tid index e256bc1cd..f1c846775 100644 --- a/editions/tw5.com/tiddlers/system/doc-macros.tid +++ b/editions/tw5.com/tiddlers/system/doc-macros.tid @@ -1,7 +1,8 @@ created: 20150117152607000 -modified: 20150228081437000 -title: $:/editions/tw5.com/doc-macros +modified: 201804111739 tags: $:/tags/Macro +title: $:/editions/tw5.com/doc-macros +type: text/vnd.tiddlywiki \define .concat(1,2,3,4,5) $1$$2$$3$$4$$5$ @@ -80,10 +81,12 @@ This is an example tiddler. See [[Table-of-Contents Macros (Examples)]]. \define .example(n,eg,egvar:NO-SUCH-VAR) <div class="doc-example"> <$reveal default="$egvar$" type="match" text="NO-SUCH-VAR"> + <$macrocall $name="copy-to-clipboard-above-right" src="""$eg$"""/> <$codeblock code="""$eg$"""/> </$reveal> <$reveal default="$egvar$" type="nomatch" text="NO-SUCH-VAR"> <!-- allow an example to contain """ --> + <$macrocall $name="copy-to-clipboard-above-right" src=<<$egvar$>>/> <$codeblock code=<<$egvar$>>/> </$reveal> <$list filter="[title<.state-prefix>addsuffix{!!title}addsuffix[/]addsuffix[$n$]]" variable=".state"> @@ -107,3 +110,5 @@ This is an example tiddler. See [[Table-of-Contents Macros (Examples)]]. </$reveal> </$list> \end + +<pre><$view field="text"/></pre> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/system/doc-styles.tid b/editions/tw5.com/tiddlers/system/doc-styles.tid index 4fb5fe007..101fbe2f6 100644 --- a/editions/tw5.com/tiddlers/system/doc-styles.tid +++ b/editions/tw5.com/tiddlers/system/doc-styles.tid @@ -1,7 +1,8 @@ created: 20150117152612000 -modified: 20150226162159000 -title: $:/editions/tw5.com/doc-styles +modified: 201804111739 tags: $:/tags/Stylesheet +title: $:/editions/tw5.com/doc-styles +type: text/vnd.tiddlywiki .doc-def { font-style: normal; @@ -161,3 +162,38 @@ tr.doc-table-subheading { .doc-block-icon .tc-image-warning { fill: <<colour alert-highlight>>; } + +.doc-from-version { + display: inline-block; + border-radius: 1em; + background: <<colour tiddler-controls-foreground>>; + color: <<colour background>>; + fill: <<colour background>>; + padding: 0 0.4em; + font-size: 0.7em; + text-transform: uppercase; + font-weight: bold; + line-height: 1.5; + vertical-align: text-bottom; +} + +.doc-deprecated-version { + display: inline-block; + border-radius: 1em; + background: red; + color: <<colour background>>; + fill: <<colour background>>; + padding: 0 0.4em; + font-size: 0.7em; + text-transform: uppercase; + font-weight: bold; + line-height: 1.5; + vertical-align: text-bottom; +} + +.doc-deprecated-version svg, +.doc-from-version svg { + width: 1em; + height: 1em; + vertical-align: text-bottom; +} \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/system/operator-macros.tid b/editions/tw5.com/tiddlers/system/operator-macros.tid index 11fdcf8b2..57ab9445e 100644 --- a/editions/tw5.com/tiddlers/system/operator-macros.tid +++ b/editions/tw5.com/tiddlers/system/operator-macros.tid @@ -20,7 +20,7 @@ tags: $:/tags/Macro <dd><$button set=<<.state>> setTo="">Hide</$button></dd> </dl> <blockquote class="doc-example-result"> - <ul><$list filter="$eg$" emptyMessage="(empty)"> + <ul><$list filter="""$eg$""" emptyMessage="(empty)"> <li><$link><$view field="title"/></$link></li> </$list></ul> </blockquote> diff --git a/editions/tw5.com/tiddlers/system/operator-template.tid b/editions/tw5.com/tiddlers/system/operator-template.tid index 312686cb5..13c5e28be 100644 --- a/editions/tw5.com/tiddlers/system/operator-template.tid +++ b/editions/tw5.com/tiddlers/system/operator-template.tid @@ -71,6 +71,9 @@ list-before: $:/core/ui/ViewTemplate/body </$set> <!--> </table> +<$list filter="[all[current]has[from-version]]" variable="listItem"> +<$macrocall $name=".from-version" version={{!!from-version}}/> +</$list> </$list> </$set> </$set> diff --git a/editions/tw5.com/tiddlers/system/static.content.tid b/editions/tw5.com/tiddlers/system/static.content.tid index d58eb7698..f815deeb7 100644 --- a/editions/tw5.com/tiddlers/system/static.content.tid +++ b/editions/tw5.com/tiddlers/system/static.content.tid @@ -1,16 +1,15 @@ title: $:/core/templates/static.content -type: text/vnd.tiddlywiki hack-to-give-us-something-to-compare-against: yes -\define tv-wikilink-template() http://tiddlywiki.com/static/$uri_doubleencoded$.html +\define tv-wikilink-template() https://tiddlywiki.com/static/$uri_doubleencoded$.html <!-- For Google, and people without JavaScript--> <$reveal state="!!hack-to-give-us-something-to-compare-against" type="nomatch" text=<<savingEmpty>>> It looks like this browser doesn't run JavaScript. You can use one of these static HTML versions to browse the same content: -* http://tiddlywiki.com/static.html - browse individual tiddlers as separate pages -* http://tiddlywiki.com/alltiddlers.html#HelloThere - single file containing all tiddlers +* https://tiddlywiki.com/static.html - browse individual tiddlers as separate pages +* https://tiddlywiki.com/alltiddlers.html#HelloThere - single file containing all tiddlers --- diff --git a/editions/tw5.com/tiddlers/system/variable-macros.tid b/editions/tw5.com/tiddlers/system/variable-macros.tid index acbf993a9..aac443017 100644 --- a/editions/tw5.com/tiddlers/system/variable-macros.tid +++ b/editions/tw5.com/tiddlers/system/variable-macros.tid @@ -7,7 +7,7 @@ tags: $:/tags/Macro \define .macro-examples(m,text:"Examples") <$link to="$m$ Macro (Examples)">$text$</$link> \define .widget-examples(w,text:"Examples") <$link to="$w$ Widget (Examples)">$text$</$link> -\define .js-macro-link(_) [[$_$|http://tiddlywiki.com/dev/index.html#JavaScript%20Macros]] +\define .js-macro-link(_) [[$_$|https://tiddlywiki.com/dev/index.html#JavaScript%20Macros]] \define .this-is-static-link-variable() <<.tip "This variable has no useful effect when ~TiddlyWiki is running in a browser, as the `href` attribute is ignored there -- links between tiddlers are performed by JavaScript instead. The variable comes into play when one is using the [[Node.js configuration|TiddlyWiki on Node.js]] to [[generate a static version|RenderTiddlersCommand]] of a wiki.">> diff --git a/editions/tw5.com/tiddlers/system/version-macros.tid b/editions/tw5.com/tiddlers/system/version-macros.tid new file mode 100644 index 000000000..763252000 --- /dev/null +++ b/editions/tw5.com/tiddlers/system/version-macros.tid @@ -0,0 +1,15 @@ +created: 20161008085627406 +modified: 201804111739 +tags: $:/tags/Macro +title: $:/editions/tw5.com/version-macros +type: text/vnd.tiddlywiki + +\define .from-version(version) +<span class="doc-from-version">{{$:/core/images/warning}} New in: $version$</span> +\end + +\define .deprecated-since(version, superseeded:"TODO-Link") +<$button to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Deprecated since: $version$ </$button> use [[$superseeded$]] instead! +\end + +<pre><$view field="text"/></pre> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/system/wikitext-macros.tid b/editions/tw5.com/tiddlers/system/wikitext-macros.tid index 932ff581d..c609205ab 100644 --- a/editions/tw5.com/tiddlers/system/wikitext-macros.tid +++ b/editions/tw5.com/tiddlers/system/wikitext-macros.tid @@ -6,6 +6,8 @@ tags: $:/tags/Macro \define wikitext-example(src) <div class="doc-example"> +<$macrocall $name="copy-to-clipboard-above-right" src=<<__src__>>/> + ``` $src$ ``` @@ -25,6 +27,8 @@ $$$ \define wikitext-example-without-html(src) <div class="doc-example"> +<$macrocall $name="copy-to-clipboard-above-right" src=<<__src__>>/> + ``` $src$ ``` diff --git a/editions/tw5.com/tiddlers/variables/actionTiddler Variable.tid b/editions/tw5.com/tiddlers/variables/actionTiddler Variable.tid new file mode 100644 index 000000000..1daddf6f6 --- /dev/null +++ b/editions/tw5.com/tiddlers/variables/actionTiddler Variable.tid @@ -0,0 +1,7 @@ +created: 20170406083917224 +modified: 20170406084026289 +tags: Variables [[Core Variables]] +title: actionTiddler Variable +type: text/vnd.tiddlywiki + +Within the ''action'' string of the DroppableWidget, the <<.def actionTiddler>> [[variable|Variables]] contains the title of the tiddler being dropped. diff --git a/editions/tw5.com/tiddlers/variables/examples/Sample Headings 1-2-3.tid b/editions/tw5.com/tiddlers/variables/examples/Sample Headings 1-2-3.tid new file mode 100644 index 000000000..97a5e97bc --- /dev/null +++ b/editions/tw5.com/tiddlers/variables/examples/Sample Headings 1-2-3.tid @@ -0,0 +1,22 @@ +created: 20180609112450207 +modified: 20180609112450207 +title: Sample Headings 1,2,3 + +! This is a Level 1 Heading + +This is a paragraph. + +<$vars tv-adjust-heading-level="-2"> + +{{Sample Headings 3,4,5}} + +</$vars> + +!! This is a Level 2 heading + +<$vars tv-adjust-heading-level="-1"> + +{{Sample Headings 4,5,6}} + +</$vars> + diff --git a/editions/tw5.com/tiddlers/variables/examples/Sample Headings 3-4-5.tid b/editions/tw5.com/tiddlers/variables/examples/Sample Headings 3-4-5.tid new file mode 100644 index 000000000..214218363 --- /dev/null +++ b/editions/tw5.com/tiddlers/variables/examples/Sample Headings 3-4-5.tid @@ -0,0 +1,9 @@ +created: 20180609112450207 +modified: 20180609112450207 +title: Sample Headings 3,4,5 + +!!! This is written as a Level 3 heading + +!!!! This is written as a Level 4 heading + +!!!!! This is written as a Level 5 heading diff --git a/editions/tw5.com/tiddlers/variables/examples/Sample Headings 4-5-6.tid b/editions/tw5.com/tiddlers/variables/examples/Sample Headings 4-5-6.tid new file mode 100644 index 000000000..eb67694dd --- /dev/null +++ b/editions/tw5.com/tiddlers/variables/examples/Sample Headings 4-5-6.tid @@ -0,0 +1,9 @@ +created: 20180609112450207 +modified: 20180609112450207 +title: Sample Headings 4,5,6 + +!!!! This is written as a Level 4 heading + +!!!!! This is written as a Level 5 heading + +!!!!!! This is written as a Level 6 heading diff --git a/editions/tw5.com/tiddlers/variables/examples/tv-adjust-heading-level.tid b/editions/tw5.com/tiddlers/variables/examples/tv-adjust-heading-level.tid new file mode 100644 index 000000000..a7a13ae25 --- /dev/null +++ b/editions/tw5.com/tiddlers/variables/examples/tv-adjust-heading-level.tid @@ -0,0 +1,25 @@ +created: 20180609112450207 +modified: 20180609112450207 +tags: [[tv-adjust-heading-level Variable]] [[Variable Examples]] +title: tv-adjust-heading-level Variable (Examples) +type: text/vnd.tiddlywiki + +\define show-tiddler(title) +!! $title$ + +<$codeblock code={{$title$}}/> +\end + +! Tiddlers + +<<show-tiddler "Sample Headings 1,2,3">> + +<<show-tiddler "Sample Headings 3,4,5">> + +<<show-tiddler "Sample Headings 4,5,6">> + +! Example + +<$macrocall $name=".example" n="1" +eg="""<$transclude tiddler="Sample Headings 1,2,3" mode="block"/>"""/> + diff --git a/editions/tw5.com/tiddlers/variables/examples/tv-get-export-image-link.tid b/editions/tw5.com/tiddlers/variables/examples/tv-get-export-image-link.tid index 9d2c1cbc7..36e151b44 100644 --- a/editions/tw5.com/tiddlers/variables/examples/tv-get-export-image-link.tid +++ b/editions/tw5.com/tiddlers/variables/examples/tv-get-export-image-link.tid @@ -3,7 +3,7 @@ tags: [[tv-get-export-image-link Variable]] [[Variable Examples]] title: tv-get-export-image-link Variable (Examples) type: text/vnd.tiddlywiki -This example fetches [[the TiddlyWiki icon|http://www.tiddlywiki.com/favicon.ico]]: +This example fetches [[the TiddlyWiki icon|https://www.tiddlywiki.com/favicon.ico]]: <$importvariables filter="$:/editions/tw5.com/macro-examples/tv-get-export-image-link"> <$codeblock code={{$:/editions/tw5.com/macro-examples/tv-get-export-image-link}}/> diff --git a/editions/tw5.com/tiddlers/variables/modifier Variable.tid b/editions/tw5.com/tiddlers/variables/modifier Variable.tid new file mode 100644 index 000000000..44c4c2077 --- /dev/null +++ b/editions/tw5.com/tiddlers/variables/modifier Variable.tid @@ -0,0 +1,14 @@ +tags: Variables [[Core Variables]] +title: modifier Variable +type: text/vnd.tiddlywiki + +Within the ''action'' string of the DroppableWidget, the <<.def modifier>> [[variable|Variables]] contains the modifier key(s) held during the drag-process. +The possible keys are ''ctrl'', ''shift'' or both ''ctrl'' and ''shift'' + +The variable contains a string that identifies the keys: + +|Modifier Key |Variable Content |h +|ctrl |ctrl | +|shift |shift | +|ctrl+shift |ctrl-shift | +|no modifier (normal drag) |normal | diff --git a/editions/tw5.com/tiddlers/variables/tv-adjust-heading-level Variable.tid b/editions/tw5.com/tiddlers/variables/tv-adjust-heading-level Variable.tid new file mode 100644 index 000000000..161c3b42c --- /dev/null +++ b/editions/tw5.com/tiddlers/variables/tv-adjust-heading-level Variable.tid @@ -0,0 +1,12 @@ +caption: tv-adjust-heading-level +created: 20180609112450207 +modified: 20180609112450207 +tags: Variables [[Core Variables]] [[Configuration Variables]] +title: tv-adjust-heading-level Variable +type: text/vnd.tiddlywiki + +The <<.def tv-adjust-heading-level>> [[variable|Variables]] allows the level of [[headings|Headings in WikiText]] to be adjusted. It is interpreted as a positive or negative number (e.g. "2" or "-3") that is added to the heading level for display. + +Note that if the resulting heading level is less than 1 then level 1 is used instead. This means that specfiying a large negative adjustment factor will reset all headings to display as level 1. Similarly, heading levels larger than 6 are clamped to the maximum HTML heading level of 6. + +<<.variable-examples "tv-adjust-heading-level">> diff --git a/editions/tw5.com/tiddlers/variables/tv-auto-open-on-import.tid b/editions/tw5.com/tiddlers/variables/tv-auto-open-on-import.tid index 81970e274..ce18639a2 100644 --- a/editions/tw5.com/tiddlers/variables/tv-auto-open-on-import.tid +++ b/editions/tw5.com/tiddlers/variables/tv-auto-open-on-import.tid @@ -9,4 +9,4 @@ The <<.def tv-auto-open-on-import>> [[variable|Variables]] controls whether the By default, the tiddler is opened. But if this variable has the value <<.value no>>, it isn't. -An example of setting this variable to <<.value no>> can be found in the upgrade plugin within the [[TiddlyWiki Upgrade Wizard|http://www.tiddlywiki.com/upgrade.html]]. People can drag their wiki files onto the wizard without triggering the normal import display. +An example of setting this variable to <<.value no>> can be found in the upgrade plugin within the [[TiddlyWiki Upgrade Wizard|https://www.tiddlywiki.com/upgrade.html]]. People can drag their wiki files onto the wizard without triggering the normal import display. diff --git a/editions/tw5.com/tiddlers/variables/tv-filter-export-link Variable.tid b/editions/tw5.com/tiddlers/variables/tv-filter-export-link Variable.tid new file mode 100644 index 000000000..f9800b43f --- /dev/null +++ b/editions/tw5.com/tiddlers/variables/tv-filter-export-link Variable.tid @@ -0,0 +1,20 @@ +caption: tv-filter-export-link +created: 20170828095135984 +modified: 20170828095757620 +tags: Variables [[Core Variables]] [[Configuration Variables]] +title: tv-filter-export-link Variable +type: text/vnd.tiddlywiki + +<<.from-version "5.1.15">> The <<.def tv-filter-export-link>> [[variable|Variables]] controls the value of the `href` attribute on the HTML `a` element generated by the <<.wlink LinkWidget>> widget. If defined, it takes precedence over the [[tv-wikilink-template Variable]]. + +<<.this-is-static-link-variable>> + +The variable is treated as a filter that is given the target tiddler title as input. The filter is evaluated and the first result is used as the `href` attribute. + +For example: + +``` +\define tv-filter-export-link() [encodeuricomponent[]encodeuricomponent[]addsuffix[.html]] +``` + +See also the <<.vlink tv-get-export-link>> variable, which dominates over this one. diff --git a/editions/tw5.com/tiddlers/variables/tv-history-list Variable.tid b/editions/tw5.com/tiddlers/variables/tv-history-list Variable.tid new file mode 100644 index 000000000..16ddd00a3 --- /dev/null +++ b/editions/tw5.com/tiddlers/variables/tv-history-list Variable.tid @@ -0,0 +1,9 @@ +created: 20170629074522030 +modified: 20170629074609739 +tags: Variables [[Core Variables]] +title: tv-history-list Variable +type: text/vnd.tiddlywiki + +The <<.def tv-history-list>> [[variable|Variables]] is assigned by the [[NavigatorWidget]] to contain the title of the tiddler containing the current history list. + +Compare <<.vlink tv-story-list>>. diff --git a/editions/tw5.com/tiddlers/variables/tv-story-list Variable.tid b/editions/tw5.com/tiddlers/variables/tv-story-list Variable.tid new file mode 100644 index 000000000..ea5677de6 --- /dev/null +++ b/editions/tw5.com/tiddlers/variables/tv-story-list Variable.tid @@ -0,0 +1,9 @@ +created: 20170629074200301 +modified: 20170629074520393 +tags: Variables [[Core Variables]] +title: tv-story-list Variable +type: text/vnd.tiddlywiki + +The <<.def tv-story-list>> [[variable|Variables]] is assigned by the [[NavigatorWidget]] to contain the title of the tiddler containing the current story list. + +Compare <<.vlink tv-history-list>>. diff --git a/editions/tw5.com/tiddlers/variables/tv-wikilink-template.tid b/editions/tw5.com/tiddlers/variables/tv-wikilink-template.tid index 5a6ab8182..6fdac1410 100644 --- a/editions/tw5.com/tiddlers/variables/tv-wikilink-template.tid +++ b/editions/tw5.com/tiddlers/variables/tv-wikilink-template.tid @@ -1,11 +1,11 @@ -created: 20150228105954000 -modified: 20150228131300000 -title: tv-wikilink-template Variable -tags: Variables [[Core Variables]] [[Configuration Variables]] -type: text/vnd.tiddlywiki caption: tv-wikilink-template +created: 20150228105954000 +modified: 20170828095603911 +tags: Variables [[Core Variables]] [[Configuration Variables]] +title: tv-wikilink-template Variable +type: text/vnd.tiddlywiki -The <<.def tv-wikilink-template>> [[variable|Variables]] controls the value of the `href` attribute on the HTML `a` element generated by the <<.wlink LinkWidget>> widget. +The <<.def tv-wikilink-template>> [[variable|Variables]] controls the value of the `href` attribute on the HTML `a` element generated by the <<.wlink LinkWidget>> widget. The <<.vlink tv-filter-export-link>>, if defined, it takes precedence over the <<.vlink tv-wikilink-template>> variable. <<.this-is-static-link-variable>> diff --git a/editions/tw5.com/tiddlers/videos/Getting Started Video.tid b/editions/tw5.com/tiddlers/videos/Getting Started Video.tid index 03d430b61..bb7282161 100644 --- a/editions/tw5.com/tiddlers/videos/Getting Started Video.tid +++ b/editions/tw5.com/tiddlers/videos/Getting Started Video.tid @@ -8,4 +8,4 @@ This brief tutorial takes you through the basics of saving changes with a standa //Note that the video is a bit out of date, and will be updated soon!// -<iframe width="560" height="315" src="http://www.youtube.com/embed/1g66s7UbyuU" frameborder="0" allowfullscreen></iframe> \ No newline at end of file +<iframe width="560" height="315" src="https://www.youtube.com/embed/1g66s7UbyuU" frameborder="0" allowfullscreen></iframe> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/videos/Introducing TiddlyDesktop Video.tid b/editions/tw5.com/tiddlers/videos/Introducing TiddlyDesktop Video.tid index 3f7c5ea25..246fc370a 100644 --- a/editions/tw5.com/tiddlers/videos/Introducing TiddlyDesktop Video.tid +++ b/editions/tw5.com/tiddlers/videos/Introducing TiddlyDesktop Video.tid @@ -6,4 +6,4 @@ type: text/vnd.tiddlywiki This brief introduction shows how to install and use TiddlyDesktop: -<iframe width="560" height="315" src="http://www.youtube.com/embed/i3Bggkm7paA" frameborder="0" allowfullscreen></iframe> \ No newline at end of file +<iframe width="560" height="315" src="https://www.youtube.com/embed/i3Bggkm7paA" frameborder="0" allowfullscreen></iframe> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/videos/Introduction Video.tid b/editions/tw5.com/tiddlers/videos/Introduction Video.tid index 8a1d17e85..862910b8c 100644 --- a/editions/tw5.com/tiddlers/videos/Introduction Video.tid +++ b/editions/tw5.com/tiddlers/videos/Introduction Video.tid @@ -6,8 +6,8 @@ type: text/vnd.tiddlywiki This brief presentation explains the basic principles of TiddlyWiki. -<iframe width="560" height="315" src="http://www.youtube.com/embed/KtCUr83XgyE" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/KtCUr83XgyE" frameborder="0" allowfullscreen></iframe> The TiddlyWiki used to produce the video can be found here: -http://tiddlywiki.com/editions/introduction/ +https://tiddlywiki.com/editions/introduction/ diff --git a/editions/tw5.com/tiddlers/videos/TiddlyWiki on Firefox for Android Video.tid b/editions/tw5.com/tiddlers/videos/TiddlyWiki on Firefox for Android Video.tid index 13bc2c8fc..85b93bd82 100644 --- a/editions/tw5.com/tiddlers/videos/TiddlyWiki on Firefox for Android Video.tid +++ b/editions/tw5.com/tiddlers/videos/TiddlyWiki on Firefox for Android Video.tid @@ -6,4 +6,4 @@ type: text/vnd.tiddlywiki This brief screencast shows how to setup Firefox for Android so you can save changes to TiddlyWiki: -<iframe width="560" height="315" src="http://www.youtube.com/embed/iikkv9orGGI" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="https://www.youtube.com/embed/iikkv9orGGI" frameborder="0" allowfullscreen></iframe> diff --git a/editions/tw5.com/tiddlers/videos/Working with the TiddlyWiki5 repository video.tid b/editions/tw5.com/tiddlers/videos/Working with the TiddlyWiki5 repository video.tid index bdba130a7..f3e08af58 100644 --- a/editions/tw5.com/tiddlers/videos/Working with the TiddlyWiki5 repository video.tid +++ b/editions/tw5.com/tiddlers/videos/Working with the TiddlyWiki5 repository video.tid @@ -6,4 +6,4 @@ type: text/vnd.tiddlywiki Mario Pietsch has created a short video tutorial on [[working with the TiddlyWiki5 GitHub repository|Working with the TiddlyWiki5 repository]]. -<iframe width="560" height="315" src="http://www.youtube.com/embed/6ElUruH92tc" frameborder="0" allowfullscreen></iframe> \ No newline at end of file +<iframe width="560" height="315" src="https://www.youtube.com/embed/6ElUruH92tc" frameborder="0" allowfullscreen></iframe> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget.tid new file mode 100644 index 000000000..a7d223e4e --- /dev/null +++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget.tid @@ -0,0 +1,30 @@ +caption: action-createtiddler +created: 20161020152745942 +modified: 20161020155119177 +tags: Widgets ActionWidgets +title: ActionCreateTiddlerWidget +type: text/vnd.tiddlywiki + +! Introduction + +The ''action-createtiddler'' widget is an [[action widget|ActionWidgets]] that creates new tiddlers. ActionWidgets are used within triggering widgets such as the ButtonWidget. + +There are several differences from the [[tm-new-tiddler message|WidgetMessage: tm-new-tiddler]]: + +* The new tiddler is not automatically displayed in the [[story river|StoryRiver]] +* The title of the new tiddler is made available for subsequent operations + +! Content and Attributes + +The ''action-createtiddler'' widget is invisible. Any content within it is ignored. + +|!Attribute |!Description | +|$basetitle |The initial title that will be attempted. If a tiddler with that title already exists, then a numerical counter is added to the title and incremented until it is unique| +|$savetitle |A text reference identifying a field or index into which the title of the newly created tiddler will be stored after it is created | +|$timestamp |Specifies whether the timestamp(s) of the target tiddler will be updated (''modified'' and ''modifier'', plus ''created'' and ''creator'' for newly created tiddlers). Can be "yes" (the default) or "no" | +|//{any attributes not starting with $}// |Each attribute name specifies a field to be created in the new tiddler | + +! Examples + +<$macrocall $name='wikitext-example-without-html' +src={{ActionCreateTiddlerWidget Example}}/> diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget_Example.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget_Example.tid new file mode 100644 index 000000000..2be233566 --- /dev/null +++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget_Example.tid @@ -0,0 +1,12 @@ +created: 20161020153426686 +modified: 20161020155142990 +tags: ActionCreateTiddlerWidget +title: ActionCreateTiddlerWidget Example +type: text/vnd.tiddlywiki + +New button caption: <$edit-text tiddler="$:/state/new-button-caption" tag="input" default=""/> + +<$button> +<$action-createtiddler $basetitle="Homemade Button" tags="$:/tags/PageControls" text={{$:/state/new-button-caption}}/> +Create non-functional page control button +</$button> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/widgets/ActionDeleteFieldWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionDeleteFieldWidget.tid index ccddfa64c..2855804fd 100644 --- a/editions/tw5.com/tiddlers/widgets/ActionDeleteFieldWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ActionDeleteFieldWidget.tid @@ -14,7 +14,7 @@ The ''action-deletefield'' widget is an [[action widget|ActionWidgets]] that del The ''action-deletefield'' widget is invisible. Any content within it is ignored. |!Attribute |!Description | -|$tiddler |The title of the tiddler whose fields are to be modified (if not provided defaults to the [[current tiddler|Current Tiddler]] | +|$tiddler |The title of the tiddler whose fields are to be modified (if not provided defaults to the [[current tiddler|Current Tiddler]]) | |$field |Optional name of a field to delete | |//{any attributes not starting with $}// |Each attribute name specifies a field to be deleted. The attribute value is ignored and need not be specified | diff --git a/editions/tw5.com/tiddlers/widgets/ActionSetFieldWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionSetFieldWidget.tid index 0e46808f7..f278dae0b 100644 --- a/editions/tw5.com/tiddlers/widgets/ActionSetFieldWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ActionSetFieldWidget.tid @@ -14,7 +14,7 @@ The ''action-setfield'' widget is an [[action widget|ActionWidgets]] that assign The ''action-setfield'' widget is invisible. Any content within it is ignored. |!Attribute |!Description | -|$tiddler |The title of the tiddler whose fields are to be modified (if not provided defaults to the [[current tiddler|Current Tiddler]] | +|$tiddler |The title of the tiddler whose fields are to be modified (if not provided defaults to the [[current tiddler|Current Tiddler]]) | |$field |Optional name of a field to be assigned the $value attribute | |$index |Optional index of a property in a [[data tiddler|DataTiddlers]] to be assigned the $value attribute| |$value |The value to be assigned to the field or index identified by the $field or $index attribute. If neither is specified then the value is assigned to the text field. If no value is specified, $field or $index will be deleted.| diff --git a/editions/tw5.com/tiddlers/widgets/BrowseWidget.tid b/editions/tw5.com/tiddlers/widgets/BrowseWidget.tid index 5d4003dc2..0f2544fb3 100644 --- a/editions/tw5.com/tiddlers/widgets/BrowseWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/BrowseWidget.tid @@ -1,12 +1,13 @@ -title: BrowseWidget -created: 201310241419 -modified: 20141202155353547 -tags: Widgets caption: browse +created: 20131024141900000 +modified: 20170718142410367 +tags: Widgets +title: BrowseWidget +type: text/vnd.tiddlywiki ! Introduction -The browse widget displays an HTML file browser button that allows the user to choose one or more files to import. It sends a [[WidgetMessage: tm-import-tiddlers]] carrying a JSON representation of the tiddlers imported from the files up through its parents. This message usually trapped by the NavigatorWidget which adds the tiddlers to the store and updates the story to display them. +The browse widget displays an HTML file browser button that allows the user to choose one or more files to import. It sends a [[WidgetMessage: tm-import-tiddlers]] carrying a JSON representation of the tiddlers imported from the files up through its parents. This message is usually handled by the NavigatorWidget which adds the tiddlers to the store and updates the story to display them. ! Content and Attributes @@ -14,6 +15,7 @@ The content of the `<$browse>` widget is ignored. |!Attribute |!Description | |multiple |Set to "multiple" to select multiple file upload | +|deserializer |<<.from-version "5.1.15">> Optional name of deserializer to be used (by default the deserializer is derived from the file extension or type) | |tooltip |Optional tooltip text | |message |Optional override of widget message to be generated. The parameter for the message will be the JavaScript object `event.target.files` | diff --git a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid index dcc8002a7..a44c135f8 100644 --- a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid @@ -1,6 +1,6 @@ caption: button created: 20131024141900000 -modified: 20160429175044822 +modified: 20170406085706139 tags: Widgets title: ButtonWidget type: text/vnd.tiddlywiki @@ -30,14 +30,16 @@ The content of the `<$button>` widget is displayed within the button. |param |The optional parameter to the message | |set |A TextReference to which a new value will be assigned | |setTo |The new value to assign to the TextReference identified in the `set` attribute | -|popup |Title of a state tiddler for a popup that is toggled when the button is clicked | +|selectedClass |An optional additional CSS class to be assigned if the popup is triggered or the tiddler specified in `set` already has the value specified in `setTo` | +|default |Default value if `set` tiddler is missing for testing against `setTo` to determine `selectedClass` | +|popup |Title of a state tiddler for a popup that is toggled when the button is clicked. See PopupMechanism for details | |aria-label |Optional [[Accessibility]] label | |tooltip |Optional tooltip | |class |An optional CSS class name to be assigned to the HTML element| |style |An optional CSS style attribute to be assigned to the HTML element | -|selectedClass |An optional additional CSS class to be assigned if the popup is triggered or the tiddler specified in `set` already has the value specified in `setTo` | |tag |An optional html tag to use instead of the default "button" | -|default |Default value if `set` tiddler is missing for testing against `setTo` to determine `selectedClass` | +|dragTiddler |An optional tiddler title making the button draggable and identifying the payload tiddler. See DraggableWidget for details | +|dragFilter |An optional filter making the button draggable and identifying the list of payload tiddlers. See DraggableWidget for details | ''Note:'' In almost all other cases where a TextReference is used as a widget attribute, it will be placed between curly brackets, to [[transclude|Transclusion in WikiText]] the value currently stored there. However, when we use a TextReference as the value of a button widget's `set` attribute, we are referencing //the storage location itself//, rather than the value stored there, so we do ''not'' use curly brackets there. //Example:// we could code a button widget that sets the `caption` field of TiddlerA to be the same as that of TiddlerB as: diff --git a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid index edde1467d..60f1b389b 100644 --- a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid @@ -1,6 +1,6 @@ caption: checkbox created: 20131024141900000 -modified: 20150626091305445 +modified: 20161221202816730 tags: Widgets title: CheckboxWidget type: text/vnd.tiddlywiki @@ -18,13 +18,16 @@ The content of the `<$checkbox>` widget is displayed within an HTML `<label>` el |!Attribute |!Description | |tiddler |Title of the tiddler to manipulate (defaults to the [[current tiddler|Current Tiddler]]) | -|tag |The name of the tag to which the checkbox should be bound | +|tag |The name of the tag to which the checkbox is bound | |invertTag |When set to ''yes'', flips the tag binding logic so that the absence of the tag causes the checkbox to be checked | -|field |The name of the field to which the checkbox should be bound | +|field |The name of the field to which the checkbox is bound | +|index|<<.from-version "5.1.14">> The index of the //tiddler//, a [[DataTiddler|DataTiddlers]], to which the checkbox is bound<<.tip "be sure to set the //tiddler// correctly">>| |checked |The value of the field corresponding to the checkbox being checked | |unchecked |The value of the field corresponding to the checkbox being unchecked | |default |The default value to use if the field is not defined | |class |The class that will be assigned to the label element | +|actions |<<.from-version "5.1.14">> A string containing ActionWidgets to be triggered when the checkbox is checked | +|uncheckactions |<<.from-version "5.1.16">> A string containing ActionWidgets to be triggered when the checkbox is unchecked | !! Tag Mode @@ -32,9 +35,7 @@ Using the checkbox widget in tag mode requires the ''tag'' attribute to specify This example creates a checkbox that flips the ''done'' tag on the current tiddler: -``` -<$checkbox tag="done">Is it done?</$checkbox> -``` +<<wikitext-example-without-html """<$checkbox tag="done"> Is it done?</$checkbox>""">> !! Field Mode @@ -42,6 +43,29 @@ Using the checkbox widget in field mode requires the ''field'' attribute to spec This example creates a checkbox that is checked if the field ''status'' is equal to ''open'' and unchecked if the field is equal to ''closed''. If the field is undefined then it defaults to ''closed'', meaning that the checkbox will be unchecked if the ''status'' field is missing. -``` -<$checkbox field="status" checked="open" unchecked="closed" default="closed">Is it open?</$checkbox> -``` +<<wikitext-example-without-html """<$checkbox field="status" checked="open" unchecked="closed" default="closed"> Is it open?</$checkbox><br>''status:'' {{!!status}}""">> + +!! Index Mode + +To use the checkbox widget in index mode set the ''index'' attribute to the index of a [[DataTiddler|DataTiddlers]]. The ''checked'' and ''unchecked'' attributes specify the values to be assigned to the index and correspond to its checked and unchecked states respectively. The ''default'' attribute is used as a fallback value if the index is undefined. + +The example below creates a checkbox that is checked if the index by the name of this tiddler in the tiddler ExampleData is equal to ''selected'' and unchecked if the index is an empty string. If the index is undefined then it defaults to an empty string, meaning the checkbox will be unchecked if the index is missing. + +<$macrocall $name="wikitext-example-without-html" src="""<$checkbox tiddler="ExampleData" index=<<currentTiddler>> checked="selected" unchecked="" default=""> Selected?</$checkbox>"""/> + +!! `actions` Attribute + +This example of using the `actions` attribute shows both the [[Action Set Field Widget|ActionSetFieldWidget]] and [[Action Send Message Widget|ActionSendMessageWidget]] to demonstrate two actions. + +The [[Set Widget|SetWidget]] uses a filter value to set the value of variable `tag`. The [[Action Send Message Widget|ActionSendMessageWidget]] joins all the tags into one large tag. The [[Action Set Field Widget|ActionSetFieldWidget]] appends the tags as individual tags. In this example, the [[Field Mangler Widget|FieldManglerWidget]] is required for the [[Action Send Message Widget|ActionSendMessageWidget]] but not for [[Action Set Field Widget|ActionSetFieldWidget]]. Be aware that the action occurs whether you check or uncheck. + +It is often necessary to use triple quotes with the `actions` attribute. Alternatively, the attribute can be assigned directly from a variable with `actions=<<my-actions>>`. + +<$macrocall $name='wikitext-example-without-html' src='<$fieldmangler> +<$set filter="[[Features]] [[Encryption]] +[tags[]]" name="tag"> +<$checkbox actions="""<$action-setfield $field="tags" $value=<<tag>> /><$action-sendmessage $message="tm-add-tag" $param=<<tag>> />""" field="checked" checked="YES" unchecked="NO" > + Add tags from tiddlers [[Features]] and [[Encryption]] +</$checkbox> +</$set> +</$fieldmangler>' /> + diff --git a/editions/tw5.com/tiddlers/widgets/CodeblockWidget.tid b/editions/tw5.com/tiddlers/widgets/CodeblockWidget.tid index 5592b3b45..acdab9ef9 100644 --- a/editions/tw5.com/tiddlers/widgets/CodeblockWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/CodeblockWidget.tid @@ -1,6 +1,6 @@ caption: codeblock created: 20151103160200000 -modified: 20151103160200000 +modified: 20160817175325205 tags: Widgets title: CodeBlockWidget type: text/vnd.tiddlywiki @@ -16,9 +16,14 @@ displayed monospace. A language may optionally be specified using the The content of the `<$codeblock>` widget is ignored. -|!Attribute |!Description| -|code|Contents of the block to render as code| -|language|Programming language for syntax highlighting| +|!Attribute |!Description | +|code |Contents of the block to render as code | +|language |Programming language for syntax highlighting | + +The `language` attribute accepts either: + +* a Highlight.js language code (see https://highlightjs.org/static/demo/ for a list) +* a MIME type (eg, `text/html` or `image/svg+xml`) ! Examples diff --git a/editions/tw5.com/tiddlers/widgets/DiffTextWidget.tid b/editions/tw5.com/tiddlers/widgets/DiffTextWidget.tid new file mode 100644 index 000000000..02b6534ba --- /dev/null +++ b/editions/tw5.com/tiddlers/widgets/DiffTextWidget.tid @@ -0,0 +1,61 @@ +caption: diff-text +created: 20180316162725329 +modified: 20180316162725329 +tags: Widgets +title: DiffTextWidget +type: text/vnd.tiddlywiki + +! Introduction + +<<.from-version "5.1.16">> The diff text widget analyses the differences between a pair of source and destination text strings and displays the results as highlighted insertions and deletions (similar to the "track changes" function of a word processor). For example: + +<$diff-text source="Hey Jude, don't make it bad. Take a sad song and make it better. Remember to let her into your heart +Then you can start to make it better." dest="Hey Jude, don't be afraid. You were made to go out and get her. The minute you let her under your skin. Then you begin to make it better."/> + +! Content and Attributes + +!! Content + +The content of the `<$diff-text>` widget is rendered immediately before the diffs. Within it, the variable `diff-count` is available, containing the number of differences found. If the widget has no content then it automatically transcludes the tiddler [[$:/language/Diffs/CountMessage]]. + +<<< +In other words, these three invocations are all equivalent: + +``` +<$diff-text source={{FirstTiddler}} dest={{SecondTiddler}}> +{{$:/language/Diffs/CountMessage}} +</$diff-text> + +<$diff-text source={{FirstTiddler}} dest={{SecondTiddler}}> +</$diff-text> + +<$diff-text source={{FirstTiddler}} dest={{SecondTiddler}}/> + +``` +<<< + +!! Attributes + +|!Attribute |!Description | +|source |The source text | +|dest |The destination text | +|cleanup |See below | + +The ''cleanup'' attribute determines which optional post-processing should be applied to the diffs: + +* ''none'': no cleanup is performed +* ''semantic'' (default): rewrites the diffs for human readability +* ''efficient'': rewrites the diffs to minimise the number of operations for subsequent processing + +(Note that in many cases the results will be the same regardless of the cleanup option. See the [[docs|https://github.com/google/diff-match-patch/wiki/API]] of the underlying library for more details). + +! Examples + +In this example we compare two texts: + +<$macrocall $name='wikitext-example-without-html' +src="""<$edit-text tiddler="SampleTiddlerFirst"/> + +<$edit-text tiddler="SampleTiddlerSecond"/> + +<$diff-text source={{SampleTiddlerFirst}} dest={{SampleTiddlerSecond}}/>"""/> diff --git a/editions/tw5.com/tiddlers/widgets/DraggableWidget.tid b/editions/tw5.com/tiddlers/widgets/DraggableWidget.tid new file mode 100644 index 000000000..5ae28567e --- /dev/null +++ b/editions/tw5.com/tiddlers/widgets/DraggableWidget.tid @@ -0,0 +1,28 @@ +caption: draggable +created: 20170406081938627 +modified: 20170406083157871 +tags: Widgets +title: DraggableWidget +type: text/vnd.tiddlywiki + +The DraggableWidget creates a DOM element that can be dragged by the user. It only works on browsers that support drag and drop, which typically means desktop browsers, but [[there are workarounds|Mobile Drag And Drop Shim Plugin]]. + +The draggable element can be assigned a list of tiddlers that are used as the payload. +If desired it can invoke actions when dragging starts and when it ends. +See DragAndDropMechanism for an overview. + +! Content and Attributes + +|!Attribute |!Description | +|tiddler |Optional title of the payload tiddler for the drag | +|filter |Optional filter defining the payload tiddlers for the drag | +|class |Optional CSS classes to assign to the draggable element. The class `tc-draggable` is added automatically, and the class `tc-dragging` is applied while the element is being dragged | +|tag |Optional tag to override the default "div" element | +|startactions |Optional action string that gets invoked when dragging ''starts'' | +|endactions |Optional action string that gets invoked when dragging ''ends'' | + +Either or both of the ''tiddler'' and ''filter'' attributes must be specified in order for there to be a payload to drag. + +The ''actionTiddler'' variable is accessible in both //startactions// and //endactions//. It holds the payload tiddler(s) specified through the //tiddler// attribute. + +The LinkWidget incorporates the functionality of the DraggableWidget via the ''draggable'' attribute. diff --git a/editions/tw5.com/tiddlers/widgets/DroppableWidget.tid b/editions/tw5.com/tiddlers/widgets/DroppableWidget.tid new file mode 100644 index 000000000..10c58e4c0 --- /dev/null +++ b/editions/tw5.com/tiddlers/widgets/DroppableWidget.tid @@ -0,0 +1,56 @@ +caption: droppable +created: 20170406082820317 +modified: 20170406085304387 +tags: Widgets +title: DroppableWidget +type: text/vnd.tiddlywiki + +\define droppable-image-actions() +<$action-setfield $tiddler=<<actionTiddler>> $field="icon" $value=<<currentTiddler>>/> +\end + +\define colour-demo-body() +<$droppable actions=<<droppable-colour-actions>>> +<span style="display: inline-block; width: 1em; height: 1em;background-color: $(currentTiddler)$;"> +</span> +</$droppable> +\end + +\define droppable-colour-actions() +<$action-setfield $tiddler=<<actionTiddler>> $field="color" $value=<<currentTiddler>>/> +\end + +The `droppable` widget creates a DOM element onto which dragged items can be dropped by the user, triggering the specified actions. It only works on browsers that support drag and drop, which typically means desktop browsers, but [[there are workarounds|Mobile Drag And Drop Shim Plugin]]. + +See DragAndDropMechanism for an overview. + +! Content and Attributes + +|!Attribute |!Description | +|actions |Actions to be performed when items are dropped | +|class |Optional CSS classes to assign to the draggable element. The class `tc-droppable` is added automatically, and the class `tc-dragover` is applied while an item is being dragged over the droppable element | +|tag |Optional tag to override the default of a "div" element when the widget is rendered in block mode, or a "span" element when it is rendered in inline mode | + +Within the action string, there are two Variables generated by the DroppableWidget: + +* The [[actionTiddler Variable]] contains the title of the item being dropped +* The [[modifier Variable]] contains the Modifier Key held while dragging (can be normal, ctrl, shift or ctrl-shift) + +If multiple items are dropped then the actions are performed repeatedly, once for each dropped item. + +! Examples + +This example displays a palette of icons. Dragging a tiddler onto one of the icons assigns that icon to the tiddler. + +<$list filter="[all[tiddlers+shadows]tag[$:/tags/Image]sort[title]]"> +<$droppable actions=<<droppable-image-actions>>> +<$transclude/> +</$droppable> +</$list> + +Similarly, this example shows a palette of colours. Dragging a tiddler onto one of the colours assigns that colour to be used for rendering the icon of the tiddler. + +<$list filter="LightPink Pink Crimson LavenderBlush PaleVioletRed HotPink DeepPink MediumVioletRed Orchid Thistle Plum Violet Magenta Fuchsia DarkMagenta Purple MediumOrchid DarkViolet DarkOrchid Indigo BlueViolet MediumPurple MediumSlateBlue SlateBlue DarkSlateBlue Lavender GhostWhite Blue MediumBlue MidnightBlue DarkBlue Navy RoyalBlue CornflowerBlue LightSteelBlue LightSlateGrey SlateGrey DodgerBlue AliceBlue SteelBlue LightSkyBlue SkyBlue DeepSkyBlue LightBlue PowderBlue CadetBlue Azure LightCyan PaleTurquoise Cyan Aqua DarkTurquoise DarkSlateGrey DarkCyan Teal MediumTurquoise LightSeaGreen Turquoise Aquamarine MediumAquamarine MediumSpringGreen MintCream SpringGreen MediumSeaGreen SeaGreen Honeydew LightGreen PaleGreen DarkSeaGreen LimeGreen Lime ForestGreen Green DarkGreen Chartreuse LawnGreen GreenYellow DarkOliveGreen YellowGreen OliveDrab Beige LightGoldenrodYellow Ivory LightYellow Yellow Olive DarkKhaki LemonChiffon PaleGoldenrod Khaki Gold Cornsilk Goldenrod DarkGoldenrod FloralWhite OldLace Wheat Moccasin Orange PapayaWhip BlanchedAlmond NavajoWhite AntiqueWhite Tan BurlyWood Bisque DarkOrange Linen Peru PeachPuff SandyBrown Chocolate SaddleBrown Seashell Sienna LightSalmon Coral OrangeRed DarkSalmon Tomato MistyRose Salmon Snow LightCoral RosyBrown IndianRed Red Brown FireBrick DarkRed Maroon White WhiteSmoke Gainsboro LightGrey Silver DarkGrey Grey DimGrey Black"> +<<colour-demo-body>> +</$list> + diff --git a/editions/tw5.com/tiddlers/widgets/DropzoneWidget.tid b/editions/tw5.com/tiddlers/widgets/DropzoneWidget.tid index 0b0a8c86c..48fcb9b7d 100644 --- a/editions/tw5.com/tiddlers/widgets/DropzoneWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/DropzoneWidget.tid @@ -1,8 +1,9 @@ -title: DropzoneWidget -created: 201310241419 -modified: 201310300837 -tags: Widgets caption: dropzone +created: 20131024141900000 +modified: 20170712153850528 +tags: Widgets +title: DropzoneWidget +type: text/vnd.tiddlywiki ! Introduction @@ -12,7 +13,12 @@ It sends a [[WidgetMessage: tm-import-tiddlers]] carrying a JSON representation ! Content and Attributes -The dropzone widget has no attributes, and displays any contained content within the dropzone. +|!Attribute |!Description | +|deserializer |<<.from-version "5.1.15">> Optional name of deserializer to be used (by default the deserializer is derived from the file extension) | + +The list of available deserializers can be inspected by executing `Object.keys($tw.Wiki.tiddlerDeserializerModules).sort().join("\n")` in the browser JavaScript console. + +The dropzone widget displays any contained content within the dropzone. ! Display diff --git a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid index 6f2224e53..e2bcfee59 100644 --- a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid @@ -9,7 +9,7 @@ type: text/vnd.tiddlywiki The edit text widget provides a user interface in the browser for editing text tiddler fields. The editing element is dynamically bound to the underlying tiddler value: changes to the tiddler are instantly reflected, and any edits are instantly propogated. -By default, the edit text widget generates a `<textarea>` as the HTML editing element when the `text` field is edited, and a `<input type="text">` element otherwise. This behaviour can be overridden with the `tag` and `type` attributes. +By default, applying the EditTextWidget to the `text` field of a tiddler will generates an HTML `<textarea>` element, i.e. a multi-line editor. Applying the EditTextWidget to any other field generates an HTML `<input type="text">` element, a single-line editor. This behaviour can be overridden with the `tag` and `type` attributes. ! Content and Attributes @@ -24,7 +24,7 @@ The content of the `<$edit-text>` widget is ignored. |placeholder |Placeholder text to be displayed when the edit field is empty | |focusPopup |Title of a state tiddler for a popup that is displayed when the editing element has focus | |focus |Set to "yes" or "true" to automatically focus the editor after creation | -|tag |Overrides the generated HTML editing element tag. Use `textarea` for a multi-line editor | +|tag |Overrides the generated HTML editing element tag. For a multi-line editor use `tag=textarea`. For a single-line editor use `tag=input` | |type |Overrides the generated HTML editing element `type` attribute | |size |The size of the input field (in characters) | |autoHeight |Either "yes" or "no" to specify whether to automatically resize `textarea` editors to fit their content (defaults to "yes") | diff --git a/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid b/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid index 41a38c6c8..b38786f28 100644 --- a/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid @@ -1,6 +1,6 @@ caption: keyboard created: 20140302192136805 -modified: 20160429175258940 +modified: 20161003114634019 tags: Widgets title: KeyboardWidget type: text/vnd.tiddlywiki @@ -19,6 +19,7 @@ The content of the `<$keyboard>` widget is rendered normally. The keyboard short |param |The parameter to be passed with the [[WidgetMessage|Messages]] | |key |Key string identifying the key(s) to be trapped (see below) | |class |A CSS class to be assigned to the generated HTML DIV element | +|tag|<<.from-version "5.1.14">> The html element the widget creates to capture the keyboard event, defaults to:<br>» `span` when parsed in inline-mode<br>» `div` when parsed in block-mode| ! Key Strings diff --git a/editions/tw5.com/tiddlers/widgets/LinkCatcherWidget.tid b/editions/tw5.com/tiddlers/widgets/LinkCatcherWidget.tid index 51753917d..03089da4a 100644 --- a/editions/tw5.com/tiddlers/widgets/LinkCatcherWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/LinkCatcherWidget.tid @@ -1,9 +1,9 @@ +caption: linkcatcher created: 20131024141900000 -modified: 20140409074643650 +modified: 20170707111536556 tags: Widgets title: LinkCatcherWidget type: text/vnd.tiddlywiki -caption: linkcatcher ! Introduction @@ -12,6 +12,7 @@ The link catcher widget traps [[WidgetMessage: tm-navigate]] dispatched within i * sending a different widget message * setting a tiddler to the title of the navigated tiddler * setting a tiddler to a specified value +* performing a series of ActionWidgets ! Content and Attributes @@ -22,3 +23,5 @@ The content of the `<$linkcatcher>` widget is displayed normally. |message |Optional identifier for a [[widget message|Messages]] to be sent when a navigation is caught | |set |Optional title of the tiddler to be set to a specified value when navigation occurs | |setTo |Value to be assigned by the `set` attribute | +|actions |Actions to be performed when a link is caught. Within the action string, the variable "navigateTo" contains the title of the tiddler being navigated | + diff --git a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid index 69fc6cdc7..b704d77b1 100644 --- a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid @@ -1,8 +1,9 @@ -title: LinkWidget -created: 201310241419 -modified: 20150228144334000 -tags: Widgets caption: link +created: 20131024141900000 +modified: 20171212063130159 +tags: Widgets +title: LinkWidget +type: text/vnd.tiddlywiki The `link` widget generates links to tiddlers. (Use the HTML `<a>` element to generate external links). @@ -10,13 +11,15 @@ The `link` widget generates links to tiddlers. (Use the HTML `<a>` element to ge |!Attribute |!Description | |to |The title of the target tiddler for the link (defaults to the [[current tiddler|Current Tiddler]]) | -|aria-label |Optional [[Accessibility]] label | +|aria-label |Optional accessibility label | |tooltip |Optional tooltip WikiText | |tabindex |Optional numeric [[tabindex|https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/tabIndex]] | |draggable |"yes" to enable the link to be draggable (defaults to "yes") | |tag |Optional tag to override the default "a" element | +|class|Optional CSS classes //in addition to// the default classes (see below)| +|overrideClass|<<.from-version "5.1.16">> Optional CSS classes //instead of// the default classes | -The content of the link widget is rendered within the `<a>` tag. +The content of the link widget is rendered within the `<a>` tag. The draggable functionality is equivalent to using the DraggableWidget with the ''tiddler'' attribute set to the link target. The default value of the tooltip attribute is supplied by the <<.vlink tv-wikilink-tooltip>> variable. @@ -53,15 +56,34 @@ This causes the tooltip to be the ''tooltip'' field of the target tiddler. If th ! CSS Classes +The link widget automatically determines and applies the following classes to links: + * `tc-tiddlylink` - applied to all links * `tc-tiddlylink-external` - applied to external, non-tiddler links * `tc-tiddlylink-internal` - applied to tiddler links * `tc-tiddlylink-missing` - applied to tiddler links where the target tiddler doesn't exist * `tc-tiddlylink-resolves` - applied to tiddler links when the target tiddler does exist +Use the `class` attribute to specify additional css classes, or `overrideClass` to apply only that but not the above defaults, e.g. when used in a LinkCatcherWidget: + +<<wikitext-example-without-html """*<$link class="example">Here</$link> the `example` class is added. +*<$link overrideClass="example">Here</$link> only the `example` class applies. +*<$link overrideClass="">Here</$link> no class is set.""">> + +! `href` generation + +The following process is used to generate the `href` attribute of the generated HTML `<a>` element: + +# If <<.vlink tv-get-export-link>> is defined it is invoked to convert the target tiddler title to the `href` value +#* In practice, only a [[JavaScript macro|Macros]] can be used +# <<.from-version "5.1.15">> If <<.vlink tv-filter-export-link>> is defined it is interpreted as a filter that converts the target tiddler title to the `href` value +# If <<.vlink tv-wikilink-template>> is defined it is treated as a specialised macro body that can perform limited conversion of the target tiddler title to the `href` value +# Otherwise, the target tiddler title is URI encoded to create the `href` + ! Configuration variables * <<.vlink tv-wikilinks>> +* <<.vlink tv-filter-export-link>> * <<.vlink tv-wikilink-template>> * <<.vlink tv-wikilink-tooltip>> * <<.vlink tv-get-export-link>> diff --git a/editions/tw5.com/tiddlers/widgets/ListWidget.tid b/editions/tw5.com/tiddlers/widgets/ListWidget.tid index 6e80b2d76..26a99208d 100644 --- a/editions/tw5.com/tiddlers/widgets/ListWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ListWidget.tid @@ -1,6 +1,6 @@ created: 201310241419 modified: 201502231037 -tags: Widgets +tags: Widgets Lists title: ListWidget caption: list @@ -63,7 +63,7 @@ Displays as: !! Grouped Lists -See NestedLists for how to generate nested and grouped lists using the ListWidget. +See GroupedLists for how to generate nested and grouped lists using the ListWidget. ! Content and Attributes @@ -94,4 +94,4 @@ In order for the storyviews to animate correctly each entry in the list should b !! History and navigation -The optional `history` attribute specifies the name of a tiddler that is used to track the current tiddler for navigation purposes. When the history tiddler changes the list view responds by telling the listview to handle navigating to the new tiddler. See HistoryMechanism for details. \ No newline at end of file +The optional `history` attribute specifies the name of a tiddler that is used to track the current tiddler for navigation purposes. When the history tiddler changes the list view responds by telling the listview to handle navigating to the new tiddler. See HistoryMechanism for details. diff --git a/editions/tw5.com/tiddlers/widgets/NavigatorWidget.tid b/editions/tw5.com/tiddlers/widgets/NavigatorWidget.tid index efcf9baf0..0e0e60ace 100644 --- a/editions/tw5.com/tiddlers/widgets/NavigatorWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/NavigatorWidget.tid @@ -1,9 +1,9 @@ +caption: navigator created: 20131024141900000 -modified: 20150619154056283 +modified: 20170629074415261 tags: Widgets title: NavigatorWidget type: text/vnd.tiddlywiki -caption: navigator ! Introduction @@ -32,3 +32,11 @@ The following [[Messages]] are handled by the navigator widget: </li> </$list> </ul> + +! Variables + +The following [[Variables]] are assigned by the navigator widget: + +* <<.vlink tv-story-list>>, giving the name of the tiddler containing the story list +* <<.vlink tv-history-list>>, giving the name of the tiddler containing the history list + diff --git a/editions/tw5.com/tiddlers/widgets/RadioWidget.tid b/editions/tw5.com/tiddlers/widgets/RadioWidget.tid index b0339c656..347a37e72 100644 --- a/editions/tw5.com/tiddlers/widgets/RadioWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/RadioWidget.tid @@ -1,9 +1,9 @@ +caption: radio created: 20131212195353929 -modified: 20150220161302000 +modified: 20170115095809695 tags: Widgets title: RadioWidget type: text/vnd.tiddlywiki -caption: radio ! Introduction @@ -15,22 +15,25 @@ The content of the `<$radio>` widget is displayed within an HTML `<label>` eleme |!Attribute |!Description | |tiddler |Title of the tiddler to manipulate (defaults to the [[current tiddler|Current Tiddler]]) | -|field |The name of the field to which the radio button will be bound | -|value |The value for the tiddler field | -|class |CSS classes to be assigned to the label around the radio button | +|field |The field of the //tiddler// bound to the radio button| +|index|<<.from-version "5.1.14">> The index of the //tiddler// being [[DataTiddler|DataTiddlers]] bound to the radio button<<.tip "takes precedence over //field//">>| +|value |The value for the //field// or //index// of the //tiddler//| +|class |The CSS classes assigned to the label around the radio button<$macrocall $name=".tip" _="""<<.from-version "5.1.14">> `tc-radio` is always applied by default, as well as `tc-radio-selected` when selected"""/>| -! Example +!! Field Mode This example uses the radio widget to change the `modifier` field of this tiddler: -``` -<$radio field="modifier" value="JoeBloggs"> Joe Bloggs</$radio> +<<wikitext-example-without-html """<$radio field="modifier" value="JoeBloggs"> Joe Bloggs</$radio> +<$radio field="modifier" value="JaneBloggs"> Jane Bloggs</$radio>""">> -<$radio field="modifier" value="JaneBloggs"> Jane Bloggs</$radio> -``` +!! Index Mode -It renders as: +Using the radio widget in index mode requires the //index// attribute to specify the name of the index of a [[DataTiddler|DataTiddlers]] to which the specified //value// is assigned. -<$radio field="modifier" value="JoeBloggs"> Joe Bloggs</$radio> +This example sets the `Tree Frog` index in the tiddler AnimalColours: -<$radio field="modifier" value="JaneBloggs"> Jane Bloggs</$radio> +<$macrocall $name="wikitext-example-without-html" src="""<$tiddler tiddler="AnimalColours"> +<$radio index="Tree Frog" value="green"> green</$radio> +<$radio index="Tree Frog" value="brown"> brown</$radio> +</$tiddler>"""/> diff --git a/editions/tw5.com/tiddlers/widgets/RangeWidget.tid b/editions/tw5.com/tiddlers/widgets/RangeWidget.tid new file mode 100644 index 000000000..dcb793f29 --- /dev/null +++ b/editions/tw5.com/tiddlers/widgets/RangeWidget.tid @@ -0,0 +1,36 @@ +caption: range +created: 20171102134825376 +modified: 20180425132848231 +tags: Widgets +title: RangeWidget +type: text/vnd.tiddlywiki + +! Introduction + +The range widget displays an HTML `<input type="range">` that reflects a given tiddler field numeric value. Adjusting the radio button sets the tiddler field to the value. + +! Content and Attributes + +The content of the `<$range>` widget is ignored. + +|!Attribute |!Description | +|tiddler |Title of the tiddler to manipulate (defaults to the [[current tiddler|Current Tiddler]]) | +|field |The field of the //tiddler// bound to the radio button| +|min |The minimum value to be able to be set by the `<$range>` widget.| +|max |The maximum value to be able to be set by the `<$range>` widget.| +|increment |The minimum amount by which a value may be changed. Defaults to 1.| +|default |The default value displayed if the field is missing or empty.| +|class |CSS classes to be assigned to the label around the radio button | + +! Examples + +!! Range -1 to 10 + +<$macrocall $name='wikitext-example-without-html' +src="""<$range tiddler="$:/_RangeDemo/1" min="-1" max="10" default="1" increment="1"/> {{$:/_RangeDemo/1}}"""/> + +!! Range 0 to 1 + +<$macrocall $name='wikitext-example-without-html' +src="""<$range tiddler="$:/_RangeDemo/2" min="0" max="1" default=".01" increment=".01"/> {{$:/_RangeDemo/2}}"""/> + diff --git a/editions/tw5.com/tiddlers/widgets/RevealWidget.tid b/editions/tw5.com/tiddlers/widgets/RevealWidget.tid index 18e1f6490..fc1fba83d 100644 --- a/editions/tw5.com/tiddlers/widgets/RevealWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/RevealWidget.tid @@ -1,6 +1,7 @@ caption: reveal created: 20131024141900000 -modified: 20151223222838652 +jeremy: tiddlywiki +modified: 20161216153618769 tags: Widgets title: RevealWidget type: text/vnd.tiddlywiki @@ -12,6 +13,11 @@ The reveal widget hides or shows its content depending upon the value of a [[sta * type=''match'': the content is displayed if the state tiddler matches a specified value * type=''nomatch'': the content is displayed if the state tiddler doesn't match a specified value * type=''popup'': the content is displayed as a popup as described in the PopupMechanism +* type=''lt'': the content is displayed if the state tiddler contains an integer with a value ''less than'' a specified value +* type=''gt'': the content is displayed if the state tiddler contains an integer with a value ''greater than'' a specified value +* type=''lteq'': the content is displayed if the state tiddler contains an integer with a value ''less than or equal to'' a specified value +* type=''gteq'': the content is displayed if the state tiddler contains an integer with a value ''greater than or equal to'' a specified value + ! Content and Attributes @@ -20,7 +26,7 @@ The content of the `<$reveal>` widget is displayed according to the rules given |!Attribute |!Description | |state |A TextReference containing the state | |tag |Overrides the default HTML element tag (`<div>` in block mode or `<span>` in inline mode) | -|type |The type of matching performed: ''match'', ''nomatch'' or ''popup'' | +|type |The type of matching performed: ''match'', ''nomatch'', ''popup'', ''lt'', ''gt'', ''lteq'' or ''gteq'' | |text |The text to match when the type is ''match'' and ''nomatch'' | |class |An optional CSS class name to be assigned to the HTML element<br/>» Set to `tc-popup-keep` to make a popup "sticky", so it won't close when you click inside of it| |style |An optional CSS style attribute to be assigned to the HTML element | @@ -79,3 +85,11 @@ And this is some text </div> </$reveal>'>> + +!! How to use text references with field content + +Here is a simple example how to use text references with field content to control the RevealWidget. If the field ``jeremy`` is populated with text ``tiddlywiki``, a message will be displayed. + +<<wikitext-example-without-html '<$reveal type="match" state="!!jeremy" text="tiddlywiki"> +~TiddlyWiki! +</$reveal>'>> diff --git a/editions/tw5.com/tiddlers/widgets/SetWidget.tid b/editions/tw5.com/tiddlers/widgets/SetWidget.tid index c4204be59..cc5f29167 100644 --- a/editions/tw5.com/tiddlers/widgets/SetWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/SetWidget.tid @@ -1,8 +1,9 @@ -title: SetWidget -created: 201311151827 -modified: 20150220162217000 -tags: Widgets caption: set +created: 20131115182700000 +modified: 20180315165405442 +tags: Widgets +title: SetWidget +type: text/vnd.tiddlywiki ! Introduction @@ -15,8 +16,13 @@ The content of the `<$set>` widget is the scope for the value assigned to the va |!Attribute |!Description | |name |The name of the variable to assign (defaults to "currentTiddler") | |value |The value to assign to the variable if the filter is missing or not empty | +|tiddler |<<.from-version "5.1.15">> Optional title of the tiddler from which to read the value | +|subtiddler |<<.from-version "5.1.16">> Optionally specifies the title of a subtiddler within a plugin tiddler identified by the ''tiddler'' attribute | +|field |<<.from-version "5.1.15">> Optional field of the tiddler from which to read the value (only used if ''tiddler'' is used) | +|index |<<.from-version "5.1.15">> Optional index of the tiddler from which to read the value (only used if ''tiddler'' is used) | |filter |An optional filter to be evaluated and assigned to the variable (see below) | -|emptyValue |The value to assign to the variable if the filter is present and evaluates to an empty list (see below) | +|select |<<.from-version "5.1.14">> An optional zero-based index of the item to return from the filter output (see below) | +|emptyValue |The value to assign to the variable if the specified value is missing or empty (see below) | !! Simple Variable Assignment @@ -55,3 +61,31 @@ This form of the set variable widget evaluates the filter and assigns the result <$text text=<<myVariable>>/> </$set> ``` + +!! Filtered Item Variable Assignment + +<<.from-version "5.1.14">> This form of the set variable widget evaluates the filter and assigns the specified result to the variable as a single item (ie, not using double square brackets for titles containing spaces). + +``` +<$set name="myVariable" filter="[tag[HelloThere]]" select="0"> +<$text text=<<myVariable>>/> +</$set> +``` + +!! Transcluded Variable Assignment + +<<.from-version "5.1.15">> This form of the set variable widget obtains the value to assign to the variable from a value in a tiddler field or index. For example: + +``` +<$set name="myVariable" tiddler="HelloThere" field="text"> +<$text text=<<myVariable>>/> +</$set> +``` + +The example above could also be written as `<$set name="myVariable" value={{HelloThere!!text}}>`. The advantage of using the ''tiddler'' attribute is that the tiddler title and field or index can themselves be computed. For example: + +``` +<$set name="myVariable" tiddler=<<myTiddler>> field={{$:/currentField}}> +<$text text=<<myVariable>>/> +</$set> +``` diff --git a/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid b/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid index 115072aa0..91b0946df 100644 --- a/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid @@ -1,5 +1,5 @@ created: 20130824154300000 -modified: 20150220162134000 +modified: 20170901101236822 tags: Widgets title: TiddlerWidget type: text/vnd.tiddlywiki @@ -7,13 +7,12 @@ caption: tiddler ! Introduction -The TiddlerWidget sets the [[current tiddler|Current Tiddler]] that applies for processing its content. +The TiddlerWidget is used to set a value for the [[current tiddler|Current Tiddler]] variable, valid within the scope of the TiddlerWidget. ! Content and Attributes |!Attribute |!Description | |tiddler |The title of the tiddler to become the new [[current tiddler|Current Tiddler]] | -|class |CSS classes to be added to the generated elements | ! CSS Class Variables diff --git a/editions/tw5.com/tiddlers/widgets/VarsWidget.tid b/editions/tw5.com/tiddlers/widgets/VarsWidget.tid index dcb7d5e98..65075d989 100644 --- a/editions/tw5.com/tiddlers/widgets/VarsWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/VarsWidget.tid @@ -32,9 +32,9 @@ Using the `<$vars>` widget, this situation may be handled in the following way: In contrast, here is the same example using the `<$set>` widget: ``` -<$set name="greeting" value="Hi" /> -<$set name="me" value={{!!title}} /> -<$set name="sentence" value=<<helloworld>> /> +<$set name="greeting" value="Hi" > +<$set name="me" value={{!!title}} > +<$set name="sentence" value=<<helloworld>> > <<greeting>>! I am <<me>> and I say: <<sentence>> </$set> </$set> diff --git a/editions/tw5.com/tiddlers/widgets/ViewWidget.tid b/editions/tw5.com/tiddlers/widgets/ViewWidget.tid index 66d415795..0967352af 100644 --- a/editions/tw5.com/tiddlers/widgets/ViewWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ViewWidget.tid @@ -1,6 +1,6 @@ caption: view created: 20131024141900000 -modified: 20160623152830060 +modified: 20170824195528248 tags: Widgets title: ViewWidget type: text/vnd.tiddlywiki @@ -20,6 +20,7 @@ The content of the `<$view>` widget is displayed if the field or property is mis |format |The format for displaying the field (see below) | |template |Optional template string used with certain formats such as dates | |subtiddler |Optional SubTiddler title when the target tiddler is a [[plugin|Plugins]] (see below) | +|mode |<<.from-version "5.1.15">> Optional transclusion parsing mode for wikified formats. May be "inline" or "block" (the default) | !! Formats @@ -30,9 +31,9 @@ The following formats can be specified in the `format` attribute: |''htmlencoded'' |The field is displayed with HTML encoding | |''urlencoded'' |The field is displayed with URL encoding | |''doubleurlencoded'' |The field is displayed with double URL encoding | -|''htmlwikified'' |The field is wikified and the resulting HTML returned as plain text (ie HTML elements will appear in plain text) | -|''plainwikified'' |The field is wikified and the text content of the resulting HTML returned as plain text (ie HTML elements will be removed) | -|''htmlencodedplainwikified'' |The field is wikified and the text content of the resulting HTML returned as HTML encoded plain text (ie HTML elements will be removed) | +|''htmlwikified'' |The field is wikified according to the mode attribute and the resulting HTML returned as plain text (ie HTML elements will appear in plain text) | +|''plainwikified'' |The field is wikified according to the mode attribute and the text content of the resulting HTML returned as plain text (ie HTML elements will be removed) | +|''htmlencodedplainwikified'' |The field is wikified according to the mode attribute and the text content of the resulting HTML returned as HTML encoded plain text (ie HTML elements will be removed) | |''date'' |The field is interpreted as a UTC date and displayed according to the DateFormat specified in the `template` attribute | |''relativedate'' |The field is interpreted as a UTC date and displayed as the interval from the present instant | |''stripcomments'' |The field is interpreted as JavaScript source code and any lines beginning `\\#` are stripped | diff --git a/editions/tw5.com/tiddlers/widgets/WikifyWidget.tid b/editions/tw5.com/tiddlers/widgets/WikifyWidget.tid index 5b9670e49..b058587fa 100644 --- a/editions/tw5.com/tiddlers/widgets/WikifyWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/WikifyWidget.tid @@ -1,8 +1,9 @@ -title: WikifyWidget -created: 20160321144949700 -modified: 20160321144949700 -tags: Widgets caption: wikify +created: 20160321144949700 +modified: 20161017122117062 +tags: Widgets +title: WikifyWidget +type: text/vnd.tiddlywiki ! Introduction @@ -23,6 +24,7 @@ The available output types are: |!Keyword |!Description | |text |Return the plain text of the rendered output (ie HTML tags are omitted) | +|formattedtext |Return the plain text with simple text formatting of the rendered output (ie HTML tags are omitted) | |html |Return the rendered HTML of the output | |parsetree |Return a formatted JSON representation of the parse tree | |widgettree |Return a formatted JSON representation of the widget tree | diff --git a/editions/tw5.com/tiddlers/wikitext/Block Quotes in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Block Quotes in WikiText.tid index 69c48744c..bdc60b0ed 100644 --- a/editions/tw5.com/tiddlers/wikitext/Block Quotes in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/Block Quotes in WikiText.tid @@ -1,6 +1,6 @@ caption: Block Quotes created: 20131206154636572 -modified: 20160607092444424 +modified: 20170417165145317 tags: WikiText title: Block Quotes in WikiText type: text/vnd.tiddlywiki @@ -35,6 +35,13 @@ Operating systems are like a brick wall for our minds <<< Nobody ">> +The core includes the class `tc-big-quote` that renders block quotes with outsize double quotes: + +<<wikitext-example src:"<<<.tc-big-quote +A dramatic quote +<<< Somebody Important +">> + ! Single-line Block Quotes The single-line syntax for block quotes is actually an extension of the syntax for [[Lists in WikiText]]. For example: diff --git a/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid index f8575f002..f18aad0d1 100644 --- a/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid @@ -1,6 +1,6 @@ caption: HTML created: 20131205160816081 -modified: 20160622112259272 +modified: 20161021102422842 tags: WikiText title: HTML in WikiText type: text/vnd.tiddlywiki @@ -14,25 +14,29 @@ This is my nice and simple block of text. HelloThere </article> ``` +[[Widgets share the same syntax as HTML tags|Widgets in WikiText]], and so the following information applies to them, too. + ! Content Parsing -The content of an HTML element will be parsed in inline mode unless the opening tag is followed by two linebreaks, in which case it is parsed in block mode. (Inline mode means that block mode formatting such as tables, lists and headings is not recognised). +The content of an HTML element will be parsed in inline mode unless the opening tag is followed by two linebreaks, in which case it will be parsed in block mode. (Inline mode means that block mode formatting such as tables, lists and headings is not recognised). ! Attributes -Attributes in HTML tags can be specified as a literal, a transclusion or a macro invocation. For example, here the value of the `href` attribute will be set to the value of the tiddler MyLinkDestination: +In an extension of conventional HTML syntax, attributes of elements/widgets can be specified in several different ways: -``` -<a href={{MyLinkDestination}} rel="noopener noreferrer">link</a> -``` +* a literal string +* a transclusion of a TextReference +* a transclusion of a [[macro/variable|Macros in WikiText]] +* as the result of a [[Filter Expression]] -Note that the link should have the `rel` attribute set to `noopener noreferrer` to maintain privacy of the URLs of private TiddlyWiki's (eg on Dropbox). See https://mathiasbynens.github.io/rel-noopener/ for more information. +!! Literal Attribute Values -Here an attribute is specified as a macro invocation: +Literal attribute values can use several different styles of quoting: -``` -<a href=<<MyMacro "Brian">> rel="noopener noreferrer">link</a> -``` +* Single quotes (eg `attr='value'`) +* Double quotes (eg `attr="value"`) +* Tripe double quotes (eg `attr="""value"""`) +* No quoting is necessary for values that do not contain spaces (eg `attr=value`) Literal attribute values can include line breaks. For example: @@ -43,7 +47,7 @@ Rodentville, Ratland."/> ``` -By using triple-double quotes you can specify attribute values that include single double quotes. For example: +By using triple-double quotes you can specify attribute values that contain single double quotes. For example: ``` <div data-address="""Mouse House, @@ -51,3 +55,34 @@ By using triple-double quotes you can specify attribute values that include sing Rodentville, Ratland."""/> ``` + +!! Transcluded Attribute Values + +Transcluded attribute values are indicated with double curly braces around a TextReference. For example: + +``` +attr={{tiddler}} +attr={{!!field}} +attr={{tiddler!!field}} +``` + +!! Variable Attribute Values + +Variable attribute values are indicated with double angle brackets around a [[macro invocation|Macro Calls in WikiText]]. For example: + +``` +<div title=<<MyMacro "Brian">>> +... +</div> +``` + +!! Filtered Attribute Values + +Filtered attribute values are indicated with triple curly braces around a [[Filter Expression]]. The value will be the first item in the resulting list, or the empty string if the list is empty. + +This example shows how to add a prefix to a value: + +``` +<$text text={{{ [<currentTiddler>]addPrefix[$:/myprefix/]] }}}> +``` + diff --git a/editions/tw5.com/tiddlers/wikitext/HTML_Links_in_WikiText.tid b/editions/tw5.com/tiddlers/wikitext/HTML_Links_in_WikiText.tid new file mode 100644 index 000000000..99ad2b447 --- /dev/null +++ b/editions/tw5.com/tiddlers/wikitext/HTML_Links_in_WikiText.tid @@ -0,0 +1,17 @@ +created: 20161021101834041 +modified: 20161021102041147 +tags: [[HTML in WikiText]] +title: HTML Links in WikiText +type: text/vnd.tiddlywiki + +It is often useful to be able to create HTML links to external resources. For example, here the value of the `href` attribute will be set to the value of the tiddler MyLinkDestination: + +``` +<a href={{MyLinkDestination}}>link</a> +``` + +However, there is an unexpected security issue that means that most of the time the link should have the `rel` attribute set to `noopener noreferrer` to maintain privacy of the URLs of private TiddlyWiki's (eg on Dropbox). See https://mathiasbynens.github.io/rel-noopener/ for more information. + +``` +<a href={{MyLinkDestination}} rel="noopener noreferrer">link</a> +``` diff --git a/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid index 331344ab0..1bb31e7ad 100644 --- a/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid @@ -11,7 +11,7 @@ Images can be included in WikiText with the following syntax: ``` [img[Motovun Jack.jpg]] -[img[http://tiddlywiki.com/favicon.ico]] +[img[https://tiddlywiki.com/favicon.ico]] ``` You can also insert images from the editor toolbar. Click ''picture'' ({{$:/core/images/picture}}) and select a picture file. diff --git a/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid index cca620a4a..88ae367a5 100644 --- a/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid @@ -37,11 +37,13 @@ You can suppress a link from being recognised by preceding it with `~`. For exam To link to an external [[resource|https://en.wikipedia.org/wiki/Web_resource]] such as a website or a file, type its //full// [[URL|https://en.wikipedia.org/wiki/URL]], including the [[URI scheme|https://en.wikipedia.org/wiki/URI_scheme]] such as a protocol (e.g. `http://`, `file://`) or `mailto`: ``` -http://tiddlywiki.com/ +https://tiddlywiki.com/ -[[TW5|http://tiddlywiki.com/]] +[[TW5|https://tiddlywiki.com/]] [[Mail me|mailto:me@where.net]] + +[[Open file|file:///c:/users/me/index.html]] ``` For this syntax to work, the URL has to be recognisable as a URL. Otherwise, it is treated as a tiddler title. As a result, in case you want to link to a resource locatable using a relative path, use the extended syntax: @@ -52,14 +54,20 @@ For this syntax to work, the URL has to be recognisable as a URL. Otherwise, it [ext[Open file|./index.html]] [ext[Open file|../README.md]] + +[ext[Open file|c:\users\me\index.html]] ``` The extended syntax still works with full URLs, although in that case it is not necessary: ``` -[ext[http://tiddlywiki.com]] +[ext[https://tiddlywiki.com]] -[ext[TW5|http://tiddlywiki.com]] +[ext[TW5|https://tiddlywiki.com]] + +[ext[Mail me|mailto:me@where.net]] + +[ext[Open file|file:///c:/users/me/index.html]] ``` You can also use the extended syntax to force an external link: diff --git a/editions/tw5.com/tiddlers/wikitext/Lists in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Lists in WikiText.tid index 3d38952d8..2cb46c5d5 100644 --- a/editions/tw5.com/tiddlers/wikitext/Lists in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/Lists in WikiText.tid @@ -1,7 +1,7 @@ caption: Lists created: 20131205160257619 modified: 20160607093103220 -tags: WikiText +tags: WikiText Lists title: Lists in WikiText type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/wikitext/Macro Calls in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Macro Calls in WikiText.tid index ecccc2e4c..f4899fbd6 100644 --- a/editions/tw5.com/tiddlers/wikitext/Macro Calls in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/Macro Calls in WikiText.tid @@ -20,3 +20,7 @@ The syntax is actually a shorthand for a <<.wlink MacroCallWidget>> widget. The As macros are simply parameterised [[variables|Variables]], a variable's value can be inserted using the same techniques. [[Examples|Macro Calls in WikiText (Examples)]] + +!! Named vs.unnamed parameters + +In the wikitext notation, using named parameters is always the safer choice compared to defining values only. Not naming parameters may have confusing side effects. For example, imagine the first parameter of some macro specifies a [[state tiddler|StateMechanism]] while the second one is intended for a [[template|Transclusion with Templates]] tiddler. Should you accidentally forget to define the first parameter or are confused about the order, the next time your macro is run, which might even be triggered using the preview, your template tiddler may inadvertently be overriden with what was intended to be the state. diff --git a/editions/tw5.com/tiddlers/wikitext/Macro Definitions in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Macro Definitions in WikiText.tid index 2565c2897..b98793046 100644 --- a/editions/tw5.com/tiddlers/wikitext/Macro Definitions in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/Macro Definitions in WikiText.tid @@ -1,9 +1,9 @@ +caption: Macro Definitions created: 20150220181617000 -modified: 20150221221642000 +modified: 20171215152754837 tags: WikiText title: Macro Definitions in WikiText type: text/vnd.tiddlywiki -caption: Macro Definitions A [[macro|Macros]] is defined using a `\define` [[pragma|Pragma]]. Like any pragma, this can only appear at the start of a tiddler. @@ -35,12 +35,42 @@ eg="""<$set name="address" value="Rabbit Hole Hill"> </$set>"""/> </$importvariables> +!! Parameters as Variables + +The parameters to a wikitext macro are also available as special variables named as the parameter name wrapped in double underscores. For example, the example above could also be expressed as: + +``` +\define sayhi(name:"Bugs Bunny") Hi, I'm <$text text=<<__name__>>/>. +``` + +Accessing parameters as variables only works in macros that are wikified and not, for example, when a macro is used as an attribute value. The advantage of the technique is that it avoids the parameter value being substituted into the macro as a literal string, which in turn can help avoid issues with parameters that contain quotes. + +For example, consider this macro. It is intended to wrap a DIV around another macro invocation, passing through the single parameter to the inner macro: + +``` +\define related-tags(base-tag) +<div class="wrapper"> +<$macrocall $name="anothermacro" param="""$base-tag$"""/> +</div> +\end +``` + +The code above will fail if the macro is invoked with the argument containing triple double quotes (for example `<<related-tags 'Triple """ Quotes'>>`). Using parameter variables offers a workaround: + +``` +\define related-tags(base-tag) +<div class="wrapper"> +<$macrocall $name="anothermacro" param=<<__base-tag__>>/> +</div> +\end +``` + !! Scope Macros are available to the tiddler that defines them, plus any tiddlers that it transcludes. To make a macro available to all tiddlers, define it in a tiddler that has the tag <<.tag $:/tags/Macro>>. -It is also possible to write a macro as a [[JavaScript module|http://tiddlywiki.com/dev/index.html#JavaScript%20Macros]]. ~JavaScript macros are available to all tiddlers, and offer the maximum flexibility. +It is also possible to write a macro as a [[JavaScript module|https://tiddlywiki.com/dev/index.html#JavaScript%20Macros]]. ~JavaScript macros are available to all tiddlers, and offer the maximum flexibility. A tiddler can manually import macro definitions from a [[selection|Title Selection]] of other tiddlers by using the <<.wlink ImportVariablesWidget>> widget. diff --git a/editions/tw5.com/tiddlers/wikitext/Transclusion and Substitution.tid b/editions/tw5.com/tiddlers/wikitext/Transclusion and Substitution.tid index e51a766fc..e7d81b671 100644 --- a/editions/tw5.com/tiddlers/wikitext/Transclusion and Substitution.tid +++ b/editions/tw5.com/tiddlers/wikitext/Transclusion and Substitution.tid @@ -26,7 +26,7 @@ As described in [[HTML in WikiText]], you can also transclude tiddler field valu <$text text={{MyTiddler}}/> ``` -As described in [[Introduction to Filters]], you can also transclude tiddler field values as filter operands. For example: +As described in [[Introduction to filter notation]], you can also transclude tiddler field values as filter operands. For example: ``` {{{ [tag{TiddlerContainingMyTag}] }}} @@ -46,7 +46,7 @@ As described in [[HTML in WikiText]], you can also transclude a variable as the <$text text=<<myMacro>>/> ``` -As described in [[Introduction to Filters]], you can also transclude a variable as the value of a filter operand. For example: +As described in [[Introduction to filter notation]], you can also transclude a variable as the value of a filter operand. For example: ``` {{{ [tag<myMacro>] }}} diff --git a/editions/tw5.com/tiddlers/wikitext/Widgets in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Widgets in WikiText.tid index 97566ab7d..5ef9253c9 100644 --- a/editions/tw5.com/tiddlers/wikitext/Widgets in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/Widgets in WikiText.tid @@ -1,9 +1,9 @@ +caption: Widgets created: 20131205160840915 -modified: 20140619111725471 +modified: 20161020210726813 tags: WikiText title: Widgets in WikiText type: text/vnd.tiddlywiki -caption: Widgets Widgets provide rich functionality within WikiText. They have the same syntax as [[HTML elements|HTML in WikiText]], but the tag name always starts with `$`. For example: @@ -19,6 +19,7 @@ Note that widgets inherit all the features of [[HTML in WikiText]]: ** Strings quoted with triple-double quotes ** Macro invocations (eg `attr=<<myMacro>>`) ** Transclusions (eg, `attr={{MyTiddler!!field}}`) +** Filtered transclusions (eg, `attr={{{ [filter[op]] }}}`) * The content of a widget is parsed in inline mode unless the opening tag is followed by two linebreaks, which forces block mode ** 'Inline mode' means that 'block mode' parse rules like headings, tables and lists are not recognised diff --git a/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid b/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid index 1ca1bd1e2..9f2d54715 100644 --- a/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid +++ b/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid @@ -21,7 +21,7 @@ To edit an existing tiddler, click the {{$:/core/images/edit-button}} button at When you create a new tiddler or edit an existing one, the tiddler will go into draft mode. This presents a control panel for modifying the tiddler in various ways. It has several parts, from top to bottom: *''The title field'' - Use this to change the title of the tiddler -*''The tag selector'' - Use this to add or remove tags. As you type a tag name in the box, a dropdown list will show you any existing tags that match. You can pick from this list or create a completely new tag. Then click the ''add'' button to add the tag to the tiddler. Each tag is shown as a coloured pill. Click the "×" on a pill to remove that tag +*''The tag selector'' - Use this to add or remove tags. As you type a tag name in the box, a dropdown list will show you any existing tags that match. You can pick from this list or create a completely new tag. Then click the ''add'' button or hit the <kbd>Enter</kbd> key to add the tag to the tiddler. Each tag is shown as a coloured pill. Click the "×" on a pill to remove that tag *''The text area'' - Use this to edit the main content of the tiddler. Click the ''preview'' button ({{$:/core/images/preview-closed}} / {{$:/core/images/preview-open}}) to see what your changes will look like *''The type selector'' - Use this when a tiddler needs to be displayed in a special way, such as an image. See ContentType for a list of the options. The default is `text/vnd.tiddlywiki`, which means the tiddler contains WikiText *''The field selector'' - Use this to add or remove fields on the tiddler. For example, if you are editing a tiddler that's being used to tag other tiddlers, you can add a [[''list'' field|ListField]] to change the order in which those tiddlers will be listed diff --git a/editions/tw5.com/tiddlers/workingwithtw/Creating journal tiddlers.tid b/editions/tw5.com/tiddlers/workingwithtw/Creating journal tiddlers.tid index 572a188a7..1825995d5 100644 --- a/editions/tw5.com/tiddlers/workingwithtw/Creating journal tiddlers.tid +++ b/editions/tw5.com/tiddlers/workingwithtw/Creating journal tiddlers.tid @@ -1,5 +1,5 @@ created: 20141010093214683 -modified: 20160610081833756 +modified: 20161218024621209 tags: [[Working with TiddlyWiki]] title: Creating journal tiddlers type: text/vnd.tiddlywiki @@ -34,3 +34,7 @@ To configure how new journal entries are created, visit the ''Basics'' tab under Hint: if you want to create a separate journal tiddler whenever you click ''new journal'' (even if you do this several times in the same day), you can include the clock time in the title format. Specify something like `YYYY-0MM-0DD at 0hhh0mm'0ss''` as the date format. Another useful trick is to include `$(currentTiddler)$` somewhere in the title format. This means that if you click ''new journal here'' on several different tiddlers, the title of each of those tiddlers will form part of the name of the resulting journal entries. + +! Making a custom new journal button + +Visit the [[Making a custom journal button]] tiddler for instructions on how to make your own custom New Journal button \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/workingwithtw/Sharing your tiddlers with others.tid b/editions/tw5.com/tiddlers/workingwithtw/Sharing your tiddlers with others.tid index 0c6b4a479..643b1cb14 100644 --- a/editions/tw5.com/tiddlers/workingwithtw/Sharing your tiddlers with others.tid +++ b/editions/tw5.com/tiddlers/workingwithtw/Sharing your tiddlers with others.tid @@ -1,16 +1,16 @@ created: 20140908163900000 -modified: 20160610074043190 +modified: 20170328142732658 tags: Learning title: Sharing your tiddlers with others type: text/vnd.tiddlywiki -There are a number of ways that people can share tiddlers: +There are a number of ways that you can share [[tiddlers|Tiddlers]] or your whole TiddlyWiki: *You can attach a ~TiddlyWiki to an e-mail -*You can publish your ~TiddlyWiki online, and grab a link to send or message to others: -**A link to the URL of the file itself -**A permalink ({{$:/core/images/permalink-button}}) to a specific tiddler (see [[PermaLinks]]) -**A permaview ({{$:/core/images/permaview-button}}) link of all the currently open tiddlers (see [[PermaView]]) -*You can grab tiddlers from ~TiddlyWikis that others have published online by clicking on a link to the tiddler within their file, and then dragging and dropping the link into your own file. An import tiddler will appear, and you can click to import the tiddler or tiddlers to your file. (see [[ImportTiddlers]]) +*You can publish your ~TiddlyWiki online and grab a link to send or message to others: +**A link to the web address of the whole ~TiddlyWiki file +**A [[permalink|PermaLinks]] ({{$:/core/images/permalink-button}}) to a specific tiddler +**A [[permaview|PermaViews]] ({{$:/core/images/permaview-button}}) link of all the currently open tiddlers * You can [[share a Dropbox link to your TiddlyWiki|Sharing a TiddlyWiki on Dropbox]] -* You can [[export tiddlers|How to export tiddlers]] ({{$:/core/images/export-button}}) in a variety of formats including text, static HTML, comma separated values (ie spreadsheet compatible) +* You can [[export tiddlers|How to export tiddlers]] ({{$:/core/images/export-button}}) in a variety of formats including text, static HTML and comma separated values (ie spreadsheet compatible) +*You can also share tiddlers merely by making your ~TiddlyWiki accessible to others, for example by publishing it online, so that they can [[import tiddlers|Importing Tiddlers]] from it diff --git a/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate between tiddlers.tid b/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate between tiddlers.tid index 824f93522..bf491a8d6 100644 --- a/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate between tiddlers.tid +++ b/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate between tiddlers.tid @@ -1,5 +1,5 @@ created: 20140908093600000 -modified: 20141010184816361 +modified: 20171219170302268 tags: [[Working with TiddlyWiki]] title: Using links to navigate between tiddlers type: text/vnd.tiddlywiki @@ -36,7 +36,7 @@ You can use links (normally displayed as blue text) to navigate from one tiddler *** ''Drafts'' lists any tiddlers that are currently in draft mode. ~TiddlyWiki considers a tiddler's draft to be a separate tiddler for as long as you are editing it, so while you're editing a tiddler entitled ''Australia'', there will be two tiddlers, ''Australia'' and ''Draft of 'Australia'''. When you close the draft by saving your changes to it, those changes will be applied to the ''Australia'' tiddler. So treat the ''Drafts'' tab as a way of finding any unfinished drafts you started. -*** ''Orphans'' lists all the tiddlers that are not connected to any other tiddler by links, tags or lists. This is a helpful aid to editing your file - it shows you which tiddlers need to be integrated more carefully with the others. +*** ''Orphans'' lists all the tiddlers that are not directly linked from another tiddler. This is a helpful aid to editing your file - it shows you which tiddlers need to be integrated more carefully with the others. *** ''Types'' lists any tiddlers with special content, such as images or audio. diff --git a/editions/tw5.com/tiddlywiki.info b/editions/tw5.com/tiddlywiki.info index 7b97d37a6..a845845d3 100644 --- a/editions/tw5.com/tiddlywiki.info +++ b/editions/tw5.com/tiddlywiki.info @@ -1,7 +1,6 @@ { - "description": "Documentation from http://tiddlywiki.com", + "description": "Documentation from https://tiddlywiki.com", "plugins": [ - "tiddlywiki/googleanalytics", "tiddlywiki/nodewebkitsaver", "tiddlywiki/browser-sniff", "tiddlywiki/railroad", @@ -14,6 +13,8 @@ "tiddlywiki/seamless", "tiddlywiki/centralised", "tiddlywiki/tight", + "tiddlywiki/heavier", + "tiddlywiki/tight-heavier", "tiddlywiki/readonly" ], "languages": [ @@ -40,7 +41,7 @@ "--rendertiddler","ReadMe","readme.md","text/html", "--rendertiddler","ReadMeBinFolder","bin/readme.md","text/html", "--rendertiddler","ContributingTemplate","contributing.md","text/html", - "--rendertiddler","$:/core/copyright.txt","licenses/copyright.md","text/plain"], + "--rendertiddler","$:/core/copyright.txt","license","text/plain"], "tw2": [ "--rendertiddler","TiddlyWiki2ReadMe","tw2/readme.md","text/html"], "static": [ diff --git a/editions/xlsx-utils-server/tiddlywiki.info b/editions/xlsx-utils-server/tiddlywiki.info new file mode 100644 index 000000000..642b784d0 --- /dev/null +++ b/editions/xlsx-utils-server/tiddlywiki.info @@ -0,0 +1,19 @@ +{ + "description": "Server configuration of the xlsx-utils edition", + "plugins": [ + "tiddlywiki/tiddlyweb", + "tiddlywiki/filesystem", + "tiddlywiki/jszip", + "tiddlywiki/xlsx-utils" + ], + "themes": [ + "tiddlywiki/vanilla", + "tiddlywiki/snowwhite" + ], + "includeWikis": [ + "../xlsx-utils" + ], + "config": { + "default-tiddler-location": "../xlsx-utils/tiddlers" + } +} diff --git a/editions/xlsx-utils/tiddlers/DefaultTiddlers.tid b/editions/xlsx-utils/tiddlers/DefaultTiddlers.tid new file mode 100644 index 000000000..95a13f956 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/DefaultTiddlers.tid @@ -0,0 +1,5 @@ +title: $:/DefaultTiddlers + +[[HelloThere]] +[[$:/plugins/tiddlywiki/xlsx-utils]] +[[Presidents Demo]] \ No newline at end of file diff --git a/editions/xlsx-utils/tiddlers/HelloThere.tid b/editions/xlsx-utils/tiddlers/HelloThere.tid new file mode 100644 index 000000000..197483b44 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/HelloThere.tid @@ -0,0 +1,9 @@ +title: HelloThere + +This is a demo of the ''xlsx-utils'' plugin for TiddlyWiki. + +{{$:/plugins/tiddlywiki/xlsx-utils/readme}} + +!! Demos + +* [[Presidents Demo]] \ No newline at end of file diff --git a/editions/xlsx-utils/tiddlers/Macros.tid b/editions/xlsx-utils/tiddlers/Macros.tid new file mode 100644 index 000000000..4fc1c8bc0 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/Macros.tid @@ -0,0 +1,6 @@ +title: $:/_Macros +tags: $:/tags/Macro + +\define download-xlsx-tiddler(title,caption) +<a href={{{ [[data:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;base64,]addsuffix{$title$}] }}} download="$title$">$caption$</a> +\end diff --git a/editions/xlsx-utils/tiddlers/Presidents Demo.tid b/editions/xlsx-utils/tiddlers/Presidents Demo.tid new file mode 100644 index 000000000..230ac29ff --- /dev/null +++ b/editions/xlsx-utils/tiddlers/Presidents Demo.tid @@ -0,0 +1,27 @@ +title: Presidents Demo + +\define tv-config-toolbar-icons() yes +\define tv-config-toolbar-text() yes + +# Visit the ''XLSX Utilities'' tab of control panel and ensure the current import specification is set to ''Presidents and Justices demo'' +# Download the demo spreadsheet: <<download-xlsx-tiddler "Presidents and Justices.xlsx" "Presidents and Justices.xlsx">> +# Explore the contents of the file to understand the data and how it is structured +# Import the spreadsheet back into TiddlyWiki +#* Use the {{$:/core/ui/Buttons/import}} button here or in the ''Tools'' sidebar tab --or-- +#* Drag and drop the file into the browser +# Click the ''import'' button on the $:/Import tiddler +# Explore the imported data using the table of contents below +# Explore the ''Presidents and Justices demo'' import specification to see how the spreadsheet data was converted into tiddlers + +! Output + +<$list filter="[role[president]limit[1]]" emptyMessage=""" +//Follow the instructions above and the results will appear here// +"""> +</$list> + +<div class="tc-table-of-contents"> + +<<toc-selective-expandable 'States'>> + +</div> diff --git a/editions/xlsx-utils/tiddlers/SiteSubtitle.tid b/editions/xlsx-utils/tiddlers/SiteSubtitle.tid new file mode 100644 index 000000000..df0fd6076 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/SiteSubtitle.tid @@ -0,0 +1,3 @@ +title: $:/SiteSubtitle + +a demo of the XLSX utilities plugin for TiddlyWiki diff --git a/editions/xlsx-utils/tiddlers/SiteTitle.tid b/editions/xlsx-utils/tiddlers/SiteTitle.tid new file mode 100644 index 000000000..46c6847da --- /dev/null +++ b/editions/xlsx-utils/tiddlers/SiteTitle.tid @@ -0,0 +1,3 @@ +title: $:/SiteTitle + +xlsx-utils diff --git a/editions/xlsx-utils/tiddlers/default-import-spec.tid b/editions/xlsx-utils/tiddlers/default-import-spec.tid new file mode 100644 index 000000000..603d16049 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/default-import-spec.tid @@ -0,0 +1,6 @@ +created: 20161021164330811 +modified: 20161021164331841 +title: $:/config/plugins/tiddlywiki/xlsx-utils/default-import-spec +type: text/vnd.tiddlywiki + +$:/_importspec/Presidents and Justices/ \ No newline at end of file diff --git a/editions/xlsx-utils/tiddlers/default-plugin-info-tab.tid b/editions/xlsx-utils/tiddlers/default-plugin-info-tab.tid new file mode 100644 index 000000000..8c7823173 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/default-plugin-info-tab.tid @@ -0,0 +1,2 @@ +title: $:/state/plugin-info--1909267488-$:/plugins/tiddlywiki/xlsx-utils---1477676357 +text: controls diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Justices-Main-modified.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Justices-Main-modified.tid new file mode 100644 index 000000000..836a96ca7 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Justices-Main-modified.tid @@ -0,0 +1,10 @@ +created: 20161021165241843 +import-field-column: Description +import-field-name: text +import-field-source: column +import-field-type: string +import-spec-role: field +modified: 20161023172126055 +title: $:/_importspec/Presidents and Justices/Justices/Main/modified +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Justices-Main-role.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Justices-Main-role.tid new file mode 100644 index 000000000..0963e7dd0 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Justices-Main-role.tid @@ -0,0 +1,9 @@ +created: 20161021165214228 +import-field-name: role +import-field-source: constant +import-field-value: justice +import-spec-role: field +modified: 20161023172127108 +title: $:/_importspec/Presidents and Justices/Justices/Main/role +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Justices-Main-tags.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Justices-Main-tags.tid new file mode 100644 index 000000000..73c1d8e8e --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Justices-Main-tags.tid @@ -0,0 +1,11 @@ +created: 20161009181413650 +import-field-column: President +import-field-list-op: append +import-field-name: tags +import-field-source: column +import-field-type: string +import-spec-role: field +modified: 20161023172128142 +title: $:/_importspec/Presidents and Justices/Justices/Main/tags +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Justices-Main-title.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Justices-Main-title.tid new file mode 100644 index 000000000..ad668260f --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Justices-Main-title.tid @@ -0,0 +1,9 @@ +created: 20161021165211404 +import-field-column: Justice +import-field-name: title +import-field-source: column +import-spec-role: field +modified: 20161023172125012 +title: $:/_importspec/Presidents and Justices/Justices/Main/title +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Justices-Main-trivia.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Justices-Main-trivia.tid new file mode 100644 index 000000000..48b9c1be8 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Justices-Main-trivia.tid @@ -0,0 +1,10 @@ +created: 20161021165829079 +import-field-column: Trivial Facts +import-field-name: trivia +import-field-source: column +import-field-type: string +import-spec-role: field +modified: 20161023172129150 +title: $:/_importspec/Presidents and Justices/Justices/Main/trivia +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Presidents-Main-parent.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Presidents-Main-parent.tid new file mode 100644 index 000000000..0b9c51f23 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Presidents-Main-parent.tid @@ -0,0 +1,10 @@ +created: 20161021164844363 +import-field-column: State +import-field-list-op: append +import-field-name: tags +import-field-source: column +import-spec-role: field +modified: 20161023172106663 +title: $:/_importspec/Presidents and Justices/Presidents/Main/parent +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Presidents-Main-role.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Presidents-Main-role.tid new file mode 100644 index 000000000..5ea2dcfd8 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Presidents-Main-role.tid @@ -0,0 +1,9 @@ +created: 20161021164839163 +import-field-name: role +import-field-source: constant +import-field-value: president +import-spec-role: field +modified: 20161023172105656 +title: $:/_importspec/Presidents and Justices/Presidents/Main/role +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Presidents-Main-text.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Presidents-Main-text.tid new file mode 100644 index 000000000..c8406bf16 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Presidents-Main-text.tid @@ -0,0 +1,9 @@ +created: 20161023172104652 +import-field-column: Description +import-field-name: text +import-field-source: column +import-spec-role: field +modified: 20161023172104652 +title: $:/_importspec/Presidents and Justices/Presidents/Main/text +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Presidents-Main-title.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Presidents-Main-title.tid new file mode 100644 index 000000000..7e17dcf98 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-Presidents-Main-title.tid @@ -0,0 +1,9 @@ +created: 20161021164831260 +import-field-column: President +import-field-name: title +import-field-source: column +import-spec-role: field +modified: 20161023172103626 +title: $:/_importspec/Presidents and Justices/Presidents/Main/title +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-States-Main-role.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-States-Main-role.tid new file mode 100644 index 000000000..24d6c8bc9 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-States-Main-role.tid @@ -0,0 +1,9 @@ +created: 20161021164652535 +import-field-name: role +import-field-source: constant +import-field-value: state +import-spec-role: field +modified: 20161023172038126 +title: $:/_importspec/Presidents and Justices/States/Main/role +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-States-Main-tags.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-States-Main-tags.tid new file mode 100644 index 000000000..44643b7d5 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-States-Main-tags.tid @@ -0,0 +1,12 @@ +created: 20161021171230908 +import-field-column: Column Name +import-field-list-op: append +import-field-name: tags +import-field-source: constant +import-field-type: string +import-field-value: States +import-spec-role: field +modified: 20161023172043708 +title: $:/_importspec/Presidents and Justices/States/Main/tags +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-States-Main-text.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-States-Main-text.tid new file mode 100644 index 000000000..fbcf95515 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-States-Main-text.tid @@ -0,0 +1,9 @@ +created: 20161023172033792 +import-field-column: Description +import-field-name: text +import-field-source: column +import-spec-role: field +modified: 20161023172033792 +title: $:/_importspec/Presidents and Justices/States/Main/text +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-States-Main-title.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-States-Main-title.tid new file mode 100644 index 000000000..5c03583e4 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/field-States-Main-title.tid @@ -0,0 +1,9 @@ +created: 20161021164642751 +import-field-column: State +import-field-name: title +import-field-source: column +import-spec-role: field +modified: 20161023172029372 +title: $:/_importspec/Presidents and Justices/States/Main/title +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/row-Justices.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/row-Justices.tid new file mode 100644 index 000000000..0ee94f212 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/row-Justices.tid @@ -0,0 +1,8 @@ +created: 20161009181413651 +import-spec-role: row +list: [[$:/_importspec/Presidents and Justices/Justices/Main/title]] [[$:/_importspec/Presidents and Justices/Justices/Main/modified]] [[$:/_importspec/Presidents and Justices/Justices/Main/role]] [[$:/_importspec/Presidents and Justices/Justices/Main/tags]] [[$:/_importspec/Presidents and Justices/Justices/Main/trivia]] +modified: 20161023172129146 +tags: +title: $:/_importspec/Presidents and Justices/Justices/Main +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/row-Presidents.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/row-Presidents.tid new file mode 100644 index 000000000..5fd2b2136 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/row-Presidents.tid @@ -0,0 +1,8 @@ +created: 20161021164852566 +import-spec-role: row +list: [[$:/_importspec/Presidents and Justices/Presidents/Main/title]] [[$:/_importspec/Presidents and Justices/Presidents/Main/text]] [[$:/_importspec/Presidents and Justices/Presidents/Main/role]] [[$:/_importspec/Presidents and Justices/Presidents/Main/parent]] +modified: 20161023172106661 +tags: +title: $:/_importspec/Presidents and Justices/Presidents/Main +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/row-States.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/row-States.tid new file mode 100644 index 000000000..623bb4394 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/row-States.tid @@ -0,0 +1,8 @@ +created: 20161021164655367 +import-spec-role: row +list: [[$:/_importspec/Presidents and Justices/States/Main/title]] [[$:/_importspec/Presidents and Justices/States/Main/text]] [[$:/_importspec/Presidents and Justices/States/Main/role]] [[$:/_importspec/Presidents and Justices/States/Main/tags]] +modified: 20161023172043705 +tags: +title: $:/_importspec/Presidents and Justices/States/Main +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/sheet-Justices.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/sheet-Justices.tid new file mode 100644 index 000000000..9132320f0 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/sheet-Justices.tid @@ -0,0 +1,9 @@ +created: 20161021164943746 +import-sheet-name: Justices +import-spec-role: sheet +list: [[$:/_importspec/Presidents and Justices/Justices/Main]] +modified: 20161021165827475 +tags: +title: $:/_importspec/Presidents and Justices/Justices +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/sheet-Presidents.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/sheet-Presidents.tid new file mode 100644 index 000000000..bccaee6bf --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/sheet-Presidents.tid @@ -0,0 +1,9 @@ +created: 20161021164721439 +import-sheet-name: Presidents +import-spec-role: sheet +list: [[$:/_importspec/Presidents and Justices/Presidents/Main]] +modified: 20161021164903102 +tags: +title: $:/_importspec/Presidents and Justices/Presidents +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/sheet-States.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/sheet-States.tid new file mode 100644 index 000000000..2f87e05fd --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/sheet-States.tid @@ -0,0 +1,9 @@ +created: 20161021164354030 +import-sheet-name: States +import-spec-role: sheet +list: [[$:/_importspec/Presidents and Justices/States/Main]] +modified: 20161021164745886 +tags: +title: $:/_importspec/Presidents and Justices/States +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/workbook.tid b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/workbook.tid new file mode 100644 index 000000000..152af0252 --- /dev/null +++ b/editions/xlsx-utils/tiddlers/import-specs/Presidents and Justices/workbook.tid @@ -0,0 +1,9 @@ +caption: Presidents and Justices demo +created: 20161021163735946 +import-spec-role: workbook +list: [[$:/_importspec/Presidents and Justices/States]] [[$:/_importspec/Presidents and Justices/Presidents]] [[$:/_importspec/Presidents and Justices/Justices]] +modified: 20161021164938592 +tags: +title: $:/_importspec/Presidents and Justices/ +type: text/vnd.tiddlywiki + diff --git a/editions/xlsx-utils/tiddlers/samples/Presidents and Justices.xlsx b/editions/xlsx-utils/tiddlers/samples/Presidents and Justices.xlsx new file mode 100644 index 000000000..c4bbc2984 Binary files /dev/null and b/editions/xlsx-utils/tiddlers/samples/Presidents and Justices.xlsx differ diff --git a/editions/xlsx-utils/tiddlers/samples/Presidents and Justices.xlsx.meta b/editions/xlsx-utils/tiddlers/samples/Presidents and Justices.xlsx.meta new file mode 100644 index 000000000..07d8622dd --- /dev/null +++ b/editions/xlsx-utils/tiddlers/samples/Presidents and Justices.xlsx.meta @@ -0,0 +1,2 @@ +title: Presidents and Justices.xlsx +type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet diff --git a/editions/xlsx-utils/tiddlywiki.info b/editions/xlsx-utils/tiddlywiki.info new file mode 100644 index 000000000..7adfc403b --- /dev/null +++ b/editions/xlsx-utils/tiddlywiki.info @@ -0,0 +1,17 @@ +{ + "description": "Demo of the XLSX utilities plugin", + "plugins": [ + "tiddlywiki/jszip", + "tiddlywiki/xlsx-utils" + ], + "themes": [ + "tiddlywiki/vanilla", + "tiddlywiki/snowwhite" + ], + "includeWikis": [ + ], + "build": { + "index": [ + "--rendertiddler","$:/core/save/all","index.html","text/plain"] + } +} diff --git a/languages/ca-ES/GettingStarted.tid b/languages/ca-ES/GettingStarted.tid index b5f02722b..5a057a7ed 100644 --- a/languages/ca-ES/GettingStarted.tid +++ b/languages/ca-ES/GettingStarted.tid @@ -3,7 +3,7 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ Benvingut a ~TiddlyWiki i a la comunitat ~TiddlyWiki -Abans de començar a desar informació important al ~TiddlyWiki cal que us assegureu que podeu desar els canvis de forma fiable. Veieu els detalls a http://tiddlywiki.com/#GettingStarted +Abans de començar a desar informació important al ~TiddlyWiki cal que us assegureu que podeu desar els canvis de forma fiable. Veieu els detalls a https://tiddlywiki.com/#GettingStarted !! Configureu aquest ~TiddlyWiki diff --git a/languages/ca-ES/Misc.multids b/languages/ca-ES/Misc.multids index 00f23a857..dea380e8c 100644 --- a/languages/ca-ES/Misc.multids +++ b/languages/ca-ES/Misc.multids @@ -1,7 +1,7 @@ title: $:/language/ BinaryWarning/Prompt: Aquest tiddler conté dades binàries -ClassicWarning/Hint: Aquest tiddler està escrit en format de text de TiddlyWiki, que no es totalment compatible amb la versió 5 de TiddlyWiki. Veieu els detalls a http://tiddlywiki.com/static/Upgrading.html . +ClassicWarning/Hint: Aquest tiddler està escrit en format de text de TiddlyWiki, que no es totalment compatible amb la versió 5 de TiddlyWiki. Veieu els detalls a https://tiddlywiki.com/static/Upgrading.html . ClassicWarning/Upgrade/Caption: actualitza CloseAll/Button: tanca-ho tot ConfirmCancelTiddler: Voleu descartar els canvis del tiddler "<$text text=<<title>>/>"? @@ -19,7 +19,7 @@ Encryption/RepeatPassword: Repetiu la contrasenya Encryption/SetPassword: Indiqueu la contrasenya Encryption/Username: Usuari InvalidFieldName: Hi ha caràcters il·legals al nom del camp "<$text text=<<fieldName>>/>". Els camps només poden utilitzar minúscules, digits i els caràcters subratllat (`_`), guió (`-`) i punt (`.`) -MissingTiddler/Hint: Falta el tiddler "<$text text=<<currentTiddler>>/>" - cliqueu {{$:/core/images/edit-button}} per generar-ho +MissingTiddler/Hint: Falta el tiddler "<$text text=<<currentTiddler>>/>" - cliqueu {{||$:/core/ui/Buttons/edit}} per generar-ho OfficialPluginLibrary: Biblioteca de connectors de ~TiddlyWiki Oficial PluginReloadWarning: Deseu si us plau {{$:/core/ui/Buttons/save-wiki}} i torneu a carregar {{$:/core/ui/Buttons/refresh}} per tal que els canvis als connectors es puguin activar RecentChanges/DateFormat: DD MMM YYYY diff --git a/languages/ca-ES/Modals/Download.tid b/languages/ca-ES/Modals/Download.tid index 9f271510e..2e95a0502 100644 --- a/languages/ca-ES/Modals/Download.tid +++ b/languages/ca-ES/Modals/Download.tid @@ -2,6 +2,6 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Download changes footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html El vostre navegador només permet desar de forma manual. Per desar les modificacions del vostre wiki, cliqueu amb el botó dret l'enllaç per baixar de sota i trieu "Baixa el fitxer" o "Desa el fitxer", i llavors trieu la carpeta i el nom del fitxer.//Podeu accelerar-ho clicant l'enllaç amb la tecla control (Windows) o la tecla opcions/alt (Mac OS X). Es demanarà la carpeta o el nom del fitxer, però probablement el vostre navegador hi assignarà un nom irreconeixible -- haureu de reanomenar el fitxer per incloure l'extensió `.html` abans no pogueu fer res útil amb ell.//Als mòbils que no permeten baixar fitxers podeu desar l'enllaç als preferits, i llavors sincronitzar els vostres preferits a un ordinador des del que podeu desar el wiki normalment. \ No newline at end of file diff --git a/languages/ca-ES/Modals/SaveInstructions.tid b/languages/ca-ES/Modals/SaveInstructions.tid index d43846f2a..87bb26b5e 100644 --- a/languages/ca-ES/Modals/SaveInstructions.tid +++ b/languages/ca-ES/Modals/SaveInstructions.tid @@ -2,6 +2,6 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Save your work footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html Els vostres canvis a aquest wiki s'han de desar com un fitxer HTML ~TiddlyWiki.!!! Navegadors d'escriptori# Trieu ''Anomena i desa'' al menú ''Fitxer''# Trieu un nom i un lloc per al fitxer#* Per alguns navegadors també cal que el format del fitxer sigui 'Pàgina web, només HTML'' o similar# Tanqueu aquesta pestanya!!! Navegadors per mòbils# Deseu aquesta pàgina als Preferits#* Si teniu configurat iCloud o Google Sync llavors el preferits es sincronitzarà automaticament amb el vostre ordinador des d'on el podreu obrir i desar com s'indica més amunt# Tanqueu aquests pestanya//Si torneu a obrir el preferits a Safari Mobile tornareu a veure el missatge. Si voleu continuar i utilitzar el fitxer, només heu de clicat el botó 'tanca'' de sota// \ No newline at end of file diff --git a/languages/ca-ES/Search.multids b/languages/ca-ES/Search.multids index 5b7cf43c4..2307857cf 100644 --- a/languages/ca-ES/Search.multids +++ b/languages/ca-ES/Search.multids @@ -2,7 +2,7 @@ title: $:/language/Search/ DefaultResults/Caption: Llista Filter/Caption: Filtre -Filter/Hint: Cerca amb una [[filter expression|http://tiddlywiki.com/static/Filters.html]] +Filter/Hint: Cerca amb una [[filter expression|https://tiddlywiki.com/static/Filters.html]] Filter/Matches: //<small><<resultCount>> coincidències</small>// Matches: //<small><<resultCount>> coincidències</small>// Shadows/Caption: Ombres diff --git a/languages/cs-CZ/GettingStarted.tid b/languages/cs-CZ/GettingStarted.tid index bb5c01ac0..d5be099f2 100644 --- a/languages/cs-CZ/GettingStarted.tid +++ b/languages/cs-CZ/GettingStarted.tid @@ -4,7 +4,7 @@ title: GettingStarted Vítejte v ~TiddlyWiki a v ~TiddlyWiki komunitě Než začnete používat ~TiddlyWiki pro záznam důležitých informací, je potřeba se přesvědčit, zda lze informace v pořádku uložit na disk -Zjistěte více na http://tiddlywiki.com/#GettingStarted +Zjistěte více na https://tiddlywiki.com/#GettingStarted !! Nastavte si tutos ~TiddlyWiki diff --git a/languages/cs-CZ/Misc.multids b/languages/cs-CZ/Misc.multids index 0111f81f0..65912e06b 100644 --- a/languages/cs-CZ/Misc.multids +++ b/languages/cs-CZ/Misc.multids @@ -1,7 +1,7 @@ title: $:/language/ BinaryWarning/Prompt: Tento tiddler obsahuje binární data -ClassicWarning/Hint: Tento tiddler používá formát textu z TiddlyWiki Classic, který není plně kompatibilní s TiddlyWiki verze 5. Na http://tiddlywiki.com/static/Upgrading.html zjistíte více. +ClassicWarning/Hint: Tento tiddler používá formát textu z TiddlyWiki Classic, který není plně kompatibilní s TiddlyWiki verze 5. Na https://tiddlywiki.com/static/Upgrading.html zjistíte více. ClassicWarning/Upgrade/Caption: upgrade CloseAll/Button: zavřít vše ConfirmCancelTiddler: Chcete zrušit změny v tiddleru "<$text text=<<title>>/>"? @@ -13,7 +13,7 @@ DropMessage: Zde pusťte (nebo zmáčknutím Esc zrušte) Encryption/ConfirmClearPassword: Chcete ztušit heslo? Tím se zruší šifrování této wiki Encryption/PromptSetPassword: Nastavte nové heslo pro tuto TiddlyWiki InvalidFieldName: Neplatné znaky v názvu pole "<$text text=<<fieldName>>/>". Název může obsahovat pouze malá písmena, čísla, podtržítko (`_`), pomlčku (`-`) a tečku (`.`) -MissingTiddler/Hint: Chybějící tiddler "<$text text=<<currentTiddler>>/>" - klikněte na {{$:/core/images/edit-button}} pro jeho vytvoření +MissingTiddler/Hint: Chybějící tiddler "<$text text=<<currentTiddler>>/>" - klikněte na {{||$:/core/ui/Buttons/edit}} pro jeho vytvoření RecentChanges/DateFormat: DD. MM. YYYY SystemTiddler/Tooltip: Toto je systémový tiddler TagManager/Colour/Heading: Barva diff --git a/languages/cs-CZ/Modals/Download.tid b/languages/cs-CZ/Modals/Download.tid index 9d101ed82..b135aedce 100644 --- a/languages/cs-CZ/Modals/Download.tid +++ b/languages/cs-CZ/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Download changes footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html Váš prohlížeč umožnuje pouze ruční ukládání. diff --git a/languages/cs-CZ/Modals/SaveInstructions.tid b/languages/cs-CZ/Modals/SaveInstructions.tid index b172e034f..8734cb1bf 100644 --- a/languages/cs-CZ/Modals/SaveInstructions.tid +++ b/languages/cs-CZ/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Save your work footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html Změny v této wiki je potřeba uložit jako ~TiddlyWiki HTML soubor. diff --git a/languages/cs-CZ/Search.multids b/languages/cs-CZ/Search.multids index 282bf78ed..1eee587fa 100644 --- a/languages/cs-CZ/Search.multids +++ b/languages/cs-CZ/Search.multids @@ -2,7 +2,7 @@ title: $:/language/Search/ DefaultResults/Caption: Seznam Filter/Caption: Filtr -Filter/Hint: Hledat pomocí [[filter expression|http://tiddlywiki.com/static/Filters.html]] +Filter/Hint: Hledat pomocí [[filter expression|https://tiddlywiki.com/static/Filters.html]] Filter/Matches: //<small>nalezeno <<resultCount>></small>// Matches: //<small>nalezeno <<resultCount>></small>// Shadows/Caption: Stínové diff --git a/languages/da-DK/Buttons.multids b/languages/da-DK/Buttons.multids index 987ca718b..cfbcf7608 100644 --- a/languages/da-DK/Buttons.multids +++ b/languages/da-DK/Buttons.multids @@ -122,6 +122,8 @@ Preview/Caption: forhåndsvisning Preview/Hint: Vis forhåndsvisnings panel PreviewType/Caption: forhåndsvisnings type PreviewType/Hint: Vælg forhåndsvisnings type +Print/Caption: print side +Print/Hint: Print den aktuelle side Quote/Caption: Citat Quote/Hint: Føj citat tekst formatering til linier indeholdende udvalgte Refresh/Caption: genopfrisk @@ -152,6 +154,11 @@ TagManager/Caption: tagadministrator TagManager/Hint: Åbn tagadministrator Theme/Caption: tema Theme/Hint: Vælg visningstema +Timestamp/Hint: Vælg om modifikationer opdaterer tidsstempler +Timestamp/Off/Caption: tidsstempler er slået fra +Timestamp/Off/Hint: Opdaterer ikke tiddstempler når tiddlere modificeres +Timestamp/On/Caption: tidsstempker er slået til +Timestamp/On/Hint: Opdater tidsstempler når tiddlere modificeres Underline/Caption: understregning Underline/Hint: Føj understregnings formatering til udvalgte Unfold/Caption: udfold tiddler diff --git a/languages/da-DK/ControlPanel.multids b/languages/da-DK/ControlPanel.multids index 22111eb5b..befe9e46b 100644 --- a/languages/da-DK/ControlPanel.multids +++ b/languages/da-DK/ControlPanel.multids @@ -52,7 +52,7 @@ Palette/HideEditor/Caption: skjul editor Palette/Prompt: Aktuel palette: Palette/ShowEditor/Caption: vis editor Parsing/Block/Caption: Blok Parse regler -Parsing/Hint: Her kan du globalt slå individuelle wiki parser regler fra. Vær påpasselig, da det at slå nogle parser regler fra, kan hindre ~TiddlyWiki i at fungere korrekt (du kan genskabe normal funktion med [[safe mode|http://tiddlywiki.com/#SafeMode]] ) +Parsing/Hint: Her kan du globalt slå individuelle wiki parser regler fra. Vær påpasselig, da det at slå nogle parser regler fra, kan hindre ~TiddlyWiki i at fungere korrekt (du kan genskabe normal funktion med [[safe mode|https://tiddlywiki.com/#SafeMode]] ) Parsing/Inline/Caption: Inline Parse regler Parsing/Pragma/Caption: Pragma Parse regler Plugins/Add/Caption: Få flere udvidelser @@ -70,10 +70,10 @@ Plugins/Installed/Hint: Aktuelt installerede udvidelser: Plugins/Language/Prompt: Sprog Plugins/Languages/Caption: Sprog Plugins/Languages/Hint: Sprogpakkeudvidelser -Plugins/NoInformation/Hint: Ingen information leveret +Plugins/NoInfoFound/Hint: Ingen ''"<$text text=<<currentTab>>/>"'' fundet Plugins/NotInstalled/Hint: Dette plugin er ikke aktuelt installeret Plugins/OpenPluginLibrary: Åbn plugin bibliotek -Plugins/Plugin/Prompt: Udvidelser +Plugins/Plugin/Prompt: Udvidelser Plugins/Plugins/Caption: Udvidelser Plugins/Plugins/Hint: Udvidelser Plugins/Reinstall/Caption: geninstallér @@ -84,7 +84,7 @@ Saving/Caption: Gemning Saving/Heading: Gemning Saving/TiddlySpot/Advanced/Heading: Avancerede indstillinger Saving/TiddlySpot/BackupDir: Backupmappe -Saving/TiddlySpot/Backups: Backups +Saving/TiddlySpot/Backups: Backups Saving/TiddlySpot/Description: Disse indstillinger bruges kun, når der gemmes til http://tiddlyspot.com eller en kompatibel server Saving/TiddlySpot/Filename: Upload filnavn Saving/TiddlySpot/Heading: ~TiddlySpot @@ -103,6 +103,9 @@ Settings/Caption: Indstillinger Settings/DefaultSidebarTab/Caption: Standard Sidepanelsfane Settings/DefaultSidebarTab/Hint: Specificér hvilken sidepanelsfane der vises som standard Settings/Hint: Disse indstillinger lader dig tilpasse din TiddlyWikis opførsel. +Settings/InfoPanelMode/Hint: Kontrol når info panelet lukkes: +Settings/InfoPanelMode/Popup/Description: Tiddler info panel lukkes automatisk +Settings/InfoPanelMode/Sticky/Description: Tiddler info panel forbliver åbent indtil det udtrykkeligt lukkes Settings/LinkToBehaviour/Caption: Tiddler åbnings adfærd Settings/LinkToBehaviour/InsideRiver/Hint: Navigation fra //indefra// the story river Settings/LinkToBehaviour/OpenAbove: Åben ovenover den aktuelle tiddler diff --git a/languages/da-DK/Docs/ModuleTypes.multids b/languages/da-DK/Docs/ModuleTypes.multids index 076175efa..f21cdb378 100644 --- a/languages/da-DK/Docs/ModuleTypes.multids +++ b/languages/da-DK/Docs/ModuleTypes.multids @@ -1,16 +1,21 @@ title: $:/language/Docs/ModuleTypes/ +allfilteroperator: En sub-operator for ''all'' filter operator. animation: Animationer kan bruges med RevealWidget. +bitmapeditoroperation: En bitmap editor toolbar operation. command: Kommandoer som kan køres under Node.js. config: Data som indsættes i `$tw.config`. filteroperator: Individuelle filter operator metoder. global: Globale data som indsættes i `$tw`. +info: Publiserer system information via [[$:/temp/info-plugin]] pseudo-plugin. isfilteroperator: Operander for ''is'' filter operatoren. +library: Generisk modul type for general purpose JavaScript moduler. macro: JavaScript makro definitioner. parser: Parsere for forskellige indholdstyper.. -saver: Savers håndterer forskellige metoder til at gemme filer fra browseren. +saver: Gemmere håndterer forskellige metoder til at gemme filer fra browseren. startup: Opstartsfunktioner. storyview: Historievisninger tilpasser animation og adfærd for liste widgets. +texteditoroperation: En text editor toolbar operation. tiddlerdeserializer: konverterer forskellige indholdstyper til tiddlere. tiddlerfield: Definerer adfærden for et individuelt tiddler felt. tiddlermethod: Føjer metoder til `$tw.Tiddler` prototypen. diff --git a/languages/da-DK/Fields.multids b/languages/da-DK/Fields.multids index cb9e7b58e..394735953 100644 --- a/languages/da-DK/Fields.multids +++ b/languages/da-DK/Fields.multids @@ -18,7 +18,7 @@ icon: Titlen på den tiddler som indeholder et ikon, der er knyttet til en tiddl library: Hvis sat til "ja" indikeres at en tiddler bør gemmes som et JavaScript library list: En ordnet liste af tiddlertitler som er knyttet til en tiddler list-after: Hvis sat, titlen på den tiddler efter hvilken denne tiddler skal indsættes i den ordnede liste over tiddler titler. -list-before: Hvis sat, titlen på en tiddler, før hvilken denne tiddler skal indsættes i den ordnede liste over tiddler titler, eller i starten af listen, hvis dette felt er tilstede men tomt. +list-before: Hvis sat, titlen på en tiddler, før hvilken denne tiddler skal indsættes i den ordnede liste over tiddler titler, eller i starten af listen, hvis dette felt er tilstede men tomt. modified: Dato og klokkeslæt, hvor en tiddler sidst blev ændret modifier: Den tiddlertitel som har samme navn som den forfatter der sidst ændrede tiddleren name: Det menneskeligt læsbare navn, som knyttes til en udvidelsestiddler diff --git a/languages/da-DK/GettingStarted.tid b/languages/da-DK/GettingStarted.tid index 53575ea65..2f211a8ad 100644 --- a/languages/da-DK/GettingStarted.tid +++ b/languages/da-DK/GettingStarted.tid @@ -3,7 +3,7 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ Velkommen til ~TiddlyWiki og ~TiddlyWiki fællesskabet -Før du begynder at lagre vigtige informationer i ~TiddlyWiki er det vigtigt, at du sikrer dig, at du på pålidelig måde kan gemme ændringer. Se http://tiddlywiki.com/#GettingStarted for detaljer +Før du begynder at lagre vigtige informationer i ~TiddlyWiki er det vigtigt, at du sikrer dig, at du på pålidelig måde kan gemme ændringer. Se https://tiddlywiki.com/#GettingStarted for detaljer !! Opsæt denne ~TiddlyWiki diff --git a/languages/da-DK/Import.multids b/languages/da-DK/Import.multids index bf79eca00..ee7994ed0 100644 --- a/languages/da-DK/Import.multids +++ b/languages/da-DK/Import.multids @@ -1,13 +1,13 @@ title: $:/language/Import/ -Imported/Hint: Følgende tiddlere blev importeret: +Imported/Hint: Følgende tiddlere blev importeret: Listing/Cancel/Caption: Fortryd Listing/Hint: Disse tiddlere er klar til import: Listing/Import/Caption: Importér Listing/Select/Caption: Vælg Listing/Status/Caption: Status Listing/Title/Caption: Titel -Upgrader/Plugins/Suppressed/Incompatible: Blokeret inkompatibelt eller forældet udvidelse +Upgrader/Plugins/Suppressed/Incompatible: Blokeret inkompatibelt eller forældet udvidelse Upgrader/Plugins/Suppressed/Version: Blokeret udvidelse (pga. at indkommende <<incoming>> er ældre end den eksisterende <<existing>>) Upgrader/Plugins/Upgraded: Upgraderet udvidelse fra <<incoming>> til <<upgraded>> Upgrader/State/Suppressed: Blokeret foreløbig statustiddler diff --git a/languages/da-DK/Misc.multids b/languages/da-DK/Misc.multids index b58315767..c23ea37c7 100644 --- a/languages/da-DK/Misc.multids +++ b/languages/da-DK/Misc.multids @@ -1,8 +1,8 @@ title: $:/language/ -AboveStory/ClassicPlugin/Warning: Det ser ud til, at du prøver at indlæse et plugin beregnet for ~TiddlyWiki Classic. Bemærk venligst, at [[disse plugins ikke virker med TiddlyWiki version 5.x.x|http://tiddlywiki.com/#TiddlyWikiClassic]]. ~TiddlyWiki Classic plugins opdaget: +AboveStory/ClassicPlugin/Warning: Det ser ud til, at du prøver at indlæse et plugin beregnet for ~TiddlyWiki Classic. Bemærk venligst, at [[disse plugins ikke virker med TiddlyWiki version 5.x.x|https://tiddlywiki.com/#TiddlyWikiClassic]]. ~TiddlyWiki Classic plugins opdaget: BinaryWarning/Prompt: Denne tiddler indeholder binære data -ClassicWarning/Hint: Denne tiddler er skrevet i ~TiddlyWiki Classic wikitekstformat, som ikke er fuldt kompatibel med ~TiddlyWiki version 5. Se http://tiddlywiki.com/static/Upgrading.html for flere detaljer.. +ClassicWarning/Hint: Denne tiddler er skrevet i ~TiddlyWiki Classic wikitekstformat, som ikke er fuldt kompatibel med ~TiddlyWiki version 5. Se https://tiddlywiki.com/static/Upgrading.html for flere detaljer.. ClassicWarning/Upgrade/Caption: Opgradér CloseAll/Button: luk alle ConfirmCancelTiddler: Ønsker du at fortryde ændringer til denne tiddler "<$text text=<<title>>/>"? @@ -20,12 +20,32 @@ Encryption/PromptSetPassword: Angiv et nyt kodeord for denne ~TiddlyWiki Encryption/RepeatPassword: Gentag kodeord Encryption/SetPassword: Angiv kodeord Encryption/Username: Brugernavn +Error/Caption: Fejl +Error/Filter: Filter fejl +Error/FilterSyntax: Syntaks fejl i filter udtryk +Error/IsFilterOperator: Filter fejl: ukendt operand for 'is' filter operator +Error/LoadingPluginLibrary: Fejl ved indlæsning af plugin library +Error/RecursiveTransclusion: Recursive transclusion fejl i transclude widget +Error/SavingToTWEdit: Fejl ved gemning til TWEdit +Error/WhileSaving: Fejl ved gemning InternalJavaScriptError/Hint: Oh, dette er pinligt. Det anbefales at du genstarter TiddlyWiki ved at opfriske din browser InternalJavaScriptError/Title: Intern JavaScript fejl InvalidFieldName: Illegale tegn i felt navn "<$text text=<<fieldName>>/>". Felter kan kun indeholde små bogstaver, tal og tegnene undersstreg (`_`), bindestreg (`-`) og punktum (`.`) -LazyLoadingWarning: <p>indlæser ekstern tekst fra ''<$text text={{!!_canonical_uri}}/>''</p><p>Hvis denne besked ikke forsvinder, bruger du måske en browser, som ikke understøtter ekstern tekst i denne konfiguration. Se http://tiddlywiki.com/#ExternalText</p> -MissingTiddler/Hint: Manglende tiddler "<$text text=<<currentTiddler>>/>" - klik {{$:/core/images/edit-button}} for at oprette den. +LazyLoadingWarning: <p>indlæser ekstern tekst fra ''<$text text={{!!_canonical_uri}}/>''</p><p>Hvis denne besked ikke forsvinder, bruger du måske en browser, som ikke understøtter ekstern tekst i denne konfiguration. Se https://tiddlywiki.com/#ExternalText</p> +LoginToTiddlySpace: Login til TiddlySpace +Manager/Controls/FilterByTag/Prompt: Filtrer efter tag: +Manager/Controls/Order/Prompt: Omvendt rækkefølge +Manager/Controls/Search/Placeholder: Søg +Manager/Controls/Search/Prompt: Søg: +Manager/Controls/Show/Option/Tiddlers: tiddlere +Manager/Controls/Show/Prompt: Vis: +Manager/Controls/Sort/Prompt: Sortér efter: +Manager/Item/Colour: Farve +Manager/Item/Fields: Felter +MissingTiddler/Hint: Manglende tiddler "<$text text=<<currentTiddler>>/>" - klik {{||$:/core/ui/Buttons/edit}} for at oprette den. +No: Nej OfficialPluginLibrary: Officielt ~TiddlyWiki udvidelsesbibliotek +OfficialPluginLibrary/Hint: Det officielle ~TiddlyWiki plugin library på tiddlywiki.com. Plugins, temaer og sprog pakker vedligeholdes af core team. PluginReloadWarning: Venligst gem {{$:/core/ui/Buttons/save-wiki}} og genindlæs {{$:/core/ui/Buttons/refresh}} for at tillade udvidelser at træde i kraft RecentChanges/DateFormat: DD. MMM YYYY SystemTiddler/Tooltip: Dette er en systemtiddler @@ -33,4 +53,6 @@ TagManager/Colour/Heading: Farve TagManager/Count/Heading: Tæl TagManager/Icon/Heading: Ikon TagManager/Tag/Heading: Tag +Tiddler/DateFormat: DD. MMM YYYY kl. hh12:0mmam UnsavedChangesWarning: Du har ændringer som ikke er gemt i ~TiddlyWiki +Yes: Ja diff --git a/languages/da-DK/Modals/Download.tid b/languages/da-DK/Modals/Download.tid index a0e865e16..12ea4f34c 100644 --- a/languages/da-DK/Modals/Download.tid +++ b/languages/da-DK/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Download changes footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html Din browser understøtter kun manuel gemning diff --git a/languages/da-DK/Modals/SaveInstructions.tid b/languages/da-DK/Modals/SaveInstructions.tid index ad2768868..76ee4e3ec 100644 --- a/languages/da-DK/Modals/SaveInstructions.tid +++ b/languages/da-DK/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Save your work footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html Dine ændringer til denne wiki skal gemmes som en ~TiddlyWiki HTML file. diff --git a/languages/da-DK/Search.multids b/languages/da-DK/Search.multids index 3ee965b5c..fe629944e 100644 --- a/languages/da-DK/Search.multids +++ b/languages/da-DK/Search.multids @@ -2,12 +2,13 @@ title: $:/language/Search/ DefaultResults/Caption: Liste Filter/Caption: Filter -Filter/Hint: Søg med et [[filterudtryk|http://tiddlywiki.com/static/Filters.html]] +Filter/Hint: Søg med et [[filterudtryk|https://tiddlywiki.com/static/Filters.html]] Filter/Matches: //<small><<resultCount>> træffere</small>// Matches: //<small><<resultCount>> træffere</small>// Matches/All: Alle træffere: Matches/Title: Titel træffere: Search: Søg +Search/TooShort: Søge tekst for kort Shadows/Caption: Skygger Shadows/Hint: Søg i skyggetiddlere Shadows/Matches: //<small><<resultCount>> træffere</small>// diff --git a/languages/da-DK/ThemeTweaks.multids b/languages/da-DK/ThemeTweaks.multids new file mode 100644 index 000000000..b4d23b9dc --- /dev/null +++ b/languages/da-DK/ThemeTweaks.multids @@ -0,0 +1,35 @@ +title: $:/language/ThemeTweaks/ + +Metrics: Størrelser +Metrics/BodyFontSize: Font størrelse for tiddler body +Metrics/BodyLineHeight: Linie højde for tiddler body +Metrics/FontSize: Font størrelse +Metrics/LineHeight: Linie højde +Metrics/SidebarBreakpoint/Hint: minimum side bredde ved hvilken story<br>river og sidebar vises side om side +Metrics/SidebarWidth: Sidebar bredde +Metrics/SidebarWidth/Hint: bredden af sidebar i flydende-fikseret layout +Metrics/StoryLeft: Story venstre position +Metrics/StoryLeft/Hint: hvor langt venstre kant af story river<br>(tiddler area) er fra vestre side af siden. +Metrics/StoryRight: Story højre +Metrics/StoryRight/Hint: hvor langt venstre margen af sidebar <br>er fra vesntre side af siden +Metrics/StoryTop/Hint: hvor langt top margen af the story river<br>er fra troppen af siden +Metrics/StoryWidth: Story bredde +Metrics/StoryWidth/Hint: Hele bredden af story river +Metrics/TiddlerWidth: Tiddler bredde +Metrics/TiddlerWidth/Hint: i story river +Options: Valgmuligheder +Options/CodeWrapping: Omgiv lange linier i code blokke +Options/SidebarLayout/Fixed-Fluid: Fikseretstory, flydende sidebar +Options/SidebarLayout/Fluid-Fixed: Flydende story, fikseret sidebar +Settings: Indstillinger +Settings/BackgroundImage: Side baggrunds billede +Settings/BackgroundImageAttachment: Side baggrunds billede tilknyttet +Settings/BackgroundImageAttachment/Fixed: Fikseret til vindoe +Settings/BackgroundImageAttachment/Scroll: Ruller med tiddlere +Settings/BackgroundImageSize: Side baggrunds billede størrelse +Settings/BackgroundImageSize/Contain: Indeholder +Settings/BackgroundImageSize/Cover: Dækker +Settings/CodeFontFamily: Code font familie +Settings/FontFamily: Font familie +ThemeTweaks: Tema justering +ThemeTweaks/Hint: Du kan justere visse aspekter af ''Vanilla'' temaet. diff --git a/languages/da-DK/TiddlerInfo.multids b/languages/da-DK/TiddlerInfo.multids index d336af5ef..513428689 100644 --- a/languages/da-DK/TiddlerInfo.multids +++ b/languages/da-DK/TiddlerInfo.multids @@ -16,6 +16,6 @@ Listed/Caption: Listet Listed/Empty: Denne tiddler er ikke listet af andre References/Caption: Referencer References/Empty: Ingen tiddlere linker til denne -Tagging/Caption: Tagging +Tagging/Caption: Tagging Tagging/Empty: Ingen tiddlere er tagget med denne Tools/Caption: Værktøj diff --git a/languages/de-DE/Buttons.multids b/languages/de-DE/Buttons.multids index 9fc6b6bdc..ac9ae808e 100644 --- a/languages/de-DE/Buttons.multids +++ b/languages/de-DE/Buttons.multids @@ -14,6 +14,8 @@ CloseOthers/Caption: Andere schließen CloseOthers/Hint: Alle anderen Tiddler schließen ControlPanel/Caption: Control-Panel ControlPanel/Hint: Öffne das Control-Panel +CopyToClipboard/Caption: Kopiere in die Zwischenablage +CopyToClipboard/Hint: Kopiere diesen Text in die Zwischenablage Delete/Caption: Löschen Delete/Hint: Lösche diesen Tiddler Edit/Caption: Bearbeiten @@ -54,6 +56,8 @@ Home/Caption: Home Home/Hint: Öffnen der Standard-Tiddler Language/Caption: Sprache Language/Hint: Auswahldialog für die Systemsprache +Manager/Caption: Tiddler Manager +Manager/Hint: Öffne den Tiddler Manager More/Caption: mehr More/Hint: Weitere Aktionen NewHere/Caption: Neu hier @@ -76,6 +80,8 @@ Permalink/Caption: Permalink Permalink/Hint: Die Adressleiste des Browsers enthält einen Link zu diesem Tiddler Permaview/Caption: Permaview Permaview/Hint: Die Adressleiste des Browsers enthält einen Link zu allen offenen Tiddlern in dieser Story +Print/Caption: Seite drucken +Print/Hint: Aktuelle Seite drucken Refresh/Caption: Aktualisieren Refresh/Hint: Die Seite wird neu in den Browser geladen Save/Caption: Fertig @@ -90,6 +96,12 @@ ShowSideBar/Caption: Sidebar einblenden ShowSideBar/Hint: Sidebar einblenden TagManager/Caption: Tag-Manager TagManager/Hint: Öffne den Tag-Manager +Timestamp/Caption: Zeitstempel +Timestamp/Hint: Einstellung, ob Änderungen den Zeitstempel beeinflussen +Timestamp/On/Caption: Zeitstempel EIN +Timestamp/On/Hint: Zeitstempel aktualisieren, wenn ein Tiddler verändert wird +Timestamp/Off/Caption: Zeitstempel AUS +Timestamp/Off/Hint: Zeitstempel bleibt unverändert, wenn ein Tiddler geändert wird Theme/Caption: Theme Theme/Hint: Theme auswählen Bold/Caption: Fett @@ -129,6 +141,8 @@ LineWidth/Caption: Zeilen Länge LineWidth/Hint: Wählen Sie die Zeilenlänge Link/Caption: Link Link/Hint: Erstellt einen Wiki-Link +Linkify/Caption: Wikilink +Linkify/Hint: Wikilink - Den selektierten Text in eckige Klammern setzen ListBullet/Caption: Punkteliste ListBullet/Hint: Zeilen, die eine Markierung enthalten, werden als Punkteliste formatiert ListNumber/Caption: Aufzählungsliste @@ -149,6 +163,8 @@ PreviewType/Caption: Vorschau Typ PreviewType/Hint: Wählen Sie den Vorschau Typ Quote/Caption: Zitat Quote/Hint: Alle Zeilen, die eine Markierung enthalten werden als Referenz/Zitat formatiert +RotateLeft/Caption: Links rotieren +RotateLeft/Hint: Rotiere das Bild um 90° nach links Size/Caption: Bildgröße Size/Caption/Height: Höhe: Size/Caption/Resize: Bildgröße ändern @@ -165,6 +181,7 @@ Subscript/Caption: Tiefsgestellt Subscript/Hint: Ausgewählten Text tiefgestellt darstellen Superscript/Caption: Hochgestellt Superscript/Hint: Ausgewählten Text hochgestellt darstellen +Transcludify/Caption: Transklusion +Transcludify/Hint: Transklusion - Den selektierten Text in geschwungene Klammern setzen Underline/Caption: Unterstreichen Underline/Hint: Ausgewählten Text unterstrichen darstellen - diff --git a/languages/de-DE/ControlPanel.multids b/languages/de-DE/ControlPanel.multids index 549fb855d..11cb70963 100644 --- a/languages/de-DE/ControlPanel.multids +++ b/languages/de-DE/ControlPanel.multids @@ -11,7 +11,9 @@ Basics/DefaultTiddlers/Prompt: Standard-Tiddler: Basics/DefaultTiddlers/TopHint: Tiddler, die beim Start geladen werden: Basics/Language/Prompt: Hallo! Aktuelle Sprache: Basics/NewJournal/Title/Prompt: Titel des neuen Journal-Tiddlers: +Basics/NewJournal/Text/Prompt: Text des neuen Journal-Tiddlers: Basics/NewJournal/Tags/Prompt: Tags des neuen Journal-Tiddlers: +Basics/NewTiddler/Title/Prompt: Titel des neuen Tiddlers: Basics/OverriddenShadowTiddlers/Prompt: Anzahl überschriebener Schatten-Tiddler: Basics/ShadowTiddlers/Prompt: Anzahl Schatten-Tiddler: Basics/Subtitle/Prompt: Untertitel: @@ -52,12 +54,12 @@ Palette/HideEditor/Caption: Editor ausblenden Palette/Prompt: Ausgewählte Farbpalette: Palette/ShowEditor/Caption: Editor zeigen Parsing/Caption: Parser -Parsing/Hint: Hier können Sie die globalen Parser-Einstellungen ändern. ACHTUNG: Manche Einstellungen können dazu führen, dass ~TiddlyWiki nicht mehr richtig funktioniert. Sollte das der Fall sein, dann können Sie die Änderungen im [["safe mode"|http://tiddlywiki.com/#SafeMode]] rückgängig machen. +Parsing/Hint: Hier können Sie die globalen Parser-Einstellungen ändern. ACHTUNG: Manche Einstellungen können dazu führen, dass ~TiddlyWiki nicht mehr richtig funktioniert. Sollte das der Fall sein, dann können Sie die Änderungen im [["safe mode"|https://tiddlywiki.com/#SafeMode]] rückgängig machen. Parsing/Block/Caption: Block Regeln Parsing/Inline/Caption: Inline Regeln Parsing/Pragma/Caption: Pragma Regeln -Plugins/Add/Hint: Suche und installiere neue Plugins Plugins/Add/Caption: Suche +Plugins/Add/Hint: Suche und installiere neue Plugins Plugins/AlreadyInstalled/Hint: Dieses Plugin ist bereits installiert. Version: <$text text=<<installedVersion>>/> Plugins/Caption: Plugins Plugins/Disable/Caption: deaktivieren @@ -71,19 +73,26 @@ Plugins/Installed/Hint: Momentan installierte Plugins Plugins/Languages/Caption: Sprachen Plugins/Languages/Hint: Spracherweiterungen Plugins/NoInfoFound/Hint: Kein ''"<$text text=<<currentTab>>/>"'' gefunden -Plugins/NoInformation/Hint: Kein Information vorhanden Plugins/NotInstalled/Hint: Dieses Plugin ist momentan nicht installiert Plugins/OpenPluginLibrary: Öffne das Plugin-Verzeichnis +Plugins/ClosePluginLibrary: Schließe das Plugin-Verzeichnis Plugins/Plugins/Caption: Plugins Plugins/Plugins/Hint: Erweiterungen Plugins/Reinstall/Caption: erneut installieren Plugins/Themes/Caption: Themes Plugins/Themes/Hint: Theme Erweiterungen Saving/Caption: Speichern -Saving/Heading: Speichern +Saving/DownloadSaver/AutoSave/Description: Erlaube automatisches Speichern für den "Download Saver" +Saving/DownloadSaver/AutoSave/Hint: Erlaube automatisches Speichern für den "Download Saver" +Saving/DownloadSaver/Caption: Download Saver +Saving/DownloadSaver/Hint: Diese Einstellungen gelten für den HTML5-compatiblen "Download Saver" +Saving/General/Caption: Allgemein +Saving/General/Hint: Diese Einstellungen gelten für alle Speichermechanismen +Saving/Hint: Einstellungen zu den TiddlyWiki Speichermechanismen Saving/TiddlySpot/Advanced/Heading: Erweiterte Einstellungen Saving/TiddlySpot/BackupDir: Verzeichnis für das "Backup" Saving/TiddlySpot/Backups: "Backups" +Saving/TiddlySpot/Caption: Speichern auf ~TiddlySpot Saving/TiddlySpot/Description: Diese Einstellungen sind nur für http://tiddlyspot.com und kompatible Server aktiv! Saving/TiddlySpot/Filename: Dateiname für den "Upload" Saving/TiddlySpot/Heading: ~TiddlySpot @@ -103,6 +112,10 @@ Settings/Caption: Einstellungen Settings/EditorToolbar/Caption: Editor Toolbar Settings/EditorToolbar/Hint: Aktivieren oder deaktivieren der Editor Toolbar Settings/EditorToolbar/Description: Editor Toolbar anzeigen +Settings/InfoPanelMode/Caption: Tiddler Info Panel Modus +Settings/InfoPanelMode/Hint: Einstellung, wann das Info Panel geschlossen wird: +Settings/InfoPanelMode/Popup/Description: Tiddler Info-Panel schließt automatisch +Settings/InfoPanelMode/Sticky/Description: TiddlerTiddler Info-Panel bleibt offen, bis es geschlossen wird Settings/Hint: Diese erweiterten Einstellungen ermöglichen Ihnen, das Verhalten von TiddlyWiki zu ändern. Settings/NavigationAddressBar/Caption: Navigation Adresszeile Settings/NavigationAddressBar/Hint: Verhalten der Adresszeile des Browsers, wenn ein Tiddler geöffnet wird: @@ -126,7 +139,9 @@ Settings/ToolbarButtons/Hint: Standard Toolbar Button Erscheinungsbild: Settings/ToolbarButtons/Icons/Description: Icon anzeigen Settings/ToolbarButtons/Text/Description: Text anzeigen Settings/DefaultSidebarTab/Caption: Standard Sidebar Tab -Settings/DefaultSidebarTab/Hint: Definition, welcher Sidebar Tab standardmäßig aktiv ist. +Settings/DefaultSidebarTab/Hint: Definition, welcher "Sidebar Tab" standardmäßig aktiv ist. +Settings/DefaultMoreSidebarTab/Caption: Standard "Mehr Sidebar Tab" +Settings/DefaultMoreSidebarTab/Hint: Definition, welcher "Mehr Sidebar Tab" standardmäßig aktiv ist. Settings/LinkToBehaviour/Caption: Tiddler Öffnen Settings/LinkToBehaviour/InsideRiver/Hint: Navigation bei Klicks //innerhalb// der Story Settings/LinkToBehaviour/OutsideRiver/Hint: Navigation bei Klicks //außerhalb// der Story @@ -143,18 +158,22 @@ Settings/MissingLinks/Hint: Aktiviere Links zu fehlenden Tiddlern. zB: Fehlender Settings/MissingLinks/Description: Aktiviere Links zu fehlenden Tiddlern. StoryView/Caption: Anzeige StoryView/Prompt: Ausgewählte Anzeige: +Stylesheets/Caption: Stylesheets +Stylesheets/Expand/Caption: Alle erweitern +Stylesheets/Hint: Hier wird der "erweiterte" CSS Code dargestellt. Die Reihenfolge, kann in der "Tag-Liste" <<tag "$:/tags/Stylesheet">> mit "Drag & Drop" angepasst werden! +Stylesheets/Restore/Caption: Alle zurücksetzen Theme/Caption: Theme Theme/Prompt: Ausgewähltes Theme: TiddlerFields/Caption: Tiddler Felder -TiddlerFields/Hint: Hier finden Sie alle [[Felder|TiddlerFields]], die in diesem Wiki verwendet werden. Inklusive der Felder aus System-, exklusive Schatten-Tiddler. +TiddlerFields/Hint: Hier finden Sie alle [[Felder|TiddlerFields]], die in diesem Wiki verwendet werden. Inklusive der Felder aus System-, exklusive Schatten-Tiddler. Toolbars/Caption: Toolbar Toolbars/EditToolbar/Caption: Edit Toolbar -Toolbars/EditToolbar/Hint: Auswählen, welche Buttons im "Edit Modus" angezeigt werden: +Toolbars/EditToolbar/Hint: Auswählen, welche Buttons im "Edit Modus" angezeigt werden. Verwenden Sie "Drag and Drop", um die Reihenfolge zu ändern Toolbars/Hint: Auswählen, welche "Toolbar Button" angezeigt werden Toolbars/PageControls/Caption: Page Toolbar -Toolbars/PageControls/Hint: Auswählen, welche Buttons im Hauptmenü angezeigt werden: +Toolbars/PageControls/Hint: Auswählen, welche Buttons im Hauptmenü angezeigt werden. Verwenden Sie "Drag and Drop", um die Reihenfolge zu ändern Toolbars/EditorToolbar/Caption: Editor Toolbar Toolbars/EditorToolbar/Hint: Auswählen, welche Editorbuttons angezeigt werden sollen. Manche Buttons sind vom Tiddler-Typ abhängig und werden eventuell ausgeblendet. Toolbars/ViewToolbar/Caption: View Toolbar -Toolbars/ViewToolbar/Hint: Auswählen, welche Buttons im "View Modus" angezeigt werden: +Toolbars/ViewToolbar/Hint: Auswählen, welche Buttons im "View Modus" angezeigt werden. Verwenden Sie "Drag and Drop", um die Reihenfolge zu ändern Tools/Download/Full/Caption: Herunterladen des ''gesamten Wikis'' diff --git a/languages/de-DE/Docs/ModuleTypes.multids b/languages/de-DE/Docs/ModuleTypes.multids index 5e9dc144d..2eecb7a59 100644 --- a/languages/de-DE/Docs/ModuleTypes.multids +++ b/languages/de-DE/Docs/ModuleTypes.multids @@ -1,16 +1,21 @@ title: $:/language/Docs/ModuleTypes/ -animation: Animationen, die vom RevealWidget verwendet werden. +allfilteroperator: Ein Sub-Operator für den ''all'' Filter Operator. +animation: Animationen, die vom RevealWidget verwendet werden. +bitmapeditoroperation: Eine "Bitmap-Editor" Toolbar Operation. command: Kommandozeilen-Parameter, die mit node.js ausgeführt werden können. config: Daten, die in `$tw.config` eingefügt werden. filteroperator: Individuelle Funktionen für den Filter-Operator. global: Globale Daten, die in `$tw` eingefügt werden. +info: Veröffentlicht System-Informationen mit dem Pseudo-plugin: [[$:/temp/info-plugin]] isfilteroperator: Operanden für den Filter-Operator: ''is'' +library: Allgemeiner Modultyp, für JavaScript Module. macro: Globale Makro-Definitionen in JavaScript. parser: Parser für verschiedene Tiddler Typen. saver: "Savers" stellen verschiedene Methoden zum Speichern mit dem Browser zur Verfügung. startup: Funktionen zur Initialisierung. storyview: [[Story-View|Story]] ist für das Verhalten des "ListWidgets" zuständig, das die Tiddler "Hauptanzeige" verwaltet. Mit dem Toolbutton Story-Modus wird einer dieser Modi ausgewählt. +texteditoroperation: Eine Text-Editor Toolbar Operation. tiddlerdeserializer: Konvertiert verschiedene textbasierte Inhaltstypen in das Tiddler-Format. tiddlerfield: Definiert das Verhalten, der unterschiedlichen Tiddler-Felder. tiddlermethod: Methoden werden dem `$tw.Tiddler` Prototypen hinzugefügt. @@ -19,4 +24,4 @@ utils: Methoden werden `$tw.utils` hinzugefügt. utils-node: Erweitert `$tw.utils` mit Methoden aus node.js. widget: Widgets verarbeiten das Rendern und Aktualisieren der Anzeige in der DOM. wikimethod: Methoden werden zu `$tw.Wiki` hinzugefügt. -wikirule: Enthält die individuellen Parser Regeln für den WikiText-Parser. +wikirule: Enthält die individuellen Parser Regeln für den WikiText-Parser. \ No newline at end of file diff --git a/languages/de-DE/EditTemplate.multids b/languages/de-DE/EditTemplate.multids index aaba84c43..ff855eaee 100644 --- a/languages/de-DE/EditTemplate.multids +++ b/languages/de-DE/EditTemplate.multids @@ -1,6 +1,6 @@ title: $:/language/EditTemplate/ -Body/External/Hint: Dies ist ein externer Tiddler, der nicht im TW file gespeichert ist. Sie können die "Tags" und "Feld" Texte ändern, jedoch nicht den Inhalt des Tiddlers! +Body/External/Hint: Dieser Tiddler zeigt den Inhalt einer Datei, die nicht im TW file gespeichert ist. Sie können die "Tags" und "Feld" Texte ändern, jedoch nicht den Inhalt des Tiddlers! Body/Placeholder: Geben Sie den Text für diesen Tiddler ein. Body/Preview/Type/Output: Anzeige Field/Remove/Caption: Lösche Feld @@ -18,6 +18,8 @@ Tags/Add/Placeholder: neuer Tag Tags/Dropdown/Caption: Tag Liste Tags/Dropdown/Hint: Tag Liste anzeigen Title/BadCharacterWarning: Warnung: Folgende Zeichen im Titel können zu Problemen führen: <<bad-chars>> +Title/Exists/Prompt: Tiddler Name existiert bereits +Title/Relink/Prompt: Ändere ''<$text text=<<fromTitle>>/>'' -> ''<$text text=<<toTitle>>/>'' in //tags// und //list// Feld aller anderen Tiddler Type/Dropdown/Caption: Tiddler Typ Liste Type/Dropdown/Hint: Anzeigen der Tiddler Typ Liste Type/Delete/Caption: Lösche Inhalts Typ diff --git a/languages/de-DE/Filters.multids b/languages/de-DE/Filters.multids index 158ac5ebe..5af138156 100755 --- a/languages/de-DE/Filters.multids +++ b/languages/de-DE/Filters.multids @@ -11,4 +11,5 @@ SystemTiddlers: System-Tiddler ShadowTiddlers: Schatten-Tiddler OverriddenShadowTiddlers: Überschriebene Schatten-Tiddler SystemTags: System-Tags +StoryList: Tiddler im "story river", außer <$text text="$:/AdvancedSearch"/> TypedTiddlers: Nicht "wiki-text" Tiddler \ No newline at end of file diff --git a/languages/de-DE/GettingStarted.tid b/languages/de-DE/GettingStarted.tid index f5f59aa8b..81f763ddf 100755 --- a/languages/de-DE/GettingStarted.tid +++ b/languages/de-DE/GettingStarted.tid @@ -5,9 +5,9 @@ Willkommen bei ~TiddlyWiki, einem persönlichen nicht-linearen Web-Notizbuch. Vor dem Start, vergewissern Sie sich, dass Sie dieses Wiki auch wirklich speichern können. Weitere Informationen finden Sie für: -* Österreich: http://tiddlywiki.com/languages/de-AT -* Deutschland: http://tiddlywiki.com/languages/de-DE -* Allgemein (englisch): http://tiddlywiki.com +* Österreich: https://tiddlywiki.com/languages/de-AT +* Deutschland: https://tiddlywiki.com/languages/de-DE +* Allgemein (englisch): https://tiddlywiki.com Erste Schritte: @@ -15,8 +15,8 @@ Erste Schritte: * Einstellungen können im [[Kontrollpanel|$:/ControlPanel]] vorgenommen werden. Siehe: "Zahnrad-Button" ** Das Anzeigen dieses Tiddlers können Sie verhindern, indem Sie die "~DefaultTiddlers" im ''Basis-Tab'' verändern. * Speichern wird mit dem "Speichern-Button" in der Navigationsleiste ausgelöst. -* Österreich: [[Weitere Informationen zu WikiText|http://tiddlywiki.com/languages/de-AT/index.html#WikiText]] -* Deutschland: [[Weitere Informationen zu WikiText|http://tiddlywiki.com/languages/de-DE/index.html#WikiText]] +* Österreich: [[Weitere Informationen zu WikiText|https://tiddlywiki.com/languages/de-AT/index.html#WikiText]] +* Deutschland: [[Weitere Informationen zu WikiText|https://tiddlywiki.com/languages/de-DE/index.html#WikiText]] Hinweis: Die österreichische und deutsche Version unterscheiden sich momentan nur in der Flagge, die bei der Standard Sprachauswahl angezeigt wird. In Zukunft können Beschriftungen der Benutzeroberfläche geringfügig von einander abweichen. zB: Jänner - Januar. diff --git a/languages/de-DE/Help/fetch.tid b/languages/de-DE/Help/fetch.tid new file mode 100644 index 000000000..8b628965d --- /dev/null +++ b/languages/de-DE/Help/fetch.tid @@ -0,0 +1,44 @@ +title: $:/language/Help/fetch +description: Fetch tiddlers from wiki by URL + +Abrufen eines oder mehrerer Dateien über HTTP/HTTPS. Importieren der tiddler, die dem Filter entsprechen. Umwandeln der ankommenden Titel, wenn nötig. + +``` +--fetch file <url> <import-filter> <transform-filter> +--fetch files <url-filter> <import-filter> <transform-filter> +--fetch raw-file <url> <transform-filter> +--fetch raw-files <url-filter> <transform-filter> +``` + +Wird der `file` Parameter verwendet, wird nur eine einzelne Datei geholt. Der erste Parameter ist die URL von der die Datei ''importiert'' werden soll. + +Wird der `files` Parameter verwendet, werden mehrere Dateien geholt. In diesem Fall ist der erste Parameter ein Filter, der eine Liste von URLs ergibt, von denen die Dateien gelesen werden sollen. Zum Beispiel: Mehrere Tiddler sind getagged mit: `remote-server` und enthalten ein Feld: `url`. ... Der Filter `[tag[remote-server]get[url]]` wird alle verfügbaren URLs ansprechen. + +Werden die `raw-file` oder `raw-files` Varianten verwendet, wird der Klartext der Datei importiert. Es wird nicht versucht die Import-logik anzuwenden. + +Der `<import-filter>` Parameter spezifiziert jene Tiddler, die importiert werden sollen. Ohne diesen Parameter wird standardmäßig `[all[tiddlers]]` als Filter verwendet. + +Der `<transform-filter>` Parameter, spezifiziert einen Filter, mit dem der Tiddler Name verändert werden kann. zB: `[addprefix[$:/meinImport/]]` würde `$:/meinImport/` allen Tiddler Namen voran stellen. + +Wird `--verbose` vor dem `--fetch` Befehl benutzt, dann werden erweiterte Diagnose Infos ausgegeben. + +Hinweis: ~TiddlyWiki wird ''keine'' veralteten plugins importieren. + +Das folgende Beispiel wird alle "nicht-system" Tiddler von https://tiddlywiki.com holen und in ein `JSON` file speichern. + +``` +tiddlywiki --verbose --fetch file "https://tiddlywiki.com/" "[!is[system]]" "" --rendertiddler "$:/core/templates/exporters/JsonFile" output.json text/plain "" exportFilter "[!is[system]]" +``` + +Das folgende Beispiel holt die "favicon" Datei von tiddlywiki.com und speichert sie als "output.ico". + +``` +tiddlywiki --verbose --fetch raw-file "https://tiddlywiki.com/favicon.ico" "[[Icon Tiddler]]" --savetiddler "Icon Tiddler" output.ico +``` + +''Wichtig!'' + +Es wird darauf hingewiesen, dass der Parameter `"[[Icon Tiddler]]"` für den `--fetch` Befehl zusätzliche Klammern enthält. Er wird hier als Tranformations-Filter verwendet! + +Der zweite `"Icon Tiddler"` Parameter für `--savetiddler` enthält keine eckigen Klammern. Er wird als Dateiname verwendet + diff --git a/languages/de-DE/Help/import.tid b/languages/de-DE/Help/import.tid new file mode 100644 index 000000000..606882826 --- /dev/null +++ b/languages/de-DE/Help/import.tid @@ -0,0 +1,32 @@ +title: $:/language/Help/import +description: Importiert mehrere Tiddler aus einer Datei + +Dieser Befehl importiert / extrahiert Tiddler aus folgenden Dateien: + +* TiddlyWiki `*.html` +* `*.tiddler` +* `*.tid` +* `*.json` +* oder andere lokale `text` Dateien + +Der `<deserializer>` Parameter muss angegeben werden. Anders als beim `--load` Befehl, der diese Information aus der Dateiendung ableiten kann. + +``` +--import <filepath> <deserializer> [<title>] [<encoding>] +``` + +TiddlyWiki enthält folgende `deserializer` Standard-Typen: + +* application/javascript +* application/json +* application/x-tiddler +* application/x-tiddler-html-div +* application/x-tiddlers +* text/html +* text/plain + +Der Tiddler-Titel entspricht nach dem Import, dem Dateinamen. + +Die Zeichenkodierung ist auf `utf8` eingestellt. Sie kann aber auf `base64` für binäre Daten geändert werden. + +Hinweis: ~TiddlyWiki importiert nur neuere Plugins, als jene, die bereits geladen sind. diff --git a/languages/de-DE/Help/load.tid b/languages/de-DE/Help/load.tid index 9d534cdd5..69e26b842 100644 --- a/languages/de-DE/Help/load.tid +++ b/languages/de-DE/Help/load.tid @@ -1,10 +1,14 @@ title: $:/language/Help/load description: Lade Tiddler von einer Datei. -Lade Tiddler aus einer TiddlyWiki 2.x.x `.html`, `.tiddler`, .`tid`, `.json` oder anderen Datei. +Lade Tiddler aus einer TiddlyWiki `.html`, `.tiddler`, `.tid`, `.json` oder anderen lokalen Datei. + +Die Umsetzung der geladenen Datei wird anhand der Datei-Erweiterung bestimmt. Verwenden sie den alternativen `import` Befehl, wenn sie den Umsetzungstyp ändern möchten. + ``` --load <filepath> +--load <dirpath> ``` Um Daten aus einer verschlüsselten TiddlyWiki Datei zu laden, muss zuerst mit dem "password" Parameter ein Passwort definiert werden. diff --git a/languages/de-DE/Help/render.tid b/languages/de-DE/Help/render.tid new file mode 100644 index 000000000..61d1a38c2 --- /dev/null +++ b/languages/de-DE/Help/render.tid @@ -0,0 +1,36 @@ +title: $:/language/Help/render +description: Ausgabe individueller Tiddler in Dateien + +Individuelle Tiddler werden anhand von Filtern spezifiziert, gelesen und in Dateien umgesetzt. + +Optionell kann eine Template-Datei angegeben werden. In diesem Fall wird nicht der Inhalt des Tiddlers, sondern des Templates umgesetzt. Die `currentTiddler` Variable wird auf den Titel, des auszugebenden, Tiddlers gesetzt. + +Es können noch zusätzliche Variablen per Name und Wert gesetzt werden. + +``` +--render <tiddler-filter> [<filename-filter>] [<render-type>] [<template>] [<name>] [<value>] +``` + +* ''tiddler-filter'': Ein Filter, der die Auszugebenden Tiddler eindeutig spezifiziert. +* ''filename-filter'': [Option] Filter, der aus Tiddler Titeln, Pfadnamen extrahiert. Wenn weggelassen, dann wird der Standard verwendet: `[is[tiddler]addsuffix[.html]]`, welcher den Titel als Dateiname verwendet. +* ''template'': [Option] Template, das verwendet werden soll +* ''render-type'': [Option] Ausgabe Type: `text/html` (Standard) generiert HTML Text und `text/plain` gibt den "reinen" Text Inhalt zurück. `text/plain` ignoriert HTML Marker und andere "nicht-druckbare" Zeichen. +* ''name'': [Option] Name einer zusätzlichen Variablen. +* ''value'': [Option] Wert dieser zusätzlichen Variablen. + +Standardmäßig sind die Dateinamen "relativ" zum `output` Verzeichnis, des `edition` Verzeichnisses. + +Mit dem `--output` Befehl kann die Ausgabe in jedes beliebige Verzeichnis umgeleitet werden. + +Wichtig: + +* Das `output` Verzeichnis wird nicht gelöscht, bevor neue Dateien geschrieben werden. +* Verzeichnisse und Dateien werden automatisch angelegt, sollten sie nicht vorhanden sein. +* Wenn eine Datei Leerzeichen enthält, dann muss dies ''doppelt'' angezeigt werden. Für TiddlyWiki mit eckigen Klammern `[[]]` und für die Kommandozeile mit Hochkomma "". Zum Beispiel: `--render "[[Motovun Jack.jpg]]"` +* Dateinamens-Filter zeigen immer auf den Titel, des gerade umzusetzenden Tiddlers. Das erlaubt uns, diesen als Basis für den Dateinamen zu verwenden. zB: `[encodeuricomponent[]addprefix[static/]]` ... Verwendet eine URI-Enkodierung für jeden Dateinamen und stellt das Wort `static/` als Pfadname voran. +* Der `--render` Befehl ist flexibler und ersetzt daher `--rendertiddler` und `--rendertiddlers`, welche mit V5.1.15 auslaufen! + +Beispiel: + +* `--render "[!is[system]]" "[encodeuricomponent[]addprefix[tiddlers/]addsuffix[.html]]"` ... Übersetzt alle Nicht-System Tiddler und schreibt sie in ein Unterverzeichnis `tiddlers/` mit URL-kodiertem Titel und der Erweiterung `.html` + diff --git a/languages/de-DE/Help/rendertiddler.tid b/languages/de-DE/Help/rendertiddler.tid index 1211bc545..d256d4a3c 100644 --- a/languages/de-DE/Help/rendertiddler.tid +++ b/languages/de-DE/Help/rendertiddler.tid @@ -1,14 +1,27 @@ title: $:/language/Help/rendertiddler description: Ausgabe eines individuellen Tiddlers, in einem spezifizierten Format. +''WICHTIG:'' + +* Der `--rendertiddler` Befehl wird ab V5.1.15 durch `--render` ersetzt. +* `--rendertiddler` wird auslaufen und sollte daher nicht mehr verwendet werden! + Ausgabe eines individuellen Tiddlers, in einem spezifizierten Format (standard: `text/html`) und Dateinamen. Optional kann ein Template tiddler angegeben werden. Die "currentTiddler" Variable wird auf den Tiddler gesetzt, der zu rendern ist. ``` ---rendertiddler <title> <filename> [<type>] [<template>] +--rendertiddler <title> <filename> [<type>] [<template>] [<name>] [<value>] ``` Standardmäßig ist das `output` Verzeichnis ein Unterverzeichnis im `edition` Verzeichnis. Der `--output` Befehl kann verwendet werden, um ein anderes Verzeichnis auszuwählen. Nicht vorhandene Verzeichnisse werden automatisch erstellt. + +''Beispiel:'' + +Der folgende Befehl speichert alle tiddler mit dem `tag: done` in eine `JSON` Datei mit dem Namen: `output.json`. Das Template `$:/core/templates/exporters/JsonFile` wird auf die zu speichernden Daten angewandt. + +``` +--rendertiddler "$:/core/templates/exporters/JsonFile" output.json text/plain "" exportFilter "[tag[done]]" +``` diff --git a/languages/de-DE/Help/rendertiddlers.tid b/languages/de-DE/Help/rendertiddlers.tid index 735660a04..3c7449bd8 100644 --- a/languages/de-DE/Help/rendertiddlers.tid +++ b/languages/de-DE/Help/rendertiddlers.tid @@ -1,6 +1,11 @@ title: $:/language/Help/rendertiddlers description: Gefilterte Ausgabe von Tiddlern, in einem spezifizierten Format. +''WICHTIG:'' + +* Der `--rendertiddlers` Befehl wird ab V5.1.15 durch `--render` ersetzt. +* `--rendertiddlers` wird auslaufen und sollte daher nicht mehr verwendet werden! + Gefilterte Ausgabe mehrerer Tiddler, in ein angegebenes Dateiformat (standard: `text/html`) mit spezifischer Erweiterung (Standard: `.html`). ``` diff --git a/languages/de-DE/Help/save.tid b/languages/de-DE/Help/save.tid new file mode 100644 index 000000000..3d0f15027 --- /dev/null +++ b/languages/de-DE/Help/save.tid @@ -0,0 +1,28 @@ +title: $:/language/Help/save +description: Speichert Klartext Tiddler als Dateien + +Speichert einzelne oder mehrere Klartext Tiddler als Text oder im Binärformat in Dateien. Die zu speichernden Tiddler werden über Filter spezifiziert. + + +``` +--save <tiddler-filter> <filename-filter> +``` + +* ''tiddler-filter'': Ein Filter, der die zu speichernden Tiddler anzeigt. +* ''filename-filter'': [Option] Ein Filter, der die Tiddler Titel in Verzeichnis Namen aufspaltet. Wenn nicht spezifiziert, dann wird: `[is[tiddler]]` verwendet. `[is[tiddler]]` übernimmt den Tiddler Titel unverändert. + +Standardmäßig sind die Dateinamen "relativ" zum `output` Verzeichnis, des `edition` Verzeichnisses. + +Mit dem `--output` Befehl kann die Ausgabe in jedes beliebige Verzeichnis umgeleitet werden. + +Hinweise: + +* Das `output` Verzeichnis wird nicht gelöscht, bevor neue Dateien geschrieben werden. +* Verzeichnisse und Dateien werden automatisch angelegt, sollten sie nicht vorhanden sein. +* Wenn eine Datei Leerzeichen enthält, dann muss dies ''doppelt'' angezeigt werden. Für TiddlyWiki mit eckigen Klammern `[[]]` und für die Kommandozeile mit Hochkomma "". Zum Beispiel: `--render "[[Motovun Jack.jpg]]"` +* Dateinamens-Filter zeigen immer auf den Titel, des gerade umzusetzenden Tiddlers. Das erlaubt uns, diesen als Basis für den Dateinamen zu verwenden. zB: `[encodeuricomponent[]addprefix[static/]]` ... Verwendet eine URI-Enkodierung für jeden Dateinamen und stellt das Wort `static/` als Pfadname voran. +* Der `--save` Befehl ist flexibler und ersetzt daher `--savetiddler` und `--savetiddlers`, welche mit V5.1.15 auslaufen! + +Beispiel: + +* `--save "[!is[system]is[image]]" "[encodeuricomponent[]addprefix[tiddlers/]]"` -- Übersetzt alle Nicht-System Bild Tiddler in Datein und schreibt diese URL-kodiert in das Unterverzeichnis `tiddlers/` diff --git a/languages/de-DE/Help/savetiddler.tid b/languages/de-DE/Help/savetiddler.tid index 378854547..20162c07d 100644 --- a/languages/de-DE/Help/savetiddler.tid +++ b/languages/de-DE/Help/savetiddler.tid @@ -1,6 +1,11 @@ title: $:/language/Help/savetiddler description: Speichert einen Tiddler als File. +''WICHTIG:'' + +* Der `--savetiddler` Befehl wird ab V5.1.15 durch `--save` ersetzt. +* `--savetiddler` wird auslaufen und sollte daher nicht mehr verwendet werden! + Speichert einen individuellen Tiddler im Text- oder Binärformat mit dem angegebenen Dateinamen. ``` diff --git a/languages/de-DE/Help/savetiddlers.tid b/languages/de-DE/Help/savetiddlers.tid index 0076a1ffd..2ef8d2aa2 100644 --- a/languages/de-DE/Help/savetiddlers.tid +++ b/languages/de-DE/Help/savetiddlers.tid @@ -1,6 +1,11 @@ title: $:/language/Help/savetiddlers description: Speichert eine Gruppe von Tiddler in ein Verzeichnis +''WICHTIG:'' + +* Der `--savetiddlers` Befehl wird ab V5.1.15 durch `--save` ersetzt. +* `--savetiddlers` wird auslaufen und sollte daher nicht mehr verwendet werden! + Speichert eine Gruppe von Tiddler im Text- oder Binärformat in ein angegebenes Verzeichnis. ``` diff --git a/languages/de-DE/Help/server.tid b/languages/de-DE/Help/server.tid index 9cac0e94a..54896f584 100644 --- a/languages/de-DE/Help/server.tid +++ b/languages/de-DE/Help/server.tid @@ -11,7 +11,7 @@ Der Server kann spezifische Tiddler im angegebenen Format anzeigen (rendern). Zu Die Parameter sind: -* ''port'' - Port Nummer mit der kommuniziert werden soll (Standard: "8080"). +* ''port'' - Port Nummer mit der kommuniziert werden soll (Standard: "8080"). Ein "nicht-numerisher" Wert wird als System-Umgebungsvariable interpretiert, von der der Wert gelesen werden soll. * ''roottiddler'' - Der Tiddler, der als ~Basis-Tiddler verwendet werden soll ( Standard: "$:/core/save/all"). * ''rendertype'' - MIME-Type, zu dem der ~Basis-Tiddler "gerendert" werden soll ( Standard: "text/plain"). * ''servetype'' - MIME-Type, mit dem der Basis-Tiddler ausgeliefert werden soll ( Standard: "text/html"). @@ -34,4 +34,9 @@ Der Name und das Passwort können als "leere" Zeichenketten definiert werden, we --server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245 ``` -Es ist möglich mehrere TiddlyWiki Server gleichzeitig zu starten. Jeder Server muss jedoch mit einem eigenen Port gestartet werden. +Es ist möglich mehrere TiddlyWiki Server gleichzeitig zu starten. Jeder Server muss jedoch mit einem eigenen Port gestartet werden. Es kann sinnvoll sein, den Prozess mit lokalen "Umgebungsvariable" zu starten. Hier wird "MEINE_PORT_NUMMER" als Beispiel verwendet. + + +``` +--server MEINE_PORT_NUMMER $:/core/save/all text/plain text/html MyUserName passw0rd +``` \ No newline at end of file diff --git a/languages/de-DE/Import.multids b/languages/de-DE/Import.multids index 41a64e421..0434359cd 100644 --- a/languages/de-DE/Import.multids +++ b/languages/de-DE/Import.multids @@ -7,6 +7,12 @@ Listing/Import/Caption: Importieren Listing/Select/Caption: Auswahl Listing/Status/Caption: Status Listing/Title/Caption: Titel +Listing/Preview: Vorschau: +Listing/Preview/Text: Text +Listing/Preview/TextRaw: Text - roh +Listing/Preview/Fields: Felder +Listing/Preview/Diff: Diff - Text +Listing/Preview/DiffFields: Diff - Felder Upgrader/Plugins/Suppressed/Incompatible: Unterdrückte, inkompatible oder veraltete "plugins" Upgrader/Plugins/Suppressed/Version: Einige "plugins" weden unterdrückt! Importierte plugins: <<incoming>> sind älter als existierende: <<existing>>. Upgrader/Plugins/Upgraded: Aktualisieren der plugins von: <<incoming>> nach: <<upgraded>> diff --git a/languages/de-DE/Misc.multids b/languages/de-DE/Misc.multids index d83f67ac1..e1ea42824 100644 --- a/languages/de-DE/Misc.multids +++ b/languages/de-DE/Misc.multids @@ -1,8 +1,8 @@ title: $:/language/ -AboveStory/ClassicPlugin/Warning: Es scheint, Sie möchten ein Plugin verwenden, dass für [[TiddlyWiki Classic|http://tiddlywiki.com/#TiddlyWikiClassic]] entwickelt wurde. Diese Plugins können jedoch mit ~TiddlyWiki Version 5 nicht verwendet werden. ~TiddlyWiki Classic plugin erkannt: +AboveStory/ClassicPlugin/Warning: Es scheint, Sie möchten ein Plugin verwenden, dass für [[TiddlyWiki Classic|https://tiddlywiki.com/#TiddlyWikiClassic]] entwickelt wurde. Diese Plugins können jedoch mit ~TiddlyWiki Version 5 nicht verwendet werden. ~TiddlyWiki Classic plugin erkannt: BinaryWarning/Prompt: Dieser Tiddler enthält binäre Daten. -ClassicWarning/Hint: Dieser Tiddler wurde im TiddlyWiki Classic Format erstellt. Dieses Format ist nur teilweise kompatibel mit TiddlyWiki Version 5. Mehr Info finden Sie unter: http://tiddlywiki.com/static/Upgrading.html +ClassicWarning/Hint: Dieser Tiddler wurde im TiddlyWiki Classic Format erstellt. Dieses Format ist nur teilweise kompatibel mit TiddlyWiki Version 5. Mehr Info finden Sie unter: https://tiddlywiki.com/static/Upgrading.html ClassicWarning/Upgrade/Caption: upgrade CloseAll/Button: alle schließen ColourPicker/Recent: Kürzlich: @@ -12,6 +12,7 @@ ConfirmOverwriteTiddler: Tiddler: "<$text text=<<title>>/>" existiert! OK übers ConfirmEditShadowTiddler: Sie sind dabei, einen Schatten-Tiddler zu verändern. Zukünftige, automatische Anpassungen werden dadurch unterdrückt. Sie können Ihre Änderungen rückgängig machen, indem Sie diesen Tiddler wieder löschen. Wollen Sie den Tiddler: "<$text text=<<title>>/>" ändern? Count: Anzahl DefaultNewTiddlerTitle: Neuer Tiddler +Diffs/CountMessage: <<diff-count>> Unterschied(e) DropMessage: Hierher ziehen (oder Escape um abzubrechen) Encryption/Cancel: Abbrechen Encryption/ConfirmClearPassword: Wollen Sie das Passwort löschen? Damit wird die Verschlüsselung beim nächsten Speichervorgang abgeschalten! @@ -22,6 +23,7 @@ Encryption/RepeatPassword: Passwort wiederholen Encryption/PasswordNoMatch: Passwörter stimmen nicht überein Encryption/SetPassword: Passwort setzen Error/Caption: Fehler +Error/EditConflict: Datei auf Server verändert Error/Filter: Filter Fehler Error/FilterSyntax: Syntax Fehler im Filter-Ausdruck Error/IsFilterOperator: Filter Fehler: Unbekannter Operand für den 'is' Filter Operator @@ -34,15 +36,33 @@ Error/XMLHttpRequest: XMLHttpRequest Fehler-Code InternalJavaScriptError/Title: Interner JavaScript Fehler InternalJavaScriptError/Hint: Es tut uns leid, aber bitte starten Sie Ihr TiddlyWiki neu, indem sie die Seite im Browser neu laden. InvalidFieldName: Das Feld: "<$text text=<<fieldName>>/>" enthält illegale Zeichen. Felder müssen klein geschrieben werden. Erlaubte Sonderzeichen sind: Zahlen, Unterstrich (`_`), Minus (`-`) und Punkt (`.`). -LazyLoadingWarning: <p>Lade externe Datei von ''<$text text={{!!_canonical_uri}}/>''</p><p>Wenn diese Meldung nicht automatisch gelöscht wird, dann verwenden Sie wahrscheinlich einen Browser der diese Funktion nicht unterstützt. Siehe http://tiddlywiki.com/#ExternalText</p> +LazyLoadingWarning: <p>Lade externe Datei von ''<$text text={{!!_canonical_uri}}/>''</p><p>Wenn diese Meldung nicht automatisch gelöscht wird, dann verwenden Sie wahrscheinlich einen Browser der diese Funktion nicht unterstützt. Oder die Tiddler "conent-type" Eistellung passt nicht, zu der, der externen Datei. Siehe https://tiddlywiki.com/#ExternalText</p> LoginToTiddlySpace: Login bei TiddlySpace -MissingTiddler/Hint: Fehlender Tiddler "<$text text=<<currentTiddler>>/>" - klicken Sie {{$:/core/images/edit-button}} um ihn zu erzeugen. +Manager/Controls/FilterByTag/None: (kein) +Manager/Controls/FilterByTag/Prompt: Filtern nach tag: +Manager/Controls/Order/Prompt: Invertiert +Manager/Controls/Search/Placeholder: Suche +Manager/Controls/Search/Prompt: Suche: +Manager/Controls/Show/Option/Tags: Tags +Manager/Controls/Show/Option/Tiddlers: Tiddler +Manager/Controls/Show/Prompt: Anzeigen: +Manager/Controls/Sort/Prompt: Sortieren nach: +Manager/Item/Colour: Farbe +Manager/Item/Fields: Feld +Manager/Item/Icon/None: (kein) +Manager/Item/Icon: Icon +Manager/Item/RawText: Text +Manager/Item/Tags: Tags +Manager/Item/Tools: Tools +Manager/Item/WikifiedText: Wikified Text +MissingTiddler/Hint: Fehlender Tiddler "<$text text=<<currentTiddler>>/>" - klicken Sie {{||$:/core/ui/Buttons/edit}} um ihn zu erzeugen. No: Nein OfficialPluginLibrary: Offizielles ~TiddlyWiki Plugin-Verzeichnis OfficialPluginLibrary/Hint: Offizielles ~TiddlyWiki Plugin-Verzeichnis auf tiddlywiki.com. Plugin, Themes und Sprach Dateien werden vom "core team" gewartet. PluginReloadWarning: Das Wiki muss gespeichert {{$:/core/ui/Buttons/save-wiki}} und neu gladen {{$:/core/ui/Buttons/refresh}} werden, damit die Plugins ausgeführt werden. RecentChanges/DateFormat: YYYY MMM DD SystemTiddler/Tooltip: Das ist ein System-Tiddler +SystemTiddlers/Include/Prompt: System-Tiddler einschließen TagManager/Colour/Heading: Farbe TagManager/Count/Heading: Anzahl TagManager/Icon/Heading: Symbol @@ -50,4 +70,4 @@ TagManager/Info/Heading: Info TagManager/Tag/Heading: Tag Tiddler/DateFormat: DDth MMM YYYY um 0hh:0mm UnsavedChangesWarning: TiddlyWiki wurde geändert, aber noch nicht gespeichert! -Yes: Ja \ No newline at end of file +Yes: Ja diff --git a/languages/de-DE/Modals/Download.tid b/languages/de-DE/Modals/Download.tid index 4c816d029..233f5be29 100644 --- a/languages/de-DE/Modals/Download.tid +++ b/languages/de-DE/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Änderungen Speichern footer: <$button message="tm-close-tiddler">Schließen</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html Ihr Browser unterstützt nur manuelles Speichern. diff --git a/languages/de-DE/Modals/SaveInstructions.tid b/languages/de-DE/Modals/SaveInstructions.tid index f34cf0f63..d652fdc2e 100644 --- a/languages/de-DE/Modals/SaveInstructions.tid +++ b/languages/de-DE/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Aktuellen Stand speichern footer: <$button message="tm-close-tiddler">Schließen</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html Ihre Änderungen sollen als ~TiddlyWiki HTML Datei gespeichert werden. diff --git a/languages/de-DE/NewJournal.multids b/languages/de-DE/NewJournal.multids index 1a3cb24c3..9dfa43f38 100644 --- a/languages/de-DE/NewJournal.multids +++ b/languages/de-DE/NewJournal.multids @@ -1,4 +1,5 @@ title: $:/config/NewJournal/ Title: YYYY MMM 0DD +Text: Tags: Journal diff --git a/languages/de-DE/Notifications.multids b/languages/de-DE/Notifications.multids index 6a8299fda..d4d995a3d 100644 --- a/languages/de-DE/Notifications.multids +++ b/languages/de-DE/Notifications.multids @@ -2,3 +2,5 @@ title: $:/language/Notifications/ Save/Done: Wiki gespeichert! Save/Starting: Wiki zum Speichern vorbereiten! +CopiedToClipboard/Succeeded: Kopiert! +CopiedToClipboard/Failed: Fehler, beim kopieren in die Zwischenablage! diff --git a/languages/de-DE/Search.multids b/languages/de-DE/Search.multids index e48f3ba5d..a711d3a35 100644 --- a/languages/de-DE/Search.multids +++ b/languages/de-DE/Search.multids @@ -2,12 +2,13 @@ title: $:/language/Search/ DefaultResults/Caption: Liste Filter/Caption: Filter -Filter/Hint: Suche mit [["filter expression"|http://tiddlywiki.com/static/Filters.html]]. +Filter/Hint: Suche mit [["filter expression"|https://tiddlywiki.com/static/Filters.html]]. Filter/Matches: //<small><<resultCount>> Treffer</small>// Matches: //<small><<resultCount>> Treffer</small>// Matches/All: Alle Treffer: Matches/Title: Titel Treffer: Search: Suchen +Search/TooShort: Suchtext ist zu kurz Shadows/Caption: Schatten Shadows/Hint: Suche in Schatten-Tiddlern. Shadows/Matches: //<small><<resultCount>> Treffer</small>// @@ -16,4 +17,4 @@ Standard/Hint: Suche in Standard-Tiddlern. Standard/Matches: //<small><<resultCount>> matches</small>// System/Caption: System System/Hint: Suche in System-Tiddlern. -System/Matches: //<small><<resultCount>> matches</small>// +System/Matches: //<small><<resultCount>> Treffer</small>// \ No newline at end of file diff --git a/languages/de-DE/ThemeTweaks.multids b/languages/de-DE/ThemeTweaks.multids index 6f4adaf8f..1099cf7c6 100644 --- a/languages/de-DE/ThemeTweaks.multids +++ b/languages/de-DE/ThemeTweaks.multids @@ -12,6 +12,7 @@ Options/CodeWrapping: Lange Zeilen in "Code-Blöcken" umbrechen Settings: Einstellungen Settings/FontFamily: Schriftfamilie Settings/CodeFontFamily: "Code" Schriftfamilie +Settings/EditorFontFamily: Editor Schriftfamilie Settings/BackgroundImage: Hintergrundbild für die Seite Settings/BackgroundImageAttachment: Hintergrundbild Anhang Settings/BackgroundImageAttachment/Scroll: Mit Inhalt "scrollen" diff --git a/languages/de-DE/TiddlerInfo.multids b/languages/de-DE/TiddlerInfo.multids index eaf184a05..9136182f7 100755 --- a/languages/de-DE/TiddlerInfo.multids +++ b/languages/de-DE/TiddlerInfo.multids @@ -1,21 +1,21 @@ title: $:/language/TiddlerInfo/ Advanced/Caption: Erweitert -Advanced/PluginInfo/Empty/Hint: keine +Advanced/PluginInfo/Empty/Hint: Keine Advanced/PluginInfo/Heading: Plugin Details Advanced/PluginInfo/Hint: Dieses Plugin enthält folgende Schatten-Tiddler: -Advanced/ShadowInfo/Heading: Shatten Status +Advanced/ShadowInfo/Heading: Schatten Status Advanced/ShadowInfo/NotShadow/Hint: Der Tiddler: <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> ist kein Schatten-Tiddler. Advanced/ShadowInfo/Shadow/Hint: Der Tiddler: <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> ist ein Schatten-Tiddler. Advanced/ShadowInfo/Shadow/Source: Er ist definiert im Plugin: <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link>. -Advanced/ShadowInfo/OverriddenShadow/Hint: Der originale Schatten-Tiddler wurde durch diesen Tiddler überschrieben. Wenn Sie diesen Tiddler löschen, wird der originale Schatten-Tiddler wieder aktiv. Vorher eventuell eine Sicherungskopie erstellen! +Advanced/ShadowInfo/OverriddenShadow/Hint: Der originale Schatten-Tiddler wurde durch diesen Tiddler überschrieben. Wenn Sie diesen Tiddler löschen, wird der originale Schatten-Tiddler wieder aktiv. Erstellen Sie vorher eventuell eine Sicherungskopie! Fields/Caption: Felder List/Caption: Liste List/Empty: Dieser Tiddler hat kein "list" Feld. Listed/Caption: Gelistet Listed/Empty: Dieser Tiddler wird nicht von anderen Tiddlern gelistet. References/Caption: Referenzen -References/Empty: Kein Tiddler linkt zu Diesem. +References/Empty: Kein Tiddler linkt zu diesem Tiddler. Tagging/Caption: Tagging -Tagging/Empty: Kein Tiddler ist mit diesem "getaggt". +Tagging/Empty: Kein Tiddler ist mit diesem Tiddler "getaggt". Tools/Caption: Tools diff --git a/languages/el-GR/Buttons.multids b/languages/el-GR/Buttons.multids index 2845b2f6d..4413a9b79 100644 --- a/languages/el-GR/Buttons.multids +++ b/languages/el-GR/Buttons.multids @@ -2,65 +2,177 @@ title: $:/language/Buttons/ AdvancedSearch/Caption: προηγμένη αναζήτηση AdvancedSearch/Hint: Προηγμένη αναζήτηση +Bold/Caption: έντονα +Bold/Hint: Εφαρμόζει μορφοποίηση έντονης γραφής στην επιλογή Cancel/Caption: άκυρο Cancel/Hint: Ακυρώνει την τροποποίηση αυτού του tiddler +Clear/Caption: καθάρισε +Clear/Hint: Καθαρίζει την εικόνα με αμιγές χρώμα Clone/Caption: κλωνοποίησε -Clone/Hint: Κλωνοποίησε αυτό το tiddler +Clone/Hint: Κλωνοποιεί αυτό το tiddler Close/Caption: κλείσε -Close/Hint: Κλείσε αυτό το tiddler +Close/Hint: Κλείνει αυτό το tiddler CloseAll/Caption: κλείσε τα όλα -CloseAll/Hint: Κλείσε όλα τα tiddlers +CloseAll/Hint: Κλείνει όλα τα tiddlers CloseOthers/Caption: κλείσε τα υπόλοιπα -CloseOthers/Hint: Κλείσε όλα τα υπόλοιπα tiddlers εκτός από αυτό +CloseOthers/Hint: Κλείνει τα υπόλοιπα tiddlers ControlPanel/Caption: πίνακας ελέγχου -ControlPanel/Hint: Άνοιξε τον πίνακα ελέγχου +ControlPanel/Hint: Ανοίγει τον πίνακα ελέγχου Delete/Caption: διέγραψε -Delete/Hint: Διέγραψε αυτό το tiddler +Delete/Hint: Διαγράφει αυτό το tiddler Edit/Caption: τροποποίησε -Edit/Hint: Τροποποίησε αυτό το tiddler -Encryption/Caption: κρυπτογράφησε -Encryption/Hint: Όρισε ή απάλειψε το συνθηματικό για την αποθήκευση αυτού του wiki -Encryption/ClearPassword/Caption: Χωρίς συνθηματικό -Encryption/ClearPassword/Hint: Απάλειψε το συνθηματικό και αποθηκεύσε αυτό το wiki χωρίς κρυπτογράφηση +Edit/Hint: Τροποποιεί αυτό το tiddler +EditorHeight/Caption: ύψος επεξεργαστή +EditorHeight/Caption/Auto: Αυτόματη ρύθμιση ύψους για να χωράει το περιεχόμενο +EditorHeight/Caption/Fixed: Προκαθορισμένο ύψος: +EditorHeight/Hint: Θέτει το ύψος του επεξεργαστή κειμένου +Encryption/Caption: κρυπτογράφηση +Encryption/ClearPassword/Caption: χωρίς συνθηματικό +Encryption/ClearPassword/Hint: Απαλείφει το συνθηματικό και αποθηκεύει αυτό το wiki χωρίς κρυπτογράφηση +Encryption/Hint: Ορίζει ή απαλείφει το συνθηματικό για την αποθήκευση αυτού του wiki Encryption/SetPassword/Caption: όρισε συνθηματικό -Encryption/SetPassword/Hint: Όρισε ένα συνθηματικό για να να αποθηκεύσεις αυτό το wiki κρυπτογραφημένο -FullScreen/Caption: πλήρη-οθόνη +Encryption/SetPassword/Hint: Ορίζει ένα συνθηματικό για να να αποθηκεύσεις αυτό το wiki κρυπτογραφημένο +Excise/Caption: περικοπή +Excise/Caption/Excise: Εκτέλεσε την περικοπή +Excise/Caption/MacroName: Όνομα μακροεντολής: +Excise/Caption/NewTitle: Τίτλος νέου tiddler: +Excise/Caption/Replace: Αντικατάστησε το αφαιρούμενο κείμενο με: +Excise/Caption/Replace/Link: δεσμός +Excise/Caption/Replace/Macro: μακροεντολή +Excise/Caption/Tag: Πρόσθεσε ως ετικέτα στο νέο tiddler τον τίτλο αυτού του tiddler +Excise/Caption/TiddlerExists: Προειδοποίηση: Το tiddler υπάρχει ήδη +Excise/Hint: Δημιουργεί νέο tiddler με το επιλεγμένο κείμενο, και το αντικαθιστά με αναφορά σε αυτό +ExportPage/Caption: εξαγωγή όλων +ExportPage/Hint: Εξάγει όλα τα tiddlers +ExportTiddler/Caption: εξαγωγή του tiddler +ExportTiddler/Hint: Εξάγει το tiddler +ExportTiddlers/Caption: εξαγωγή των tiddlers +ExportTiddlers/Hint: Εξάγει τα tiddlers +Fold/Caption: δίπλωσε το tiddler +Fold/FoldBar/Caption: ράβδος διπλώματος +Fold/FoldBar/Hint: Προαιρετικές ράβδοι για να διπλώνετε και να ξεδιπλώνετε τα tiddler +Fold/Hint: Διπλώνει το σώμα αυτού του tiddler +FoldAll/Caption: δίπλωσε όλα τα tiddlers +FoldAll/Hint: Διπλώνει τα σώματα όλων των ανοιχτών tiddler +FoldOthers/Caption: δίπλωσε τα υπόλοιπα tiddlers +FoldOthers/Hint: Διπλώνει τα σώματα των υπόλοιπων ανοιχτών tiddlers +FullScreen/Caption: πλήρης-οθόνη FullScreen/Hint: Εναλλαγή κατάστασης πλήρους-οθόνης -Import/Caption: εισαγωγή -Import/Hint: Εισαγωγή αρχείων -Info/Caption: πληροφορίες -Info/Hint: Δείξε πληροφορίες για αυτό το tiddler +Heading1/Caption: επικεφαλίδα 1 +Heading1/Hint: Εφαρμόζει μορφοποίηση επικεφαλίδας 1 στις επιλεγμένες γραμμές +Heading2/Caption: επικεφαλίδα 2 +Heading2/Hint: Εφαρμόζει μορφοποίηση επικεφαλίδας 2 στις επιλεγμένες γραμμές +Heading3/Caption: επικεφαλίδα 3 +Heading3/Hint: Εφαρμόζει μορφοποίηση επικεφαλίδας 3 στις επιλεγμένες γραμμές +Heading4/Caption: επικεφαλίδα 4 +Heading4/Hint: Εφαρμόζει μορφοποίηση επικεφαλίδας 4 στις επιλεγμένες γραμμές +Heading5/Caption: επικεφαλίδα 5 +Heading5/Hint: Εφαρμόζει μορφοποίηση επικεφαλίδας 5 στις επιλεγμένες γραμμές +Heading6/Caption: επικεφαλίδα 6 +Heading6/Hint: Εφαρμόζει μορφοποίηση επικεφαλίδας 6 στις επιλεγμένες γραμμές +Help/Caption: βοήθεια +Help/Hint: Εμφανίζει το πάνελ της βοήθειας +HideSideBar/Caption: κρύψε την πλευρική εργαλειοθήκη +HideSideBar/Hint: Κρύβει την πλευρική εργαλειοθήκη Home/Caption: αρχική -Home/Hint: Ανοίγει τα τυπικά tiddlers +Home/Hint: Ανοίγει τα προκαθορισμένα tiddlers +Import/Caption: εισαγωγή +Import/Hint: Εισαγωγή διαφόρων τύπων αρχείων όπως αρχεία κειμένου, εικόνας, TiddlyWiki, ή JSON +Info/Caption: πληροφορίες +Info/Hint: Δείχνει πληροφορίες για αυτό το tiddler +Italic/Caption: πλάγια +Italic/Hint: Εφαρμόζει πλάγια μορφοποίηση στην επιλογή Language/Caption: γλώσσα -Language/Hint: Επιλέξτε την γλώσσα για την διεπαφή του χρήστη +Language/Hint: Επιλέγει την γλώσσα για την διεπαφή του χρήστη +LineWidth/Caption: πλάτος γραμμής +LineWidth/Hint: Καθορισμός του πλάτους της γραμμής για βάψιμο +Link/Caption: δεσμός +Link/Hint: Δημιουγεί έναν δεσμό σε κείμενο του wiki +ListBullet/Caption: λίστα με κουκίδες +ListBullet/Hint: Εφαρμόζει μορφοποίηση λίστας με κουκίδες στις επιλεγμένες γραμμές +ListNumber/Caption: αριθμημένη λίστα +ListNumber/Hint: Εφαρμόζει μορφοποίηση αριθμημένης λίστας στις επιλεγμένες γραμμές +Manager/Caption: διαχειριστής tiddler +Manager/Hint: Ανοίγει τον διαχειριστή των tiddler +MonoBlock/Caption: monospaced ενότητα +MonoBlock/Hint: Εφαρμόζει μορφοποίηση ενότητας monospaced στις επιλεγμένες γραμμές +MonoLine/Caption: monospaced +MonoLine/Hint: Εφαρμίζει μορφοποίηση χαρακτήρων monospaced στην επιλογή More/Caption: περισσότερα More/Hint: Περισσότερες ενέργειες NewHere/Caption: νέο εδώ -NewHere/Hint: Δημιούργησε ένα νέο tiddler που έχει ως ετικέτα του το τρέχον +NewHere/Hint: Δημιουργεί ένα νέο tiddler που έχει ως ετικέτα του το τρέχον +NewImage/Caption: νέα εικόνα +NewImage/Hint: Δημιουργεί ένα νέο tiddler εικόνας NewJournal/Caption: νέο ημερολόγιο -NewJournal/Hint: Δημιούργησε ένα νέο ημερολογιακό tiddler +NewJournal/Hint: Δημιουργεί ένα νέο ημερολογιακό tiddler NewJournalHere/Caption: νέο ημερολόγιο εδώ -NewJournalHere/Hint: Δημιούργησε ένα νέο ημερολογιακό tiddler με ετικέτα το παρόν +NewJournalHere/Hint: Δημιουργεί ένα νέο ημερολογιακό tiddler με ετικέτα το τρέχον +NewMarkdown/Caption: νέο Markdown tiddler +NewMarkdown/Hint: Δημιουργεί ένα νέο Markdown tiddler NewTiddler/Caption: νέο tiddler -NewTiddler/Hint: Δημιούργησε ένα νέο tiddler +NewTiddler/Hint: Δημιουργεί ένα νέο tiddler +Opacity/Caption: αδιαφάνεια +Opacity/Hint: Καθορίζει τόν βαθμό αδιαφάνειας κατά το βάψιμο +OpenWindow/Caption: άνοιξε σε νέο παράθυρο +OpenWindow/Hint: Ανοίγει το tiddler σε νέο παράθυρο +Paint/Caption: χρώμα βαφής +Paint/Hint: Κοθορίζει το χρώμα βαφής +Palette/Caption: παλέτα +Palette/Hint: Επιλέγει την παλέτα των χρωμάτων Permalink/Caption: μόνιμος σύνδεσμος -Permalink/Hint: Θέσε στην γραμμή διεύθυνσης του προγράμματος πλοήγησης έναν μόνιμο σύνδεσμο για αυτό το tiddler +Permalink/Hint: Θέτει στην γραμμή διεύθυνσης του προγράμματος πλοήγησης έναν άμεσο σύνδεσμο για αυτό το tiddler Permaview/Caption: μόνιμη όψη -Permaview/Hint: Θέσε στην γραμμή διεύθυνσης του προγράμματος πλοήγησης έναν μόνιμο σύνδεσμο για όλα τα tiddlers σε αυτή την ιστορία +Permaview/Hint: Θέτει στην γραμμή διεύθυνσης του προγράμματος πλοήγησης έναν άμεσο σύνδεσμο για όλα τα tiddlers σε αυτή την ιστορία +Picture/Caption: εικόνα +Picture/Hint: Εισάγει μια εικόνα +Preview/Caption: προεπισκόπιση +Preview/Hint: Δείχνει το πάνελ προεπισκόπησης +PreviewType/Caption: τύπος προεπισκόπησης +PreviewType/Hint: Επιλογή τύπου προεπισκόπησης +Print/Caption: τύπωσε σελίδα +Print/Hint: Εκτυπώνει την τρέχουσα σελίδα +Quote/Caption: εισαγωγικά αναφοράς +Quote/Hint: Εφαρμόζει μορφοποίηση εισαγωγικών αναφοράς κειμένου στις γραμμές που περιλαμβάνει η επιλογή Refresh/Caption: ανανέωση -Refresh/Hint: Επαναφόρτωση του wiki +Refresh/Hint: Εκτελεί μια πλήρη ανανέωση (επαναφόρτωση) του wiki Save/Caption: αποθήκευση Save/Hint: Αποθήκευσε αυτό το tiddler SaveWiki/Caption: αποθήκευση αλλαγών SaveWiki/Hint: Αποθήκευσε τις αλλαγές +ShowSideBar/Caption: εμφάνιση πλευρικής εργαλειοθήκης +ShowSideBar/Hint: Εμφανίζει την πλευρική εργαλειοθήκη +Size/Caption: μέγεθος εικόνας +Size/Caption/Height: Ύψος: +Size/Caption/Resize: Αλλαγή μεγέθους εικόνας +Size/Caption/Width: Πλάτος: +Size/Hint: Καθορισμός του μεγέθους της εικόνας +Stamp/Caption: σφραγγίδα +Stamp/Caption/New: Βάλτε την δική σας +Stamp/Hint: Εισαγωγή ενός προκαθορισμένου αποσπάσματος κειμένου +Stamp/New/Text: Κείμενο αποσπάσματος. (Θυμηθείτε να προσθέσετε έναν περιγραφικό τίτλο στο πεδίο caption). +Stamp/New/Title: Όνομα που θα εμφανίζεται στο μενού StoryView/Caption: ιστορική όψη -StoryView/Hint: Επέλεξε την ιστορική οπτικοποίηση -HideSideBar/Caption: απόκρυψη πλευρικής γραμμής -HideSideBar/Hint: Κρύψε την πλευρική γραμμή -ShowSideBar/Caption: εμφάνιση πλευρικής γραμμής -ShowSideBar/Hint: Δείξε την πλευρική γραμμή +StoryView/Hint: Επιλογή της οπτικοποίησης της ιστορικής όψης +Strikethrough/Caption: διαγραμμένο +Strikethrough/Hint: Εφαρμόζει μορφοποίηση διαγραμμένου κειμένου στην επιλογή +Subscript/Caption: δείκτης +Subscript/Hint: Εφαρμόζει μορφοποίηση δείκτη στην επιλογή +Superscript/Caption: εκθέτης +Superscript/Hint: Εφαρμόζει μορφοποίηση εκθέτη στην επιλογή TagManager/Caption: διαχειριστής ετικετών -TagManager/Hint: Άνοιξε τον διαχειριστή ετικετών +TagManager/Hint: Ανοίγει τον διαχειριστή ετικετών Theme/Caption: θέμα -Theme/Hint: Διάλεξε το οπτικό θέμα +Theme/Hint: Επιλογή οπτικού θέματος +Timestamp/Caption: χρονική σήμανση +Timestamp/Hint: Επιλέξτε το αν οι τροποποιήσεις θα ενημερώνουν τις χρονικές σημάνσεις +Timestamp/Off/Caption: χρονικές σημάνσεις εκτός λειτουργίας +Timestamp/Off/Hint: Να μην ενημερώνονται οι χρονικές σημάνσεις όταν τροποποιούνται τα tiddler +Timestamp/On/Caption: χρονικές σημάνσεις λειτουργούν +Timestamp/On/Hint: Οι χρονικές σημάνσεις ενημερώνονται όταν τροποποιούνται τα tiddler +Underline/Caption: υπογράμμιση +Underline/Hint: Εφαρμόζει μορφοποίηση υπογράμμισης στην επιλογή +Unfold/Caption: ξεδίπλωσε το tiddler +Unfold/Hint: Ξεδιπλώνει το σώμα αυτού του tiddler +UnfoldAll/Caption: ξεδίπλωσε όλα τα tiddler +UnfoldAll/Hint: Ξεδιπλώνει το σώμα σε όλα τα ανοιχτά tiddler diff --git a/languages/el-GR/ControlPanel.multids b/languages/el-GR/ControlPanel.multids index 5ed16e571..511fab4da 100644 --- a/languages/el-GR/ControlPanel.multids +++ b/languages/el-GR/ControlPanel.multids @@ -4,22 +4,23 @@ Advanced/Caption: Προηγμένα Advanced/Hint: Εσωτερικές πληροφορίες σχετικά με αυτό το TiddlyWiki Appearance/Caption: Εμφάνιση Appearance/Hint: Τρόποι για να παραμετροποιήσετε την εμφάνιση του δικού σας TiddlyWiki. -Basics/AnimDuration/Prompt: Διάρκεια κίνησης: +Basics/AnimDuration/Prompt: Διάρκεια κινούμενων εφέ: Basics/Caption: Βασικά Basics/DefaultTiddlers/BottomHint: Χρησιμοποιήστε [[διπλές αγκύλες ]] για τίτλους με κενά. Ή, μπορείτε να διαλέξετε τη <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">διατήρηση της διάταξης της ιστορίας</$button> -Basics/DefaultTiddlers/Prompt: Τυπικά tiddlers: -Basics/DefaultTiddlers/TopHint: Επιλέξτε ποια tiddlers θα εμφανίζονται κατά την έναρξη: +Basics/DefaultTiddlers/Prompt: Προκαθορισμένα tiddler: +Basics/DefaultTiddlers/TopHint: Επιλέξτε τα tiddler που θα εμφανίζονται κατά την έναρξη: Basics/Language/Prompt: Γεια σας! Τρέχουσα γλώσσα: -Basics/NewJournal/Title/Prompt: Τίτλος των νέων ημερολογιακών tiddlers -Basics/NewJournal/Tags/Prompt: Ετικέτες για νέα ημερολογιακά tiddlers -Basics/OverriddenShadowTiddlers/Prompt: Πλήθος σκιώδων tiddlers που έχουν παρακαμφθεί: +Basics/NewJournal/Tags/Prompt: Ετικέτες για νέα ημερολογιακά tiddler +Basics/NewJournal/Text/Prompt: Κείμενο για τα νέα ημερολογιακά tiddler +Basics/NewJournal/Title/Prompt: Τίτλος των νέων ημερολογιακών tiddler +Basics/OverriddenShadowTiddlers/Prompt: Πλήθος σκιώδων tiddlers που έχουν παρακαμφθεί: Basics/ShadowTiddlers/Prompt: Πλήθος σκιώδων tiddlers: Basics/Subtitle/Prompt: Υπότιτλος: Basics/SystemTiddlers/Prompt: Πλήθος tiddlers συστήματος: Basics/Tags/Prompt: Πλήθος ετικετών: Basics/Tiddlers/Prompt: Πλήθος tiddlers: Basics/Title/Prompt: Τίτλος αυτού του ~TiddlyWiki: -Basics/Username/Prompt: Όνομα χρήστη για καταχώρηση τροποποιήσεων: +Basics/Username/Prompt: Όνομα χρήστη για την υπογραφή των τροποποιήσεων: Basics/Version/Prompt: ~TiddlyWiki έκδοση: EditorTypes/Caption: Τύποι επεξεργαστών EditorTypes/Editor/Caption: Επεξεργαστής @@ -27,71 +28,150 @@ EditorTypes/Hint: Αυτά τα tiddlers καθορίζουν ποιος κει EditorTypes/Type/Caption: Τύπος Info/Caption: Πληροφορίες Info/Hint: Πληροφορίες σχετικα με αυτό το TiddlyWiki +KeyboardShortcuts/Add/Caption: πρόσθεσε συντόμευση +KeyboardShortcuts/Add/Prompt: Πληκτρολογήστε εδώ την συντόμευση +KeyboardShortcuts/Caption: Συντομεύσεις πληκτρολογίου +KeyboardShortcuts/Hint: Διαχείριση των αντιστοιχήσεων στις συντομεύσεις πληκτρολογίου +KeyboardShortcuts/NoShortcuts/Caption: Δεν έχουν αντιστοιχηθεί συντομεύσεις πληκτρολογίου +KeyboardShortcuts/Platform/All: Όλες οι πλατφόρμες +KeyboardShortcuts/Platform/Linux: Μόνο για πλατφόρμα Linux +KeyboardShortcuts/Platform/Mac: Μόνο για πλατφόρμα Macintosh +KeyboardShortcuts/Platform/NonLinux: Μόνο για μη-Linux πλατφόρμες +KeyboardShortcuts/Platform/NonMac: Μόνο για μη-Macintosh πλατφόρμες +KeyboardShortcuts/Platform/NonWindows: Μόνο για μη-Windows πλατφόρμες +KeyboardShortcuts/Platform/Windows: Μόνο για πλατφόρμα Windows +KeyboardShortcuts/Remove/Hint: αφαίρεση την συντόμευση πληκτρολογίου LoadedModules/Caption: Φορτωμένες μονάδες -LoadedModules/Hint: Αυτές είναι οι τρέχουσες φορτωμένες μονάδες tiddler που συνδέονται στα επιμέρους πηγαία tiddlers. Οι πλάγια γραμμένες μονάδες δεν έχουν πηγαίο tiddler, συνήθως επειδή αρχικοποιούνται κατά την διαδικασία εκκίνησης. +LoadedModules/Hint: Αυτές είναι οι τρέχουσες φορτωμένες μονάδες tiddler που συνδέονται με τα αντίστοιχα τους πηγαία tiddler. Οι πλάγια γραμμένες μονάδες δεν έχουν πηγαίο tiddler, συνήθως επειδή αρχικοποιούνται κατά την διαδικασία εκκίνησης. Palette/Caption: Παλέτα Palette/Editor/Clone/Caption: κλωνοποίησε Palette/Editor/Clone/Prompt: Συνιστάτε να κλωνοποιήσετε αυτήν την σκιώδη παλέτα πριν την τροποποιήσετε -Palette/Editor/Prompt/Modified: Αυτή η σκιώδη παλέτα έχει τροποποιηθεί Palette/Editor/Prompt: Επεξεργασία +Palette/Editor/Prompt/Modified: Αυτή η σκιώδη παλέτα έχει τροποποιηθεί Palette/Editor/Reset/Caption: επαναφορά Palette/HideEditor/Caption: απόκρυψη επεξεργαστή Palette/Prompt: Τρέχουσα παλέτα: Palette/ShowEditor/Caption: εμφάνισε επεξεργαστή +Parsing/Block/Caption: Κανόνες συντακτικής ανάλυσης τμημάτων +Parsing/Caption: Συντακτική ανάλυση +Parsing/Hint: Εδώ μπορείτε να απενεργοποιήσετε ή να ενεργοποιήσετε καθολικά τους κανόνες τις συντακτικής ανάλυσης του wiki. Για να εφαρμοστούν οι αλλαγές σας αποθηκεύστε και επαναφορτώστε το wiki σας. Η απενεργοποίηση συγκεκριμένων κανόνων συντακτικής ανάλυσης ενδέχεται να δημιουργήσει πρόβλημα στην ορθή λειτουργία του <$text text="TiddlyWiki"/>. Χρησιμοποιήστε [[ασφαλή κατάσταση|https://tiddlywiki.com/#SafeMode]] για να επανέλθετε στην κανονική λειτουργία.. +Parsing/Inline/Caption: Inline κανόνες συντακτικής ανάλυσης +Parsing/Pragma/Caption: Pragma κανόνες συντακτικής ανάλυσης +Plugins/Add/Caption: Βρείτε περισσότερα πρόσθετα +Plugins/Add/Hint: Εγκαθιστά πρόσθετα από την επίσημη βιβλιοθήκη +Plugins/AlreadyInstalled/Hint: Το πρόσθετο αυτό έχει ήδη εγκατασταθεί στην έκδοση <$text text=<<installedVersion>>/> Plugins/Caption: Πρόσθετα +Plugins/ClosePluginLibrary: κλείσε την βιβλιοθήκη πρόσθετων Plugins/Disable/Caption: απενεργοποίησε -Plugins/Disable/Hint: Απενεργοποίησε αυτό το πρόσθετο όταν φορτωθεί ξανά η σελίδα +Plugins/Disable/Hint: Να απενεργοποιηθεί αυτό το πρόσθετο όταν φορτωθεί ξανά η σελίδα Plugins/Disabled/Status: (απενεργοποιημένο) -Plugins/Empty/Hint: Άδειο +Plugins/Empty/Hint: Κενό Plugins/Enable/Caption: ενεργοποίησε Plugins/Enable/Hint: Ενεργοποίησε αυτό το πρόσθετο όταν φορτωθεί ξανά η σελίδα +Plugins/Install/Caption: εγκατέστησε +Plugins/Installed/Hint: Τρέχοντα εγκατεστημένα πρόσθετα: Plugins/Language/Prompt: Γλώσσες +Plugins/Languages/Caption: Γλώσσες +Plugins/Languages/Hint: Πρόσθετα γλωσσικά πακέτα +Plugins/NoInfoFound/Hint: Δεν βρέθηκε το ''"<$text text=<<currentTab>>/>"'' +Plugins/NoInformation/Hint: Δεν παρέχονται πληροφορίες +Plugins/NotInstalled/Hint: Το πρόσθετο αυτό δεν είναι εγκατεστημένο +Plugins/OpenPluginLibrary: άνοιξε την βιβλιοθήκη πρόσθετων Plugins/Plugin/Prompt: Πρόσθετα +Plugins/Plugins/Caption: Πρόσθετα +Plugins/Plugins/Hint: Πρόσθετα +Plugins/Reinstall/Caption: επανεγκατέστησε Plugins/Theme/Prompt: Θέματα +Plugins/Themes/Caption: Θέματα +Plugins/Themes/Hint: Πρόσθετα θεμάτων Saving/Caption: Αποθήκευση +Saving/DownloadSaver/AutoSave/Description: Επιτρέπει αυτόματη αποθήκευση για τον αποθηκευτή μεταφορτώσεων +Saving/DownloadSaver/AutoSave/Hint: Ενεργοποιεί την αυτόματη αποθήκευση στον αποθηκευτή μεταφορτώσεων +Saving/DownloadSaver/Caption: Αποθηκευτής μεταφορτώσεων +Saving/DownloadSaver/Hint: Αυτές οι ρυθμίσεις εφαρμόζονται σε αποθηκευτή μεταφορτώσεων που είναι συμβατός με HTML5 +Saving/General/Caption: Γενικά +Saving/General/Hint: Αυτές οι ρυθμίσεις εφαρμόζονται σε όλους τους φορτωμένους αποθηκευτές Saving/Heading: Αποθήκευση +Saving/Hint: Ρυθμίσεις που χρησιμοποιούνται για την αποθήκευση ολόκληρου του TiddlyWiki σε ένα μοναδικό αρχείο μέσω ένος αποθηκευτικού τμήματος Saving/TiddlySpot/Advanced/Heading: Προηγμένες ρυθμίσεις Saving/TiddlySpot/BackupDir: Φάκελος αντιγράφων ασφαλείας Saving/TiddlySpot/Backups: Αντίγραφα ασφαλείας -Saving/TiddlySpot/Description: Αυτές οι ρυθμίσεις χρησιμοποιούνται μόνο όταν γίνεται αποθήκευση στο http://tiddlyspot.com ή, σε έναν συμβατό απομακρυσμένο εξυπηρετητή -Saving/TiddlySpot/Filename: ανέβασμα αρχείου +Saving/TiddlySpot/Caption: ~TiddlySpot Αποθηκευτής +Saving/TiddlySpot/Description: Αυτές οι ρυθμίσεις χρησιμοποιούνται μόνο όταν γίνεται αποθήκευση στο http://tiddlyspot.com, ή σε συμβατό απομακρυσμένο εξυπηρετητή +Saving/TiddlySpot/Filename: ανέβασμα αρχείου ως Saving/TiddlySpot/Heading: ~TiddlySpot -Saving/TiddlySpot/Hint: // Το τυπικό URL του εξυπηρετητή είναι το `http://<wikiname>.tiddlyspot.com/store.cgi` και μπορεί να αλλαχθεί για να χρησιμοποιηθεί μια διαφορετική διεύθυνση εξυπηρετητή // +Saving/TiddlySpot/Hint: // Το τυπικό URL του εξυπηρετητή είναι το `http://<wikiname>.tiddlyspot.com/store.cgi` και μπορεί να αλλαχθεί για να χρησιμοποιηθεί μια διαφορετική διεύθυνση εξυπηρετητή, π.χ. `http://example.com/store.php`.// Saving/TiddlySpot/Password: Συνθηματικό Saving/TiddlySpot/ServerURL: URL Εξυπηρετητή Saving/TiddlySpot/UploadDir: Φάκελος ανεβάσματος -Saving/TiddlySpot/UserName: Όνομα Wiki +Saving/TiddlySpot/UserName: Όνομα Wiki Settings/AutoSave/Caption: Αυτόματη αποθήκευση Settings/AutoSave/Disabled/Description: Μην αποθηκεύσεις αυτόματα τις αλλαγές Settings/AutoSave/Enabled/Description: Αυτόματα αποθήκευσε τις αλλαγές Settings/AutoSave/Hint: Αυτόματη αποθήκευση αλλαγών κατά την επεξεργασία +Settings/CamelCase/Caption: Camel Case Wiki σύνδεσμοι +Settings/CamelCase/Description: Ενεργοποίηση αυτόματης δημιουργίας ~CamelCase συνδέσμων +Settings/CamelCase/Hint: Μπορείτε να απενεργοποιήσετε καθολικά την αυτόματη δημιουργία συνδέσμων σε ~CamelCase φράσεις. Απαιτείται όμως επαναφόρτωση για να εφαρμοστεί. Settings/Caption: Ρυθμίσεις +Settings/DefaultSidebarTab/Caption: Προκαθορισμένη καρτέλα πλευρικής-εργαλειοθήκης +Settings/DefaultSidebarTab/Hint: Καθορίστε ποια καρτέλα πλευρικής-εργαλειοθήκης θα εμφανίζεται αυτομάτως +Settings/EditorToolbar/Caption: εργαλειοθήκη επεξεργασίας +Settings/EditorToolbar/Description: Εμφανίζει την εργαλειοθήκη επεξεργασίας +Settings/EditorToolbar/Hint: Ενεργοποιεί ή απενεργοποιεί την εργαλειοθήκη επεξεργασίας: Settings/Hint: Αυτές οι ρυθμίσεις σας επιτρέπουν να παραμετροποιήσετε την συμπεριφορά του TiddlyWiki. +Settings/InfoPanelMode/Caption: Κατάσταση πάνελ πληροφορικών Tiddler +Settings/InfoPanelMode/Hint: Ελέγχει το πότε θα κλείνει το πάνελ πληροφοριών του tiddler: +Settings/InfoPanelMode/Popup/Description: Αυτόματο κλείσιμο του πάνελ πληροφορικών του Tiddler +Settings/InfoPanelMode/Sticky/Description: Παραμένει ανοιχτό μέχρι το πάνελ πληροφοριών του Tiddler μέχρι κάποιος να το κλείσει +Settings/LinkToBehaviour/Caption: Συμπεριφορά ανοίγματος του Tiddler +Settings/LinkToBehaviour/InsideRiver/Hint: Πλοήγηση εσωτερικά από την ροή της ιστορίας +Settings/LinkToBehaviour/OpenAbove: Άνοιγμα πάνω από το τρέχων tiddler +Settings/LinkToBehaviour/OpenAtBottom: Άνοιγμα στο κάτω μέρος της ροής της ιστορίας +Settings/LinkToBehaviour/OpenAtTop: Άνοιγμα στο άνω μέρος της ροής της ιστορίας +Settings/LinkToBehaviour/OpenBelow: Άνοιγμα κάτω αόπ το τρέχων tiddler +Settings/LinkToBehaviour/OutsideRiver/Hint: Πλοήγηση εξώτερικά από την ροής της ιστορίας +Settings/MissingLinks/Caption: Wiki σύνδεσμοι +Settings/MissingLinks/Description: Ενεργοποίηση συνδέσμων σε μη υπαρκτά tiddlers +Settings/MissingLinks/Hint: Επιλέξτε το αν θα δημιουργούνται σύνδεσμοι σε tiddler που δεν έχουν ακόμα δημιουργηθεί Settings/NavigationAddressBar/Caption: Γραμμή διεύθυνσης πλοήγησης Settings/NavigationAddressBar/Hint: Η συμπεριφορά της γραμμής διεύθυνσης του προγράμματος πλοήγησης ιστοσελίδων όταν μεταβαίνετε σε κάποιο tiddler: -Settings/NavigationAddressBar/No/Description: Μην ενημερώνεις την γραμμή διευθύνσεων +Settings/NavigationAddressBar/No/Description: Μην ενημερώνεις την γραμμή διευθύνσεων Settings/NavigationAddressBar/Permalink/Description: Συμπεριέλαβε το tiddler προορισμού Settings/NavigationAddressBar/Permaview/Description: Συμπεριέλαβε το tiddler προορισμού και την τρέχουσα ακολουθία της ιστορίας Settings/NavigationHistory/Caption: Ιστορικό πλοήγησης Settings/NavigationHistory/Hint: Ενημέρωση του ιστορικού στο πρόγραμμα πλοήγησης όταν μεταβαίνουμε σε κάποιο tiddler: Settings/NavigationHistory/No/Description: Μην ενημερώσεις το ιστορικό Settings/NavigationHistory/Yes/Description: Ενημέρωσε το ιστορικό +Settings/PerformanceInstrumentation/Caption: επισκόπηση επιδόσεων +Settings/PerformanceInstrumentation/Description: Ενεργοποίηση της επισκόπησης των επιδόσεων +Settings/PerformanceInstrumentation/Hint: Εμφανίζει στατιστικά στοιχεία επιδόσεων στην κονσόλα προγραμματιστών του προγράμματος πλοήγησης. Απαιτείται ανανέωση της σελίδα για να ενεργοποιηθεί. +Settings/TitleLinks/Caption: Tiddler Τίτλοι +Settings/TitleLinks/Hint: Προαιρετικά εμφανίζει τους τίτλους από τα tiddler ως συνδέσμους +Settings/TitleLinks/No/Description: Να μην εμφανίζονται οι τίτλοι των tiddler ως σύνδεσμοι +Settings/TitleLinks/Yes/Description: Να εμφανίζονται οι τίττλοι των tiddler ως σύνδεσμοι Settings/ToolbarButtons/Caption: Κουμπιά γραμμής εργαλείων Settings/ToolbarButtons/Hint: Τυπική εμφάνιση κουμπιού γραμμής εργαλείων: Settings/ToolbarButtons/Icons/Description: Συμπεριέλαβε εικόνα Settings/ToolbarButtons/Text/Description: Συμπεριέλαβε κείμενο +Settings/ToolbarButtonStyle/Caption: Στυλ κουμπιών εργαλειοθήκης +Settings/ToolbarButtonStyle/Hint: Επιλέξτε το στυλ των κουμπιών της εργαλειοθήκης: +Settings/ToolbarButtonStyle/Styles/Borderless: Χωρίς περιθώρια +Settings/ToolbarButtonStyle/Styles/Boxed: Εγκιβωτισμένα +Settings/ToolbarButtonStyle/Styles/Rounded: Στρογγυλοποιημένα StoryView/Caption: Ιστορική όψη StoryView/Prompt: Τρέχουσα όψη: Theme/Caption: Θέμα Theme/Prompt: Τρέχον θέμα: TiddlerFields/Caption: Πεδία Tiddler -TiddlerFields/Hint: Αυτό είναι το πλήρες σύνολο από TiddlerFields που χρησιμοποιούνται σε αυτό το wiki (συμπεριλαμβανομένων των tiddlers συστήματος, αλλά εξαιρούνται τα σκιώδη tiddlers). +TiddlerFields/Hint: Αυτό είναι το πλήρες σύνολο από TiddlerFields που χρησιμοποιούνται σε αυτό το wiki (συμπεριλαμβανομένων των tiddler συστήματος, αλλά εξαιρούνται τα σκιώδη tiddler). Toolbars/Caption: Γραμμές εργαλείων +Toolbars/EditorToolbar/Caption: Εργαλειοθήκη επεξεργασίας +Toolbars/EditorToolbar/Hint: Επιλέξτε ποια κουμπιά θα εμφανίζονται στην εργαλειοθήκη επεξεργασίας. Σημειώστε πως μερικά κουμπιά θα εμφανίζονται μόνο όταν επεξεργάζεστε tiddler συγκεκριμένων τύπων. Μπορείτε να αλλάξετε την σειρά με σύρε και άσε Toolbars/EditToolbar/Caption: Γραμμή τροποποιήσεων -Toolbars/EditToolbar/Hint: Επιλέξτε ποια κουμπιά θα εμφανίζονται στα tiddlers που βρίσκονται σε κατάσταση τροποποίησης +Toolbars/EditToolbar/Hint: Επιλέξτε ποια κουμπιά θα εμφανίζονται στα tiddler που βρίσκονται σε κατάσταση τροποποίησης Toolbars/Hint: Επιλέξτε ποια κουμπιά της γραμμής εργαλείων θα εμφανίζονται Toolbars/PageControls/Caption: Γραμμή εργαλείων σελίδας Toolbars/PageControls/Hint: Επιλέξτε ποια κουμπιά θα εμφανίζονται στην γραμμή εργαλείων της κεντρικής σελίδας Toolbars/ViewToolbar/Caption: Εμφάνιση γραμμής εργαλείων -Toolbars/ViewToolbar/Hint: Επιλέξτε ποια κουμπιά θα εμφανίζονται για tiddlers σε κατάσταση προβολής +Toolbars/ViewToolbar/Hint: Επιλέξτε ποια κουμπιά θα εμφανίζονται για tiddler σε κατάσταση προβολής Tools/Download/Full/Caption: Λήψη του πλήρους wiki diff --git a/languages/el-GR/CoreReadMe.tid b/languages/el-GR/CoreReadMe.tid new file mode 100644 index 000000000..4000a51a5 --- /dev/null +++ b/languages/el-GR/CoreReadMe.tid @@ -0,0 +1,9 @@ +title: $:/core/readme + +This plugin contains TiddlyWiki's core components, comprising: +Αυτό το πρόσθετο περιέχει συστατικά του πυρήνα του TiddlyWiki, αποτελούμενα από: + +* Ενότητες κώδικα σε JavaScript +* Εικονίδια +* Πρότυπα που είναι αναγκαία στην δημιουργία του περιβάλλοντος διεπαφής χρήστη του TiddlyWiki's +* Μεταφράσεις στα αγγλικά (''en-GB'') των τοπικών αλφαριθμητικών που χρησιμοποιούνται από τον πυρήνα diff --git a/languages/el-GR/Docs/ModuleTypes.multids b/languages/el-GR/Docs/ModuleTypes.multids index 747ff71c6..c8be76bf7 100644 --- a/languages/el-GR/Docs/ModuleTypes.multids +++ b/languages/el-GR/Docs/ModuleTypes.multids @@ -1,19 +1,25 @@ title: $:/language/Docs/ModuleTypes/ +allfilteroperator: Ένας υπο-τελεστής για τον τελεστή φιλτραρίσματος ''all''. animation: Κινούμενη εικόνα που μπορεί να χρησιμοποιηθεί με το το RevealWidget. -command: Εντολές που μπορούν να εκτελεστούν εντός του Node.js. +bitmapeditoroperation: Μια λειτουργία του επεξεργαστή χαρτογραφικής εικόνας της εργαλειοθήκης. +command: Εντολές που μπορούν να εκτελεστούν εντός του Node.js. config: Δεδομένα προς εισαγωγή στο `$tw.config`. filteroperator: Ιδιαίτεροι τελεστές ή μέθοδοι φιλτραρίσματος. global: Καθολικά δεδομένα προς εισαγωγή στο `$tw`. +info: Δημοσιεύει πληροφορίες συστήματος μέσω του [[$:/temp/info-plugin]] ψευτο-πρόσθετου. isfilteroperator: Τελεστέοι για τον τελεστή φιλτραρίσματος ''is''. +library: Γενικός τύπος module για τα γενικού σκοπού JavaScript modules. macro: Ορισμοί JavaScript μακροεντολών. parser: Γραμματικοί αναλυτές (Parsers) για διάφορους τύπους περιεχομένων. saver: Μεθοδοι αποθήκευσης - διαχείριση διαφορετικών μεθόδων για την αποθήκευση αρχείων από το πρόγραμμα περιήγησης. startup: Λειτουργίες έναρξης. storyview: Ιστορική όψη - παραμετροποίηση της κινούμενης εικόνας και της συμπεριφοράς των πρόσθετων λίστας +texteditoroperation: Μια λειτουργία επεξεργασίας κειμένου της εργαλειοθήκης. tiddlerdeserializer: Μετατρέπει διάφορους τύπους περιεχομένου σε tiddlers. tiddlerfield: Καθορίζει την συμπεριφορά ενός μεμονωμένου πεδίου ενός tiddler. tiddlermethod: Προσθέτει μεθόδους στο `$tw.Tiddler` πρότυπο. +upgrader: Εφαρμόζει επεξεργασία αναβάθμισης στα tiddler κατά την διάρκεια μιας αναβάθμισης ή εισαγωγής. utils: Προσθέτει μεθόδους στο `$tw.utils`. utils-node: Προσθέτει εξειδικευμένες Node.js μεθόδους στο `$tw.utils`. widget: Πρόσθετα που ενθυλακώνουν το DOM απεικονίζουν και ανανεώνουν. diff --git a/languages/el-GR/Docs/PaletteColours.multids b/languages/el-GR/Docs/PaletteColours.multids index a98ffcc93..45653ca88 100644 --- a/languages/el-GR/Docs/PaletteColours.multids +++ b/languages/el-GR/Docs/PaletteColours.multids @@ -1,101 +1,105 @@ title: $:/language/Docs/PaletteColours/ -alert-background: Υπόβαθρο προειδοποίησης -alert-border: Περιθώριο προειδοποίησης +alert-background: Υπόβαθρο προειδοποίησης +alert-border: Περίγραμμα προειδοποίησης alert-highlight: Επισήμανση προειδοποίησης alert-muted-foreground: Βουβό προσκήνιο προειδοποίησης background: Γενικό υπόβαθρο -blockquote-bar: Πλαίσιο Blockquote -dirty-indicator: Ένδειξη μη αποθηκευμένων αλλαγών +blockquote-bar: Πλαίσιο Blockquote +button-background: Υπόβαθρο προεπιλεγμένου κουμπιού +button-border: Περίγραμμα προεπιλεγμένου κουμπιού +button-foreground: Χρώμα προεπιλεγμένου κουμπιού code-background: Υπόβαθρο κώδικα -code-border: Περιθώριο κώδικα +code-border: Περίγραμμα κώδικα code-foreground: Προσκήνιο κώδικα +dirty-indicator: Ένδειξη μη αποθηκευμένων αλλαγών download-background: Υπόβαθρο κουμπιού μεταφόρτωσης download-foreground: Προσκήνιο κουμπιού μεταφόρτωσης dragger-background: Υπόβαθρο Συρσίματος dragger-foreground: Προσκήνιο Συρσίματος -dropdown-background: Υπόβαθρο Απόθεσης -dropdown-border: Περιθώριο Απόθεσης -dropdown-tab-background-selected: Υπόβαθρο καρτέλας Απόθεσης για επιλεγμένες καρτέλες -dropdown-tab-background: Υπόβαθρο καρτέλας Απόθεσης +dropdown-background: Υπόβαθρο πτυσώμενου +dropdown-border: Περίγραμμα πτυσώμενου +dropdown-tab-background: Υπόβαθρο καρτέλας πτυσώμενου +dropdown-tab-background-selected: Υπόβαθρο καρτέλας πτυσώμενου για επιλεγμένες καρτέλες dropzone-background: Υπόβαθρο ζώνης ρίψης +external-link-background: Υπόβαθρο εξωτερικού δεσμού external-link-background-hover: Υπόβαθρο εξωτερικού δεσμού σε αιώρηση external-link-background-visited: Υπόβαθρο εξωτερικού δεσμού που έγινε ήδη επίσκεψη -external-link-background: Υπόβαθρο εξωτερικού δεσμού +external-link-foreground: Προσκήνιο εξωτερικού δεσμού external-link-foreground-hover: Προσκήνιο εξωτερικού δεσμού σε αιώρηση external-link-foreground-visited: Προσκήνιο εξωτερικού δεσμού που έγινε ήδη επίσκεψη -external-link-foreground: Προσκήνιο εξωτερικού δεσμού foreground: Γενικό προσκήνιο message-background: Υπόβαθρο πλαισίου μηνύματος -message-border: Περιθώριο πλαισίου μηνύματος +message-border: Περίγραμμα πλαισίου μηνύματος message-foreground: Προσκήνιο πλαισίου μηνύματος modal-backdrop: Σκηνικό Αποκλειστικό modal-background: Υπόβαθρο Αποκλειστικό -modal-border: Περιθώριο Αποκλειστικό +modal-border: Περίγραμμα Αποκλειστικό modal-footer-background: Υπόβαθρο υποσέλιδου Αποκλειστικό -modal-footer-border: Περιθώριο υποσέλιδου Αποκλειστικό -modal-header-border: Περιθώριο κεφαλίδας Αποκλειστικό +modal-footer-border: Περίγραμμα υποσέλιδου Αποκλειστικό +modal-header-border: Περίγραμμα κεφαλίδας Αποκλειστικό muted-foreground: Προσκήνιο γενικό βουβό notification-background: Υπόβαθρο ειδοποίησης -notification-border: Περιθώριο ειδοποίησης +notification-border: Περίγραμμα ειδοποίησης page-background: Υπόβαθρο Σελίδας pre-background: Υπόβαθρο μορφοποιημένου κώδικα -pre-border: Περιθώριο μορφοποιημένου κώδικα +pre-border: Περίγραμμα μορφοποιημένου κώδικα primary: Γενικά στοιχειώδη sidebar-button-foreground: Προσκήνιο κουμπιού πλευρικής γραμμής -sidebar-controls-foreground-hover: Προσκήνιο αντικειμένων ελέγχου πλευρικής γραμμής σε αιώρηση sidebar-controls-foreground: Προσκήνιο αντικειμένων ελέγχου Πλευρικής γραμμής -sidebar-foreground-shadow: Σκιά προσκήνιου πλευρικής γραμμής +sidebar-controls-foreground-hover: Προσκήνιο αντικειμένων ελέγχου πλευρικής γραμμής σε αιώρηση sidebar-foreground: Προσκήνιο πλευρικής γραμμής -sidebar-muted-foreground-hover: Προσκήνιο σε αιώρηση για βουβή πλευρική γραμμή +sidebar-foreground-shadow: Σκιά προσκήνιου πλευρικής γραμμής sidebar-muted-foreground: Προσκήνιο βουβής πλευρικής γραμμής -sidebar-tab-background-selected: Υπόβαθρο καρτέλας πλευρικής γραμμής για επιλεγμένες καρτέλες +sidebar-muted-foreground-hover: Προσκήνιο σε αιώρηση για βουβή πλευρική γραμμή sidebar-tab-background: Υπόβαθρο καρτέλας πλευρικής γραμμής -sidebar-tab-border-selected: Περιθώριο καρτέλας πλευρικής γραμμής για επιλεγμένες καρτέλες -sidebar-tab-border: Περιθώριο καρτέλας πλευρικής γραμμής +sidebar-tab-background-selected: Υπόβαθρο καρτέλας πλευρικής γραμμής για επιλεγμένες καρτέλες +sidebar-tab-border: Περίγραμμα καρτέλας πλευρικής γραμμής +sidebar-tab-border-selected: Περίγραμμα καρτέλας πλευρικής γραμμής για επιλεγμένες καρτέλες sidebar-tab-divider: Διαχωριστής καρτελών πλευρικής γραμμής -sidebar-tab-foreground-selected: Προσκήνιο καρτέλας πλευρικής γραμμής για επιλεγμένες γραμμές sidebar-tab-foreground: Προσκήνιο καρτέλας πλευρικής γραμμής -sidebar-tiddler-link-foreground-hover: Προσκήνιο δεσμού tiddler σε πλευρική γραμμή εν αιώρηση +sidebar-tab-foreground-selected: Προσκήνιο καρτέλας πλευρικής γραμμής για επιλεγμένες γραμμές sidebar-tiddler-link-foreground: Προσκήνιο tiddler δεσμού σε πλευρική γραμμή -static-alert-foreground: Προσκήνιο στατικής προειδοποίησης -tab-background-selected: Υπόβαθρο καρτέλας για επιλεγμένες καρτέλες +sidebar-tiddler-link-foreground-hover: Προσκήνιο δεσμού tiddler σε πλευρική γραμμή εν αιώρηση +site-title-foreground: Χρώματα τίτλου ιστότοπου +static-alert-foreground: Προσκήνιο στατικής προειδοποίησης tab-background: Υπόβαθρο καρτέλας -tab-border-selected: Περιθώριο καρτέλας για επιλεγμένες καρτέλες -tab-border: Περιθώριο καρτέλας +tab-background-selected: Υπόβαθρο καρτέλας για επιλεγμένες καρτέλες +tab-border: Περίγραμμα καρτέλας +tab-border-selected: Περίγραμμα καρτέλας για επιλεγμένες καρτέλες tab-divider: Διαχωριστής καρτελών -tab-foreground-selected: Προσκήνιο καρτέλας για επιλεγμένες καρτέλες tab-foreground: Προσκήνιο καρτέλας -table-border: Περιθώριο καρτέλας +tab-foreground-selected: Προσκήνιο καρτέλας για επιλεγμένες καρτέλες +table-border: Περίγραμμα καρτέλας table-footer-background: Υπόβαθρο υπότιτλου σε πίνακα table-header-background: Υπόβαθρο επικεφαλίδας πίνακα tag-background: Υπόβαθρο ετικέτας tag-foreground: Προσκήνιο ετικέτας tiddler-background: Υπόβαθρο Tiddler -tiddler-border: Περιθώριο Tiddler +tiddler-border: Περίγραμμα Tiddler +tiddler-controls-foreground: Προσκήνιο Tiddler κουμπιών tiddler-controls-foreground-hover: Προσκήνιο κουμπιών Tiddler σε αιώρηση tiddler-controls-foreground-selected: Προσκήνιο Tiddler κουμπιών για επιλεγμένα κουμπιά -tiddler-controls-foreground: Προσκήνιο Tiddler κουμπιών -tiddler-editor-background: Υπόβαθρο επεξεργαστή Tiddler -tiddler-editor-border-image: Εικόνα περιθωρίου επεξεργαστή Tiddler -tiddler-editor-border: Περιθώριο επεξεργαστή Tiddler +tiddler-editor-background: Υπόβαθρο επεξεργαστή Tiddler +tiddler-editor-border: Περίγραμμα επεξεργαστή Tiddler +tiddler-editor-border-image: Εικόνα περιγράματος επεξεργαστή Tiddler tiddler-editor-fields-even: Υπόβαθρο επεξεργαστή Tiddler για ζυγά πεδία tiddler-editor-fields-odd: Υπόβαθρο επεξεργαστή Tiddler για μονά πεδία -tiddler-info-background: Υπόβαθρο πάνελ πληροφοριών του Tiddler -tiddler-info-border: Περιθώριο πάνελ πληροφοριών του Tiddler -tiddler-info-tab-background: Υπόβαθρο καρτέλας πάνελ πληροφοριών του Tiddler -tiddler-link-background: Υπόβαθρο δεσμού Tiddler -tiddler-link-foreground: Προσκήνιο δεσμού Tiddler -tiddler-subtitle-foreground: Προσκήνιο δευτερεύοντος τίτλου Tiddler -tiddler-title-foreground: Προσκήνιο τίτλου Tiddler -toolbar-new-button: Προσκήνιο κουμπιού 'νέο tiddler' +tiddler-info-background: Υπόβαθρο πάνελ πληροφοριών του Tiddler +tiddler-info-border: Περίγραμμα πάνελ πληροφοριών του Tiddler +tiddler-info-tab-background: Υπόβαθρο καρτέλας πάνελ πληροφοριών του Tiddler +tiddler-link-background: Υπόβαθρο δεσμού Tiddler +tiddler-link-foreground: Προσκήνιο δεσμού Tiddler +tiddler-subtitle-foreground: Προσκήνιο δευτερεύοντος τίτλου Tiddler +tiddler-title-foreground: Προσκήνιο τίτλου Tiddler +toolbar-cancel-button: Προσκήνιο κουμπιού 'άκυρο' +toolbar-close-button: Προσκήνιο κουμπιού 'κλείσε' +toolbar-delete-button: Προσκήνιο κουμπιού 'διέγραψε' +toolbar-done-button: Προσκήνιου κουμπιού 'ολοκλήρωση' +toolbar-edit-button: Προσκήνιο κουμπιού 'επεξεργασία' +toolbar-info-button: Προσκήνιο κουμπιού 'πληροφορίες' +toolbar-new-button: Προσκήνιο κουμπιού 'νέο tiddler' toolbar-options-button: Προσκήνιο κουμπιού 'επιλογές' -toolbar-save-button: Προσκήνιο κουμπιού 'αποθήκευσης' -toolbar-info-button: Προσκήνιο κουμπιού 'πληροφορίες' -toolbar-edit-button: Προσκήνιο κουμπιού 'επεξεργασία' -toolbar-close-button: Προσκήνιο κουμπιού 'κλείσε' -toolbar-delete-button: Προσκήνιο κουμπιού 'διέγραψε' -toolbar-cancel-button: Προσκήνιο κουμπιού 'άκυρο' -toolbar-done-button: Προσκήνιου κουμπιού 'ολοκλήρωση' +toolbar-save-button: Προσκήνιο κουμπιού 'αποθήκευσης' untagged-background: Υπόβαθρο χαπιού χωρίς ετικέτα very-muted-foreground: Πολύ βουβό προσκήνιο diff --git a/languages/el-GR/EditTemplate.multids b/languages/el-GR/EditTemplate.multids index b95ca81f8..a996d6b14 100644 --- a/languages/el-GR/EditTemplate.multids +++ b/languages/el-GR/EditTemplate.multids @@ -1,14 +1,28 @@ title: $:/language/EditTemplate/ -Body/External/Hint: Αυτό είναι ένα εξωτερικό tiddler αποθηκευμένο εκτός του κύριου TiddlyWiki αρχείου. Μπορείτε να τροποποιήσετε τις ετικέτες και τα πεδία αλλά δεν μπορείτε να τροποποιήσετε άμεσα το ίδιο το περιεχόμενο του +Body/External/Hint: Αυτό το tiddler εμφανίζει περιεχόμενο που είναι αποθηκευμένο εκτός του TiddlyWiki αρχείου. Μπορείτε να τροποποιήσετε τις ετικέτες και τα πεδία αλλά δεν μπορείτε να τροποποιήσετε άμεσα το ίδιο το περιεχόμενο του Body/Placeholder: Πληκτρολογήστε το κείμενο για αυτό το tiddler +Body/Preview/Type/Output: αποτέλεσμα +Field/Remove/Caption: αφαίρεσε το πεδίο +Field/Remove/Hint: Αφαιρεί το πεδίο Fields/Add/Button: προσθήκη +Fields/Add/Dropdown/System: Πεδία του συστήματος +Fields/Add/Dropdown/User: Πεδία του χρήστη Fields/Add/Name/Placeholder: όνομα πεδίου Fields/Add/Prompt: Πρόσθεσε ένα νέο πεδίο: Fields/Add/Value/Placeholder: τιμή πεδίου -Shadow/Warning: Αυτό είναι ένα σκιώδες tiddler. Οποιεσδήποτε αλλαγές θα παρακάμψουν την τυπική έκδοση -Shadow/OverriddenWarning: Αυτό είναι ένα τροποποιημένο σκιώδες tiddler. Μπορείτε να ανακαλέσετε την τυπική έκδοση του διαγράφοντας αυτό το tiddler +Shadow/OverriddenWarning: Αυτό είναι ένα τροποποιημένο σκιώδες tiddler. Μπορείτε να ανακαλέσετε την προκαθορισμένη εκδοχή σε ένα πρόσθετο <<pluginLink>> διαγράφοντας αυτό το tiddler +Shadow/Warning: Αυτό είναι ένα σκιώδες tiddler. Οποιεσδήποτε αλλαγές κάνετε θα παρακάμψουν την προκαθορισμένη εκδοχή του πρόσθετου <<pluginLink>> Tags/Add/Button: προσθήκη Tags/Add/Placeholder: όνομα ετικέτας +Tags/Dropdown/Caption: λίστα ετικετών +Tags/Dropdown/Hint: Εμφανίζει την λίστα ετικετών +Title/BadCharacterWarning: Προειδοποίηση: αποφύγετε την χρήση των χαρακτήρων <<bad-chars>> στους τίτλους των tiddler +Title/Exists/Prompt: Το tiddler προορισμού υπάρχει ήδη +Title/Relink/Prompt: Ενημερώνει το ''<$text text=<<fromTitle>>/>'' σε ''<$text text=<<toTitle>>/>'' στα πεδία //tags// και //list// των υπολοίπων tiddler +Type/Delete/Caption: Διέγραψε τον τύπο περιεχομένου +Type/Delete/Hint: Διαγράφει το content type +Type/Dropdown/Caption: λίστα τύπων περιεχομένου +Type/Dropdown/Hint: Εμφανίζει λίστα με τύπους περιεχομένου Type/Placeholder: τύπος περιεχομένου Type/Prompt: Τύπος: diff --git a/languages/el-GR/Exporters.multids b/languages/el-GR/Exporters.multids new file mode 100644 index 000000000..97e290673 --- /dev/null +++ b/languages/el-GR/Exporters.multids @@ -0,0 +1,6 @@ +title: $:/language/Exporters/ + +CsvFile: CSV αρχείο +JsonFile: JSON αρχείο +StaticRiver: Στατική HTML +TidFile: ".tid" αρχείο diff --git a/languages/el-GR/Fields.multids b/languages/el-GR/Fields.multids index 91baed93d..6629dda86 100644 --- a/languages/el-GR/Fields.multids +++ b/languages/el-GR/Fields.multids @@ -1,31 +1,31 @@ title: $:/language/Docs/Fields/ _canonical_uri: Το πλήρες URI ενός εξωτερικού tiddler εικόνας -bag: Το όνομα της τσάντας από όπου το tiddler προέρχεται +bag: Το όνομα του σακιδίου από όπου προέρχεται το tiddler caption: Το κείμενο που θα εμφανίζεται σε μιά καρτέλα ή ένα κουμπί color: Η CSS τιμή χρώματος που σχετίζεται με ένα tiddler component: Το όνομα του συστατικού που είναι υπεύθυνο για ένα [[tiddler προειδοποίησης|AlertMechanism]] -current-tiddler: Χρησιμοποιείται για την προσωρινή αποθήκευση του κορυφαίου tiddler σε μία [[ιστορική λίστα|HistoryMechanism]] created: Η ημερομηνία που το tiddler δημιουργήθηκε creator: Το όνομα του προσώπου που δημιούργησε το tiddler +current-tiddler: Χρησιμοποιείται για την προσωρινή αποθήκευση του κορυφαίου tiddler σε μία [[ιστορική λίστα|HistoryMechanism]] dependents: Για ένα πρόσθετο, λίστα με τους τίτλους από τα εξαρτώμενα πρόσθετα description: Το κείμενο που περιγράφει ένα πρόσθετο, ή έναν αποκλειστικό διάλογο draft.of: Για πρόχειρα tiddlers, περιέχει τον τίτλο από το tiddler για το οποίο αυτό είναι μια πρόχειρη έκδοση draft.title: Για πρόχειρα tiddlers, περιέχει τον προτεινόμενο νέο τίτλο από το tiddler footer: Το κείμενο του υποσέλιδου για έναν οδηγό hack-to-give-us-something-to-compare-against: Ένα προσωρινό πεδίο που χρησιμοποιείται στο [[$:/core/templates/static.content]] -icon: Ο τίτλος από το tiddler που περιέχει το εικονίδιο που σχετίζεται με ένα tiddler -library: Αν οριστεί σε "yes" σημαίνει πως το tiddler θα πρέπει να αποθηκευτεί ως μια βιβλιοθήκη της JavaScript +icon: Ο τίτλος του tiddler που περιέχει το εικονίδιο που σχετίζεται με ένα tiddler +library: Αν οριστεί σε "yes" υποδεικνύει πως το tiddler θα πρέπει να αποθηκευτεί ως μια βιβλιοθήκη της JavaScript list: Μια διατεταγμένη λίστα από τίτλους tiddler που σχετίζεται με ένα tiddler -list-before: Αν οριστεί, ο τίτλος από ένα tiddler όπου πριν από αυτό το παρόν tiddler πρέπει να προστεθεί στην διατεταγμένη λίστα των tiddler τίτλων, ή στην αρχή της λίστας αν αυτό το πεδίο είναι παρόν αλλά κενό list-after: Αν οριστεί, ο τίτλος από το tiddler μετά τον οποίο το παρόν tiddler θα πρέπει να προστεθεί στην διατεταγμένη λίστα tiddler τίτλων +list-before: Αν οριστεί, ο τίτλος από ένα tiddler όπου πριν από αυτό το παρόν tiddler πρέπει να προστεθεί στην διατεταγμένη λίστα των tiddler τίτλων, ή στην αρχή της λίστας αν αυτό το πεδίο είναι παρόν αλλά κενό modified: Η ημερομηνία και ώρα κατά την οποία ένα tiddler τροποποιήθηκε για τελευταία φορά -modifier: Ο τίτλος του tiddler που σχετίζεται με το τελευταίο πρόσωπο που τροποποιησε το tiddler +modifier: Ο τίτλος του tiddler που σχετίζεται με το τελευταίο πρόσωπο που τροποποίησε το tiddler name: Το ανθρωπίνως αναγνώσιμο όνομα που σχετίζεται με ένα tiddler πρόσθετου plugin-priority: Μια αριθμητική τιμή που καθορίζει την προτεραιότητα ενός tiddler πρόσθετου plugin-type: Ο τύπος του πρόσθετου σε ένα tiddler πρόσθετου -revision: Η αναθεώρηση από το tiddler που κρατείται στον εξυπηρετητή released: Ημερομηνία μιας έκδοσης του TiddlyWiki +revision: Η αναθεώρηση από το tiddler που κρατείται στον εξυπηρετητή source: Το πηγαίο URL που σχετίζεται με ένα tiddler subtitle: Το κείμενο στον υπότιτλο για έναν οδηγό tags: Μια λίστα από ετικέτες που σχετίζονται με ένα tiddler diff --git a/languages/el-GR/Filters.multids b/languages/el-GR/Filters.multids index ca5b7299f..a56c9d018 100644 --- a/languages/el-GR/Filters.multids +++ b/languages/el-GR/Filters.multids @@ -1,12 +1,15 @@ title: $:/language/Filters/ -AllTiddlers: Όλα, εκτός των tiddler συστήματος -RecentTiddlers: Πρόσφατα τροποποιημένα tiddlers AllTags: Όλες οι ετικέτες, εκτός των ετικετών συστήματος -Missing: tiddlers που λείπουν -Drafts: Πρόχειρα tiddlers -Orphans: Ορφανά tiddlers -SystemTiddlers: tiddlers συστήματος -ShadowTiddlers: σκιώδη tiddlers -OverriddenShadowTiddlers: Σκιώδη tiddlers που έχουν παρακαμφθεί +AllTiddlers: Όλα, εκτός των tiddler συστήματος +Drafts: Πρόχειρα tiddler +Missing: tiddler που λείπουν +Orphans: Ορφανά tiddler +OverriddenShadowTiddlers: Σκιώδη tiddler που έχουν παρακαμφθεί +RecentSystemTiddlers: Πρόσφατα τροποποιημένα tiddler, συμπεριλαμβανομένων και των tiddler του συστήματος +RecentTiddlers: Πρόσφατα τροποποιημένα tiddler +ShadowTiddlers: σκιώδη tiddler +StoryList: Tiddler στην ιστορική ροή, εξαιρώντας τα <$text text="$:/AdvancedSearch"/> SystemTags: Ετικέτες συστήματος +SystemTiddlers: tiddler συστήματος +TypedTiddlers: tiddler χωρίς Wiki-γραφή diff --git a/languages/el-GR/GettingStarted.tid b/languages/el-GR/GettingStarted.tid index 111369ba8..cfd13a06d 100644 --- a/languages/el-GR/GettingStarted.tid +++ b/languages/el-GR/GettingStarted.tid @@ -1,25 +1,18 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ -Καλώς ήρθατε στο ~TiddlyWiki, το μη-γραμμικό προσωπικό σημειωματάριο του ιστού. +Καλώς ήρθατε στο ~TiddlyWiki, και στην ~TiddlyWiki κοινότητα -Για να ξεκινήσετε, πρώτα επαληθεύστε ότι μπορείτε να αποθηκεύσετε τις αλλαγές σας με επιτυχία - δείτε στο http://tiddlywiki.com/ για περισσότερες οδηγίες. +Πριν ξεκινήσετε να διοχετεύετε σημαντικές πληροφορίες στο ~TiddlyWiki είναι σημαντικό να σιγουρευτείτε ότι μπορείτε να αποθηκεύσετε τις αλλαγές σας με αξιοπιστία. Δείτε στο https://tiddlywiki.com/#GettingStarted για λεπτομέρειες -Έπειτα μπορείτε: - -* Δημιουργήσετε νέα tiddlers χρησιμοποιώντας το 'συν' κουμπί στην πλευρική γραμμή εργαλείων -* Επισκεφτείτε τον [[πίνακα ελέγχου|$:/ControlPanel]] χρησιμοποιώντας το κουμπί 'γρανάζι' στην πλευρική γραμμή εργαλείων για να παραμετροποιήσετε το wiki σας -** Να σταματήσετε την εμφάνιση αυτού του μηνύματος τροποποιώντας την επιλογή προκαθορισμένα tiddlers κάτω από την καρτέλα ''Βασικά'' -* Αποθηκεύσετε τις αλλαγές χρησιμοποιώντας το κουμπί της 'αποθήκευσης' στην πλευρική γραμμή εργαλείων -* Να μάθετε περισσότερα σχετικά με την γλώσσα [[WikiText|http://tiddlywiki.com/static/WikiText.html]] - -!! Ρυθμίστε αυτή την ~TiddlyWiki +!! Ρυθμίστε αυτό το ~TiddlyWiki <div class="tc-control-panel"> |<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> | |<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> | -|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// | +|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// | </div> -See the [[control panel|$:/ControlPanel]] for more options. + +Δείτε στον [[πίνακα ελέγχου|$:/ControlPanel]] για περισσότερες επιλογές. diff --git a/languages/el-GR/Help/build.tid b/languages/el-GR/Help/build.tid index 69b4e623d..83f8ee86b 100644 --- a/languages/el-GR/Help/build.tid +++ b/languages/el-GR/Help/build.tid @@ -1,11 +1,11 @@ title: $:/language/Help/build -description: Automatically run configured commands +description: Αυτόματα εκτελεί προκαθορισμένες εντολές -Χτίζει τους προκαθορισμένους προορισμούς για το τρέχον wiki. Αν δεν έχει προκαθοριστεί προορισμός τότε όλοι οι διαθέσιμοι προορισμοί θα χτιστούν. +Χτίζει τους προκαθορισμένους προορισμούς χτισίματος για το τρέχον wiki. Αν δεν έχει καθοριστεί προορισμός χτισίματος τότε όλοι οι διαθέσιμοι προορισμοί θα χτιστούν. ``` --build <προορισμός> [<προορισμός> ...] ``` -Οι προορισμοί ορίζονται στο `tiddlywiki.info` αρχείο ενός wiki φακέλου. +Οι προορισμοί χτισίματος ορίζονται στο `tiddlywiki.info` αρχείο ενός wiki φακέλου. diff --git a/languages/el-GR/Help/default.tid b/languages/el-GR/Help/default.tid index 38bab4e3e..e068d1ac2 100644 --- a/languages/el-GR/Help/default.tid +++ b/languages/el-GR/Help/default.tid @@ -1,4 +1,5 @@ title: $:/language/Help/default +description: \define commandTitle() $:/language/Help/$(command)$ @@ -15,7 +16,7 @@ $:/language/Help/$(command)$ </$list> </ul> -Για αναλυτική βοήθεια για κάποια εντολή: +Για να βρείτε αναλυτική βοήθεια για μία συγκεκριμένη εντολή: ``` tiddlywiki --help <εντολή> diff --git a/languages/el-GR/Help/editions.tid b/languages/el-GR/Help/editions.tid new file mode 100644 index 000000000..c42a353c9 --- /dev/null +++ b/languages/el-GR/Help/editions.tid @@ -0,0 +1,8 @@ +title: $:/language/Help/editions +description: Εμφανίζει τις διαθέσιμες εκδόσεις του TiddlyWiki + +Εμφανίζει λίστα με τα ονόματα και τις περιγραφές των διαθέσιμων εκδόσεων. Μπορείτε να δημιουργήσετε ένα νέο wiki μιας συγκεκριμένης έκδοσης με την `--init` εντολή. + +``` +--editions +``` diff --git a/languages/el-GR/Help/fetch.tid b/languages/el-GR/Help/fetch.tid new file mode 100644 index 000000000..a4d412986 --- /dev/null +++ b/languages/el-GR/Help/fetch.tid @@ -0,0 +1,38 @@ +title: $:/language/Help/fetch +description: Ανακαλεί tiddler από το wiki μέσω URL + +Φέρνει ένα ή περισσότερα αρχεία μέσω HTTP/HTTPS, και εισάγει τα tiddler που ταιριάζουν σε ένα φίλτρο, προαιρετικά μετασχηματίζει τους εισερχόμενους τίτλους. + +``` +--fetch file <url> <φίλτρο-εισαγωγής> <φίλτρο-μετασχηματισμού> +--fetch files <url-filter> <φίλτρο-εισαγωγής> <φίλτρο-μετασχηματισμού> +--fetch raw-file <url> <φίλτρο-μετασχηματισμού> +--fetch raw-files <url-filter> <φίλτρο-μετασχηματισμού> +``` + +Οι "file" και "files" εκδοχές παίρνουν τα καθορισμένα αρχεία και προσπαθούν να εισάγουν τα tiddler σε αυτά (τελείται η ίδια επεξεργασία με αυτήν που θα γινόταν αν σέρναμε τα αρχεία μέσα στο παράθυρο του προγράμματος περιήγησης). Οι "raw-file" και "raw-files" εκδοχές παίρνουν τα καθορισμένα αρχεία και έπειτα αποθηκεύουν τα ακατέργαστα δεδομένα τους σε tiddler, χωρίς να εφαρμόσουν την λογική της εισαγωγής. + +Με τις "file" και "raw-file" εκδοχές ανακαλείτε μόνο ένα μεμονωμένο αρχείο και η πρώτη παράμετρος είναι το URL του αρχείου που θα διαβαστεί. + +Με τις "files" και "raw-files" εκδοχές, ανακαλούνται πολλαπλά αρχεία και η πρώτη παράμετρος είναι ένα φίλτρο που αποδίδει μια λίστα από URL των αρχείων που θα ανακληθούν. Για παράδειγμα, αν θεωρήσουμε ένα σύνολο από tiddler που έχουν ετικέτα "remote-server" τα οποία έχουν ένα πεδίο "url" το φίλτρο `[tag[remote-server]get[url]]` θα επιστρέψει όλα τα διαθέσιμα URL. + +Για τις "file" και "files" εκδοχές, η παράμετρος `<iφίλτρο-εισαγωγής>` καθορίζει ένα φίλτρο που προσδιορίζει το ποια tiddler θα εισαχθούν. Αν δεν οριστεί τότε έχει προκαθορισμένη τιμή `[all[tiddlers]]`. + +Για όλες τις εκδοχές η παράμετρος `<φίλτρο-μετασχηματισμού>` καθορίζει ένα προαιρετικό φίλτρο που μετασχηματίζει τους τίτλους των εισηγμένων tiddler. Για παράδειγμα , `[addprefix[$:/myimports/]]` θα προσθέσει το πρόθεμα `$:/myimports/` σε κάθε τίτλο. + +Αν πριν την `--fetch` εντολή υπάρχει η `--verbose` τότε θα εμφανίσει πληροφορίες σχετικά με την πρόοδο κατά την εισαγωγή. + +Σημειώστε ότι το TiddlyWiki δεν θα ανακαλέσει μια παλαιότερη έκδοση ενός ήδη φορτωμένου πρόσθετου. + +Το ακόλουθο παράδειγμα ανακαλεί όλα τα μη-συστεμικά tiddlers από το https://tiddlywiki.com και τα αποθηκεύει σε ένα JSON αρχείο: + +``` +tiddlywiki --verbose --fetch file "https://tiddlywiki.com/" "[!is[system]]" "" --rendertiddler "$:/core/templates/exporters/JsonFile" output.json text/plain "" exportFilter "[!is[system]]" +``` + +Το ακόλουθο παράδειγμα ανακαλεί το "favicon" αρχείο από το tiddlywiki.com και το αποθηκεύει σε ένα αρχείο με όνομα "output.ico". Σημειώστε ότι το ενδιάμεσο tiddler "Icon Tiddler" βρίσκεται μέσα σε εισαγωγικά στην "--fetch" εντολή επειδή χρησιμοποιείται ως φίλτρο μετασχηματισμού προκειμένου να αντικαταστήσει τον προκαθορισμένο τίτλο, ενώ δεν υπάρχουν εισαγωγικά στην εντολή "--savetiddler" επειδή χρησιμοποιείται απευθείας ως τίτλος. + +``` +tiddlywiki --verbose --fetch raw-file "https://tiddlywiki.com/favicon.ico" "[[Icon Tiddler]]" --savetiddler "Icon Tiddler" output.ico +``` + diff --git a/languages/el-GR/Help/help.tid b/languages/el-GR/Help/help.tid index 0356af3cb..e11385e0a 100644 --- a/languages/el-GR/Help/help.tid +++ b/languages/el-GR/Help/help.tid @@ -1,10 +1,10 @@ title: $:/language/Help/help -description: Εμφανίζει κείμενο βοήθειας για τις εντολές του TiddlyWiki +description: Εμφανίζει κείμενο βοήθειας για τις εντολές του TiddlyWiki Εμφανίζει βοηθητικό κείμενο για μία εντολή: ``` ---help [<command>] +--help [<όνομα εντολής>] ``` Αν δεν οριστεί όνομα εντολής, τότε εμφανίζει μια λίστα με τις διαθέσιμες εντολές. diff --git a/languages/el-GR/Help/import.tid b/languages/el-GR/Help/import.tid new file mode 100644 index 000000000..d0f3120ee --- /dev/null +++ b/languages/el-GR/Help/import.tid @@ -0,0 +1,24 @@ +title: $:/language/Help/import +description: Εισάγει tiddler από ένα αρχείο + +Εισάγει tiddler από 2.x.x TiddlyWiki αρχεία (`.html`), `.tiddler`, `.tid`, `.json` ή άλλα αρχεία. Σημειώστε πως η παράμετρος deserializer είναι υποχρεωτική, σε αντίθεση με την εντολή load όπου εκεί συνεπάγεται από την κατάληξη του ονόματος του αρχείου. + +``` +--import <filepath> <deserializer> [<τίτλος>] [<κωδικοποίηση>] +``` + +Οι διαθέσιμοι deserializers στον πυρήνα περιλαμβάνουν: + +* application/javascript +* application/json +* application/x-tiddler +* application/x-tiddler-html-div +* application/x-tiddlers +* text/html +* text/plain + +Ο τίτλος των εισαγόμενων tiddler έχει ως προκαθορισμένη τιμή το όνομα του αρχείου. + +Η κωδικοποίηση έχει ως προκαθορισμένη τιμή την "utf8", αλλά σε περίπτωση εισαγωγής δυαδικών αρχείων μπορεί να είναι "base64" . + +Σημειώστε ότι το TiddlyWiki δεν θα εισάγει παλαιότερη έκδοση πρόσθετου σε ένα πρόσθετο που έχει ήδη φορτωθεί. diff --git a/languages/el-GR/Help/load.tid b/languages/el-GR/Help/load.tid index 34d7799c5..64eb0f7f0 100644 --- a/languages/el-GR/Help/load.tid +++ b/languages/el-GR/Help/load.tid @@ -5,6 +5,7 @@ description: Φόρτωσε τα tiddlers από ένα αρχείο ``` --load <διαδρομή στο αρχείο> +--load <διαδρομή σε φάκελο> ``` Η φόρτωση tiddlers από ένα κρυπτογραφημένο TiddlyWiki προαπαιτεί να έχετε πρώτα καθορίσει το συνθηματικό με την εντολή συνθηματικού. Για παράδειγμα: diff --git a/languages/el-GR/Help/notfound.tid b/languages/el-GR/Help/notfound.tid index ccf078b93..fa08a1c8a 100644 --- a/languages/el-GR/Help/notfound.tid +++ b/languages/el-GR/Help/notfound.tid @@ -1,3 +1,4 @@ title: $:/language/Help/notfound +description: Δεν βρέθηκε αντίστοιχη καταχώριση στην βοήθεια \ No newline at end of file diff --git a/languages/el-GR/Help/output.tid b/languages/el-GR/Help/output.tid index ab7c52bb0..afe0feada 100644 --- a/languages/el-GR/Help/output.tid +++ b/languages/el-GR/Help/output.tid @@ -7,4 +7,4 @@ description: Καθορίζει τον βασικό φάκελο εξόδου γ --output <διαδρομή προς φάκελο> ``` -Αν η προσδιορισμένη διαδρομή προς τον φάκελο είναι σχετική τότε εφαρμόζεται με βάση το τρέχον φάκελο εργασίας. +Αν η προσδιορισμένη διαδρομή προς τον φάκελο είναι σχετική τότε εφαρμόζεται με βάση το τρέχον φάκελο εργασίας. Για παράδειγμα η `--ouput .` ορίζει ως φάκελο εξόδου το τρέχον φάκελο εργασίας. diff --git a/languages/el-GR/Help/render.tid b/languages/el-GR/Help/render.tid new file mode 100644 index 000000000..4e889f48e --- /dev/null +++ b/languages/el-GR/Help/render.tid @@ -0,0 +1,34 @@ +title: $:/language/Help/render +description: Απεικονίζει μεμονωμένα tiddler σε αρχεία + +Απεικονίζει μεμονωμένα tiddler και αποθηκεύει τα αποτελέσματα στα καθορισμένα αρχεία. + +Προαιρετικά μπορεί να οριστεί ο τίτλος ενός πρότυπου tiddler, όπου στην περίπτωση αυτή το πρότυπο tiddler απεικονίζεται έχοντας στην μεταβλητή "currentTiddler" θέσει ως τιμή τον τίτλο του τίτλου που απεικονίζεται. + +Επίσης μπορεί να οριστούν προαιρετικά το όνομα και η τιμή για μία επιπρόσθετη μεταβλητή. + +``` +--render <φίλτρο-tiddler> [<φίλτρο-όνομα-αρχείου>] [<τύπος-απεικόνισης>] [<πρότυπο>] [<όνομα>] [<τιμή>] +``` + +* ''φίλτρο-tiddler'': Φίλτρο που επιλέγει τα tiddler που θα απεικονιστούν +* ''φίλτρο-όνομα-αρχείου'': Προαιρετικό φίλτρο που μετασχηματίζει τους τίτλους των tiddler σε διαδρομές. Αν παραληφθεί η προκαθορισμένη του τιμή είναι `[is[tiddler]addsuffix[.html]]`, η οποία χρησιμοποιεί τον τίτλο του tiddler χωρίς αλλαγές ως όνομα αρχείου +* ''πρότυπο'': Προαιρετικό πρότυπο μέσο του οποίου γίνεται η απεικόνιση για κάθε ένα tiddler +* ''τύπος-απεικόνισης'': Προαιρετικά ο τύπος απεικόνισης: `text/html` (ο προκαθορισμένος) επιστρέφει το πλήρες HTML κείμενο ενώ ο τύπος `text/plain` απλώς επιστρέφει το περιεχόμενο κείμενο (δηλ. αγνοεί τις HTML ετικέτες και τα λοιπά μη εκτυπώσιμα στοιχεία) +* ''όνομα'': Όνομα μιας προαιρετικής μεταβλητής +* ''τιμή'': Τιμή μιας προαιρετικής μεταβλητής + +Η προκαθορισμένη συμπεριφορά είναι το όνομα αρχείου να αναλύεται σχετικά ως προς τον υπο-φάκελο `output` του φακέλου της έκδοσης. Η εντολή `--output` μπορεί να χρησιμοποιηθεί για να οδηγήσει την έξοδο σε διαφορετικό φάκελο. + +Παρατηρήσεις: + +* Ο φάκελος εξόδου δεν καθαρίζεται από τυχόν προϋπάρχοντα αρχεία +* Αν κάποιοι φάκελοι λείπουν στην διαδρομή προς το αρχείο τότε δημιουργούνται αυτόματα. +* Όταν αναφέρεστε σε ένα tiddler το οποίο περιέχει κενά στον τίτλο του, φροντίστε να χρησιμοποιήσετε τα εισαγωγικά που είναι αναγκαία από τον φλοιό σας καθώς και τις διπλές ορθογώνιες αγκύλες του TiddlyWiki: `--render "[[Motovun Jack.jpg]]"` +* Το φίλτρο για το όνομα αρχείου αποτιμάτε έχοντας τα επιλεγμένα αντικείμενα στον τίτλο του tiddler που γίνεται η τρέχουσα απεικόνιση, επιτρέποντας στο τίτλο να χρησιμοποιηθεί ως βάση για τον υπολογισμό του ονόματος του αρχείου. Για παράδειγμα `[encodeuricomponent[]addprefix[static/]]` εφαρμόζει URI κωδικοποίηση σε κάθε τίτλο, και μετά προσθέτει το πρόθεμα `static/` +* Η εντολή `--render` είναι μια πιο εύπλαστη εναλλακτική για τις εντολές `--rendertiddler` και `--rendertiddlers` που θεωρούνται πλέον παρωχημένες. + +Παραδείγματα: + +* `--render "[!is[system]]" "[encodeuricomponent[]addprefix[tiddlers/]addsuffix[.html]]"` -- απεικονίζει όλα τα μη-συστεμικά tiddler ως αρχεία στον υποφάκελο "tiddlers" με URL-κωδικοποιημένους τίτλους και την επέκταση HTML + diff --git a/languages/el-GR/Help/rendertiddler.tid b/languages/el-GR/Help/rendertiddler.tid index a9f15f04f..d559432a2 100644 --- a/languages/el-GR/Help/rendertiddler.tid +++ b/languages/el-GR/Help/rendertiddler.tid @@ -1,12 +1,23 @@ title: $:/language/Help/rendertiddler -description: Απεικονίζει ένα μεμονωμένο tiddler με το καθορισμένο ContentType +description: Απεικονίζει ένα μεμονωμένο tiddler στο καθορισμένο ContentType -Απεικονίζει ένα μεμονωμένο tiddler με το καθορισμένο ContentType, προκαθορισμένη τιμή είναι `text/html` και το αποθηκεύει στο προκαθορισμένο όνομα αρχείου: +(Παρατήρηση: Η εντολή `--rendertiddler` θεωρείτε πλέον παρωχημένη και συστήνεται η χρήση της νέας πιο ευέλικτης εντολής `--render`) + +Απεικονίζει ένα μεμονωμένο tiddler ως συγκεκριμένο ContentType που προκαθορίζεται σε `text/html` και το αποθηκεύει σε ένα καθορισμένο όνομα αρχείου. + +Προαιρετικά μπορεί να χρησιμοποιηθεί ο τίτλος ενός πρότυπου tiddler, όπου στην περίπτωση αυτή γίνεται απεικόνιση του πρότυπου tiddler έχοντας ορίσει στην μεταβλητή "currentTiddler" τιμή το tiddler του οποίου γίνεται η απεικόνιση (την πρώτη παραμετρική τιμή). + +Επίσης μπορεί να οριστούν προαιρετικά το όνομα και η τιμή μιας επιπρόσθετης μεταβλητής ``` ---rendertiddler <τίτλος> <όνομα αρχείου> [<τύπος>] +--rendertiddler <title> <filename> [<type>] [<template>] [<name>] [<value>] ``` -Τυπικά, το όνομα του αρχείου αναλύεται σχετικά ως προς τον υποφάκελο `output` του φακέλου της έκδοσης. Η εντολή `--output` μπορεί να χρησιμοποιηθεί για άμεση έξοδο σε ένα διαφορετικό φάκελο. +Η προκαθορισμένη συμπεριφορά είναι το όνομα αρχείου να αναλύεται σχετικά ως προς τον υπο-φάκελο `output` του φακέλου της έκδοσης. Η εντολή `--output` μπορεί να χρησιμοποιηθεί για να οδηγήσει την έξοδο σε διαφορετικό φάκελο. -Κάθε φάκελος που λείπει στο μονοπάτι θα δημιουργηθεί αυτόματα. +Αν κάποιοι φάκελοι λείπουν στην διαδρομή προς το αρχείο τότε δημιουργούνται αυτόματα. + +Για παράδειγμα, ή ακόλουθη εντολή αποθηκεύει όλα τα tiddler που ταιριάζουν στο φίλτρο `[tag[done]]` σε ένα JSON αρχείο με τίτλο `output.json` χρησιμοποιώντας το πρότυπο `$:/core/templates/exporters/JsonFile` του πυρήνα. +``` +--rendertiddler "$:/core/templates/exporters/JsonFile" output.json text/plain "" exportFilter "[tag[done]]" +``` diff --git a/languages/el-GR/Help/rendertiddlers.tid b/languages/el-GR/Help/rendertiddlers.tid index 4b6be8653..9699bd48c 100644 --- a/languages/el-GR/Help/rendertiddlers.tid +++ b/languages/el-GR/Help/rendertiddlers.tid @@ -1,10 +1,12 @@ title: $:/language/Help/rendertiddlers -description: Απεικονίζει tiddlers που ταιριάζουν σε ένα φίλτρο ενός συγκεκριμένου ContentType +description: Απεικονίζει tiddlers που ταιριάζουν σε ένα φίλτρο σε ένα συγκεκριμένο ContentType + +(Παρατήρηση: Η εντολή `--rendertiddlers` θεωρείτε πλέον παρωχημένη και συστήνεται η χρήση της νέας πιο ευέλικτης εντολής `--render`) Απεικονίζει ένα σύνολο από tiddlers που ταιριάζουν σε ένα φίλτρο για να ξεχωρίσουν τα αρχεία ενός συγκεκριμένου ContentType (προκαθορισμένη τιμή `text/html`) και κατάληξης (προκαθορισμένη τιμή `.html`). ``` ---rendertiddlers <φίλτρο> <πρότυπο> <διαδρομή στο αρχείο> [<τύπος>] [<κατάληξη>] +--rendertiddlers <φίλτρο> <πρότυπο> <διαδρομή> [<τύπος>] [<κατάληξη>] ["noclean"] ``` Για παράδειγμα: @@ -15,4 +17,4 @@ description: Απεικονίζει tiddlers που ταιριάζουν σε Τυπικά, η διαδρομή στο αρχείο αναλύεται σχετικά με τον υποφάκελο `output` του φακέλου της έκδοσης. Η `--output` εντολή μπορεί να χρησιμοποιηθεί για να ανακατευθύνει την έξοδο σε ένα διαφορετικό φάκελο. -Τυχόν αρχεία στο φάκελο προορισμού διαγράφονται. Ο φάκελος προορισμού δημιουργείται αναδρομικά αν δεν υπάρχει. +Τυχόν αρχεία στο φάκελο προορισμού διαγράφονται εκτός και χρησιμοποιηθεί η ένδειξη "noclean". Ο φάκελος προορισμού δημιουργείται αναδρομικά αν δεν υπάρχει. diff --git a/languages/el-GR/Help/save.tid b/languages/el-GR/Help/save.tid new file mode 100644 index 000000000..47c2a463c --- /dev/null +++ b/languages/el-GR/Help/save.tid @@ -0,0 +1,25 @@ +title: $:/language/Help/save +description: Αποθηκεύει μεμονωμένα ακατέργαστα tiddler σε αρχεία + +Αποθηκεύει μεμονωμένα tiddler σε ακατέργαστη μορφή κειμένου ή δυαδική σε καθορισμένα αρχεία. + +``` +--save <φίλτρο-tiddler> <φίλτρο-ονόματος-αρχείου> +``` + +* ''φίλτρο-tiddler'': Ένα φίλτρο που επιλέγει τα tiddler που θα αποθηκευτούν +* ''φίλτρο-ονόματος-αρχείου'': Προαιρετικό φίλτρο που μετασχηματίζει τους τίτλους των tiddler σε ονόματα διαδρομών. Αν παραληφθεί, έχει προκαθορισμένη τιμή `[is[tiddler]]`, η οποία χρησιμοποιεί τον τίτλο του tiddler χωρίς αλλαγές ως όνομα αρχείου + +Η προκαθορισμένη συμπεριφορά είναι το όνομα αρχείου να αναλύεται σχετικά ως προς τον υπο-φάκελο `output` του φακέλου της έκδοσης. Η εντολή `--output` μπορεί να χρησιμοποιηθεί για να οδηγήσει την έξοδο σε διαφορετικό φάκελο. + +Παρατηρήσεις: + +* Ο φάκελος εξόδου δεν καθαρίζεται από τυχόν προϋπάρχοντα αρχεία +* Αν κάποιοι φάκελοι δεν υπάρχουν στην διαδρομή προς το όνομα αρχείου τότε αυτοί δημιουργούνται αυτόματα. +* Όταν αναφέρεστε σε ένα tiddler το οποίο περιέχει κενά στον τίτλο του, φροντίστε να χρησιμοποιήσετε τα εισαγωγικά που είναι αναγκαία από τον φλοιό σας καθώς και τις διπλές ορθογώνιες αγκύλες του TiddlyWiki: `--render "[[Motovun Jack.jpg]]"` +* Το φίλτρο για το όνομα αρχείου αποτιμάτε έχοντας θέσει τα επιλεγμένα αντικείμενα ως τιμή στον τίτλο του tiddler που γίνεται η τρέχουσα αποθήκευση, επιτρέποντας στο τίτλο να χρησιμοποιηθεί ως βάση για τον υπολογισμό του ονόματος του αρχείου. Για παράδειγμα `[encodeuricomponent[]addprefix[static/]]` εφαρμόζει URI κωδικοποίηση σε κάθε τίτλο, και μετά προσθέτει το πρόθεμα `static/` +* Η εντολή `--save` είναι μια πιο εύπλαστη εναλλακτική για τις εντολές `--savetiddler` και `--savetiddlers` που θεωρούνται πλέον παρωχημένες. + +Παραδείγματα: + +* `--save "[!is[system]is[image]]" "[encodeuricomponent[]addprefix[tiddlers/]]"` -- αποθηκεύει όλα τα μή-συστεμικά tiddler εικόνας ως αρχεία στον υποφάκελο "tiddlers" με URL-κωδικοποίηση στους τίτλους diff --git a/languages/el-GR/Help/savetiddler.tid b/languages/el-GR/Help/savetiddler.tid index 758659f27..9cbcec881 100644 --- a/languages/el-GR/Help/savetiddler.tid +++ b/languages/el-GR/Help/savetiddler.tid @@ -1,6 +1,8 @@ title: $:/language/Help/savetiddler description: Αποθηκεύει ένα ακατέργαστο tiddler σε ένα αρχείο +(Παρατήρηση: Η εντολή `--savetiddler` θεωρείτε πλέον παρωχημένη και συστήνεται η χρήση της νέας πιο ευέλικτης εντολής `--save`) + Αποθηκεύει ένα μεμονωμένο tiddler με μορφή ακατέργαστου κειμένου ή δυαδική στο καθορισμένο όνομα αρχείου. ``` diff --git a/languages/el-GR/Help/savetiddlers.tid b/languages/el-GR/Help/savetiddlers.tid index 740466ec7..5c36aef10 100644 --- a/languages/el-GR/Help/savetiddlers.tid +++ b/languages/el-GR/Help/savetiddlers.tid @@ -1,12 +1,16 @@ title: $:/language/Help/savetiddlers description: Αποθηκεύει μια ομάδα από ακατέργαστα tiddlers σε ένα φάκελο +(Παρατήρηση: Η εντολή `--savetiddlers` θεωρείτε πλέον παρωχημένη και συστήνεται η χρήση της νέας πιο ευέλικτης εντολής `--save`) + Αποθηκεύει μια ομάδα από tiddlers σε μορφή ακατέργαστου κειμένου η δυαδική στο καθορισμένο φάκελο. ``` ---savetiddlers <φίλτρο> <διαδρομή στο φάκελο> +--savetiddlers <φίλτρο> <διαδρομή στο φάκελο> ["noclean"] ``` Τυπικά, η διαδρομή αναλύεται σχετικά ως προς τον υποφάκελο `output` του φακέλου της έκδοσης. Η `--output` εντολή μπορεί να χρησιμοποιηθεί για να ανακατευθύνει την έξοδο σε ένα διαφορετικό φάκελο. +Ο φάκελος εξόδου καθαρίζεται από τυχόν προϋπάρχοντα αρχεία πριν να αποθηκευτούν τα καθορισμένα αρχεία. Η διαγραφή μπορεί να απενεργοποιηθεί χρησιμοποιώντας την ένδειξη "noclean". + Τυχόν φάκελοι που λείπουν κατά την διαδρομή θα δημιουργηθούν αυτόματα. diff --git a/languages/el-GR/Help/server.tid b/languages/el-GR/Help/server.tid index d731f6d57..7e377d9be 100644 --- a/languages/el-GR/Help/server.tid +++ b/languages/el-GR/Help/server.tid @@ -3,22 +3,22 @@ description: Παρέχει μια HTTP διεπαφή εξυπηρετητή Ο εξυπηρετητής που έχει υλοποιηθεί εντός του TiddlyWiki5 είναι πολύ απλοϊκός. Αν και συμβατός με το TiddlyWeb δεν υποστηρίζει πολλά από τα χαρακτηριστικά που χρειάζονται για μια στιβαρή χρήση στο διαδίκτυο. -Στην ρίζα, εξυπηρετεί με την απεικόνιση ενός συγκεκριμένου tiddler. Εκτός ρίζας, εξυπηρετεί μεμονωμένα tiddlers που έχουν κωδικοποιηθεί σε JSON, και υποστηρίζει τις βασικές HTTP λειτουργίες για `GET`, `PUT` και `DELETE`. +Στην ρίζα, εξυπηρετεί την απεικόνιση ενός συγκεκριμένου tiddler. Εκτός ρίζας, εξυπηρετεί μεμονωμένα tiddlers που έχουν κωδικοποιηθεί σε JSON, και υποστηρίζει τις βασικές HTTP λειτουργίες για `GET`, `PUT` και `DELETE`. ``` ---server <port> <roottiddler> <rendertype> <servetype> <username> <password> <host> <pathprefix> +--server <πόρτα> <tiddler-ρίζας> <τύπος-απεικόνισης> <τύπος-εξυπηρέτησης> <όνομα-χρήστη> <συνθηματικό> <εξυπηρετητής> <πρόθεμα-διαδρομών> ``` Οι παράμετροι είναι: -* ''port'' - Ο αριθμός της πόρτας την οποία θα εξυπηρετεί (τυπική τιμή είναι η "8080") -* ''roottiddler'' - Το tiddler που εξυπηρετεί ως ρίζα (τυπική τιμή είναι το "$:/core/save/all") -* ''rendertype'' - Ο τύπος περιεχομένου ο οποίος θα χρησιμοποιηθεί για να απεικονιστεί το ριζικό tiddler (τυπική τιμή είναι το "text/plain") -* ''servetype'' - Ο τύπος περιεχομένου με τον οποίο το ριζικό tiddler θα εξυπηρετηθεί (τυπική τιμή είναι "text/html") -* ''username'' - Το τυπικό όνομα χρήστη για υπογραφή των τροποποιήσεων -* ''password'' - προαιρετικό συνθηματικό για βασική ταυτοποίηση χρήστη -* ''host'' - προαιρετικό το όνομα του κεντρικού υπολογιστή για εξυπηρέτηση από αυτόν (τυπική τιμή το "127.0.0.1" γνωστό ως "localhost") -* ''pathprefix'' - προαιρετικό πρόθεμα για διαδρομές +* ''πόρτα'' - Ο αριθμός της πόρτας την οποία θα εξυπηρετεί (τυπική τιμή είναι η "8080") +* ''tiddler-ρίζας'' - Το tiddler που εξυπηρετεί ως ρίζα (τυπική τιμή είναι το "$:/core/save/all") +* ''τύπος-απεικόνισης'' - Ο τύπος περιεχομένου ο οποίος θα χρησιμοποιηθεί για να απεικονιστεί το ριζικό tiddler (τυπική τιμή είναι το "text/plain") +* ''τύπος-εξυπηρέτησης'' - Ο τύπος περιεχομένου με τον οποίο το ριζικό tiddler θα εξυπηρετηθεί (τυπική τιμή είναι "text/html") +* ''όνομα-χρήστη'' - Το τυπικό όνομα χρήστη για υπογραφή των τροποποιήσεων +* ''συνθηματικό'' - προαιρετικό συνθηματικό για βασική ταυτοποίηση χρήστη +* ''εξυπηρετητής'' - προαιρετικό το όνομα του κεντρικού υπολογιστή για εξυπηρέτηση από αυτόν (τυπική τιμή το "127.0.0.1" γνωστό ως "localhost") +* ''πρόθεμα-διαδρομών'' - προαιρετικό πρόθεμα για διαδρομές Αν καθοριστεί η παράμετρος συνθηματικού τότε το πρόγραμμα περιήγησης θα ενημερώσει τον χρήστη να εισάγει το όνομα χρήστη και συνθηματικό του. Σημειώστε ότι το συνθηματικό θα μεταδοθεί ως απλό κείμενο οπότε η υλοποίηση αυτή δεν είναι κατάλληλη για γενική χρήση. @@ -28,7 +28,7 @@ description: Παρέχει μια HTTP διεπαφή εξυπηρετητή --server 8080 $:/core/save/all text/plain text/html MyUserName passw0rd ``` -Το όνομα χρήστη και το συνθηματικό μπορούν να καθοριστούν ως κενά αλφαρηθμητικά αν χρειάζεστε να καθορίσετε το όνομα του κεντρικού υπολογιστή, ή το πρόθεμα για διαδρομές και δεν χρειάζεστε να καθορίσετε ένα συνθηματικό: +Το όνομα χρήστη και το συνθηματικό μπορούν να καθοριστούν ως κενά αλφαριθμητικά αν χρειάζεστε να καθορίσετε το όνομα του κεντρικού υπολογιστή, ή το πρόθεμα για διαδρομές και δεν χρειάζεστε να καθορίσετε ένα συνθηματικό: ``` --server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245 diff --git a/languages/el-GR/Help/unpackplugin.tid b/languages/el-GR/Help/unpackplugin.tid new file mode 100644 index 000000000..c6cfeee1c --- /dev/null +++ b/languages/el-GR/Help/unpackplugin.tid @@ -0,0 +1,8 @@ +title: $:/language/Help/unpackplugin +description: Εξάγει τα ωφέλιμα tiddler από ένα πρόσθετο + +Εξάγει τα ωφέλιμα tiddlers από ένα πρόσθετο, δημιουργώντας τα ως κοινότυπα tiddlers: + +``` +--unpackplugin <τίτλος> +``` diff --git a/languages/el-GR/Import.multids b/languages/el-GR/Import.multids index 66a0af790..dfb9e3794 100644 --- a/languages/el-GR/Import.multids +++ b/languages/el-GR/Import.multids @@ -1,5 +1,6 @@ title: $:/language/Import/ +Imported/Hint: Τα ακόλουθα tiddler έχουν εισαχθεί: Listing/Cancel/Caption: Άκυρο Listing/Hint: Αυτά τα tiddlers είναι έτοιμα για εισαγωγή: Listing/Import/Caption: Εισαγωγή @@ -11,4 +12,4 @@ Upgrader/Plugins/Suppressed/Version: Μπλοκαρισμένο πρόσθετο Upgrader/Plugins/Upgraded: Αναβαθμισμένο πρόσθετο από <<incoming>> σε <<upgraded>> Upgrader/State/Suppressed: Μπλοκαρισμένο προσωρινά tiddler κατάστασης Upgrader/System/Suppressed: Μπλοκαρισμένο tiddler συστήματος -Upgrader/ThemeTweaks/Created: Μετα-εγκατεστημένη παραλλαγή θέματος από <$text text=<<from>>/> +Upgrader/ThemeTweaks/Created: Απόδημη μικρή αλλαγή θέματος από <$text text=<<from>>/> diff --git a/languages/el-GR/Misc.multids b/languages/el-GR/Misc.multids index a73629348..41a27342c 100644 --- a/languages/el-GR/Misc.multids +++ b/languages/el-GR/Misc.multids @@ -1,22 +1,72 @@ title: $:/language/ +AboveStory/ClassicPlugin/Warning: Φαίνεται πως προσπαθείτε να φορτώσετε ένα πρόσθετο που έχει σχεδιαστεί για την έκδοση ~TiddlyWiki Classic. Παρακαλώ σημειώστε ότι [[αυτά τα πρόσθετα δεν λειτουργούν με την έκδοση 5.x.x του TiddlyWiki|https://tiddlywiki.com/#TiddlyWikiClassic]]. Εντοπίστηκε πρόσθετο για την έκδοση ~TiddlyWiki Classic: BinaryWarning/Prompt: Αυτό το tiddler περιέχει δυαδικά δεδομένα -ClassicWarning/Hint: Αυτό το tiddler έχει γραφτεί με την TiddlyWiki κλασική μορφή κειμένου, που δεν είναι πλήρως συμβατή με αυτήν του TiddlyWiki 5ης έκδοσης. Δείτε στο http://tiddlywiki.com/static/Upgrading.html για περισσότερες λεπτομέρειες. +ClassicWarning/Hint: Αυτό το tiddler έχει γραφτεί με την TiddlyWiki κλασική μορφή κειμένου, που δεν είναι πλήρως συμβατή με αυτήν του TiddlyWiki 5ης έκδοσης. Δείτε στο https://tiddlywiki.com/static/Upgrading.html για περισσότερες λεπτομέρειες. ClassicWarning/Upgrade/Caption: αναβάθμιση CloseAll/Button: κλείστα όλα +ColourPicker/Recent: Πρόσφατα: ConfirmCancelTiddler: Θέλετε να απορριφθούν οι όποιες τροποποιήσεις έχετε κάνει για το tiddler "<$text text=<<title>>/>"? ConfirmDeleteTiddler: Θέλετε να διαγραφεί το tiddler "<$text text=<<title>>/>"? -ConfirmOverwriteTiddler: Θέλετε να αντικαταστήσετε το tiddler "<$text text=<<title>>/>"? ConfirmEditShadowTiddler: Πρόκειται να τροποποιήσετε ένα Σκιώδη Tiddler. Οποιεσδήποτε τροποποιήσεις θα αντικαταστήσουν το τυπικό σύστημα και υπάρχει κίνδυνος να δυσκολευτείτε σε σε μελλοντική αναβάθμιση. Είστε σίγουροι ότι θέλετε να τροποποιήσετε το "<$text text=<<title>>/>"? +ConfirmOverwriteTiddler: Θέλετε να αντικαταστήσετε το tiddler "<$text text=<<title>>/>"? +Count: απαρίθμηση DefaultNewTiddlerTitle: Νέο tiddler DropMessage: Ρίχτε εδώ (ή πατήστε το πλήκτρο Esc για ακύρωση) +Encryption/Cancel: Άκυρο Encryption/ConfirmClearPassword: Θέλετε να καθαρίσετε το συνθηματικό; Αυτό θα έχει ως συνέπεια να μην κρυπτογραφητε το wiki όταν κάνετε αποθήκευση +Encryption/Password: Συνθηματικό +Encryption/PasswordNoMatch: Τα συνθηματικά δεν ταιριάζουν Encryption/PromptSetPassword: Ορίστε το νέο συνθηματικό για αυτό το TiddlyWiki +Encryption/RepeatPassword: Επαναλάβατε το συνθηματικό +Encryption/SetPassword: Ορίστε το συνθηματικό +Encryption/Username: Όνομα χρήστη +Error/Caption: Σφάλμα +Error/EditConflict: Το αρχείο στον εξυπηρετητή είναι διαφορετικό +Error/Filter: Σφάλμα φίλτρου +Error/FilterSyntax: Συντακτικό σφάλμα στην έκφραση του φίλτρου +Error/IsFilterOperator: Σφάλμα φίλτρου: Άγνωστος τελεστέος για τον τελεστή φίλτρου 'is' +Error/LoadingPluginLibrary: Σφάλμα κατά την φόρτωση της βιβλιοθήκης του πρόσθετου +Error/RecursiveTransclusion: Σφάλμα αναδρομής σε transclusion στο transclude widget +Error/RetrievingSkinny: Σφάλμα κατά την ανάκληση της skinny tiddler λίστας +Error/SavingToTWEdit: Σφάλμα κατά την αποθήκευση στο TWEdit +Error/WhileSaving: Σφάλμα κατά την αποθήκευση +Error/XMLHttpRequest: XMLHttpRequest κωδικός σφάλματος +InternalJavaScriptError/Hint: Λοιπόν, αυτό είναι αδιέξοδο. Συνιστάτε να επανεκκινήσετε το TiddlyWiki κάνοντας ανανέωση στον φυλλομετρητή σας +InternalJavaScriptError/Title: Εσωτερικό σφάλμα σε JavaScript InvalidFieldName: Μη έγκυροι χαρακτήρες στο όνομα πεδίου "<$text text=<<fieldName>>/>". Τα ονόματα πεδίων μπορούν να περιέχουν μόνο πεζούς χαρακτήρες, ψηφία και τους χαρακτήρες κάτω παύλα (`_`), μείον (`-`) και τελεία (`.`) -MissingTiddler/Hint: Ανύπαρκτο tiddler "<$text text=<<currentTiddler>>/>" - κάντε κλικ {{$:/core/images/edit-button}} για να δημιουργηθεί +LazyLoadingWarning: <p>Γίνεται φόρτωση εξωτερικού κειμένου από ''<$text text={{!!_canonical_uri}}/>''</p><p>Αν αυτό το μήνυμα δεν εξαφανιστεί ίσως το πρόγραμμα περιήγησης που χρησιμοποιείται να μην υποστηρίζει εξωτερικό κείμενο στις τρέχουσες του ρυθμίσεις. Δείτε σχετικά στο https://tiddlywiki.com/#ExternalText</p> +LoginToTiddlySpace: Είσοδος χρήστη στο TiddlySpace +Manager/Controls/FilterByTag/None: (κανένα) +Manager/Controls/FilterByTag/Prompt: Φιλτράρισμα με ετικέτα: +Manager/Controls/Order/Prompt: Αντιστροφή σειράς +Manager/Controls/Search/Placeholder: Αναζήτηση +Manager/Controls/Search/Prompt: Αναζήτηση: +Manager/Controls/Show/Option/Tags: ετικέτες +Manager/Controls/Show/Prompt: Δείξε: +Manager/Controls/Sort/Prompt: Ταξινόμηση βάσει: +Manager/Item/Colour: Χρώμα +Manager/Item/Fields: Πεδία +Manager/Item/Icon: Εικονίδιο +Manager/Item/Icon/None: (κανένα) +Manager/Item/RawText: ακατέργαστο κείμενο +Manager/Item/Tags: Ετικέτες +Manager/Item/Tools: Εργαλεία +Manager/Item/WikifiedText: Wikified κείμενο +MissingTiddler/Hint: Ανύπαρκτο tiddler "<$text text=<<currentTiddler>>/>" - κάντε κλικ {{||$:/core/ui/Buttons/edit}} για να δημιουργηθεί +No: Όχι +OfficialPluginLibrary: Επίσημη ~TiddlyWiki βιβλιοθήκη πρόσθετων +OfficialPluginLibrary/Hint: The official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team. +PluginReloadWarning: Παρακαλώ αποθηκεύστε {{$:/core/ui/Buttons/save-wiki}} και ξαναφορτώστε {{$:/core/ui/Buttons/refresh}} προκειμένου να ενεργοποιηθούν οι αλλαγές στα πρόσθετα RecentChanges/DateFormat: DDth MMM YYYY SystemTiddler/Tooltip: Αυτό είναι ένα tiddler συστήματος +SystemTiddlers/Include/Prompt: Συμπεριέλαβε συστεμικά tiddlers TagManager/Colour/Heading: Χρώμα +TagManager/Count/Heading: Μέτρα TagManager/Icon/Heading: Εικονίδιο +TagManager/Info/Heading: Πληροφορίες TagManager/Tag/Heading: Ετικέτα +Tiddler/DateFormat: DDth MMM YYYY στις hh12:0mmam UnsavedChangesWarning: Έχετε μη αποθηκευμένες αλλαγές στο TiddlyWiki +Yes: Ναι +Εντοπίστηκε πρόσθετο για την έκδοση ~TiddlyWiki Classic: diff --git a/languages/el-GR/Modals/Download.tid b/languages/el-GR/Modals/Download.tid index bc128451e..96a7fdf9e 100644 --- a/languages/el-GR/Modals/Download.tid +++ b/languages/el-GR/Modals/Download.tid @@ -2,8 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Μεταφόρτωση αλλαγών footer: <$button message="tm-close-tiddler">Κλείσε</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html - +help: https://tiddlywiki.com/static/DownloadingChanges.html Το πρόγραμμα πλοήγησης που χρησιμοποιείτε υποστηρίζει μόνο χειροκίνητη αποθήκευση. diff --git a/languages/el-GR/Modals/SaveInstructions.tid b/languages/el-GR/Modals/SaveInstructions.tid index 19271d6ef..4714ecde0 100644 --- a/languages/el-GR/Modals/SaveInstructions.tid +++ b/languages/el-GR/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Αποθηκεύστε την εργασία σας footer: <$button message="tm-close-tiddler">Κλείσε</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html Οι αλλαγές σας σε αυτό το wiki χρειάζεται να αποθηκευτούν ως ένα ~TiddlyWiki HTML αρχείο. diff --git a/languages/el-GR/NewJournal.multids b/languages/el-GR/NewJournal.multids index 47bd1b28c..97ab8f657 100644 --- a/languages/el-GR/NewJournal.multids +++ b/languages/el-GR/NewJournal.multids @@ -1,4 +1,4 @@ title: $:/config/NewJournal/ +Tags: Ημερολόγιο Title: DDη MMM YYYY -Tags: Journal diff --git a/languages/el-GR/Search.multids b/languages/el-GR/Search.multids index cbbd5e56f..5f8325ddc 100644 --- a/languages/el-GR/Search.multids +++ b/languages/el-GR/Search.multids @@ -1,15 +1,20 @@ title: $:/language/Search/ +DefaultResults/Caption: Λίστα Filter/Caption: Φίλτρο -Filter/Hint: Αναζήτηση μέσω μιας [[έκφρασης φιλτραρίσματος|http://tiddlywiki.com/static/Filters.html]] -Filter/Matches: //<small><$count filter={{$:/temp/advancedsearch}}/> βρέθηκαν</small>// -Matches: //<small><$count filter="[!is[system]search{$:/temp/search}]"/> βρέθηκαν</small>// +Filter/Hint: Αναζήτηση μέσω μιας [[έκφρασης φιλτραρίσματος|https://tiddlywiki.com/static/Filters.html]] +Filter/Matches: //<small><<resultCount>> αποτελέσματα</small>// +Matches: //<small><<resultCount>> αποτελέσματα</small>// +Matches/All: Όλα τα αποτελέσματα: +Matches/Title: Ταίριασμα σε Τίτλο: +Search: Αναζήτηση +Search/TooShort: Το κείμενο αναζήτησης είναι πολύ λίγο Shadows/Caption: Σκιώδη Shadows/Hint: Αναζήτηση για σκιώδη tiddlers -Shadows/Matches: //<small><$count filter="[all[shadows]search{$:/temp/advancedsearch}]"/> βρέθηκαν</small>// +Shadows/Matches: //<small><<resultCount>> αποτελέσματα</small>// Standard/Caption: Τυπικά Standard/Hint: Αναζήτηση για τυπικά tiddlers -Standard/Matches: //<small><$count filter="[!is[system]search{$:/temp/advancedsearch}]"/> βρέθηκαν</small>// +Standard/Matches: //<small><<resultCount>> αποτελέσματα</small>// System/Caption: Συστήματος System/Hint: Αναζήτηση για tiddlers συστήματος -System/Matches: //<small><$count filter="[is[system]search{$:/temp/advancedsearch}]"/> βρέθηκαν</small>// +System/Matches: //<small><<resultCount>> αποτελέσματα</small>// diff --git a/languages/el-GR/SideBar.multids b/languages/el-GR/SideBar.multids index b0ae9bc5a..00e5d981b 100644 --- a/languages/el-GR/SideBar.multids +++ b/languages/el-GR/SideBar.multids @@ -3,6 +3,7 @@ title: $:/language/SideBar/ All/Caption: Άπαντα Contents/Caption: Περιεχόμενα Drafts/Caption: Πρόχειρα +Explorer/Caption: Εξερευνητής Missing/Caption: Λείπουν More/Caption: Περισσότερα Open/Caption: Ανοιχτά diff --git a/languages/el-GR/Snippets/ListByTag.tid b/languages/el-GR/Snippets/ListByTag.tid new file mode 100644 index 000000000..94a3b6de1 --- /dev/null +++ b/languages/el-GR/Snippets/ListByTag.tid @@ -0,0 +1,5 @@ +title: $:/language/Snippets/ListByTag +tags: $:/tags/TextEditor/Snippet +caption: Λίστα από tiddlers μέσω ετικέτας + +<<list-links "[tag[task]sort[title]]">> diff --git a/languages/el-GR/Snippets/MacroDefinition.tid b/languages/el-GR/Snippets/MacroDefinition.tid new file mode 100644 index 000000000..fae697ae7 --- /dev/null +++ b/languages/el-GR/Snippets/MacroDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/MacroDefinition +tags: $:/tags/TextEditor/Snippet +caption: Ορισμός μακροεντολής + +\define macroName(param1:"default value",param2) +Κείμενο μακροεντολής +\end diff --git a/languages/el-GR/Snippets/Table4x3.tid b/languages/el-GR/Snippets/Table4x3.tid new file mode 100644 index 000000000..07f4c843e --- /dev/null +++ b/languages/el-GR/Snippets/Table4x3.tid @@ -0,0 +1,8 @@ +title: $:/language/Snippets/Table4x3 +tags: $:/tags/TextEditor/Snippet +caption: Πίνακας με 4 στήλες και 3 γραμμές + +|! |!Άλφα |!Βήτα |!Γάμμα |!Δέλτα | +|!Ένα | | | | +|!Δύο | | | | | +|!Τρία | | | | | diff --git a/languages/el-GR/Snippets/TableOfContents.tid b/languages/el-GR/Snippets/TableOfContents.tid new file mode 100644 index 000000000..868f49290 --- /dev/null +++ b/languages/el-GR/Snippets/TableOfContents.tid @@ -0,0 +1,9 @@ +title: $:/language/Snippets/TableOfContents +tags: $:/tags/TextEditor/Snippet +caption: Πίνακας περιεχομένων + +<div class="tc-table-of-contents"> + +<<toc-selective-expandable 'TableOfContents'>> + +</div> \ No newline at end of file diff --git a/languages/el-GR/ThemeTweaks.multids b/languages/el-GR/ThemeTweaks.multids new file mode 100644 index 000000000..ec0c03938 --- /dev/null +++ b/languages/el-GR/ThemeTweaks.multids @@ -0,0 +1,42 @@ +title: $:/language/ThemeTweaks/ + +Metrics: Μεγέθη +Metrics/BodyFontSize: Μέγεθος γραμματοσειράς για το σώμα του tiddler +Metrics/BodyLineHeight: Ύψος γραμμής για το σώμα του tiddler +Metrics/FontSize: Μέγεθος γραμματοσειράς +Metrics/LineHeight: Ύψος γραμμής +Metrics/SidebarBreakpoint: Σημείο σπασίματος πλευρικής εργαλειοθήκης +Metrics/SidebarBreakpoint/Hint: Το ελάχιστο πλάτος σελίδας στο οποίο η ιστορική <br> ροή και η πλευρική εργαλειοθήκη θα εμφανίζονται η μία δίπλα στην άλλη +Metrics/SidebarWidth: Πλάτος πλευρικής εργαλειοθήκης +Metrics/SidebarWidth/Hint: Το πλάτος της πλευρικής εργαλειοθήκης σε ρευστή-σταθερή διάταξη +Metrics/StoryLeft: Αριστερή θέση ιστορικού +Metrics/StoryLeft/Hint: πόσο μακρυά το αριστερό περιθώριο (margin) της ιστορικής ροής<br>(περιοχή tiddler) απέχει από το αριστερό μέρος της σελίδας +Metrics/StoryRight: Δεξιά θέση ιστορικού +Metrics/StoryRight/Hint: Πόσο απέχει το αριστερό περιθώριο (margin) της πλευρικής εργαλειοθήκης <br> από το αριστερά της σελίδας +Metrics/StoryTop: Θέση κορυφής ιστορικού +Metrics/StoryTop/Hint: πόσο απέχει το margin κορυφής της ιστορικής ροής<br> από την κορυφή της σελίδας +Metrics/StoryWidth: Το συνολικό πλάτος της ιστορικής ροής +Metrics/StoryWidth/Hint: Το συνολικό πλάτος της ιστορικής ροής +Metrics/TiddlerWidth: Πλάτος του tiddler +Metrics/TiddlerWidth/Hint: εντός της ιστορικής ροής +Options: Επιλογές +Options/CodeWrapping: Αναδίπλωση μεγάλων γραμμών σε τμήματα κώδικα +Options/SidebarLayout: Διάταξη πλευρικής εργαλειοθήκης +Options/SidebarLayout/Fixed-Fluid: Σταθερό ιστορικό, ρευστή πλευρική εργαλειοθήκη +Options/SidebarLayout/Fluid-Fixed: Ρευστό ιστορικό, σταθερή πλευρική εργαλειοθήκη +Options/StickyTitles: Κολλώδεις τίτλοι +Options/StickyTitles/Hint: Αναγκάζει τους τίτλους των tiddler να "κολλάνε" στην κορυφή του παραθύρου του προγράμματος περιήγησης. Προσοχή: Δεν λειτουργεί στον Chrome, και δημιουργεί κάποια προβλήματα απεικόνισης στον Firefox +Settings: Ρυθμίσεις +Settings/BackgroundImage: Εικόνα υποβάθρου σελίδας +Settings/BackgroundImageAttachment: Επισύναψη εικόνας υποβάθρου σελίδας +Settings/BackgroundImageAttachment/Fixed: Σταθερό στο παράθυρο +Settings/BackgroundImageAttachment/Scroll: Κύλιση με tiddlers +Settings/BackgroundImageSize: Μέγεθος εικόνας υποβάθρου της σελίδας +Settings/BackgroundImageSize/Auto: Αυτόματα +Settings/BackgroundImageSize/Contain: Περιέχει +Settings/BackgroundImageSize/Cover: Εξώφυλλο +Settings/CodeFontFamily: Οικογένεια γραμματοσειράς για κώδικα +Settings/EditorFontFamily: Οικογένεια γραμματοσειράς για επεξεργασία +Settings/FontFamily: Οικογένεια γραμματοσειράς +ThemeTweaks: Μικροαλλαγές στο θέμα +ThemeTweaks/Hint: Μπορείτε να κάνετε κάποιες μικροαλλαγές στο θέμα ''Vanilla''. diff --git a/languages/el-GR/TiddlerInfo.multids b/languages/el-GR/TiddlerInfo.multids index d2af638d7..01fb9b7eb 100644 --- a/languages/el-GR/TiddlerInfo.multids +++ b/languages/el-GR/TiddlerInfo.multids @@ -6,13 +6,13 @@ Advanced/PluginInfo/Heading: Λεπτομέρειες πρόσθετου Advanced/PluginInfo/Hint: Αυτό το πρόσθετο περιέχει τα παρακάτω σκιώδη tiddlers: Advanced/ShadowInfo/Heading: Κατάσταση Σκιώδους Advanced/ShadowInfo/NotShadow/Hint: Το tiddler <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> δεν είναι σκιώδης tiddler +Advanced/ShadowInfo/OverriddenShadow/Hint: Έχει παρακαμφθεί από ένα κανονικό tiddler Advanced/ShadowInfo/Shadow/Hint: Το tiddler <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> είναι ένα σκιώδης tiddler Advanced/ShadowInfo/Shadow/Source: Έχει οριστεί στο πρόσθετο <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link> -Advanced/ShadowInfo/OverriddenShadow/Hint: Έχει παρακαμφθεί από ένα κανονικό tiddler Fields/Caption: Πεδία List/Caption: Λίστα List/Empty: Αυτό το tiddler δεν περιέχει λίστα -Listed/Caption: Αναφέρεται +Listed/Caption: Σε λίστα Listed/Empty: Αυτό το tiddler δεν εμφανίζεται σε λίστα οποιουδήποτε άλλου tiddler References/Caption: Αναφορές References/Empty: Δεν υπάρχουν δεσμοί από tiddlers σε αυτό diff --git a/languages/el-GR/Types/application_javascript.tid b/languages/el-GR/Types/application%2Fjavascript.tid similarity index 76% rename from languages/el-GR/Types/application_javascript.tid rename to languages/el-GR/Types/application%2Fjavascript.tid index c1720e552..b37979282 100644 --- a/languages/el-GR/Types/application_javascript.tid +++ b/languages/el-GR/Types/application%2Fjavascript.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/application/javascript description: JavaScript κώδικας name: application/javascript -group: Προγραμματιστής +group: Προγραμματιστή diff --git a/languages/el-GR/Types/application_json.tid b/languages/el-GR/Types/application%2Fjson.tid similarity index 73% rename from languages/el-GR/Types/application_json.tid rename to languages/el-GR/Types/application%2Fjson.tid index 6298bbab7..60c0451ff 100644 --- a/languages/el-GR/Types/application_json.tid +++ b/languages/el-GR/Types/application%2Fjson.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/application/json description: JSON δεδομένα name: application/json -group: Προγραμματιστής +group: Προγραμματιστή diff --git a/languages/el-GR/Types/application_x_tiddler_dictionary.tid b/languages/el-GR/Types/application%2Fx-tiddler-dictionary.tid similarity index 79% rename from languages/el-GR/Types/application_x_tiddler_dictionary.tid rename to languages/el-GR/Types/application%2Fx-tiddler-dictionary.tid index 4e95a74c0..dbcca9294 100644 --- a/languages/el-GR/Types/application_x_tiddler_dictionary.tid +++ b/languages/el-GR/Types/application%2Fx-tiddler-dictionary.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/application/x-tiddler-dictionary description: Λεξικό δεδομένων name: application/x-tiddler-dictionary -group: Προγραμματιστής +group: Προγραμματιστή diff --git a/languages/el-GR/Types/image%2Fgif.tid b/languages/el-GR/Types/image%2Fgif.tid new file mode 100644 index 000000000..187633501 --- /dev/null +++ b/languages/el-GR/Types/image%2Fgif.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/image/gif +description: Εικόνα GIF +name: image/gif +group: Εικόνας diff --git a/languages/el-GR/Types/image%2Fjpeg.tid b/languages/el-GR/Types/image%2Fjpeg.tid new file mode 100644 index 000000000..ab7db8add --- /dev/null +++ b/languages/el-GR/Types/image%2Fjpeg.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/image/jpeg +description: Εικόνα JPEG +name: image/jpeg +group: Εικόνας diff --git a/languages/el-GR/Types/image_png.tid b/languages/el-GR/Types/image%2Fpng.tid similarity index 79% rename from languages/el-GR/Types/image_png.tid rename to languages/el-GR/Types/image%2Fpng.tid index e048729a6..46c9ea3c2 100644 --- a/languages/el-GR/Types/image_png.tid +++ b/languages/el-GR/Types/image%2Fpng.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/image/png description: Εικόνα PNG name: image/png -group: Εικόνα +group: Εικόνας diff --git a/languages/el-GR/Types/image_svg_xml.tid b/languages/el-GR/Types/image%2Fsvg%2Bxml.tid similarity index 70% rename from languages/el-GR/Types/image_svg_xml.tid rename to languages/el-GR/Types/image%2Fsvg%2Bxml.tid index c675b3c97..9efb62017 100644 --- a/languages/el-GR/Types/image_svg_xml.tid +++ b/languages/el-GR/Types/image%2Fsvg%2Bxml.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/image/svg+xml -description: Εικόνα Δομημένων Διανυσματικών Γραφικών +description: Εικόνα Δομημένων Διανυσματικών Γραφικών (SVG) name: image/svg+xml -group: Εικόνα +group: Εικόνας diff --git a/languages/el-GR/Types/image_x-icon.tid b/languages/el-GR/Types/image%2Fx-icon.tid similarity index 85% rename from languages/el-GR/Types/image_x-icon.tid rename to languages/el-GR/Types/image%2Fx-icon.tid index 2444ae7a8..43fc68aeb 100644 --- a/languages/el-GR/Types/image_x-icon.tid +++ b/languages/el-GR/Types/image%2Fx-icon.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/image/x-icon description: Αρχείο Εικονιδίου μορφής ICO name: image/x-icon -group: Εικόνα +group: Εικόνας diff --git a/languages/el-GR/Types/text_css.tid b/languages/el-GR/Types/text%2Fcss.tid similarity index 70% rename from languages/el-GR/Types/text_css.tid rename to languages/el-GR/Types/text%2Fcss.tid index c27dbeea7..40e3e39bd 100644 --- a/languages/el-GR/Types/text_css.tid +++ b/languages/el-GR/Types/text%2Fcss.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/text/css description: Στατικό stylesheet name: text/css -group: Προγραμματιστής +group: Προγραμματιστή diff --git a/languages/el-GR/Types/text_html.tid b/languages/el-GR/Types/text%2Fhtml.tid similarity index 78% rename from languages/el-GR/Types/text_html.tid rename to languages/el-GR/Types/text%2Fhtml.tid index 1aee6304f..c2fd0ec0f 100644 --- a/languages/el-GR/Types/text_html.tid +++ b/languages/el-GR/Types/text%2Fhtml.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/text/html description: Γλώσσα HTML name: text/html -group: Κείμενο +group: Κειμένου diff --git a/languages/el-GR/Types/text_plain.tid b/languages/el-GR/Types/text%2Fplain.tid similarity index 79% rename from languages/el-GR/Types/text_plain.tid rename to languages/el-GR/Types/text%2Fplain.tid index eda6823e2..cffa9ed01 100644 --- a/languages/el-GR/Types/text_plain.tid +++ b/languages/el-GR/Types/text%2Fplain.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/text/plain description: Απλό κείμενο name: text/plain -group: Κείμενο +group: Κειμένου diff --git a/languages/el-GR/Types/text%2Fvnd.tiddlywiki.tid b/languages/el-GR/Types/text%2Fvnd.tiddlywiki.tid new file mode 100644 index 000000000..8baed190b --- /dev/null +++ b/languages/el-GR/Types/text%2Fvnd.tiddlywiki.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/vnd.tiddlywiki +description: TiddlyWiki 5 +name: text/vnd.tiddlywiki +group: Κειμένου diff --git a/languages/el-GR/Types/text_x-tiddlywiki.tid b/languages/el-GR/Types/text%2Fx-tiddlywiki.tid similarity index 82% rename from languages/el-GR/Types/text_x-tiddlywiki.tid rename to languages/el-GR/Types/text%2Fx-tiddlywiki.tid index 97bf4add9..d162e15ef 100644 --- a/languages/el-GR/Types/text_x-tiddlywiki.tid +++ b/languages/el-GR/Types/text%2Fx-tiddlywiki.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/text/x-tiddlywiki description: TiddlyWiki κλασικό name: text/x-tiddlywiki -group: Κείμενο +group: Κειμένου diff --git a/languages/es-ES/ControlPanel.multids b/languages/es-ES/ControlPanel.multids index 32bc8c54b..bf6af73ff 100644 --- a/languages/es-ES/ControlPanel.multids +++ b/languages/es-ES/ControlPanel.multids @@ -54,7 +54,7 @@ Palette/ShowEditor/Caption: Abrir el editor Parsing/Block/Caption: Bloquear reglas sintácticas Parsing/Caption: Interpretación sintáctica Parsing/Hint: Aquí se pueden deshabilitar globalmente reglas de interpretación sintáctica del wiki. Ten cuidado: deshabilitar ciertas reglas puede hacer que ~TiddlyWiki deje de funcionar correctamente. -En tal caso, puedes recuperar su normal funcionamiento en [[modo seguro|http://tiddlywiki.com/#SafeMode]]. +En tal caso, puedes recuperar su normal funcionamiento en [[modo seguro|https://tiddlywiki.com/#SafeMode]]. Parsing/Inline/Caption: Reglas sintácticas de texto Parsing/Pragma/Caption: Reglas sintácticas del compilador Plugins/Add/Caption: Obten complementos y extensiones diff --git a/languages/es-ES/GettingStarted.tid b/languages/es-ES/GettingStarted.tid index 6eb420def..19d61f5f7 100644 --- a/languages/es-ES/GettingStarted.tid +++ b/languages/es-ES/GettingStarted.tid @@ -5,7 +5,7 @@ Bienvenido a TiddlyWiki y a su comunidad de usuarios Antes de guardar información importante en TiddlyWiki, es preciso que te asegures de poder hacerlo de manera fiable -Visita http://tiddlywiki.com/#GettingStarted para más información (en inglés) +Visita https://tiddlywiki.com/#GettingStarted para más información (en inglés) !! Configura este ~TiddlyWiki <div class="tc-control-panel"> diff --git a/languages/es-ES/Misc.multids b/languages/es-ES/Misc.multids index cb0bad3a1..df36e3a6c 100644 --- a/languages/es-ES/Misc.multids +++ b/languages/es-ES/Misc.multids @@ -1,11 +1,11 @@ title: $:/language/ AboveStory/ClassicPlugin/Warning: Parece que quieres cargar un plugin diseñado para ~TiddlyWiki Classic. <br> -Ten en cuenta que [[estos plugins no funcionan en TiddlyWiki version 5.x.x|http://tiddlywiki.com/#TiddlyWikiClassic]]<br> +Ten en cuenta que [[estos plugins no funcionan en TiddlyWiki version 5.x.x|https://tiddlywiki.com/#TiddlyWikiClassic]]<br> Plugins de ~TiddlyWiki Classic detectados BinaryWarning/Prompt: Este tiddler contiene datos binarios ClassicWarning/Hint: Este tiddler está escrito en formato de texto de una versión de TiddlyWiki Classic que no es totalmente compatible con la versión 5 de TiddlyWiki<br> -Visite http://tiddlywiki.com/static/Upgrading.html para más información +Visite https://tiddlywiki.com/static/Upgrading.html para más información ClassicWarning/Upgrade/Caption: Actualizar CloseAll/Button: Cerrar todo ColourPicker/Recent: Recientes: @@ -32,8 +32,8 @@ InternalJavaScriptError/Title: Error interno de JavaScript InvalidFieldName: Caracteres ilegales en el campo "<$text text=<<fieldName>>/>"<br> Los campos sólo pueden contener letras en minúscula, dígitos y los caracteres guión bajo (`_`), guión corto (`-`) y punto (`.`) LazyLoadingWarning: <p>Cargando texto externo desde ''<$text text={{!!_canonical_uri}}/>''</p><p>Si este mensaje no desaparece, puede que se deba a que estás usando un navegador que con esta configuración no permite texto externo</br> -Vea http://tiddlywiki.com/#ExternalText</p> -MissingTiddler/Hint: El tiddler "<$text text=<<currentTiddler>>/>" no existe - haz clic en {{$:/core/images/edit-button}} para crearlo +Vea https://tiddlywiki.com/#ExternalText</p> +MissingTiddler/Hint: El tiddler "<$text text=<<currentTiddler>>/>" no existe - haz clic en {{||$:/core/ui/Buttons/edit}} para crearlo OfficialPluginLibrary: Librería de plugins oficiales de ~TiddlyWiki OfficialPluginLibrary/Hint: Librería de plugins oficiales de ~TiddlyWiki en tiddlywiki.com<br> Plugins, temas y paquetes de idioma que mantiene el equipo de TiddlyWiki diff --git a/languages/es-ES/Modals/Download.tid b/languages/es-ES/Modals/Download.tid index 8e5e3a390..fe1871ddf 100644 --- a/languages/es-ES/Modals/Download.tid +++ b/languages/es-ES/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Download changes footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html Tu navegador sólo permite guardar manualmente diff --git a/languages/es-ES/Modals/SaveInstructions.tid b/languages/es-ES/Modals/SaveInstructions.tid index 067156fd8..80b53760a 100644 --- a/languages/es-ES/Modals/SaveInstructions.tid +++ b/languages/es-ES/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Save your work footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html Los cambios realizados a este wiki necesitan ser guardados como archivo ~TiddlyWiki HTML. diff --git a/languages/es-ES/Search.multids b/languages/es-ES/Search.multids index 73edfb949..3ed5f4d12 100644 --- a/languages/es-ES/Search.multids +++ b/languages/es-ES/Search.multids @@ -2,7 +2,7 @@ title: $:/language/Search/ DefaultResults/Caption: Lista Filter/Caption: Filtro -Filter/Hint: Búsqueda por medio de [[expresiones de filtrado|http://tiddlywiki.com/static/Filters.html]] <small> (instrucciones en inglés)</small> +Filter/Hint: Búsqueda por medio de [[expresiones de filtrado|https://tiddlywiki.com/static/Filters.html]] <small> (instrucciones en inglés)</small> Filter/Matches: //<small><<resultCount>> coincidencias</small>// Matches: //<small><<resultCount>> coincidencias </small>// Matches/All: Cualquier coincidencia diff --git a/languages/fa-IR/Buttons.multids b/languages/fa-IR/Buttons.multids new file mode 100644 index 000000000..4f099761e --- /dev/null +++ b/languages/fa-IR/Buttons.multids @@ -0,0 +1,180 @@ +title: $:/language/Buttons/ + +AdvancedSearch/Caption: جستجوی پیشرفته +AdvancedSearch/Hint: جستجوی پیشرفته +Bold/Caption: درشت +Bold/Hint: متن انتخاب شده رو درشت کن +Cancel/Caption: لغو +Cancel/Hint: تغییرات این تیدلر رو ذخیره نکن +Clear/Caption: پاک کردن +Clear/Hint: عکس رو به رنگ خالص تبدیل کن +Clone/Caption: کلون +Clone/Hint: این تیدلر رو کلون کن +Close/Caption: بستن +Close/Hint: این تیدلر رو ببند +CloseAll/Caption: همه رو بستن +CloseAll/Hint: همه‌ی تیدلرها رو ببند +CloseOthers/Caption: بستن بقیه +CloseOthers/Hint: بقیه‌ی تیدلرها رو ببند +ControlPanel/Caption: کنترل پنل +ControlPanel/Hint: کنترل پنل رو باز کن +Delete/Caption: پاک کردن +Delete/Hint: این تیدلر رو پاک کن +Edit/Caption: ویرایش +Edit/Hint: این تیدلر رو ویرایش کن +EditorHeight/Caption: ارتفاع ویرایشگر +EditorHeight/Caption/Auto: به صورت خودکار ارتفاع رو تنظیم کن تا متناسب با محتوا بشه. +EditorHeight/Caption/Fixed: ارتفاع ثابت: +EditorHeight/Hint: ارتفاع ویرایشگر متن رو انتخاب کن: +Encryption/Caption: رمزگردانی +Encryption/ClearPassword/Caption: پاک کردن کلمه‌ی عبور +Encryption/ClearPassword/Hint: پاک کردن کلمه‌ی عبور و ذخیره‌ی این ویکی بدون رمزگردانی +Encryption/Hint: حذف یا مشخص کردن رمزی برای این ویکی +Encryption/SetPassword/Caption: مشخص کردن رمز +Encryption/SetPassword/Hint: مشخص کردن رمزی برای رمزگردانی این ویکی +Excise/Caption: شکافتن +Excise/Caption/Excise: بشکاف +Excise/Caption/MacroName: عنوان ماکرو: +Excise/Caption/NewTitle: عنوان تیدلر جدید: +Excise/Caption/Replace: متن شکافته شده رو با این جایگزین کن: +Excise/Caption/Replace/Link: پیوند +Excise/Caption/Replace/Macro: ماکرو +Excise/Caption/Replace/Transclusion: پیوست: +Excise/Caption/Tag: تیدلر جدید رو با عنوان این تیدلر برچسب بزن +Excise/Caption/TiddlerExists: هشدار: تیدلر از قبل وجود دارد +Excise/Hint: شکفتن متن انتخاب شده به تیدلر جدید +ExportPage/Caption: خروجی از همه +ExportPage/Hint: خروجی از همه تیدلرها +ExportTiddler/Caption: خروجی از تیدلر +ExportTiddler/Hint: خروجی از تیدلر +ExportTiddlers/Caption: خروجی از تیدلرها +ExportTiddlers/Hint: خروجی از تیدلرها +Fold/Caption: تیدلر رو جمع کن +Fold/FoldBar/Caption: نوارِ جمع‌کن +Fold/FoldBar/Hint: نوارهای اختیاری جهت جمع و باز کردن تیدلرها +Fold/Hint: بدنه‌ی این تیدلر رو جمع کن +FoldAll/Caption: همه‌ی تیدلرها رو جمع کن +FoldAll/Hint: بدنه‌ی همه‌ی تیدلر‌ها رو جمع کن +FoldOthers/Caption: بقیه‌ی تیدلرها رو جمع کن +FoldOthers/Hint: بدنه‌ی بقیه‌ی تیدلرهای باز رو جمع کن +FullScreen/Caption: تما-صفحه +FullScreen/Hint: داخل یا خارج شدن از حالت تمام-صفحه +Heading1/Caption: عنوان ۱ +Heading1/Hint: فرمت عنوان مرحله‌ی ۱ رو بر روی خط‌هایی که شامل متن انتخاب شد‌اند، وارد کن. +Heading2/Caption: عنوان ۲ +Heading2/Hint: فرمت عنوان مرحله‌ی ۲ رو بر روی خط‌هایی که شامل متن انتخاب شد‌اند، وارد کن. +Heading3/Caption: عنوان ۳ +Heading3/Hint: فرمت عنوان مرحله‌ی ۳ رو بر روی خط‌هایی که شامل متن انتخاب شد‌اند، وارد کن. +Heading4/Caption: عنوان ۴ +Heading4/Hint: فرمت عنوان مرحله‌ی ۴ رو بر روی خط‌هایی که شامل متن انتخاب شد‌اند، وارد کن. +Heading5/Caption: عنوان ۵ +Heading5/Hint: فرمت عنوان مرحله‌ی ۵ رو بر روی خط‌هایی که شامل متن انتخاب شد‌اند، وارد کن. +Heading6/Caption: عنوان ۶ +Heading6/Hint: فرمت عنوان مرحله‌ی ۶ رو بر روی خط‌هایی که شامل متن انتخاب شد‌اند، وارد کن. +Help/Caption: راهنما +Help/Hint: نمایش صفحه راهنما +HideSideBar/Caption: مخفی‌کردن نوار کناری +HideSideBar/Hint: مخفی‌کردن نوار کناری +Home/Caption: خانه +Home/Hint: باز کردن تیدلرهای پیشفرض +Import/Caption: درون‌ریزی +Import/Hint: Import many types of file including text, image, TiddlyWiki or JSON +درونریزی انواع فایل شامل متن، عکس تیدلی ویکی یا json +Info/Caption: اطلاعات +Info/Hint: اطلاعات +Italic/Caption: مایل‌نویس +Italic/Hint: مایل‌نویس کردن بخش انتخاب شده +Language/Caption: زبان +Language/Hint: انتخاب زبان محیط کاربری +LineWidth/Caption: عرض خط +LineWidth/Hint: مشخص کردن عرض خط برای نقاشی +Link/Caption: پیوند +Link/Hint: ساخت پیوند ویکی‌تکست +ListBullet/Caption: لیست گلوله‌ای +ListBullet/Hint: لیست گلوله‌ای کردن خط‌های انتخاب شده +ListNumber/Caption: لیست شماره‌دار +ListNumber/Hint: لیست شماره‌دار کردن خط‌های انتخاب شده +Manager/Caption: مدیریت تیدلرها +Manager/Hint: بازکردن مدیریت تیدلرها +MonoBlock/Caption: بلوک تک-فاصله +MonoBlock/Hint: بلوک تک-فاصله‌ای کردن خط‌های انتخاب شده +MonoLine/Caption: تک فاصله‌ای +MonoLine/Hint: استفاده از حروف تک فاصله‌ای برای متن انتخاب شده +More/Caption: بیشتر +More/Hint: عمل‌های بیشتر +NewHere/Caption: اینجا جدید +NewHere/Hint: ساختن تیدلر جدید با این برچسب +NewImage/Caption: تصویر جدید +NewImage/Hint: ساختن تیدلر تصویری جدید +NewJournal/Caption: ژورنال جدید +NewJournal/Hint: ساختن تیدلر ژورنال جدید +NewJournalHere/Caption: ژورنال جدید اینجا +NewJournalHere/Hint: ساختن تیدلر ژورنال جدید با این برچسب +NewMarkdown/Caption: تیدلر Markdown جدید +NewMarkdown/Hint: ساختن تیدلر markdown جدید +NewTiddler/Caption: تیدلر جدید +NewTiddler/Hint: تیدلر جدید بساز +Opacity/Caption: کدری +Opacity/Hint: مشخص کردن میزان کدری نقاشی +OpenWindow/Caption: باز کردن در پنجره جدید +OpenWindow/Hint: بازکردن تیدلر در پنجره جدید +Paint/Caption: رنگ نقاشی +Paint/Hint: مشخص کردن رنگ نقاشی +Palette/Caption: پالت +Palette/Hint: انتخاب پالت رنگ نقاشی +Permalink/Caption: لینک دائم +Permalink/Hint: آدرس مرورگر رو تبدیل به پیوند مستقیم به این تیدلر کن +Permaview/Caption: نمایش دائم +Permaview/Hint: آدرس مرورگر رو تبدیل به پیوند مستقیم به همه تیدلر‌های این داستان کن +Picture/Caption: تصویر +Picture/Hint: قرار دادن تصویر +Preview/Caption: پیش‌نمایش +Preview/Hint: پنجره‌ی پیش‌نمایش رو نشون بده +PreviewType/Caption: پیش‌نمایش نوع +PreviewType/Hint: انتخاب پیش‌نمایش نوع +Print/Caption: پرینت صفحه +Print/Hint: صفحه‌ی حال حاضر رو پرینت کن +Quote/Caption: نقل قول +Quote/Hint: خط‌هایی که شامل متن انتخاب شده اند را تبدیل به نقل‌قول کن +Refresh/Caption: تازه‌سازی +Refresh/Hint: تازه‌سازی کامل کل ویکی +Save/Caption: اوکی +Save/Hint: تایید تغییرات بر روی این تیدلر +SaveWiki/Caption: ذخیره تغییرات +SaveWiki/Hint: ذخیره تغییرات +ShowSideBar/Caption: نمایش نوار کناری +ShowSideBar/Hint: نمایش نوار کناری +Size/Caption: اندازه‌ی تصویر +Size/Caption/Height: ارتفاع: +Size/Caption/Resize: تغییر اندازه‌ی تصویر +Size/Caption/Width: عرض: +Size/Hint: مشخص کردن اندازه‌ی تصویر +Stamp/Caption: مهر +Stamp/Caption/New: اضافه کردن مال خودت +Stamp/Hint: ردادن تکه‌ای متن پیش‌تنظیم‌شده +Stamp/New/Text: متن قطعه‌ای ( به یادداشته باشید که عنوانی توصیف کننده در باکس عنوان قرار دهید) +Stamp/New/Title: اسم همانطوری که در منو نمایش داده شده +StoryView/Caption: نمای داستانی +StoryView/Hint: انتخاب نوع نمایش داستان +Strikethrough/Caption: خط‌خورده +Strikethrough/Hint: خط‌خوردگی متن انتخاب شده +Subscript/Caption: زیرنویس +Subscript/Hint: تبدیل متن انتخابی به زیرنویس +Superscript/Caption: ابرمتن +Superscript/Hint: تبدیل متن انتخابی به ابرمتن +TagManager/Caption: مدیریت برچسب +TagManager/Hint: بازکردن مدیریت برچسب +Theme/Caption: قالب +Theme/Hint: انتخاب قالب نمایش +Timestamp/Caption: انتخاب مهر زمانی +Timestamp/Hint: انتخاب این که آیا تغییرات مهرزمانی را عوض کنند یا نه +Timestamp/Off/Caption: مهرهای زمانی خاموش‌اند +Timestamp/Off/Hint: مهرهای زمانی را زمانیکه تیدلرها تغییر می‌کنند، عوض نکن +Timestamp/On/Caption: مهرهای زمانی روشن‌اند +Timestamp/On/Hint: مهرهای زمانی را زمانیکه تیدلرها تغییر می‌کنند، عوض کن +Underline/Caption: زیرخط +Underline/Hint: زیر متن انتخاب شده خط بکش +Unfold/Caption: باز کردن تیدلر +Unfold/Hint: باز کردن بدنه‌ی این تیدلر +UnfoldAll/Caption: باز کردن همه‌ی تیدلرها +UnfoldAll/Hint: باز کردن بدنه‌ی همه‌ی تیدلرهای باز diff --git a/languages/fa-IR/ControlPanel.multids b/languages/fa-IR/ControlPanel.multids new file mode 100644 index 000000000..079898429 --- /dev/null +++ b/languages/fa-IR/ControlPanel.multids @@ -0,0 +1,177 @@ +title: $:/language/ControlPanel/ + +Advanced/Caption: پیشرفته +Advanced/Hint: اطلاعات داخلی در مورد TiddlyWiki +Appearance/Caption: ظاهر +Appearance/Hint: روش‌های تغییر ظاهر TiddlyWiki +Basics/AnimDuration/Prompt: طول زمان انیمیشن: +Basics/Caption: اساسی‌ها +Basics/DefaultTiddlers/BottomHint: Use [[double square brackets]] for titles with spaces. Or you can choose to <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">retain story ordering</$button> +Basics/DefaultTiddlers/Prompt: تیدلرهای پیش‌فرض: +Basics/DefaultTiddlers/TopHint: انتخاب کن که کدوم تیدلرها در هنگام شروع نمایش داده بشن: +Basics/Language/Prompt: سلام! زبان حاضر: +Basics/NewJournal/Tags/Prompt: برچسب‌ها برای تیدلرهای ژورنالی جدید +Basics/NewJournal/Text/Prompt: متن برای تیدلرهای ژورنالی جدید +Basics/NewJournal/Title/Prompt: عنوان برای تیدلرهای ژورنالی جدید +Basics/OverriddenShadowTiddlers/Prompt: تعداد تیدلرهای سایه‌ای باز‌نویسی شد: +Basics/ShadowTiddlers/Prompt: تعداد تیدلرهای سایه‌ای: +Basics/Subtitle/Prompt: زیرنویس: +Basics/SystemTiddlers/Prompt: تعداد تیدلرهای سیستمی: +Basics/Tags/Prompt: تعداد برچسب‌ها: +Basics/Tiddlers/Prompt: تعداد تیدلر‌ها: +Basics/Title/Prompt: عنوان این ~TiddlyWiki: +Basics/Username/Prompt: نام کاربری برای امضای ویرایش‌ها: +Basics/Version/Prompt: ~TiddlyWiki ورژن: +EditorTypes/Caption: انواع ویرایشگرها +EditorTypes/Editor/Caption: ویرایشگر +EditorTypes/Hint: این تیدلرها مشخص می‌کنند که کدوم ویرایشگر برای کدوم نوع تیدلر استفاده بشه. +EditorTypes/Type/Caption: نوع +Info/Caption: اطلاعات +Info/Hint: اطلاعات درباره‌ی این TiddlyWiki +KeyboardShortcuts/Add/Caption: اضافه کردن میانبر +KeyboardShortcuts/Add/Prompt: میانبر را در اینجا بنویسید +KeyboardShortcuts/Caption: میانبر‌های صفحه کلید +KeyboardShortcuts/Hint: مدیریت میانبر‌های صفحه کلید ساخته شده +KeyboardShortcuts/NoShortcuts/Caption: هیچ میانبر‌های صفحه کلیدی ساخته نشده است. +KeyboardShortcuts/Platform/All: همه‌ی پلتفورم‌ها +KeyboardShortcuts/Platform/Linux: فقط برای لینوکس +KeyboardShortcuts/Platform/Mac: فقط برای مکینتاش +KeyboardShortcuts/Platform/NonLinux: فقط برای غیر لینوکس‌ها +KeyboardShortcuts/Platform/NonMac: فقط برای غیر مکینتاش‌ها +KeyboardShortcuts/Platform/NonWindows: فقط برای غیر ویندوزها +KeyboardShortcuts/Platform/Windows: ففقط برای ویندوز +KeyboardShortcuts/Remove/Hint: حذف میانبر‌ صفحه کلید +LoadedModules/Caption: مدول‌های بارگزاری شده +LoadedModules/Hint: این‌ها مدول‌های تیدلر بارگزاری شده هستند که به تیدلرهای منبعشون پیوند داده شدن. هر مدولی که مایل‌نویس شده، بدون تیدلر منبع هست که معمولن بخاطر این هست که در هنگام بارگزاری ساخته شدند. +Palette/Caption: پالت +Palette/Editor/Clone/Caption: کلون +Palette/Editor/Clone/Prompt: پیشنهاد می شه که قبل ازاستفاده از این پالت سایه‌ای، کلونش کنین. +Palette/Editor/Prompt: ویرایش‌کردن +Palette/Editor/Prompt/Modified: این پالت سایه‌ای تغییر کرده است. +Palette/Editor/Reset/Caption: بازسازی +Palette/HideEditor/Caption: مخفی‌کردن ویرایش‌گر +Palette/Prompt: پالت حال حاضر: +Palette/ShowEditor/Caption: نمایش ویرایش‌گر +Parsing/Block/Caption: قواعد تجزیه‌ی بلوک‌ها +Parsing/Caption: تجزیه کردن +Parsing/Hint: Here you can globally disable/enable wiki parser rules. For changes to take effect, save and reload your wiki. Disabling certain parser rules can prevent <$text text="TiddlyWiki"/> from functioning correctly. Use [[safe mode|https://tiddlywiki.com/#SafeMode]] to restore normal operation. +اینجا می‌تونی قواعد تجزیه‌ی ویکی رو به صورت کلی عوض کنی. برای این که تغییرات تاثیرگذار باشن، ذخیره کن و ویکیت رو دوباره بارگذاری کن. غیر فعال کردن بعضی قواعد تجزیه می‌تونه مانع عملکرد درست <$text text="TiddlyWiki"/> بشه. +از [[safe mode|https://tiddlywiki.com/#SafeMode]] استفاده کن تا عملکرد‌ها عادی بشه. +Parsing/Inline/Caption: قواعد تجزیه‌ی درون‌خطی +Parsing/Pragma/Caption: قواعد تجزیه پراگما +Plugins/Add/Caption: دریافت افزونه‌های بیشتر +Plugins/Add/Hint: نصب افزونه از کتاب‌خانه‌ی رسمی +Plugins/AlreadyInstalled/Hint: این افزونه از ورژن <$text text=<<installedVersion>>/> از قبل نصب شده‌است +Plugins/Caption: افزونه‌ها +Plugins/ClosePluginLibrary: بستن کتاب‌خانه‌ی افزونه‌ها +Plugins/Disable/Caption: غیرفعال +Plugins/Disable/Hint: این افزونه را هنگام بارگذاری دوباره‌ی صفحه غیرفعال کن +Plugins/Disabled/Status: (غیرفعال) +Plugins/Empty/Hint: هیچ +Plugins/Enable/Caption: فعال +Plugins/Enable/Hint: این افزونه را هنگام بارگذاری دوباره‌ی صفحه فعال کن +Plugins/Install/Caption: نصب +Plugins/Installed/Hint: افزونه‌ی نصب شده: +Plugins/Languages/Caption: زبان‌ها +Plugins/Languages/Hint: افزونه‌های بسته‌های زبانی +Plugins/NoInfoFound/Hint: هیچ ''"<$text text=<<currentTab>>/>"'' پیدا نشد +Plugins/NoInformation/Hint: هیچ اطلاعاتی داده نشد +Plugins/NotInstalled/Hint: این افزونه در حال حاضر نصب نشده‌است +Plugins/OpenPluginLibrary: بازکردن کتاب‌خانه‌ی افزونه +Plugins/Plugins/Caption: افزونه‌ها +Plugins/Plugins/Hint: افزونه‌ها +Plugins/Reinstall/Caption: بازنصب +Plugins/Themes/Caption: قالب‌ها +Plugins/Themes/Hint: افزونه قالب‌ها +Saving/Caption: در حال ذخیره +Saving/DownloadSaver/AutoSave/Description: اجازه‌ی ذخیره‌ی خودکار به ذخیره کننده‌ی بارگذار +Saving/DownloadSaver/AutoSave/Hint: فعال‌سازی ذخیره‌ی خودکار به ذخیره کننده‌ی بارگذار +Saving/DownloadSaver/Caption: ذخیره کننده‌ی بارگذار +Saving/DownloadSaver/Hint: +این تنظیمات بر روی ذخیره کننده‌ی بارگذار مطابق با HTML5 اجرا می‌شه +Saving/General/Caption: عمومی +Saving/General/Hint: این تنظیمات بر روی تمام ذخیره‌کننده‌های فعال اجرا می‌شود +Saving/Hint: Settings used for saving the entire TiddlyWiki as a single file via a saver module +تنظیماتی برای ذخیره‌ی کل TiddlyWiki بر روی یک فایل از طریق مدولی برای ذخیره +Saving/TiddlySpot/Advanced/Heading: تنظیمات پیشرفته +Saving/TiddlySpot/BackupDir: محل پشتیبانی‌گیری +Saving/TiddlySpot/Backups: محل پشتیبانی‌گیری +Saving/TiddlySpot/Caption: ذخیره کننده‌ی ~TiddlySpot +Saving/TiddlySpot/Description: این تنظیمات فقط زمانی استفاده می‌شوند که از http://tiddlyspot.com یا یک سرور دوردست دارای مطابقت استفاده می‌شود. +Saving/TiddlySpot/Filename: اسم فایل آپلود شده +Saving/TiddlySpot/Heading: ~TiddlySpot +Saving/TiddlySpot/Hint: //The server URL defaults to `http://<wikiname>.tiddlyspot.com/store.cgi` and can be changed to use a custom server address, e.g. `http://example.com/store.php`.// +Saving/TiddlySpot/Password: رمز +Saving/TiddlySpot/ServerURL: آدرس سرور +Saving/TiddlySpot/UploadDir: محل آپلود +Saving/TiddlySpot/UserName: اسم ویکی +Settings/AutoSave/Caption: ذخیره خودکار +Settings/AutoSave/Disabled/Description: تغییرات رو خودکار ذخیره نکن +Settings/AutoSave/Enabled/Description: تغییرات رو خودکار ذخیره کن. +Settings/AutoSave/Hint: سعی کن تغییرات رو به صورت خودکار ذخیره کنی در حینی که ویرایش انجام می‌شه توسط یک ذخیره کننده‌ی پشتیبان. +Settings/CamelCase/Caption: CamelCase Wiki Links +Settings/CamelCase/Description: فعال سازی پیوند‌های ~CamelCase خودکار +Settings/CamelCase/Hint: شما پیوندسازی خودکار عبارات ~CamelCase را غیر فعال ساختید. این تغییر نیازمند بارگزاری دوباره است تا عمل کند. +Settings/Caption: تنظیمات +Settings/DefaultSidebarTab/Caption: برگه‌ی پیشفرض نوار کناری +Settings/DefaultSidebarTab/Hint: مشخص کنید که کدام برگه‌ی نوارکناری به صورت پیشفرض نمایش داده شود +Settings/EditorToolbar/Caption: نوار ابزار ویرایشگر +Settings/EditorToolbar/Description: نوار ابزار ویرایشگر رو نمایش بده +Settings/EditorToolbar/Hint: نوار ابزار ویرایشگر رو فعال یا غیرفعال کن: +Settings/Hint: این تنظیمات به شما امکان تغییر رفتار TiddlyWiki را می‌دهند. +Settings/InfoPanelMode/Caption: حالت صفحه‌ی اطلاعات تیدلر +Settings/InfoPanelMode/Hint: زمانی که حالت صفحه‌ی اطلاعات تیدلر بسته می‌شه رو کنترل کن: +Settings/InfoPanelMode/Popup/Description: حالت صفحه‌ی اطلاعات تیدلر به صورت خودکار بسته می‌شه +Settings/InfoPanelMode/Sticky/Description: حالت صفحه‌ی اطلاعات تیدلر باز می‌مونه مگر این که عمدن بسته بشه +Settings/LinkToBehaviour/Caption: رفتار باز شدن تیدلر +Settings/LinkToBehaviour/InsideRiver/Hint: هدایت از //درون// رود داستان +Settings/LinkToBehaviour/OpenAbove: بالای تیدلر کنونی باز کن +Settings/LinkToBehaviour/OpenAtBottom: پایین رود داستان باز کن +Settings/LinkToBehaviour/OpenAtTop: بالای رود داستان باز کن +Settings/LinkToBehaviour/OpenBelow: پایین تیدلر کنونی باز کن +Settings/LinkToBehaviour/OutsideRiver/Hint: هدایت از //بیرون// رود داستان +Settings/MissingLinks/Caption: پیوند‌های ویکی +Settings/MissingLinks/Description: فعا‌ل‌سازی پیوند به تیدلرهای ناموجود +Settings/MissingLinks/Hint: انتخاب کنید که آیا پیوند به تیدلرهایی که هنوز وجود ندارد زده شود یا نه +Settings/NavigationAddressBar/Caption: نوار آدرس هدایت‌گر +Settings/NavigationAddressBar/Hint: عملکرد نوار آدرس هنگامی که به داخل تیدلر می‌رود: +Settings/NavigationAddressBar/No/Description: نوار آدرس را بروز نکن +Settings/NavigationAddressBar/Permalink/Description: تیدلر مورد نظر را شامل شود +Settings/NavigationAddressBar/Permaview/Description: تیدلر مورد نظر و توالی داستان کنونی را شامل شود +Settings/NavigationHistory/Caption: تاریخچه‌ی حرکت +Settings/NavigationHistory/Hint: زمانی که به یک تیدلر می‌روی تاریخچه مرورگر بروزرسانی شود: +Settings/NavigationHistory/No/Description: تاریخچه بروز نشود +Settings/NavigationHistory/Yes/Description: بروزرسانی تاریخ‌چه +Settings/PerformanceInstrumentation/Caption: استعمال آلات کارایی +Settings/PerformanceInstrumentation/Description: فعال‌سازی استعمال آلات کارایی +Settings/PerformanceInstrumentation/Hint: نمایش آمار کارایی در کنسول توسعه‌گر مرورگر. نیازمند بارگزاری مجدد. +Settings/TitleLinks/Caption: عنوان‌های تیدلر +Settings/TitleLinks/Hint: به صورت اختیاری عنوان‌ها رو به صورت پیوند نمایش بده +Settings/TitleLinks/No/Description: عنوان تیدلرها رو به صورت پیوند نمایش نده +Settings/TitleLinks/Yes/Description: عنوان تیدلرها رو به صورت پیوند نمایش بده +Settings/ToolbarButtons/Caption: دکمه‌های نوار ابزار +Settings/ToolbarButtons/Hint: ظاهر پیشفرض دکمه‌های نوار ابزار: +Settings/ToolbarButtons/Icons/Description: شامل آیکون +Settings/ToolbarButtons/Text/Description: شامل متن +Settings/ToolbarButtonStyle/Caption: استایل دکمه‌های نوار ابزار +Settings/ToolbarButtonStyle/Hint: انتخاب استایل دکمه‌های نوار ابزار: +Settings/ToolbarButtonStyle/Styles/Borderless: بدون مرز +Settings/ToolbarButtonStyle/Styles/Boxed: مربع شده +Settings/ToolbarButtonStyle/Styles/Rounded: گرد شده +StoryView/Caption: نمای داستانی +StoryView/Prompt: نمای حال حاضر: +Theme/Caption: قالب +Theme/Prompt: قالب کنونی: +TiddlerFields/Caption: فضای تیدلر +TiddlerFields/Hint: این مجموعه‌ای کامل از فضاهای تیدلرهای استفاده شده در این ویکی است (شامل تیدلرهای سیستم اما بدون تیدلرهای سایه‌ای). +Toolbars/Caption: نوارابزارها +Toolbars/EditorToolbar/Caption: نوارابزار ویرایشگر +Toolbars/EditorToolbar/Hint: انتخاب کن کدام دکمه‌های در نوارابزار ویرایشگر نمایش داده شود. توجه کن که بعضی دکمه‌ها فقط در ویرایشگرهای تیدلرهای بخصوصی نمایش داده می‌شوند. برای تغییر ترتیب بکش و بندازشان +Toolbars/EditToolbar/Caption: ویرایش نوار ابزار +Toolbars/EditToolbar/Hint: انتخاب کن کدام دکمه‌ها برای تیدلرها در حالت ویرایش نمایش داده شود. برای تغییر ترتیب بکش و بندازشان +Toolbars/Hint: انتخاب نمایش دکمه‌های نوارابزار +Toolbars/PageControls/Caption: نوارابزار صفحه +Toolbars/PageControls/Hint: انتخاب کن کدام دکمه‌ها در نوار ابزار صفحه اصلی نمایش داده شود. برای تغییر ترتیب بکش و بندازشان +Toolbars/ViewToolbar/Caption: نوارابزار رو نمایش بده +Toolbars/ViewToolbar/Hint: انتخاب کن کدام دکمه‌ها برای تیدلرها در حالت نمایش، نمایش داده شود. برای تغییر ترتیب بکش و بندازشان +Tools/Download/Full/Caption: ویکی کامل رو دانلود کن diff --git a/languages/fa-IR/CoreReadMe.tid b/languages/fa-IR/CoreReadMe.tid new file mode 100644 index 000000000..8aaf69d48 --- /dev/null +++ b/languages/fa-IR/CoreReadMe.tid @@ -0,0 +1,8 @@ +title: $:/core/fa/readme + +این افزونه شامل قطعات مرکزی تیدلی ویکی است. که متشکل است از: + +* مدول‌های جاوا اسکریپت +* آیکون‌ها +* قالب‌هایی که برای ساخت تیدلی‌ویکی لازم است +* انگلیسی بریتانیایی (''en-GB'') زنجیره‌های قابل محلی سازی که توسط مرکز استفاده می‌شود. diff --git a/languages/fa-IR/Dates.multids b/languages/fa-IR/Dates.multids new file mode 100644 index 000000000..8b7916d6b --- /dev/null +++ b/languages/fa-IR/Dates.multids @@ -0,0 +1,87 @@ +title: $:/language/ + +Date/DaySuffix/1: +Date/DaySuffix/10: +Date/DaySuffix/11: +Date/DaySuffix/12: +Date/DaySuffix/13: +Date/DaySuffix/14: +Date/DaySuffix/15: +Date/DaySuffix/16: +Date/DaySuffix/17: +Date/DaySuffix/18: +Date/DaySuffix/19: +Date/DaySuffix/2: +Date/DaySuffix/20: +Date/DaySuffix/21: +Date/DaySuffix/22: +Date/DaySuffix/23: +Date/DaySuffix/24: +Date/DaySuffix/25: +Date/DaySuffix/26: +Date/DaySuffix/27: +Date/DaySuffix/28: +Date/DaySuffix/29: +Date/DaySuffix/3: +Date/DaySuffix/30: +Date/DaySuffix/31: +Date/DaySuffix/4: +Date/DaySuffix/5: +Date/DaySuffix/6: +Date/DaySuffix/7: +Date/DaySuffix/8: +Date/DaySuffix/9: +Date/Long/Day/0: یکشنبه +Date/Long/Day/1: دوشنبه +Date/Long/Day/2: سه شنبه +Date/Long/Day/3: چهارشنبه +Date/Long/Day/4: پنجشنبه +Date/Long/Day/5: جمعه +Date/Long/Day/6: شنبه +Date/Long/Month/1: January +Date/Long/Month/10: October +Date/Long/Month/11: Novembe +Date/Long/Month/12: December +Date/Long/Month/2: February +Date/Long/Month/3: March +Date/Long/Month/4: April +Date/Long/Month/5: May +Date/Long/Month/6: June +Date/Long/Month/7: July +Date/Long/Month/8: August +Date/Long/Month/9: September +Date/Period/am: صبح +Date/Period/pm: بعد از ظهر +Date/Short/Day/0: یکش +Date/Short/Day/1: دوش +Date/Short/Day/2: سش +Date/Short/Day/3: چرش +Date/Short/Day/4: پنجش +Date/Short/Day/5: جمعه +Date/Short/Day/6: شنب +Date/Short/Month/1: Jan +Date/Short/Month/10: Oct +Date/Short/Month/11: Nov +Date/Short/Month/12: Dec +Date/Short/Month/2: Feb +Date/Short/Month/3: Mar +Date/Short/Month/4: Apr +Date/Short/Month/5: May +Date/Short/Month/6: Jun +Date/Short/Month/7: Jul +Date/Short/Month/8: Aug +Date/Short/Month/9: Sep +RelativeDate/Future/Days: <<period>> روز از الان +RelativeDate/Future/Hours: <<period>> ساعت از الان +RelativeDate/Future/Minutes: <<period>> دقیقه از الان +RelativeDate/Future/Months: <<period>> ماه از الان +RelativeDate/Future/Second: ۱ ثانیه از الان +RelativeDate/Future/Seconds: <<period>> ثانیه از الان +RelativeDate/Future/Years: <<period>> سال از الان +RelativeDate/Past/Days: <<period>> روز قبل +RelativeDate/Past/Hours: <<period>> ساعت قبل +RelativeDate/Past/Minutes: <<period>> دقیقه قبل +RelativeDate/Past/Months: <<period>> ماه قبل +RelativeDate/Past/Second: 1 ثانیه قبل +RelativeDate/Past/Seconds: <<period>> ثانیه قبل +RelativeDate/Past/Years: <<period>> سال قبل diff --git a/languages/fa-IR/Docs/ModuleTypes.multids b/languages/fa-IR/Docs/ModuleTypes.multids new file mode 100644 index 000000000..27adfbfb3 --- /dev/null +++ b/languages/fa-IR/Docs/ModuleTypes.multids @@ -0,0 +1,2 @@ +title: $:/language/Docs/ModuleTypes/ + diff --git a/languages/fa-IR/Docs/PaletteColours.multids b/languages/fa-IR/Docs/PaletteColours.multids new file mode 100644 index 000000000..9796752f4 --- /dev/null +++ b/languages/fa-IR/Docs/PaletteColours.multids @@ -0,0 +1,2 @@ +title: $:/language/Docs/PaletteColours/ + diff --git a/languages/fa-IR/EditTemplate.multids b/languages/fa-IR/EditTemplate.multids new file mode 100644 index 000000000..168ed4379 --- /dev/null +++ b/languages/fa-IR/EditTemplate.multids @@ -0,0 +1,29 @@ +title: $:/language/EditTemplate/ + +Body/External/Hint: این یک تیدلر خارجی است که در خارج فایل اصلی تیدلی‌ویکی ذخیره شده‌است. شما می‌توانید برچسب‌ها و فضاهای خالی را ویرایش کنید اما نمی‌توانید مستقیمن محتوا را عوض کنید +Body/Placeholder: متن این تیدلر را تایپ کن +Body/Preview/Type/Output: خروجی +Field/Remove/Caption: حذف فضاهای خالی +Field/Remove/Hint: حذف فضای خالی +Fields/Add/Button: اضافه کردن +Fields/Add/Dropdown/System: فضای خالی سیستمی +Fields/Add/Dropdown/User: فضای خالی کاربر +Fields/Add/Name/Placeholder: فضای خالی نام +Fields/Add/Prompt: فضای خالی اضافه کن: +Fields/Add/Value/Placeholder: ارزش فضای خالی +Shadow/OverriddenWarning: این یک تیدلر سایه‌ای ویرایش‌شده است. شما می‌توانید به ویرایش پیشفرض افزونه<<pluginLink>>، از طریق حذف این تیدلر برگردید +Shadow/Warning: +این یک تیدلر سایه‌است. هر تغییر که انجام دهید به ویرایش پیشفرض افزونه <<pluginLink>> برمی‌گردد +Tags/Add/Button: اضافه کن +Tags/Add/Placeholder: نام برچسب +Tags/Dropdown/Caption: لیست برچسب +Tags/Dropdown/Hint: نمایش لیست برچسب +Title/BadCharacterWarning: اخطار: از استفاده از هر گونه از کاراکترهای <<bad-chars>> در عنوان تیدلرها خودداری کنید +Title/Exists/Prompt: تیدلر مورد نظر از قبل وجود دارد +Title/Relink/Prompt: برروز رسانی کنه ''<$text text=<<fromTitle>>/>'' به ''<$text text=<<toTitle>>/>'' در //برچسب// و //لیست// فضای خالی سایر تیدلرها +Type/Delete/Caption: پاک کردن نوع محتوا +Type/Delete/Hint: پاک کردن نوع محتوا +Type/Dropdown/Caption: لیست انواع محتوا +Type/Dropdown/Hint: نمایش لیست انواع محتوا +Type/Placeholder: نوع محتوا +Type/Prompt: نوع: diff --git a/languages/fa-IR/Exporters.multids b/languages/fa-IR/Exporters.multids new file mode 100644 index 000000000..e7b701348 --- /dev/null +++ b/languages/fa-IR/Exporters.multids @@ -0,0 +1,6 @@ +title: $:/language/Exporters/ + +CsvFile: فایل CSV +JsonFile: فایل JSON +StaticRiver: Static HTML +TidFile: فایل ".tid" diff --git a/languages/fa-IR/Fields.multids b/languages/fa-IR/Fields.multids new file mode 100644 index 000000000..8712916de --- /dev/null +++ b/languages/fa-IR/Fields.multids @@ -0,0 +1,2 @@ +title: $:/language/Docs/Fields/ + diff --git a/languages/fa-IR/Filters.multids b/languages/fa-IR/Filters.multids new file mode 100644 index 000000000..356e4fa0c --- /dev/null +++ b/languages/fa-IR/Filters.multids @@ -0,0 +1,2 @@ +title: $:/language/Filters/ + diff --git a/languages/fa-IR/GettingStarted.tid b/languages/fa-IR/GettingStarted.tid new file mode 100644 index 000000000..13ca87746 --- /dev/null +++ b/languages/fa-IR/GettingStarted.tid @@ -0,0 +1,17 @@ +title: GettingStarted + +\define lingo-base() $:/language/ControlPanel/Basics/ +به ~TiddlyWiki و جامعه‌ی ~TiddlyWiki خوش آمدید. + +قبل از این که هر گونه اطلاعات مهمی رو در ~TiddlyWiki وارد کنی، مهمه که اطمینان کسب کنیم که می‌تونی اطلاعات رو به شکل قابل اعتمادی ذخیره کنی. برای اطلاعات بیشتر ببین: https://tiddlywiki.com/#GettingStarted + +!! این رو تنظیم کن ~TiddlyWiki + +<div class="tc-control-panel"> + +|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> | +|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> | +|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// | +</div> + +برای انتخاب‌های بیشتر این رو ببین: [[control panel|$:/ControlPanel]] diff --git a/languages/fa-IR/Import.multids b/languages/fa-IR/Import.multids new file mode 100644 index 000000000..1c365356b --- /dev/null +++ b/languages/fa-IR/Import.multids @@ -0,0 +1,15 @@ +title: $:/language/Import/ + +Imported/Hint: تیدلرهای ذیل وارد شدند: +Listing/Cancel/Caption: کنسل +Listing/Hint: این تیدلرها آماده‌ی وارد شدن هستند: +Listing/Import/Caption: وارد کردن +Listing/Select/Caption: انتخاب +Listing/Status/Caption: وضعیت +Listing/Title/Caption: عنوان +Upgrader/Plugins/Suppressed/Incompatible: نامنطبق‌ها بلاک شدند یا افزونه قدیمی است +Upgrader/Plugins/Suppressed/Version: افزونه‌ها بلاک شدن (بخاطر این که ورودی‌ها <<incoming>> قدیمی‌تر از موجود‌ها <<existing>> هستند) +Upgrader/Plugins/Upgraded: افزونه‌ها از <<incoming>> به <<upgraded>> بروز شدند. +Upgrader/State/Suppressed: تیدلرهای دارای وضعیت موقت بلاک شدند +Upgrader/System/Suppressed: تیدلرهای سیستمی بلاک شدند +Upgrader/ThemeTweaks/Created: تغییرات قالب از <$text text=<<from>>/> دریافت شدند diff --git a/languages/fa-IR/Misc.multids b/languages/fa-IR/Misc.multids new file mode 100644 index 000000000..4fef47264 --- /dev/null +++ b/languages/fa-IR/Misc.multids @@ -0,0 +1,70 @@ +title: $:/language/ + +AboveStory/ClassicPlugin/Warning: به نظر می‌آید که قصد استفاده از افزونه‌ای را داری که برای ~TiddlyWiki Classic طراحی شده‌است. لطفن توجه کن که [[این افزونه‌ها با تیدلی‌ویکی ویرایش 5.x.x|https://tiddlywiki.com/#TiddlyWikiClassic کار نمی‌کند]]. افزونه‌های ~TiddlyWiki Classic شناسایی شده: +BinaryWarning/Prompt: این تیدلر شامل اطلاعات بایناری است +ClassicWarning/Hint: این تیدلر با فرمت تیدلی‌ویکی کلاسیک نوشته شده است, که با تیدلی‌ویکی ویرایش ۵ هماهنگ نیست. برای اطلاعات بیشتر https://tiddlywiki.com/static/Upgrading.html را ببین. +ClassicWarning/Upgrade/Caption: بروزرسانی +CloseAll/Button: همه را ببند +ColourPicker/Recent: تازه‌ها: +ConfirmCancelTiddler: آیا تمایل دارید که تغییرات بر روی "<$text text=<<title>>/>" را فراموش کنید؟ +ConfirmDeleteTiddler: آیا قصد پاک کردند تیدلر "<$text text=<<title>>/>" را دارید؟ +ConfirmEditShadowTiddler: شما قصد ویرایش یک تیدلر سایه‌ای را دارید. هر تغییری سیستم‌ را از حالت پیشفرض در می‌آورد که هر گونه برروزرسانی را در آینده پیچیده می‌سازد.‌ آیا مطمئنید که قصد ویرایش "<$text text=<<title>>/>" را دارید؟ +ConfirmOverwriteTiddler: آیا قصد بازنویسی تیدلر"<$text text=<<title>>/>"را دارید؟ +Count: شمارش +DefaultNewTiddlerTitle: تیدلر جدید +DropMessage: اینجا بنداز ( یا دکمه‌ی escape رو بزن تا کنسل بشه) +Encryption/Cancel: کنسل +Encryption/ConfirmClearPassword: آیا قصد پاکسازی رمز را دارید؟ این رمزنگاریی که هنگام ساخت این ویکی بوده را حذف می‌کند +Encryption/Password: رمز +Encryption/PasswordNoMatch: رمزها با هم یکی نیستند +Encryption/PromptSetPassword: رمز جدیدی برای این تیدلی‌ویکی بسازید +Encryption/RepeatPassword: تکرار رمز +Encryption/SetPassword: تعیین رمز +Encryption/Username: نام کاربری +Error/Caption: خطا +Error/EditConflict: فایل در سرور عوض شد +Error/Filter: خطای فیلتر +Error/FilterSyntax: در نحوه‌ی بیان فیلتر خطای نحوی وجود داشت +Error/IsFilterOperator: خطای فیلتر: عملکرد ناشناخته‌ای برای عملگر 'is' مشخص شده +Error/LoadingPluginLibrary: خطا در بارگزاری کتاب‌خانه افزونه +Error/RecursiveTransclusion: Recursive transclusion error in transclude widget +Error/RetrievingSkinny: طا در دریافت لیست‌های تیدلر لاغر +Error/SavingToTWEdit: خطا در ذخیره در TWEdit +Error/WhileSaving: خطا در حین ذخیره +Error/XMLHttpRequest: XMLHttpRequest error code +InternalJavaScriptError/Hint: اوه این خجالت آوره. پیشنهاد می‌کنیم که با ریفرش کردن مرورگرتون تیدلی‌ویکی رو دوباره باز کنین +InternalJavaScriptError/Title: خطای JavaScript داخلی +InvalidFieldName: Illegal characters in field name "<$text text=<<fieldName>>/>". Fields can only contain lowercase letters, digits and the characters underscore (`_`), hyphen (`-`) and period (`.`) +LazyLoadingWarning: <p>Loading external text from ''<$text text={{!!_canonical_uri}}/>''</p><p>If this message doesn't disappear you may be using a browser that doesn't support external text in this configuration. See https://tiddlywiki.com/#ExternalText</p> +LoginToTiddlySpace: Login to TiddlySpace +Manager/Controls/FilterByTag/None: (هیچ) +Manager/Controls/FilterByTag/Prompt: فیتلر با استفاده از برچسب‌ها: +Manager/Controls/Order/Prompt: برعکس‌سازی ترتیب +Manager/Controls/Search/Placeholder: جستجو +Manager/Controls/Search/Prompt: جستجو: +Manager/Controls/Show/Option/Tags: برچسب‌ها +Manager/Controls/Show/Option/Tiddlers: تیدلرها +Manager/Controls/Show/Prompt: نمایش: +Manager/Controls/Sort/Prompt: مرتب کردن بر اساس: +Manager/Item/Colour: رنگ +Manager/Item/Fields: فضاهای خالی +Manager/Item/Icon: آیکون +Manager/Item/Icon/None: (هیچ) +Manager/Item/RawText: متن خام +Manager/Item/Tags: برچسب‌ها +Manager/Item/Tools: ابزارها +Manager/Item/WikifiedText: تکست ویکی‌سازی شده +MissingTiddler/Hint: تیدلر گمشده"<$text text=<<currentTiddler>>/>" - بر روی {{$:/core/images/edit-button}} کلیک کن تا بسازی +No: نه +OfficialPluginLibrary: کتابخانه افزونه‌ی رسیمی ~TiddlyWiki +RecentChanges/DateFormat: رر م‌م‌م س‌س‌س‌س +SystemTiddler/Tooltip: این یک تیدلر سیستمی است +SystemTiddlers/Include/Prompt: شامل تیدلرهای سیستمی شود +TagManager/Colour/Heading: رنگ +TagManager/Count/Heading: شمارش +TagManager/Icon/Heading: آیکون +TagManager/Info/Heading: اطلاعات +TagManager/Tag/Heading: برچسب +Tiddler/DateFormat: DDth MMM YYYY at hh12:0mmam +UnsavedChangesWarning: شما تغییرات ذخیره نشده در تیدلی‌ویکی دارید +Yes: آره diff --git a/languages/fa-IR/Modals/Download.tid b/languages/fa-IR/Modals/Download.tid new file mode 100644 index 000000000..a635ac186 --- /dev/null +++ b/languages/fa-IR/Modals/Download.tid @@ -0,0 +1,13 @@ +title: $:/language/Modals/Download +type: text/vnd.tiddlywiki +subtitle: Download changes +footer: <$button message="tm-close-tiddler">Close</$button> +help: https://tiddlywiki.com/static/DownloadingChanges.html + +مرورگرتان فقط ذخیره‌سازی دستی را پشتیبانی می‌کند. + +برای ذخیره کردن ویکی تغییریافته، بر روی پیوند دانلود کلیک راست کن و «Download file» یا «Save file» را انتخاب کن. بعد نام پوشه یا فایل را انتخاب کن. + +//You can marginally speed things up by clicking the link with the control key (Windows) or the options/alt key (Mac OS X). You will not be prompted for the folder or filename, but your browser is likely to give it an unrecognisable name -- you may need to rename the file to include an `.html` extension before you can do anything useful with it.// + +On smartphones that do not allow files to be downloaded you can instead bookmark the link, and then sync your bookmarks to a desktop computer from where the wiki can be saved normally. diff --git a/languages/fa-IR/NewJournal.multids b/languages/fa-IR/NewJournal.multids new file mode 100644 index 000000000..f846377f7 --- /dev/null +++ b/languages/fa-IR/NewJournal.multids @@ -0,0 +1,4 @@ +title: $:/config/NewJournal/ + +Tags: ژورنال +Title: رر م‌م‌م ‌س‌س‌س‌س diff --git a/languages/fa-IR/Notifications.multids b/languages/fa-IR/Notifications.multids new file mode 100644 index 000000000..1ac2f9665 --- /dev/null +++ b/languages/fa-IR/Notifications.multids @@ -0,0 +1,4 @@ +title: $:/language/Notifications/ + +Save/Done: ویکی ذخیره شده +Save/Starting: شروع ذخیره‌سازی ویکی diff --git a/languages/fa-IR/Search.multids b/languages/fa-IR/Search.multids new file mode 100644 index 000000000..d801c6905 --- /dev/null +++ b/languages/fa-IR/Search.multids @@ -0,0 +1,20 @@ +title: $:/language/Search/ + +DefaultResults/Caption: لیست +Filter/Caption: فیلتر +Filter/Hint: سرچ از طریق [[filter expression|https://tiddlywiki.com/static/Filters.html]] +Filter/Matches: //<small><<resultCount>>همخوانی دارد </small>// +Matches: //<small><<resultCount>> همخوانی دارد</small>// +Matches/All: همه همخوانی کند با: +Matches/Title: عنوان همخوانی کند با: +Search: جستجو +Search/TooShort: متن جستجو خیلی کوتاه است +Shadows/Caption: سایه‌ها +Shadows/Hint: در تیدلرهای سایه‌ای جستجو کن +Shadows/Matches: //<small><<resultCount>> همخوانی دارد </small>// +Standard/Caption: استاندارد +Standard/Hint: در تیدلرهای استاندارد جستجو کن +Standard/Matches: //<small><<resultCount>> همخوانی دارد </small>// +System/Caption: سیستم +System/Hint: در تیدلرهای سیستمی جستجو کن +System/Matches: //<small><<resultCount>> همخوانی دارد </small>// diff --git a/languages/fa-IR/SideBar.multids b/languages/fa-IR/SideBar.multids new file mode 100644 index 000000000..c1494350d --- /dev/null +++ b/languages/fa-IR/SideBar.multids @@ -0,0 +1,16 @@ +title: $:/language/SideBar/ + +All/Caption: همه +Contents/Caption: محتواها +Drafts/Caption: پیش‌نویس +Missing/Caption: گم شده +More/Caption: بیشتر +Open/Caption: باز کن +Orphans/Caption: یتیم‌ها +Recent/Caption: تازه‌ها +Shadows/Caption: سایه‌ها +System/Caption: سیستم +Tags/Caption: برچسب‌ها +Tags/Untagged/Caption: بدون برچسب‌ها +Tools/Caption: ابزار +Types/Caption: انواع diff --git a/languages/fa-IR/SiteSubtitle.tid b/languages/fa-IR/SiteSubtitle.tid new file mode 100644 index 000000000..8cefaa8af --- /dev/null +++ b/languages/fa-IR/SiteSubtitle.tid @@ -0,0 +1,3 @@ +title: $:/SiteSubtitle + +یک دفترچه آنلاین غیر خطی \ No newline at end of file diff --git a/languages/fa-IR/SiteTitle.tid b/languages/fa-IR/SiteTitle.tid new file mode 100644 index 000000000..1fd02cd51 --- /dev/null +++ b/languages/fa-IR/SiteTitle.tid @@ -0,0 +1,3 @@ +title: $:/SiteTitle + +~TiddlyWiki من \ No newline at end of file diff --git a/languages/fa-IR/ThemeTweaks.multids b/languages/fa-IR/ThemeTweaks.multids new file mode 100644 index 000000000..b9facc8c8 --- /dev/null +++ b/languages/fa-IR/ThemeTweaks.multids @@ -0,0 +1,2 @@ +title: $:/language/ThemeTweaks/ + diff --git a/languages/fa-IR/TiddlerInfo.multids b/languages/fa-IR/TiddlerInfo.multids new file mode 100644 index 000000000..5a79123f7 --- /dev/null +++ b/languages/fa-IR/TiddlerInfo.multids @@ -0,0 +1,21 @@ +title: $:/language/TiddlerInfo/ + +Advanced/Caption: پیشرفته +Advanced/PluginInfo/Empty/Hint: هیچ +Advanced/PluginInfo/Heading: جزییات افزونه +Advanced/PluginInfo/Hint: این افزونه شامل تیدلرهای سایه‌ای زیر می‌شود: +Advanced/ShadowInfo/Heading: وضعیت سایه +Advanced/ShadowInfo/NotShadow/Hint: این تیدلر <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> یک تیدلر سایه‌ای نیست +Advanced/ShadowInfo/OverriddenShadow/Hint: توسط یک تیدلر معمولی جایگزین شد +Advanced/ShadowInfo/Shadow/Hint: این تیدلر <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> یک تیدلر سایه‌ای است +Advanced/ShadowInfo/Shadow/Source: در افزونه مشخص شده است <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link> +Fields/Caption: فضاهای خالی +List/Caption: لیست +List/Empty: این تیدلر شامل لیستی نمی‌شود +Listed/Caption: لیست شده +Listed/Empty: این تیدلر توسط هیچ مورد دیگر لیست نشده است +References/Caption: مراجع +References/Empty: هیچ تیدلری به این یکی پیوند نشده است +Tagging/Caption: برچسب‌گذاری +Tagging/Empty: هیچ تیدلری با این یکی برچسب نشده است +Tools/Caption: ابزارها diff --git a/languages/fa-IR/icon.tid b/languages/fa-IR/icon.tid new file mode 100644 index 000000000..70e605629 --- /dev/null +++ b/languages/fa-IR/icon.tid @@ -0,0 +1,14 @@ +title: $:/languages/fa-IR/icon +type: image/svg+xml + +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg + width="1050" + height="600" + xmlns="http://www.w3.org/2000/svg" + id="Flag_of_Iran_1964"> + <rect height="200" width="1050" fill="#da0000" x="0" y="400" /> + <rect height="200" width="1050" fill="white" x="0" y="200" /> + <rect height="200" width="1050" fill="#239f40" x="0" y="0" /> +</svg> \ No newline at end of file diff --git a/languages/fa-IR/plugin.info b/languages/fa-IR/plugin.info new file mode 100644 index 000000000..0a433da5f --- /dev/null +++ b/languages/fa-IR/plugin.info @@ -0,0 +1,9 @@ +{ + "title": "$:/languages/fa-IR", + "name": "fa", + "plugin-type": "language", + "description": "Persian (Iran)", + "author": "amirography", + "core-version": ">=5.0.0", + "text-direction": "rtl" +} diff --git a/languages/fr-FR/Buttons.multids b/languages/fr-FR/Buttons.multids index ba591b68d..5dff4f9c2 100644 --- a/languages/fr-FR/Buttons.multids +++ b/languages/fr-FR/Buttons.multids @@ -13,7 +13,7 @@ CloseAll/Hint: Ferme tous les tiddlers CloseOthers/Caption: fermer les autres tiddlers CloseOthers/Hint: Ferme les autres tiddlers ControlPanel/Caption: panneau de contrôle -ControlPanel/Hint: Ouvrir le panneau de contrôle +ControlPanel/Hint: Ouvre le panneau de contrôle Delete/Caption: supprimer Delete/Hint: Supprime ce tiddler Edit/Caption: éditer @@ -21,9 +21,9 @@ Edit/Hint: Édite ce tiddler Encryption/Caption: chiffrement Encryption/Hint: Affecte ou résilie le mot de passe pour la sauvegarde de ce wiki Encryption/ClearPassword/Caption: résilier le mot de passe -Encryption/ClearPassword/Hint: Résilie le mot de passe et sauvegarder ce wiki sans chiffrement +Encryption/ClearPassword/Hint: Résilie le mot de passe et sauvegarde ce wiki sans chiffrement Encryption/SetPassword/Caption: affecter un mot de passe -Encryption/SetPassword/Hint: Affecte un mot de passe pour sauvegarder une version chiffrée de ce wiki +Encryption/SetPassword/Hint: Affecte un mot de passe pour sauvegarde une version chiffrée de ce wiki ExportPage/Caption: exporter tout ExportPage/Hint: Exporte tous les tiddlers ExportTiddler/Caption: exporter ce tiddler @@ -32,8 +32,8 @@ ExportTiddlers/Caption: exporter ces tiddlers ExportTiddlers/Hint: Exporte ces tiddlers Fold/Caption: replier le tiddler Fold/Hint: Replie le corps du tiddler -Fold/FoldBar/Caption: fold-bar -Fold/FoldBar/Hint: Barres optionnelles pour replier et déplier les tiddlers +Fold/FoldBar/Caption: Barre de repli +Fold/FoldBar/Hint: Barre optionnelle pour replier et déplier les tiddlers Unfold/Caption: déplier le tiddler Unfold/Hint: Déplie le corps de ce tiddler FoldOthers/Caption: replier les autres tiddlers @@ -45,23 +45,23 @@ UnfoldAll/Hint: Déplie le corps de tous les tiddlers ouverts FullScreen/Caption: plein-écran FullScreen/Hint: Entre ou sort du mode plein-écran Help/Caption: aide -Help/Hint: Afficher le panneau d'aide +Help/Hint: Affiche le panneau d'aide Import/Caption: importer -Import/Hint: Importe des fichiers +Import/Hint: Importe des fichiers de nombreux types, notamment texte, image, TiddlyWiki ou JSON Info/Caption: informations -Info/Hint: Affiche les informations sur ce tiddler +Info/Hint: Affiche des informations sur ce tiddler Home/Caption: accueil Home/Hint: Ouvre les tiddlers par défaut Language/Caption: langue Language/Hint: Choix de la langue pour l'interface utilisateur More/Caption: plus -More/Hint: Autres actions -NewHere/Caption: nouveau, ici -NewHere/Hint: Crée un nouveau tiddler avec pour tag le tiddler courant +More/Hint: Actions supplémentaires +NewHere/Caption: nouveau, à partir d'ici +NewHere/Hint: Crée un nouveau tiddler avec pour tag le titre du tiddler courant NewJournal/Caption: nouveau journal NewJournal/Hint: Crée un nouveau tiddler journal -NewJournalHere/Caption: nouveau journal, ici -NewJournalHere/Hint: Crée un nouveau tiddler journal avec pour tag le tiddler courant +NewJournalHere/Caption: nouveau journal, à partir d'ici +NewJournalHere/Hint: Crée un nouveau tiddler journal avec pour tag le titre du tiddler courant NewImage/Caption: nouvelle image NewImage/Hint: Crée une nouveau tiddler image NewMarkdown/Caption: nouveau tiddler Markdown @@ -76,20 +76,28 @@ Permalink/Caption: permalink Permalink/Hint: Remplace l'URL dans la barre d'adresse du navigateur par un lien direct vers ce tiddler Permaview/Caption: permaview Permaview/Hint: Remplace l'URL dans la barre d'adresse du navigateur par un lien direct vers l'ensemble des tiddlers présents dans le déroulé +Print/Caption: imprimer la page +Print/Hint: Imprime la page courante Refresh/Caption: rafraîchir Refresh/Hint: Rafraîchit la totalité du wiki -Save/Caption: enregistrer +Save/Caption: ok Save/Hint: Confirme les changements apportés à ce tiddler SaveWiki/Caption: enregistrer les modifications SaveWiki/Hint: Enregistre les modifications -StoryView/Caption: vue sur le déroulé +StoryView/Caption: visualisation du déroulé StoryView/Hint: Choisit le mode de visualisation du déroulé HideSideBar/Caption: cacher la barre latérale HideSideBar/Hint: Cache la barre latérale ShowSideBar/Caption: afficher la barre latérale ShowSideBar/Hint: Affiche la barre latérale TagManager/Caption: gestionnaire de tags -TagManager/Hint: Gestionnaire de tags +TagManager/Hint: Ouvre le gestionnaire de tags +Timestamp/Caption: horodatage +Timestamp/Hint: Décide si les modifications mettent à jour l'horodatage +Timestamp/On/Caption: horodatage activé +Timestamp/On/Hint: L'horodatage est mis à jour quand les tiddlers sont modifiés +Timestamp/Off/Caption: horodatage désactivé +Timestamp/Off/Hint: L'horodatage n'est pas mis à jour quand les tiddlers sont modifiés Theme/Caption: thème Theme/Hint: Choix du thème pour l'affichage Bold/Caption: gras @@ -108,9 +116,9 @@ Excise/Caption/Replace: Remplacer le texte excisé par : Excise/Caption/Replace/Macro: macro Excise/Caption/Replace/Link: lien Excise/Caption/Replace/Transclusion: transclusion -Excise/Caption/Tag: Utiliser le titre de ce tiddler comme tag du nouveau tiddler +Excise/Caption/Tag: Utilise le titre de ce tiddler comme tag du nouveau tiddler Excise/Caption/TiddlerExists: Attention : le tiddler existe déjà -Excise/Hint: Excise le texte sélectionner vers un nouveau tiddler +Excise/Hint: Excise le texte sélectionné vers un nouveau tiddler Heading1/Caption: en-tête 1 Heading1/Hint: Applique le formatage des en-têtes de niveau 1 aux lignes de la sélection Heading2/Caption: en-tête 2 @@ -129,6 +137,8 @@ LineWidth/Caption: épaisseur du trait LineWidth/Hint: Choisit une épaisseur de trait pour le remplissage Link/Caption: lien Link/Hint: Crée un lien wikitext +Linkify/Caption: wikilien +Linkify/Hint: Encadre la sélection avec des crochets droits ListBullet/Caption: liste à puces ListBullet/Hint: Formate les lignes de la sélection comme une liste à puces ListNumber/Caption: liste numérotée @@ -149,14 +159,16 @@ PreviewType/Caption: type de prévisualisation PreviewType/Hint: Choisit le type de prévisualisation Quote/Caption: citation Quote/Hint: Formate les lignes de la sélection comme une citation +RotateLeft/Caption: pivoter vers la gauche +RotateLeft/Hint: Fait pivoter l'image vers la gauche de 90 degrés Size/Caption: taille de l'image Size/Caption/Height: Hauteur : -Size/Caption/Resize: Retailler l'image +Size/Caption/Resize: Redimensionner l'image Size/Caption/Width: Largeur : -Size/Hint: Choisit la taille de l'image +Size/Hint: Indique une taille pour l'image Stamp/Caption: tampon Stamp/Caption/New: Ajoutez le vôtre -Stamp/Hint: Insère un fragment de texte prédéterminé +Stamp/Hint: Insère un fragment de texte préconfiguré Stamp/New/Title: Nom tel qu'il apparaît dans le menu Stamp/New/Text: Texte du fragment. (N'oubliez pas d'ajouter une légende dans le champ //caption//.) Strikethrough/Caption: barré @@ -165,5 +177,7 @@ Subscript/Caption: indice Subscript/Hint: Met en indice le texte sélectionné Superscript/Caption: exposant Superscript/Hint: Met en exposant le texte sélectionné -Underline/Caption: souligner +Transcludify/Caption: transclusion +Transcludify/Hint: Encadre la sélection avec des accolades +Underline/Caption: souligné Underline/Hint: Souligne le texte sélectionné diff --git a/languages/fr-FR/ControlPanel.multids b/languages/fr-FR/ControlPanel.multids index e65d3903e..adc161e00 100644 --- a/languages/fr-FR/ControlPanel.multids +++ b/languages/fr-FR/ControlPanel.multids @@ -8,18 +8,20 @@ Basics/AnimDuration/Prompt: Durée de l'animation Basics/Caption: Fondamentaux Basics/DefaultTiddlers/BottomHint: Utilisez les [[crochets doubles]] pour les titres contenant des espaces. Vous pouvez aussi décider de <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">Conserver le déroulé actuel</$button> Basics/DefaultTiddlers/Prompt: Tiddlers par défaut -Basics/DefaultTiddlers/TopHint: Liste des tiddlers qui seront affichés au démarrage : +Basics/DefaultTiddlers/TopHint: Liste les tiddlers qui seront affichés au démarrage : Basics/Language/Prompt: Bonjour ! Langue active : Basics/NewJournal/Title/Prompt: Modèle pour les titres des tiddlers journaux +Basics/NewJournal/Text/Prompt: Texte pour les nouveaux tiddlers journaux Basics/NewJournal/Tags/Prompt: Tags pour les nouveaux tiddlers journaux -Basics/OverriddenShadowTiddlers/Prompt: Nombre de tiddlers //shadow// remplacés +Basics/NewTiddler/Title/Prompt: Modèle pour les titres des nouveaux tiddlers +Basics/OverriddenShadowTiddlers/Prompt: Nombre de tiddlers //shadow// modifiés Basics/ShadowTiddlers/Prompt: Nombre de tiddlers //shadow// Basics/Subtitle/Prompt: Sous-titre -Basics/SystemTiddlers/Prompt: Nombre de tiddlers système -Basics/Tags/Prompt: Nombre de tags -Basics/Tiddlers/Prompt: Nombre de tiddlers -Basics/Title/Prompt: Titre de ce ~TiddlyWiki -Basics/Username/Prompt: Signer les modifications avec ce nom d'utilisateur +Basics/SystemTiddlers/Prompt: Nombre de tiddlers système : +Basics/Tags/Prompt: Nombre de tags : +Basics/Tiddlers/Prompt: Nombre de tiddlers : +Basics/Title/Prompt: Titre de ce ~TiddlyWiki : +Basics/Username/Prompt: Signer les modifications avec ce nom d'utilisateur : Basics/Version/Prompt: Version de ~TiddlyWiki : EditorTypes/Caption: Types d'éditeur EditorTypes/Editor/Caption: Éditeur @@ -27,11 +29,11 @@ EditorTypes/Hint: Ces tiddlers déterminent l'éditeur à utiliser pour éditer EditorTypes/Type/Caption: Type Info/Caption: Info Info/Hint: Information sur ce TiddlyWiki -KeyboardShortcuts/Add/Prompt: Entre le raccourci ici +KeyboardShortcuts/Add/Prompt: Entrez le raccourci ici KeyboardShortcuts/Add/Caption: ajoute un raccourci KeyboardShortcuts/Caption: Raccourcis clavier -KeyboardShortcuts/Hint: Gère la spécification des raccourcis clavier -KeyboardShortcuts/NoShortcuts/Caption: Aucun raccourci clavier spécifié +KeyboardShortcuts/Hint: Gère les définitions des raccourcis clavier +KeyboardShortcuts/NoShortcuts/Caption: Aucun raccourci clavier défini KeyboardShortcuts/Remove/Hint: supprime le raccourci clavier KeyboardShortcuts/Platform/All: Toutes plates-formes KeyboardShortcuts/Platform/Mac: Plate-forme Macintosh seulement @@ -41,7 +43,7 @@ KeyboardShortcuts/Platform/NonLinux: Plate-formes non-Linux seulement KeyboardShortcuts/Platform/Windows: Plate-forme Windows seulement KeyboardShortcuts/Platform/NonWindows: Plates-formes non-Windows seulement LoadedModules/Caption: Modules chargés -LoadedModules/Hint: Liste des modules chargés, avec leurs tiddlers sources. Les italiques indiquent que les tiddlers sources n'existent pas, le plus souvent parce que le module a été créé lors du processus d'amorçage. +LoadedModules/Hint: Liste des modules chargés, liés à leurs tiddlers sources. Les italiques indiquent que les tiddlers sources n'existent pas, le plus souvent parce que le module a été créé lors du processus d'amorçage. Palette/Caption: Palette Palette/Editor/Clone/Caption: Cloner Palette/Editor/Clone/Prompt: Il est recommandé de cloner cette palette « shadow » avant de l'éditer @@ -49,10 +51,15 @@ Palette/Editor/Prompt/Modified: Cette palette « shadow » a été modifiée Palette/Editor/Prompt: Édition de Palette/Editor/Reset/Caption: Réinitialiser Palette/HideEditor/Caption: Masquer l'éditeur -Palette/Prompt: Palette en cours : +Palette/Prompt: Palette actuelle : Palette/ShowEditor/Caption: Afficher l'éditeur -Plugins/Add/Hint: Installer des plugins à partir de la bibliothèque officielle +Parsing/Caption: Analyse +Parsing/Hint: Ici, vous pouvez activer/désactiver globalement les règles de l'analyseur du wiki. Les changements seront effectifs après enregistrement et rechargement de votre wiki. Désactiver certaines règles peut empêcher <$text text="TiddlyWiki"/> de fonctionner correctement. Pour restaurer le fonctionnement normal, utilisez le [[safe mode|https://tiddlywiki.com/#SafeMode]]. +Parsing/Block/Caption: Règles d'analyse Block +Parsing/Inline/Caption: Règles d'analyse Inline +Parsing/Pragma/Caption: Règles d'analyse PragmaP Plugins/Add/Caption: Ajouter des plugins +Plugins/Add/Hint: Installer des plugins à partir de la bibliothèque officielle Plugins/AlreadyInstalled/Hint: Ce plugin est déjà installé dans la version <$text text=<<installedVersion>>/> Plugins/Caption: Plugins Plugins/Disable/Caption: désactiver @@ -61,11 +68,11 @@ Plugins/Disabled/Status: (désactivé) Plugins/Empty/Hint: Aucun Plugins/Enable/Caption: activer Plugins/Enable/Hint: Active ce plugin au prochain rechargement de la page -Plugins/Install/Caption: installe +Plugins/Install/Caption: installer Plugins/Installed/Hint: Plugins installés : Plugins/Languages/Caption: Langues Plugins/Languages/Hint: Plugins de langue -Plugins/NoInformation/Hint: Aucune information disponible +Plugins/NoInfoFound/Hint: ''"<$text text=<<currentTab>>/>"'' non trouvé Plugins/NotInstalled/Hint: Ce plugin n'est pas installé Plugins/OpenPluginLibrary: ouvre la bibliothèque de plugins Plugins/Plugins/Caption: Plugins @@ -73,20 +80,22 @@ Plugins/Plugins/Hint: Plugins Plugins/Reinstall/Caption: réinstalle Plugins/Themes/Caption: Thèmes Plugins/Themes/Hint: Plugins de thème -Parsing/Caption: Parsing -Parsing/Hint: Ici, vous pouvez désactiver globalement des règles individuelles de parsing du wiki. Soyez prudent, car désactiver certaines règles peuvent empêcher ~TiddlyWiki de fonctionner correctement (vous pouvez revenir au parsing par défaut avec le [[safe mode|http://tiddlywiki.com/#SafeMode]] ) -Parsing/Block/Caption: Block Parse Rules -Parsing/Inline/Caption: Inline Parse Rules -Parsing/Pragma/Caption: Pragma Parse Rules Saving/Caption: Sauvegarde -Saving/Heading: Sauvegarde +Saving/DownloadSaver/AutoSave/Description: Permet l'enregistrement automatique pour l'enregistreur de téléchargement +Saving/DownloadSaver/AutoSave/Hint: Active l'auto-enregistrement pour l'enregistreur de téléchargement +Saving/DownloadSaver/Caption: Enregistreur de téléchargement +Saving/DownloadSaver/Hint: Ces paramètres s'appliquent à l'enregistreur de téléchargement compatible HTML5 +Saving/General/Caption: Général +Saving/General/Hint: Ces paramètres s'appliquent à tous les enregistreurs chargés +Saving/Hint: Paramètres pour enregistrer le ~TiddlyWiki complet dans un seul fichier, via un module enregistreur Saving/TiddlySpot/Advanced/Heading: Paramètres avancés Saving/TiddlySpot/BackupDir: Dossier des //sauvegardes// Saving/TiddlySpot/Backups: Sauvegardes +Saving/TiddlySpot/Caption: Enregistreur ~TiddlySpot Saving/TiddlySpot/Description: Ces paramètres ne servent que lors de la sauvegarde vers http://tiddlyspot.com ou vers un serveur distant compatible Saving/TiddlySpot/Filename: Nom du fichier enregistré Saving/TiddlySpot/Heading: ~TiddlySpot -Saving/TiddlySpot/Hint: //L'URL par défaut est `http://<nom du wiki>.tiddlyspot.com/store.cgi`. Elle peut être remplacée par une adresse serveur personnalisée.// +Saving/TiddlySpot/Hint: //L'URL par défaut est `http://<nom du wiki>.tiddlyspot.com/store.cgi`. Elle peut être remplacée par une adresse serveur personnalisée, comme `http://example.com/store.php`.// Saving/TiddlySpot/Password: Mot de passe Saving/TiddlySpot/ServerURL: URL du serveur Saving/TiddlySpot/UploadDir: Dossier des dépôts @@ -94,11 +103,18 @@ Saving/TiddlySpot/UserName: Nom utilisé pour ce Wiki Settings/AutoSave/Caption: Sauvegarde automatique Settings/AutoSave/Disabled/Description: Pas de sauvegarde automatique des modifications Settings/AutoSave/Enabled/Description: Sauvegarde automatique des modifications -Settings/AutoSave/Hint: Sauvegarde automatique des modifications pendant l'édition +Settings/AutoSave/Hint: Tentative de sauvegarde automatique des modifications pendant l'édition quand un enregistreur compatible est utilisé Settings/CamelCase/Caption: Liens Wiki //Camel Case// -Settings/CamelCase/Hint: Vous pouvez désactiver globalement les liens créés à partir des expressions de la forme ~CamelCase. Pour que ce paramètres prenne effet, il est nécessaire de recharger le wiki +Settings/CamelCase/Hint: Vous pouvez désactiver globalement les liens créés à partir des expressions de type ~CamelCase. Pour que ce paramètre prenne effet, il est nécessaire de recharger le wiki Settings/CamelCase/Description: Active les liens automatiques sur les expressions de la forme ~CamelCase Settings/Caption: Paramétrage +Settings/EditorToolbar/Caption: Barre d'outils de l'éditeur +Settings/EditorToolbar/Hint: Active ou désactive la barre d'outils de l'éditeur : +Settings/EditorToolbar/Description: Affiche la barre d'outils de l'éditeur +Settings/InfoPanelMode/Caption: Mode Panneau d'Informations du Tiddler +Settings/InfoPanelMode/Hint: Contrôle à quel moment le panneau d'informations du tiddler se ferme : +Settings/InfoPanelMode/Popup/Description: Le panneau d'informations se ferme automatiquement +Settings/InfoPanelMode/Sticky/Description: Le panneau d'informations du tiddler reste ouvert jusqu'à ce qu'il soit fermé explicitement Settings/Hint: Ce paramétrage vous permet de personnaliser le comportement de TiddlyWiki. Settings/NavigationAddressBar/Caption: Barre d'adresse pendant la navigation Settings/NavigationAddressBar/Hint: Comportement de la barre d'adresse du navigateur lorsqu'on pointe vers un tiddler : @@ -109,7 +125,7 @@ Settings/NavigationHistory/Caption: Historique de navigation Settings/NavigationHistory/Hint: Mise à jour de l'historique de navigation du navigateur lorsqu'on pointe vers un tiddler : Settings/NavigationHistory/No/Description: Ne pas mettre à jour l'historique Settings/NavigationHistory/Yes/Description: Mettre à jour l'historique -Settings/PerformanceInstrumentation/Caption: Instrumentation de la Performance +Settings/PerformanceInstrumentation/Caption: Instrumentation de la performance Settings/PerformanceInstrumentation/Hint: Affiche des statistiques de performance dans la console de développement du navigateur. Nécessite de recharger la page pour prendre effet. Settings/PerformanceInstrumentation/Description: Active l'instrumentation de la performance Settings/ToolbarButtonStyle/Caption: Style des boutons de la barre d'outils @@ -123,6 +139,8 @@ Settings/ToolbarButtons/Icons/Description: Afficher l'icône Settings/ToolbarButtons/Text/Description: Afficher le texte Settings/DefaultSidebarTab/Caption: Onglet par défaut sur la barre latérale Settings/DefaultSidebarTab/Hint: Indique l'onglet de la barre latérale qui sera affiché par défaut +Settings/DefaultMoreSidebarTab/Caption: Onglet par défaut sous le Plus de la barre latérale +Settings/DefaultMoreSidebarTab/Hint: Indique quel onglet sera affiché par défaut sous le Plus de la barre latérale Settings/LinkToBehaviour/Caption: Comportement à l'ouverture du tiddler Settings/LinkToBehaviour/InsideRiver/Hint: Navigation depuis un emplacement //interne// au déroulé Settings/LinkToBehaviour/OutsideRiver/Hint: Navigation depuis un emplacement //externe// au déroulé @@ -139,6 +157,10 @@ Settings/MissingLinks/Hint: Peut-on pointer vers des tiddlers qui n'existent pas Settings/MissingLinks/Description: Active les liens vers les tiddlers inexistants StoryView/Caption: Vue sur le déroulé StoryView/Prompt: Vue courante : +Stylesheets/Caption: Stylesheets +Stylesheets/Expand/Caption: Tout déployer +Stylesheets/Hint: Voici le rendu CSS courant pour les tiddlers feuilles de style tagués avec <<tag "$:/tags/Stylesheet">> +Stylesheets/Restore/Caption: Restaurer Theme/Caption: Thème Theme/Prompt: Thème courant : TiddlerFields/Caption: Champs des tiddlers @@ -150,7 +172,7 @@ Toolbars/Hint: Choix des boutons à afficher dans les barres d'outils Toolbars/PageControls/Caption: Barre d'outils de la page Toolbars/PageControls/Hint: Choix des boutons à afficher sur la barre d'outils principale de la page Toolbars/EditorToolbar/Caption: Barre d'outils de l'Éditeur -Toolbars/EditorToolbar/Hint: Choisir les boutons à afficher dans la barre d'outils de l'éditeur. À noter que la présence de certains boutons dépendra du type du tiddler édité +Toolbars/EditorToolbar/Hint: Choix des boutons à afficher dans la barre d'outils de l'éditeur. À noter que la présence de certains boutons dépendra du type du tiddler édité Toolbars/ViewToolbar/Caption: Barre d'outils du mode visualisation Toolbars/ViewToolbar/Hint: Choix des boutons à afficher pour les tiddlers en mode visualisation Tools/Download/Full/Caption: Télécharger le wiki complet diff --git a/languages/fr-FR/Docs/ModuleTypes.multids b/languages/fr-FR/Docs/ModuleTypes.multids index 8213dbac1..e85f28723 100644 --- a/languages/fr-FR/Docs/ModuleTypes.multids +++ b/languages/fr-FR/Docs/ModuleTypes.multids @@ -1,18 +1,23 @@ title: $:/language/Docs/ModuleTypes/ +allfilteroperator: Un sous-opérateur pour l'opérateur de filtre ''all''. animation: Animations pouvant être utilisées par le RevealWidget. +bitmapeditoroperation: Une opération intégrée à la barre d'outils de l'éditeur de bitmap. command: Commandes qui peuvent être exécutées en mode Node.js. config: Données à inclure dans `$tw.config`. filteroperator: Méthodes d'opérateurs pour les filtres. global: Données globales à inclure dans `$tw`. -isfilteroperator: Opérandes pour l'opérateur de filtre « is ». +info: Publie des informations système via le pseudo-plugin [[$:/temp/info-plugin]]. +isfilteroperator: Opérandes pour l'opérateur de filtre ''is''. +library: Module générique pour les modules ~JavaScript de portée générale. macro: Définitions de macros ~JavaScript. parser: Parseurs pour divers types de contenu. -saver: Les tiddlers de sauvegarde contiennent les différentes méthodes pour enregistrer des fichiers à partir du navigateur. +saver: Les tiddlers d'enregistrement contiennent les différentes méthodes pour enregistrer des fichiers à partir du navigateur. startup: Fonctions de démarrage. storyview: Différents points de vue sur le déroulé, qui personnalisent l'animation et le comportement des widgets de liste. +texteditoroperation: Une opération intégrée à la barre d'outils de l'éditeur de texte. tiddlerdeserializer: Convertit différents types de contenu en tiddlers. -tiddlerfield: Définit le comportement des champs de tiddler. +tiddlerfield: Définit le comportement d'un champ de tiddler. tiddlermethod: Ajoute des méthodes au prototype `$tw.Tiddler`. upgrader: Applique une procédure de mise à jour aux tiddlers lors de l'opération de mise à jour/importation. utils: Ajoute des méthodes dans `$tw.utils`. diff --git a/languages/fr-FR/Docs/PaletteColours.multids b/languages/fr-FR/Docs/PaletteColours.multids index 3a7f92625..edfb27147 100644 --- a/languages/fr-FR/Docs/PaletteColours.multids +++ b/languages/fr-FR/Docs/PaletteColours.multids @@ -61,6 +61,7 @@ sidebar-tab-foreground-selected: Premier plan pour les onglets sélectionnés de sidebar-tab-foreground: Premier plan pour les onglets de la barre latérale sidebar-tiddler-link-foreground-hover: Premier plan au passage de la souris sur le lien d'un tiddler de la barre latérale sidebar-tiddler-link-foreground: Premier plan du lien d'un tiddler de la barre latérale +site-title-foreground: Premier plan pour le titre du wiki (SiteTitle) static-alert-foreground: Premier plan pour les alertes statiques tab-background-selected: Fond pour les onglets sélectionnés tab-background: Fond pour les onglets diff --git a/languages/fr-FR/EditTemplate.multids b/languages/fr-FR/EditTemplate.multids index d9aa0eef9..a2d1090f0 100644 --- a/languages/fr-FR/EditTemplate.multids +++ b/languages/fr-FR/EditTemplate.multids @@ -1,7 +1,8 @@ title: $:/language/EditTemplate/ -Body/External/Hint: Ceci est un tiddler externe, conservé en dehors du fichier TiddlyWiki principal. Vous pouvez éditer les tags et les champs mais pas directement le contenu lui-même +Body/External/Hint: Ce tiddler affiche du contenu situé en dehors du fichier TiddlyWiki principal. Vous pouvez éditer les tags et les champs mais pas directement le contenu lui-même Body/Placeholder: Entrez le texte ici +Body/Preview/Type/Output: sortie Field/Remove/Caption: supprimer le champ Field/Remove/Hint: Supprime le champ Fields/Add/Button: ajouter @@ -10,13 +11,15 @@ Fields/Add/Prompt: Ajouter un nouveau champ : Fields/Add/Value/Placeholder: valeur du champ Fields/Add/Dropdown/System: Champs système Fields/Add/Dropdown/User: Champs utilisateur -Shadow/OverriddenWarning: Ce tiddler est une version modifiée d'un tiddler « shadow ». Pour revenir à la version par défaut, il vous suffit de supprimer ce tiddler. -Shadow/Warning: Ceci est un tiddler « shadow ». Toute modification supplantera la version par défaut +Shadow/OverriddenWarning: Ce tiddler est une version modifiée d'un tiddler « shadow ». Pour revenir à la version par défaut du plugin <<pluginLink>>, il vous suffit de supprimer ce tiddler. +Shadow/Warning: Ceci est un tiddler « shadow ». Toute modification supplantera la version issue du plugin <<pluginLink>> Tags/Add/Button: ajouter Tags/Add/Placeholder: nom du tag Tags/Dropdown/Caption: liste des tags Tags/Dropdown/Hint: Montre la liste des tags -Title/BadCharacterWarning: Attention : il est préférable d'éviter l'usage des caractères <<bad-chars>> dans les titres de tiddlers +Title/BadCharacterWarning: Attention : il est préférable d'éviter l'usage des caractères <<bad-chars>> dans les titres des tiddlers +Title/Exists/Prompt: Le tiddler cible existe déjà +Title/Relink/Prompt: Changer ''<$text text=<<fromTitle>>/>'' en ''<$text text=<<toTitle>>/>'' dans les //tags// et les champs //list// des autres tiddlers Type/Dropdown/Caption: liste des types de contenu Type/Dropdown/Hint: Montre la liste des types de contenu Type/Delete/Caption: supprimer le type de contenu diff --git a/languages/fr-FR/Fields.multids b/languages/fr-FR/Fields.multids index 46d78c428..cc6e382a0 100644 --- a/languages/fr-FR/Fields.multids +++ b/languages/fr-FR/Fields.multids @@ -16,15 +16,15 @@ footer: Texte de bas de page dans le cas d'un wizard hack-to-give-us-something-to-compare-against: Champ de stockage temporaire utilisé dans [[$:/core/templates/static.content]] icon: Titre du tiddler contenant l'icone associée à un tiddler library: Avec une valeur à <q>yes</q>, indique qu'un tiddler doit être sauvegardé comme bibliothèque JavaScript -list: Liste ordonnée de titres de tiddlers à associer au tiddler -list-before: Si présent, contient le titre du tiddler avant lequel ce tiddler doit être ajouté dans la liste ordonnée. Si ce champ est présent mais vide, le titre doit être ajouté au début de la liste. -list-after: Si présent, contient le titre du tiddler après lequel ce tiddler doit être ajouté dans la liste ordonnée. +list: Liste ordonnée de titres de tiddlers associée à un tiddler +list-before: Si présent, contient le titre du tiddler avant lequel ce tiddler doit être ajouté dans la liste ordonnée des titres de tiddlers. Si ce champ est présent mais vide, le titre doit être ajouté au début de la liste. +list-after: Si présent, contient le titre du tiddler après lequel ce tiddler doit être ajouté dans la liste ordonnée des titres de tiddlers. modified: Date et heure à laquelle le tiddler a été modifié pour la dernière fois modifier: Titre du tiddler associé à l'utilisateur qui a modifié ce tiddler pour la dernière fois -name: S'il s'agit d'un plugin, le nom de la personne associée à ce tiddler -plugin-priority: S'il s'agit d'un plugin, un nombre indiquant la priorité de ce tiddler -plugin-type: S'il s'agit d'un plugin, le type de plugin de ce tiddler -revision: Numéro de révision du tiddler présent sur le server +name: Dans le cas d'un tiddler provenant d'un plugin, le nom de la personne associée à ce tiddler +plugin-priority: Dans le cas d'un tiddler provenant d'un plugin, un nombre indiquant la priorité de ce tiddler +plugin-type: Dans le cas d'un tiddler provenant d'un plugin, le type du plugin +revision: Numéro de révision du tiddler présent sur le serveur released: Date de version d'un TiddlyWiki source: URL source associée à ce tiddler subtitle: Texte du sous-titre pour un wizard diff --git a/languages/fr-FR/Filters.multids b/languages/fr-FR/Filters.multids index b30422931..0fc6cf3c2 100644 --- a/languages/fr-FR/Filters.multids +++ b/languages/fr-FR/Filters.multids @@ -9,5 +9,7 @@ Drafts: Les tiddlers en cours d'édition Orphans: Les tiddlers orphelins SystemTiddlers: Les tiddlers système ShadowTiddlers: Les tiddlers shadow +StoryList: Les tiddlers du déroulé, hormis $:/AdvancedSearch OverriddenShadowTiddlers: Les tiddlers shadow modifiés SystemTags: Les tags système +TypedTiddlers: Tiddlers ayant un contenu non wiki-text \ No newline at end of file diff --git a/languages/fr-FR/GettingStarted.tid b/languages/fr-FR/GettingStarted.tid index 7711da02b..8aa68609b 100644 --- a/languages/fr-FR/GettingStarted.tid +++ b/languages/fr-FR/GettingStarted.tid @@ -3,8 +3,8 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ Bienvenue sur ~TiddlyWiki et parmi la communauté ~TiddlyWiki. -Commencez par vérifier que vos modifications peuvent être sauvegardées -correctement — reportez-vous aux [[instructions détaillées|http://tiddlywiki.com/languages/fr-FR/index.html#Saving]] sur http://tiddlywiki.com/. +Avant de confier à TiddlyWiki des informations importantes, commencez par vérifier que vos modifications peuvent être sauvegardées +correctement — reportez-vous aux [[instructions détaillées|https://tiddlywiki.com/languages/fr-FR/index.html#Saving]] sur https://tiddlywiki.com/. !! Personnalisez ce ~TiddlyWiki diff --git a/languages/fr-FR/Help/build.tid b/languages/fr-FR/Help/build.tid index 2f4a2826c..683adc2f2 100644 --- a/languages/fr-FR/Help/build.tid +++ b/languages/fr-FR/Help/build.tid @@ -4,8 +4,8 @@ description: Lance automatiquement les commandes configurées Compile le wiki courant à partir des cibles spécifiées. Si aucune cible n'est spécifiée, toutes les cibles seront compilées. ``` ---build <target> [<target> ...] +--build <cible> [<cible> ...] ``` -Les cibles de compilation sont définies dans le fichier `tiddlywiki.info` du [[dossier associé au wiki|WikiFolders]]. +Les cibles de compilation sont définies dans le fichier `tiddlywiki.info` du [[dossier associé au wiki|TiddlyWikiFolders]]. diff --git a/languages/fr-FR/Help/clearpassword.tid b/languages/fr-FR/Help/clearpassword.tid index c8a44ff4e..ffdbcf916 100644 --- a/languages/fr-FR/Help/clearpassword.tid +++ b/languages/fr-FR/Help/clearpassword.tid @@ -1,7 +1,7 @@ title: $:/language/Help/clearpassword -description: Efface le mot de passe pour les prochaines opérations +description: Efface un mot de passe pour les prochaines opérations de chiffrement -Efface le mot de passe pour les prochaines opérations +Efface le mot de passe pour les prochaines opérations de chiffrement ``` --clearpassword diff --git a/languages/fr-FR/Help/default.tid b/languages/fr-FR/Help/default.tid index fb0eb24b0..9314a960f 100644 --- a/languages/fr-FR/Help/default.tid +++ b/languages/fr-FR/Help/default.tid @@ -18,5 +18,5 @@ Liste des commandes disponibles : Pour obtenir de l'aide sur une commande précise : ``` -tiddlywiki --help <command> +tiddlywiki --help <commande> ``` diff --git a/languages/fr-FR/Help/editions.tid b/languages/fr-FR/Help/editions.tid index e7c8f7737..19ced5600 100644 --- a/languages/fr-FR/Help/editions.tid +++ b/languages/fr-FR/Help/editions.tid @@ -1,7 +1,7 @@ title: $:/language/Help/editions description: Liste les éditions TiddlyWiki disponibles -Liste les noms et descriptions des éditions disponibles. Vous pouvez créer un nouveau wiki à partir d'une édition particulière avec la commande `--init`. +Liste les noms et descriptions des éditions disponibles. La commande `--init` permet de créer un nouveau wiki à partir d'une édition particulière. ``` --editions diff --git a/languages/fr-FR/Help/fetch.tid b/languages/fr-FR/Help/fetch.tid new file mode 100644 index 000000000..e835eecfa --- /dev/null +++ b/languages/fr-FR/Help/fetch.tid @@ -0,0 +1,28 @@ +title: $:/language/Help/fetch +description: Télécharge des tiddlers depuis un wiki à partir de leurs URL + +Télécharge un ou plusieurs fichiers via HTTP/HTTPS, puis importe les tiddlers correspondant à un filtre, en transformant optionnellement les titres des tiddlers importés. + +``` +--fetch file <url> <filtre-import> <filtre-de-transformation> +--fetch files <filtre-urls> <filtre-import> <filtre-de-transformation> +``` + +Avec la variante "file", un seul fichier est téléchargé et le premier paramètre est l'URL du fichier à lire. + +Avec la variante "files", plusieurs fichiers sont téléchargés et le premier paramètre est un filtre produisant une liste d'URLs pour les fichiers à lire. Par exemple, étant donné un ensemble de tiddlers tagués "remote-server" et disposant d'un champ "url", le filtre `[tag[remote-server]get[url]]` permet de récupérer toutes les URLs disponibles. + +Le paramètre `<filtre-import>` spécifie un filtre qui détermine quels tiddlers seront importés. Lorsqu'il n'est pas indiqué, il prend comme valeur par défaut `[all[tiddlers]]`. + +Le paramètre `<filtre de transformation>` spécifie un filtre optionnel qui transforme les titres des tiddlers importés. Par exemple, `[addprefix[$:/myimports/]]` permettrait d'ajouter le préfixe `$:/myimports/` à chaque titre. + +On obtient des informations concernant la progression de l'importation en faisant précéder la commande `--fetch` de la commande `--verbose`. + +Il faut noter que TiddlyWiki ne téléchargera pas une version plus ancienne d'un plugin déjà chargé. + +L'exemple ci-dessous récupère tous les tiddlers non-système de https://tiddlywiki.com et les enregistre dans un fichier JSON : + +``` +tiddlywiki --verbose --fetch file "https://tiddlywiki.com/" "[!is[system]]" "" --rendertiddler "$:/core/templates/exporters/JsonFile" output.json text/plain "" exportFilter "[!is[system]]" +``` + diff --git a/languages/fr-FR/Help/import.tid b/languages/fr-FR/Help/import.tid new file mode 100644 index 000000000..160891bf2 --- /dev/null +++ b/languages/fr-FR/Help/import.tid @@ -0,0 +1,24 @@ +title: $:/language/Help/import +description: Importe des tiddlers depuis un fichier + +Importe des tiddlers depuis des fichiers locaux TiddlyWiki (`.html`), `.tiddler`, `.tid`, `.json` ou autres. Le désérialiseur doit être spécifié explicitement, à la différence de la commande `load` qui déduit le désérialiseur à utiliser à partir de l'extension du fichier. + +``` +--import <chemin-du-fichier> <désérialiseur> [<titre>] [<encodage>] +``` + +Les principaux désérialiseurs présents par défaut sont : + +* application/javascript +* application/json +* application/x-tiddler +* application/x-tiddler-html-div +* application/x-tiddlers +* text/html +* text/plain + +S'il n'est pas spécifié, le titre du tiddler importé a pour valeur le nom du fichier. + +L'encodage par défaut est "utf8", mais peut valoir "base64" en cas d'importation des fichiers binaires. + +À noter que TiddlyWiki refusera d'importer pas une version plus ancienne d'un plugin déjà chargé. diff --git a/languages/fr-FR/Help/load.tid b/languages/fr-FR/Help/load.tid index 0c8676d97..d04f64a8d 100644 --- a/languages/fr-FR/Help/load.tid +++ b/languages/fr-FR/Help/load.tid @@ -7,7 +7,7 @@ Charge des tiddlers à partir de fichiers ~TiddlyWikiClassic 2.x.x (`.html`), `. --load <chemindufichier> ``` -Pour charger des tiddlers à partir d'un fichier ~TiddlyWiki chiffré, vous devrez commencer par spécifier le mot de passe à l'aide de la [[commande password|PasswordCommand]]. Par exemple : +Pour charger des tiddlers à partir d'un fichier ~TiddlyWiki chiffré, vous devrez d'abord spécifier le mot de passe à l'aide de la [[commande password|PasswordCommand]]. Par exemple : ``` tiddlywiki ./MonWiki --password pa55w0rd --load mon_wiki_secret.html diff --git a/languages/fr-FR/Help/password.tid b/languages/fr-FR/Help/password.tid index b82012207..01eaa724e 100644 --- a/languages/fr-FR/Help/password.tid +++ b/languages/fr-FR/Help/password.tid @@ -6,4 +6,5 @@ Fournit un mot de passe pour les prochaines opérations de chiffrement. ``` --password <motdepasse> ``` -''Note'' : Cette commande n'est pas appropriée pour servir un TiddlyWiki protégé par mot de passe. Pour cela, utilisez plutôt l'option password de la [[commande Server|ServerCommand]]. + +''Note'' : Cette commande n'est pas appropriée pour servir un TiddlyWiki protégé par mot de passe. Pour cela, utilisez plutôt l'option //password// de la [[commande Server|ServerCommand]]. diff --git a/languages/fr-FR/Help/render.tid b/languages/fr-FR/Help/render.tid new file mode 100644 index 000000000..0fd55a935 --- /dev/null +++ b/languages/fr-FR/Help/render.tid @@ -0,0 +1,34 @@ +title: $:/language/Help/render +description: Exécute le contenu de tiddlers individuels vers des fichiers + +Exécute le contenu des tiddlers individuels identifiés par un filtre et enregistre le résultat vers les fichiers spécifiés. + +Optionellement, on peut spécifier le titre d'un tiddler modèle (template). Dans ce cas, au lieu d'exécuter directement le contenu de chaque tiddler, le modèle est exécuté après avoir donné pour valeur à la variable "currentTiddler" le titre du tiddler dont le contenu est en cours d'exécution. + +On peut spécifier le nom et la valeur d'une variable supplémentaire. + +``` +--render <filtre-sur-les-tiddlers> [<filtre-des-noms-de-fichier>] [<type-de-rendu>] [<modèle>] [<nom>] [<valeur>] +``` + +* ''filtre-sur-les-tiddlers'': Un filtre qui indentifie les tiddlers dont le contenu doit être exécuté +* ''filtre-des-noms-de-fichier'': filtre optionnel pour transformer les titres de tiddlers en chemin de fichiers. À défaut, le filtre utilisé est `[is[tiddler]addsuffix[.html]]`, qui utilise le titre inchangé du tiddler comme nom de fichier +* ''modèle'': Modèle optionnel via lequel chaque tiddler doit être rendu +* ''type-de-rendu'': Type de rendu optionnel : la valeur `text/html` (par défaut) retourne le text HTML complet et `text/plain` se contente de retourner le contenu sous forme texte (autrement dit ignore les balises HTML et autres caractères non imprimables) +* ''nom'': Nom de la variable optionnelle +* ''valeur'': Valeur de la variable optionnelle + +Par défaut, le nom de fichier est résolu relativement au sous-répertoire `output` du réepertoire de l'édition. La commande `--output` peut servir à diriger les sorties vers un répertoire différent. + +Notes : + +* Les éventuels fichiers présents dans le répertoire de sortie ne sont pas supprimmés +* Les répertoires absents dans le chemin de fichier sont créés automatiquement. +* Lorsqu'un tiddler contient des espaces dans le titre, prendre garde à utiliser aussi bien les guillemets nécessaires au shell et les doubles crochets droits propres à TiddlyWiki : `--render "[[Motovun Jack.jpg]]"` +* Le filtre des noms de fichier est évalué après avoir initialisé l'élément d'entrée avec le titre du tiddler en cours d'exécution, permettant ainsi d'utiliser le titre comme base de calcul pour le nom de fichier. Par exemple `[encodeuricomponent[]addprefix[static/]]` applique un encodage d'URI à chaque titre, puis ajoute le préfixe `static/` +* La commande `--render` remplace de manière plus souple les deux commandes `--rendertiddler` et `--rendertiddlers`, qui sont du même coup obsolètes. + +Exemples : + +* `--render "[!is[system]]" "[encodeuricomponent[]addprefix[tiddlers/]addsuffix[.html]]"` -- enregistre le contenu exécuté de tous les tiddlers non-système vers des fichiers du sous-répertoire "tiddlers" nommés par encodage URL des titres et ajout d'une extension html. + diff --git a/languages/fr-FR/Help/rendertiddler.tid b/languages/fr-FR/Help/rendertiddler.tid index 9bd995727..ec2ddde31 100644 --- a/languages/fr-FR/Help/rendertiddler.tid +++ b/languages/fr-FR/Help/rendertiddler.tid @@ -1,12 +1,22 @@ title: $:/language/Help/rendertiddler -description: Enregistre un tiddler avec un rendu correspondant au type de contenu spécifié +description: Exécute le contenu d'un tiddler pour le type spécifié -Enregistre un tiddler sous le chemin de fichier indiqué, avec un rendu correspondant au type de contenu (ContentType) spécifié — par défaut `text/html`. Un tiddler modèle (template) peut être indiqué optionnellement. Dans ce cas, c'est le tiddler modèle qui est rendu, avec la variable "currentTiddler" initialisée avec le tiddler dont le titre est donné en valeur du premier paramètre. +Enregistre vers le chemin indiqué le résultat de l'exécution d'un tiddler pour le type de contenu (ContentType) spécifié — par défaut `text/html`. + +Un tiddler modèle (template) peut être indiqué optionnellement. Dans ce cas, le tiddler modèle est exécuté après initialisation de la variable "currentTiddler" avec le tiddler dont le titre est donné en premier paramètre de la commande. + +Le nom et la valeur d'une variable supplémentaire peuvent être spécifiés optionnellement. ``` ---rendertiddler <titre> <chemindufichier> [<type>] [<modèle>] +--rendertiddler <titre> <chemindufichier> [<type>] [<modèle>] [<nom>] [<valeur>] ``` Par défaut, le nom de fichier est résolu relativement au sous-répertoire `output` du répertoire de l'édition. La commande `--output` peut servir à rediriger la sortie vers un répertoire différent. -Les répertoires présents dans le chemin du fichier et qui n'existent pas encore sont créés automatiquement. \ No newline at end of file +Les répertoires présents dans le chemin du fichier et qui n'existent pas encore sont créés automatiquement. + +Par exemple, la commande ci-dessous enregistre tous les tiddlers correspondant au filtre `[tag[done]]` vers un fichier JSON de nom `output.json`, en faisant appel au template prédéfini `$:/core/templates/exporters/JsonFile`. + +``` +--rendertiddler "$:/core/templates/exporters/JsonFile" output.json text/plain "" exportFilter "[tag[done]]" +``` diff --git a/languages/fr-FR/Help/rendertiddlers.tid b/languages/fr-FR/Help/rendertiddlers.tid index a45f7652d..b7d9e663a 100644 --- a/languages/fr-FR/Help/rendertiddlers.tid +++ b/languages/fr-FR/Help/rendertiddlers.tid @@ -1,10 +1,10 @@ title: $:/language/Help/rendertiddlers -description: Enregistre un ensemble de tiddlers sélectionnés par un filtre, avec un rendu correspondant au type de contenu (ContentType) spécifié +description: Exécute le contenu d'un ensemble de tiddlers sélectionnés par un filtre, pour le type de contenu (ContentType) spécifié -Enregistre un ensemble de tiddlers (sélectionnés par un filtre) dans le répertoire indiqué et avec l'extension indiquée — par défaut `.html`. Le choix du rendu est fonction du type de contenu (ContentType) spécifié — par défaut `text/html` : +Enregistre vers le chemin indiqué et avec l'extension indiquée — par défaut `.html`, le résultat de l'exécution d'un ensemble de tiddlers (sélectionnés par un filtre). Le résultat de l'exécution est rendu selon le type de contenu (ContentType) spécifié — par défaut `text/html` : ``` ---rendertiddlers <filtre> <modèle> <chemindurépertoire> [<type>] [<extension>] +--rendertiddlers <filtre> <modèle> <chemindurépertoire> [<type>] [<extension>] ["noclean"] ``` Par exemple : @@ -13,4 +13,6 @@ Par exemple : --rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html ./static text/plain ``` -Tous les fichiers du répertoire cible sont supprimés. Le répertoire cible est créé récursivement s'il n'existe pas. \ No newline at end of file +Par défaut, le nom de fichier est résolu relativement au sous-répertoire `output` du répertoire de l'édition. La commande `--output` peut servir à rediriger la sortie vers un répertoire différent. + +Tous les fichiers du répertoire cible sont supprimés, sauf si le drapeau ''noclean'' est spécifié. Le répertoire cible est créé récursivement s'il n'existe pas. \ No newline at end of file diff --git a/languages/fr-FR/Help/save.tid b/languages/fr-FR/Help/save.tid new file mode 100644 index 000000000..04fdc227a --- /dev/null +++ b/languages/fr-FR/Help/save.tid @@ -0,0 +1,25 @@ +title: $:/language/Help/save +description: Enregistre des tiddlers individuels tels quels vers des fichiers + +Enregistre des tiddlers individuels identifiés par un filtre, soit tels quels, soit dans un format binaire dans les fichiers spécifiés. + +``` +--save <filtre-des-tiddlers> <filtre-des-noms-de-fichiers> +``` + +* ''filtre-des-tiddlers'': Un filtre identifiant les tiddlers à enregistrer +* ''filtre-des-noms-de-fichiers'': Filtre optionnel pour transformer les titres de tiddlers en chemins de fichiers. À défaut, le filtre utilisé est `[is[tiddler]]`, qui utilise le titre inchangé du tiddler comme nom de fichier + +Par défaut, le nom de fichier est résolu relativement au sous-répertoire `output` du réepertoire de l'édition. La commande `--output` peut servir à diriger les sorties vers un répertoire différent. + +Notes : + +* Les éventuels fichiers présents dans le répertoire de sortie ne sont pas supprimmés +* Les répertoires absents dans le chemin de fichier sont créés automatiquement. +* Lorsqu'un tiddler contient des espaces dans le titre, prendre garde à utiliser aussi bien les guillemets nécessaires au shell et les doubles crochets droits propres à TiddlyWiki : `--render "[[Motovun Jack.jpg]]"` +* Le filtre des noms de fichier est évalué après avoir initialisé l'élément d'entrée avec le titre du tiddler en cours d'exécution, permettant ainsi d'utiliser le titre comme base de calcul pour le nom de fichier. Par exemple `[encodeuricomponent[]addprefix[static/]]` applique un encodage d'URI à chaque titre, puis ajoute le préfixe `static/` +* La commande `--save` remplace de manière plus souple les deux commandes `--savetiddler` et `--savetiddlers`, qui sont du même coup obsolètes. + +Exemples : + +* `--save "[!is[system]is[image]]" "[encodeuricomponent[]addprefix[tiddlers/]]"` -- enregistre tous les tiddlers images non-système comme des fichiers du sous-répertoire "tiddlers" nommés après encodage URL des titres. diff --git a/languages/fr-FR/Help/savetiddler.tid b/languages/fr-FR/Help/savetiddler.tid index 103460f58..f691f5a83 100644 --- a/languages/fr-FR/Help/savetiddler.tid +++ b/languages/fr-FR/Help/savetiddler.tid @@ -7,4 +7,6 @@ Enregistre un tiddler texte ou binaire dans le fichier spécifié, sous sa forme --savetiddler <titre> <chemindufichier> ``` +Par défaut, le nom de fichier est résolu relativement au sous-répertoire `output` du répertoire de l'édition. La commande `--output` peut servir à rediriger la sortie vers un répertoire différent. + Les répertoires présents dans le chemin du fichier et qui n'existent pas encore sont créés automatiquement. \ No newline at end of file diff --git a/languages/fr-FR/Help/savetiddlers.tid b/languages/fr-FR/Help/savetiddlers.tid index 7ce1542de..50c795579 100644 --- a/languages/fr-FR/Help/savetiddlers.tid +++ b/languages/fr-FR/Help/savetiddlers.tid @@ -9,6 +9,6 @@ Enregistre un groupe de tiddlers vers le chemin spécifié, sous leur forme brut Par défaut, le répertoire de sortie est calculé relativement au sous-répertoire `output` du répertoire de l'édition. La commande `--output` peut servir à diriger la sortie vers un répertoire différent. -Les fichiers présents dans le répertoire de sortie sont supprimés avant d'enregistrer les fichiers des tiddlers spécifiés par le filtre. Pour empêcher cette suppression, ajouter le drapeau ''noclean''. +Les fichiers présents dans le répertoire de sortie sont supprimés avant que soient enregistrés les fichiers des tiddlers spécifiés par le filtre. Pour empêcher cette suppression, ajouter le drapeau ''noclean''. Les éventuels répertoires manquants dans le chemin spécifié sont créés automatiquement. diff --git a/languages/fr-FR/Help/server.tid b/languages/fr-FR/Help/server.tid index 7ad07cab9..0ac4575a2 100644 --- a/languages/fr-FR/Help/server.tid +++ b/languages/fr-FR/Help/server.tid @@ -1,23 +1,24 @@ title: $:/language/Help/server description: Fournit une interface serveur HTTP à TiddlyWiki -Le serveur embarqué dans TiddlyWiki5 est très simple. Bien qu'il soit compatible avec TiddlyWeb, il n'a pas la robustesse requise pour une utilisation intensive sur l'Internet. +Le serveur embarqué dans TiddlyWiki5 est très simple. Bien qu'il soit compatible avec TiddlyWeb, il n'a pas la robustesse requise pour une utilisation sur l'Internet. À la racine de l'url, il sert le tiddler spécifié avec le rendu indiqué. Au-delà, il sert des tiddlers encodés en JSON, et reconnaît les principales opérations HTTP pour `GET`, `PUT` et `DELETE`. ``` ---server <port> <tiddlerracine> <typedurendu> <typeduservice> <nomdutilisateur> <motdepasse> <machine> +--server <port> <tiddler-racine> <type-du-rendu> <type-du-service> <nom-d-utilisateur> <mot-de-passe> <machine> <prefixe-des-chemins> ``` Les arguments sont : -* ''port'' - numéro de port sur lequel servir le contenu (défaut : "8080") -* ''tiddlerracine'' - le titre du tiddler à afficher à la racine de l'URL (défaut : "$:/core/save/all") -* ''typedurendu'' - le type avec lequel le contenu du tiddler racine doit être rendu (`text/plain` par défaut) -* ''typeduservice'' - le type avec lequel le contenu du tiddler racine doit être servi (`text/html` par défaut) -* ''nomdutilisateur'' - le nom d'utilisateur qui servira par défaut à signer les modifications -* ''motdepasse'' - mot de passe optionnel permettant une authentification basique +* ''port'' - numéro de port sur lequel servir le contenu ; une valeur non-numérique sera interprétée comme un nom de variable d'environnement du système dont la valeur est le numéro de port (défaut : "8080") +* ''tiddler-racine'' - le titre du tiddler à afficher à la racine de l'URL (défaut : "$:/core/save/all") +* ''type-du-rendu'' - le type avec lequel le contenu du tiddler racine doit être rendu (`text/plain` par défaut) +* ''type-du-service'' - le type avec lequel le contenu du tiddler racine doit être servi (`text/html` par défaut) +* ''nom-d-utilisateur'' - le nom d'utilisateur qui servira par défaut à signer les modifications +* ''mot-de-passe'' - mot de passe optionnel permettant une authentification basique * ''machine'' - nom de machine optionnel d'où le contenu doit être servi ("127.0.0.1" par défaut, autrement dit "localhost") +* ''prefixe-des-chemins'' - préfixe optionnel pour les chemins Si le mot de passe est spécifié en argument, le navigateur demandera à l'utilisateur d'entrer le nom d'utilisateur et le mot de passe. On notera que le mot de passe est transmis en clair, et que cette implémentation ne convient donc pas pour un usage général. @@ -27,10 +28,14 @@ Par exemple : --server 8080 $:/core/save/all text/plain text/html MonNomUtilisateur m0tdepa55e ``` -Le nom d'utilisateur et le mot de passe peuvent être spécifiés en tant que chaînes vides si vous avez besoin d'indiquer le nom de machine ou le préfixe de chemin sans pour autant demander un mot de passe : +Le nom d'utilisateur et le mot de passe peuvent être spécifiés sous forme de chaînes vides si vous avez besoin d'indiquer le nom de machine ou le préfixe des chemins sans pour autant demander un mot de passe : ``` --server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245 ``` -Si vous souhaitez faire fonctionner plusieurs serveurs TiddlyWiki en même temps sur la même machine, vous devrez leur assigner à chacun un port différent. +Si vous voulez faire tourner plusieurs serveurs TiddlyWiki en même temps sur la même machine, vous devrez leur assigner chacun un port différent. Il peut être utile d'utiliser une variable d'environnement pour passer le numéro de port au process Node.js. L'exemple suivant utilise une variable d'environnement appelée "MY_PORT_NUMBER" : + +``` +--server MY_PORT_NUMBER $:/core/save/all text/plain text/html MonNomUtilisateur m0tdepa55e +``` diff --git a/languages/fr-FR/Help/setfield.tid b/languages/fr-FR/Help/setfield.tid index 858d3dc41..556c2200b 100644 --- a/languages/fr-FR/Help/setfield.tid +++ b/languages/fr-FR/Help/setfield.tid @@ -1,7 +1,7 @@ title: $:/language/Help/setfield description: Prépare des tiddlers externes for use -//Notez que cette commande est expérimentale et peut changer ou être remplacée avant qu'elle soit finalisée// +//Notez que cette commande est expérimentale et peut changer ou être remplacée avant d'être finalisée// Initialise le champ spécifié d'un groupe de tiddlers avec le résultat de la wikification d'un tiddler template, la variable `currentTiddler` prenant tour à tour la valeur de chaque tiddler. @@ -14,4 +14,4 @@ Les paramètres sont les suivants : * ''filtre'' - filtre identifiant les tiddlers cibles * ''nom-du-champ'' - le champ à modifier ("text" par défaut) * ''titre-du-template'' - le tiddler à wikifier dans le champ spécifié. Si manquant ou blanc, le champ spécifié est supprimé -* ''type-de-rendu'' - le type de texte à utiliser pour le rendu ("text/plain" par défaut ; "text/html" peut être utilisé pour inclure des éléments HTML) +* ''type-de-rendu'' - le type de texte à utiliser pour le rendu ("text/plain" par défaut ; "text/html" peut servir à inclure des éléments HTML) diff --git a/languages/fr-FR/Import.multids b/languages/fr-FR/Import.multids index dad9a5e07..685e4d996 100644 --- a/languages/fr-FR/Import.multids +++ b/languages/fr-FR/Import.multids @@ -7,9 +7,15 @@ Listing/Import/Caption: Importer Listing/Select/Caption: Sélectionner Listing/Status/Caption: Statut Listing/Title/Caption: Titre +Listing/Preview: Prévisualisation : +Listing/Preview/Text: Texte +Listing/Preview/TextRaw: Texte (brut) +Listing/Preview/Fields: Champs +Listing/Preview/Diff: Diff +Listing/Preview/DiffFields: Diff (champs) Upgrader/Plugins/Suppressed/Incompatible: Plugin bloqué : incompatible ou obsolète Upgrader/Plugins/Suppressed/Version: Plugin bloqué (la version <<incoming>> en cours d'importation est plus ancienne que la version <<existing>> actuelle) -Upgrader/Plugins/Upgraded: Plugin mis à jour à partir de <<incoming>> vers <<upgraded>> +Upgrader/Plugins/Upgraded: Plugin mis à jour depuis <<incoming>> vers <<upgraded>> Upgrader/State/Suppressed: Tiddler d'état temporaire bloqué Upgrader/System/Suppressed: Tiddler système bloqué Upgrader/ThemeTweaks/Created: Thème modifié à partir de <$text text=<<from>>/> diff --git a/languages/fr-FR/Misc.multids b/languages/fr-FR/Misc.multids index 90ffb589b..cadedc0af 100644 --- a/languages/fr-FR/Misc.multids +++ b/languages/fr-FR/Misc.multids @@ -1,19 +1,21 @@ title: $:/language/ -AboveStory/ClassicPlugin/Warning: On dirait que vous essayez de charger un plugin conçu pour ~TiddlyWiki Classic. Merci de noter que [[ces plugins ne fonctionnent pas avec TiddlyWiki version 5.x.x|http://tiddlywiki.com/#TiddlyWikiClassic]]. Plugins ~TiddlyWiki Classic détectés : +AboveStory/ClassicPlugin/Warning: On dirait que vous essayez de charger un plugin conçu pour ~TiddlyWiki Classic. Merci de noter que [[ces plugins ne fonctionnent pas avec TiddlyWiki version 5.x.x|https://tiddlywiki.com/#TiddlyWikiClassic]]. Plugins ~TiddlyWiki Classic détectés : BinaryWarning/Prompt: Ce tiddler contient des données binaires -ClassicWarning/Hint: Ce tiddler est écrit au format TiddlyWiki Classic, qui n'est pas entièrement compatible avec TiddlyWiki version 5. Pour en savoir plus, rendez-vous à l'adresse http://tiddlywiki.com/static/Upgrading.html. -ClassicWarning/Upgrade/Caption: Mettre à jour -CloseAll/Button: Tout fermer +ClassicWarning/Hint: Ce tiddler est écrit au format TiddlyWiki Classic, qui n'est pas entièrement compatible avec TiddlyWiki version 5. Pour en savoir plus, rendez-vous à l'adresse https://tiddlywiki.com/static/Upgrading.html. +ClassicWarning/Upgrade/Caption: mettre à jour +CloseAll/Button: tout fermer +ColourPicker/Recent: Récent : ConfirmCancelTiddler: Souhaitez-vous annuler les modifications apportées au tiddler « <$text text=<<title>>/> » ? ConfirmDeleteTiddler: Souhaitez-vous supprimer le tiddler « <$text text=<<title>>/> » ? ConfirmOverwriteTiddler: Souhaitez-vous supplanter le tiddler « <$text text=<<title>>/> » ? ConfirmEditShadowTiddler: Vous êtes sur le point d'éditer un ShadowTiddler. Toute modification supplantera la version par défaut du système, rendant les prochaines mises à jour non-triviales. Êtes-vous sûr(e) de vouloir éditer "<$text text=<<title>>/>"? Count: total DefaultNewTiddlerTitle: Nouveau tiddler -DropMessage: Lâcher ici (ou appuyer sur « escape » pour annuler) +Diffs/CountMessage: <<diff-count>> différences +DropMessage: Déposer ici (ou appuyer sur « escape » pour annuler) Encryption/Cancel: Annuler -Encryption/ConfirmClearPassword: Souhaitez-vous supprimer ce mot de passe ? Si oui, ce wiki ne sera plus chiffré au moment de la sauvegarde +Encryption/ConfirmClearPassword: Souhaitez-vous supprimer ce mot de passe ? Si oui, ce wiki ne sera plus chiffré lors de la sauvegarde Encryption/PromptSetPassword: Choisir un nouveau mot de passe pour ce TiddlyWiki Encryption/Username: Nom d'utilisateur Encryption/Password: Mot de passe @@ -21,28 +23,49 @@ Encryption/RepeatPassword: Répéter le mot de passe Encryption/PasswordNoMatch: Les mots de passe ne correspondent pas Encryption/SetPassword: Définir ce mot de passe Error/Caption: Erreur +Error/EditConflict: Le fichier a changé sur le serveur Error/Filter: Erreur de filtre Error/FilterSyntax: Erreur de syntaxe dans l'expression du filtre -Error/IsFilterOperator: Erreu de filtre : Opérande inconnu pour l'opérateur de filtre 'is' +Error/IsFilterOperator: Erreur de filtre : Opérande inconnu pour l'opérateur de filtre 'is' Error/LoadingPluginLibrary: Erreur lors du chargement de la bibliothèque de plugins Error/RecursiveTransclusion: Erreur dans le widget //transclude// : transclusion récursive -Error/RetrievingSkinny: Erreur pendant la récupération de la liste des tiddlers (dégrossis) +Error/RetrievingSkinny: Erreur pendant la récupération de la liste des tiddlers partiels Error/SavingToTWEdit: Erreur lors de l'enregistrement vers TWEdit Error/WhileSaving: Erreur lors de l'enregistrement Error/XMLHttpRequest: Code d'erreur XMLHttpRequest InternalJavaScriptError/Title: Erreur interne JavaScript InternalJavaScriptError/Hint: C'est assez embarrassant. Il est recommandé de rafraîchir l'affichage de votre navigateur InvalidFieldName: Caractères illicites dans le nom du champ « <$text text=<<fieldName>>/> ». Les champs ne peuvent contenir que des lettres minuscules non accentuées et les caractères souligné (`_`), tiret (`-`) et point (`.`) -LazyLoadingWarning: <p>Chargement d'un texte externe ''<$text text={{!!_canonical_uri}}/>''</p><p>Si ce message ne disparaît pas, il se peut que vous utilisiez un navigateur qui n'accepte pas les textes externes dans cette configuration. Voir http://tiddlywiki.com/#ExternalText</p> +LazyLoadingWarning: <p>Tentative de chargement d'un contenu externe ''<$text text={{!!_canonical_uri}}/>''</p><p>Si ce message ne disparaît pas, il est possible que vous deviez ajuster le type de contenu du tiddler en fonction du type de votre contenu externe, ou vous utilisez peut-être un navigateur qui n'accepte pas les contenus externes dans cette configuration. Voir https://tiddlywiki.com/#ExternalText</p> LoginToTiddlySpace: Identification sur TiddlySpace -MissingTiddler/Hint: Le tiddler « <$text text=<<currentTiddler>>/> » est manquant - cliquez sur {{$:/core/images/edit-button}} pour le créer +Manager/Controls/FilterByTag/None: (aucun) +Manager/Controls/FilterByTag/Prompt: Filtrer par tag : +Manager/Controls/Order/Prompt: Ordre inverse +Manager/Controls/Search/Placeholder: Recherche +Manager/Controls/Search/Prompt: Rechercher : +Manager/Controls/Show/Option/Tags: tags +Manager/Controls/Show/Option/Tiddlers: tiddlers +Manager/Controls/Show/Prompt: Afficher : +Manager/Controls/Sort/Prompt: Trier par : +Manager/Item/Colour: Couleur +Manager/Item/Fields: Champs +Manager/Item/Icon/None: (aucune) +Manager/Item/Icon: Icône +Manager/Item/RawText: Texte brut +Manager/Item/Tags: Tags +Manager/Item/Tools: Outils +Manager/Item/WikifiedText: Texte wikifié +MissingTiddler/Hint: Le tiddler « <$text text=<<currentTiddler>>/> » est manquant +- cliquez sur {{||$:/core/ui/Buttons/edit}} pour le créer No: Non OfficialPluginLibrary: Bibliothèque officielle des plugins ~TiddlyWiki OfficialPluginLibrary/Hint: La bibliothèque officielle des plugins ~TiddlyWiki sur tiddlywiki.com. Plugins, thèmes et packs pour les différentes langues sont maintenus par l'équipe responsable du noyau. PluginReloadWarning: Merci d'enregistrer {{$:/core/ui/Buttons/save-wiki}} et de recharger {{$:/core/ui/Buttons/refresh}} pour que les changements apportés aux plugins prennent effet RecentChanges/DateFormat: DD MMM YYYY SystemTiddler/Tooltip: Ceci est un tiddler système +SystemTiddlers/Include/Prompt: Inclure les tiddlers système TagManager/Colour/Heading: Couleur +TagManager/Count/Heading: Total TagManager/Icon/Heading: Icône TagManager/Info/Heading: Info TagManager/Tag/Heading: Tag diff --git a/languages/fr-FR/Modals/Download.tid b/languages/fr-FR/Modals/Download.tid index 5f7c04d8d..c35326c05 100644 --- a/languages/fr-FR/Modals/Download.tid +++ b/languages/fr-FR/Modals/Download.tid @@ -2,12 +2,12 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Télécharger vos modifications footer: <$button message="tm-close-tiddler">Fermer</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html Votre navigateur ne supporte que l'enregistrement manuel. Pour enregistrer les modifications de votre wiki, faites un clic droit sur le lien de téléchargement ci-dessous et choisissez "Enregistrer..." ou "Télécharger...", puis choisissez le répertoire et le nom de fichier. -//Il est possible d'accélérer un peu les choses en cliquant sur le lien en pressant la touche contrôle (Windows) ou la touche option/alt (Mac OS X). On ne vous demandera pas un nom de fichier ou de répertoire, mais votre navigateur proposera probablement un nom difficile à identifier — il vous faudra sans doute le renommer pour ajouter une extension .html avant qu'il soit réellement utilisable.// +//Il est possible d'accélérer un peu les choses en cliquant sur le lien tout en appuyant sur la touche contrôle (sous Windows) ou la touche option/alt (sous MacOS X). On ne vous demandera pas un nom de fichier ou de répertoire, mais votre navigateur proposera probablement un nom difficile à identifier — il vous faudra sans doute le renommer pour lui ajouter une extension .html avant qu'il soit effectivement utilisable.// -Sur les smartphones qui n'autorisent pas le téléchargement de fichiers, vous pouvez ajouter le lien à vos favoris/signets, puis synchroniser vos signets avec un ordinateur de bureau, d'où le wiki pourra être enregistré normalement. +Sur les smartphones qui n'autorisent pas le téléchargement de fichiers, vous pouvez ajouter le lien à vos favoris/signets, puis synchroniser vos signets vers un ordinateur de bureau, d'où le wiki pourra être enregistré normalement. diff --git a/languages/fr-FR/Modals/SaveInstructions.tid b/languages/fr-FR/Modals/SaveInstructions.tid index cf6e3ed41..76f842ce4 100644 --- a/languages/fr-FR/Modals/SaveInstructions.tid +++ b/languages/fr-FR/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Enregistrez votre travail footer: <$button message="tm-close-tiddler">Fermer</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html Les modifications effectuées dans ce wiki doivent être sauvegardées sous forme de fichier ~TiddlyWiki HTML. diff --git a/languages/fr-FR/Search.multids b/languages/fr-FR/Search.multids index e85858fc1..0b4da8d5a 100644 --- a/languages/fr-FR/Search.multids +++ b/languages/fr-FR/Search.multids @@ -1,12 +1,14 @@ title: $:/language/Search/ -Filter/Caption: Filtres -Filter/Hint: Recherche via une combinaison de [[filtres|http://tiddlywiki.com/static/Filters.html]] +DefaultResults/Caption: Liste +Filter/Caption: Filtrer +Filter/Hint: Recherche via une combinaison de [[filtres|https://tiddlywiki.com/static/Filters.html]] Filter/Matches: //<small><<resultCount>> correspondances</small>// Matches: //<small><<resultCount>> correspondances</small>// Matches/All: Toutes les correspondances : Matches/Title: Correspondances sur les titres : -Search: Recherche +Search: Recherch +Search/TooShort: Texte de recherche trop court Shadows/Caption: Shadows Shadows/Hint: Recherche parmi les tiddlers //shadow// Shadows/Matches: //<small><<resultCount>> correspondances</small>// diff --git a/languages/fr-FR/SideBar.multids b/languages/fr-FR/SideBar.multids index 8c1febb55..f82793ab1 100644 --- a/languages/fr-FR/SideBar.multids +++ b/languages/fr-FR/SideBar.multids @@ -11,6 +11,6 @@ Recent/Caption: Récents Shadows/Caption: Shadows System/Caption: Système Tags/Caption: Tags -Tags/Untagged/Caption: sans étiquette +Tags/Untagged/Caption: sans tag Tools/Caption: Outils Types/Caption: Types diff --git a/languages/fr-FR/SiteSubtitle.tid b/languages/fr-FR/SiteSubtitle.tid index 5e1f5d457..9c984c27b 100644 --- a/languages/fr-FR/SiteSubtitle.tid +++ b/languages/fr-FR/SiteSubtitle.tid @@ -1,3 +1,3 @@ title: $:/SiteSubtitle -un carnet de notes non linéaire pour le Web \ No newline at end of file +un carnet de notes web personnel et non linéaire \ No newline at end of file diff --git a/languages/fr-FR/Snippets/MacroDefinition.tid b/languages/fr-FR/Snippets/MacroDefinition.tid new file mode 100644 index 000000000..2f7ddd0b1 --- /dev/null +++ b/languages/fr-FR/Snippets/MacroDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/MacroDefinition +tags: $:/tags/TextEditor/Snippet +caption: Définition de macro + +\define Nomdemacro(param1:"valeur par défaut",param2) +Texte de la macro +\end diff --git a/languages/fr-FR/ThemeTweaks.multids b/languages/fr-FR/ThemeTweaks.multids index c7af938f4..834e60930 100644 --- a/languages/fr-FR/ThemeTweaks.multids +++ b/languages/fr-FR/ThemeTweaks.multids @@ -7,11 +7,12 @@ Options/SidebarLayout: Agencement de la barre latérale Options/SidebarLayout/Fixed-Fluid: Déroulé fixe, barre latérale extensible Options/SidebarLayout/Fluid-Fixed: Déroulé extensible, barre latérale fixe Options/StickyTitles: Titres accrochés -Options/StickyTitles/Hint: “Accroche" les titres de tiddler en haut de la fenêtre du navigateur pendant le défilement. Attention<<:>> Ne fonctionne pas du tout avec Chrome, et peut causer quelques problèmes de mise en page dans Firefox +Options/StickyTitles/Hint: Lorsqu'on fait défiler le déroulé, les titres des tiddlers s'accrochent en haut de la fenêtre du navigateur tant que le contenu de leur tiddler est visible. Attention : ne fonctionne pas du tout avec Chrome, et peut causer quelques problèmes de mise en page dans Firefox Options/CodeWrapping: Enroule les lignes trop longues à l'intérieur des blocs de code Settings: Réglages Settings/FontFamily: Famille de polices Settings/CodeFontFamily: Famille de polices pour le code +Settings/EditorFontFamily: Famille de polices pour l'éditeur Settings/BackgroundImage: Image de fond de page Settings/BackgroundImageAttachment: Arrimage de l'image de fond de page Settings/BackgroundImageAttachment/Scroll: Défile avec les tiddlers @@ -23,14 +24,14 @@ Settings/BackgroundImageSize/Contain: Contenue Metrics: Tailles Metrics/FontSize: Taille police Metrics/LineHeight: Hauteur ligne -Metrics/BodyFontSize: Taille de la police dans un tiddler -Metrics/BodyLineHeight: Hauteur de ligne dans un tiddler +Metrics/BodyFontSize: Taille de la police dans le corps des tiddlers +Metrics/BodyLineHeight: Hauteur de ligne dans le corps des tiddlers Metrics/StoryLeft: Gauche du déroulé -Metrics/StoryLeft/Hint: marge gauche du déroulé principal<br>(zone des tiddlers) au bord gauche de la page +Metrics/StoryLeft/Hint: marge gauche entre le déroulé principal<br>(zone des tiddlers) et le bord gauche de la page Metrics/StoryTop: Haut du déroulé -Metrics/StoryTop/Hint: marge supérieure du déroulé pincipal<br>au bord supérieur de la page +Metrics/StoryTop/Hint: marge supérieure entre le déroulé pincipal<br>et le bord supérieur de la page Metrics/StoryRight: Droite du déroulé -Metrics/StoryRight/Hint: marge de gauche du menu latéral<br>au bord gauche de la page +Metrics/StoryRight/Hint: marge de gauche entre la barre latérale<br>et le bord gauche de la page Metrics/StoryWidth: Largeur du déroulé Metrics/StoryWidth/Hint: largeur hors tout du déroulé Metrics/TiddlerWidth: Largeur des tiddlers @@ -38,4 +39,4 @@ Metrics/TiddlerWidth/Hint: largeur des tiddlers dans le déroulé Metrics/SidebarBreakpoint: Décroché de la barre latérale Metrics/SidebarBreakpoint/Hint: largeur minimum de la page à partir de laquelle déroulé principal et barre latérale apparaissent côte à côte Metrics/SidebarWidth: Largeur de la barre latérale -Metrics/SidebarWidth/Hint: largeur de la barre latérale dans l'agencement extensible-fixe +Metrics/SidebarWidth/Hint: largeur de la barre latérale dans l'agencement //déroulé extensible—barre latérale fixe// diff --git a/languages/fr-FR/TiddlerInfo.multids b/languages/fr-FR/TiddlerInfo.multids index e02d62725..6576139c7 100644 --- a/languages/fr-FR/TiddlerInfo.multids +++ b/languages/fr-FR/TiddlerInfo.multids @@ -13,9 +13,9 @@ Fields/Caption: Champs List/Caption: Liste List/Empty: Ce tiddler ne contient pas de champ //list// Listed/Caption: Listé -Listed/Empty: Ce tiddler ne figure pas dans la liste d'un autre tiddler +Listed/Empty: Ce tiddler ne figure dans le champ //list// d'aucun autre tiddler References/Caption: Références -References/Empty: Aucun tiddler ne pointe vers celui-ci +References/Empty: Aucun tiddler ne comporte de lien vers celui-ci Tagging/Caption: Étiquetage Tagging/Empty: Le titre de ce tiddler ne sert de tag à aucun tiddler Tools/Caption: Outils diff --git a/languages/fr-FR/Types/application_javascript.tid b/languages/fr-FR/Types/application_javascript.tid index 998024a6e..f4910e5ce 100644 --- a/languages/fr-FR/Types/application_javascript.tid +++ b/languages/fr-FR/Types/application_javascript.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/application/javascript description: Code JavaScript name: application/javascript group: Développeur +group-sort: 2 \ No newline at end of file diff --git a/languages/fr-FR/Types/application_json.tid b/languages/fr-FR/Types/application_json.tid index c32381655..dc54104c0 100644 --- a/languages/fr-FR/Types/application_json.tid +++ b/languages/fr-FR/Types/application_json.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/application/json description: Données au format JSON name: application/json group: Développeur +group-sort: 2 diff --git a/languages/fr-FR/Types/application_x_tiddler_dictionary.tid b/languages/fr-FR/Types/application_x_tiddler_dictionary.tid index d8d9c72ae..9e01bfba1 100644 --- a/languages/fr-FR/Types/application_x_tiddler_dictionary.tid +++ b/languages/fr-FR/Types/application_x_tiddler_dictionary.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/application/x-tiddler-dictionary description: Dictionnaire de données name: application/x-tiddler-dictionary group: Développeur +group-sort: 2 \ No newline at end of file diff --git a/languages/fr-FR/Types/image_gif.tid b/languages/fr-FR/Types/image_gif.tid index e679adbb0..0f8004846 100644 --- a/languages/fr-FR/Types/image_gif.tid +++ b/languages/fr-FR/Types/image_gif.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/gif description: Image au format GIF name: image/gif group: Image +group-sort: 1 \ No newline at end of file diff --git a/languages/fr-FR/Types/image_jpeg.tid b/languages/fr-FR/Types/image_jpeg.tid index 4b36a96b4..1c6af2d9a 100644 --- a/languages/fr-FR/Types/image_jpeg.tid +++ b/languages/fr-FR/Types/image_jpeg.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/jpeg description: Image au format JPEG name: image/jpeg group: Image +group-sort: 1 diff --git a/languages/fr-FR/Types/image_png.tid b/languages/fr-FR/Types/image_png.tid index b0e45c905..1b461f281 100644 --- a/languages/fr-FR/Types/image_png.tid +++ b/languages/fr-FR/Types/image_png.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/png description: Image au format PNG name: image/png group: Image +group-sort: 1 diff --git a/languages/fr-FR/Types/image_svg_xml.tid b/languages/fr-FR/Types/image_svg_xml.tid index 671a46d2d..ffdba8321 100644 --- a/languages/fr-FR/Types/image_svg_xml.tid +++ b/languages/fr-FR/Types/image_svg_xml.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/svg+xml description: Image au format SVG name: image/svg+xml group: Image +group-sort: 1 diff --git a/languages/fr-FR/Types/image_x-icon.tid b/languages/fr-FR/Types/image_x-icon.tid index 9b8420975..4d2a4a60a 100644 --- a/languages/fr-FR/Types/image_x-icon.tid +++ b/languages/fr-FR/Types/image_x-icon.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/x-icon description: Fichier icone au format ICO name: image/x-icon group: Image +group-sort: 1 diff --git a/languages/fr-FR/Types/text_css.tid b/languages/fr-FR/Types/text_css.tid index 5e657d4b3..09e13c0fb 100644 --- a/languages/fr-FR/Types/text_css.tid +++ b/languages/fr-FR/Types/text_css.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/css description: Feuille de style CSS statique name: text/css group: Développeur +group-sort: 2 diff --git a/languages/fr-FR/Types/text_html.tid b/languages/fr-FR/Types/text_html.tid index 0872d88ad..382614432 100644 --- a/languages/fr-FR/Types/text_html.tid +++ b/languages/fr-FR/Types/text_html.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/html description: Marquage HTML name: text/html group: Texte +group-sort: 0 \ No newline at end of file diff --git a/languages/fr-FR/Types/text_plain.tid b/languages/fr-FR/Types/text_plain.tid index 3e90fd385..99b8d415d 100644 --- a/languages/fr-FR/Types/text_plain.tid +++ b/languages/fr-FR/Types/text_plain.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/plain description: Format texte name: text/plain group: Texte +group-sort: 0 diff --git a/languages/fr-FR/Types/text_vnd.tiddlywiki.tid b/languages/fr-FR/Types/text_vnd.tiddlywiki.tid index 5a0671fa5..af59152c2 100644 --- a/languages/fr-FR/Types/text_vnd.tiddlywiki.tid +++ b/languages/fr-FR/Types/text_vnd.tiddlywiki.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/vnd.tiddlywiki description: TiddlyWiki version 5 name: text/vnd.tiddlywiki group: Texte +group-sort: 0 diff --git a/languages/fr-FR/Types/text_x-tiddlywiki.tid b/languages/fr-FR/Types/text_x-tiddlywiki.tid index 096f313d8..2eb3284ff 100644 --- a/languages/fr-FR/Types/text_x-tiddlywiki.tid +++ b/languages/fr-FR/Types/text_x-tiddlywiki.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/x-tiddlywiki description: TiddlyWiki Classic name: text/x-tiddlywiki group: Texte +group-sort: 0 diff --git a/languages/he-IL/Buttons.multids b/languages/he-IL/Buttons.multids new file mode 100644 index 000000000..05c842546 --- /dev/null +++ b/languages/he-IL/Buttons.multids @@ -0,0 +1,169 @@ +title: $:/language/Buttons/ + +AdvancedSearch/Caption: חיפוש מתקדם +AdvancedSearch/Hint: חיפוש מתקדם +Bold/Caption: הדגש +Bold/Hint: עיצוב טקסט מודגש +Cancel/Caption: בטל +Cancel/Hint: בטל שינויים בטידלר +Clear/Caption: נקה +Clear/Hint: נקה את התמונה לצבע אחיד +Clone/Caption: שכםל +Clone/Hint: שכפל את הטידלר +Close/Caption: סגור +Close/Hint: סגור טידלר זה +CloseAll/Caption: סגור הכל +CloseAll/Hint: סגור את כל הטידלרים +CloseOthers/Caption: סגור אחרים +CloseOthers/Hint: סגור טידלרים אחרים +ControlPanel/Caption: לוח בקרה +ControlPanel/Hint: פתח לוח בקרה +Delete/Caption: מחק +Delete/Hint: מחק טידלר זה +Edit/Caption: ערוך +Edit/Hint: ערוך טידלר זה +EditorHeight/Caption: גובה העורך +EditorHeight/Caption/Auto: התאם גובה לתוכן אוטומטית +EditorHeight/Caption/Fixed: גובה קבוע +EditorHeight/Hint: בחר את הגובה של העורך +Encryption/Caption: הצפנה +Encryption/ClearPassword/Caption: נקה סיסמה +Encryption/ClearPassword/Hint: נקה סיסמה ושמור את הויקי ללא הצפנה +Encryption/Hint: קבע או נקה סיסמה לשמירת ויקי זה +Encryption/SetPassword/Caption: קבע סיסמה +Encryption/SetPassword/Hint: קבע סיסמה לשמירת הויקי עם הצפנה +Excise/Caption: הוצא +Excise/Caption/Excise: הוצא לטידלר אחר +Excise/Caption/MacroName: :שם המקרו +Excise/Caption/NewTitle: שם הטידלר החדש: +Excise/Caption/Replace: החלך את הטקסט המוצא ב: +Excise/Caption/Replace/Link: קישור +Excise/Caption/Replace/Macro: מקרו +Excise/Caption/Replace/Transclusion: תרגום +Excise/Caption/Tag: תייג את הטידלר החדש בשם של הטידלר הנוכחי +Excise/Caption/TiddlerExists: אזהרה: טידלר כבר קיים +Excise/Hint: הוצא את הטקסט הנבחר לטידלר חדש +ExportPage/Caption: ייצא הכל +ExportPage/Hint: ייצא את כל הטידלרים +ExportTiddler/Caption: יצא טידלר +ExportTiddler/Hint: יצא טידלר +ExportTiddlers/Caption: ייצא טידלרים +ExportTiddlers/Hint: ייצא טידלרים +Fold/Caption: קפל טילדר +Fold/FoldBar/Caption: קפל סרגל +Fold/FoldBar/Hint: סרגלים אופציונליים לקפל ולפתוח טידלרים +Fold/Hint: קפל את גוף הטידלר הזה +FoldAll/Caption: קפל את כל הטידלרים +FoldAll/Hint: קפל את הגופים של כל הטידלרים הפתוחים +FoldOthers/Caption: קפל טידלרים אחרים +FoldOthers/Hint: קפל את הגופים של כל הטידלרים הפתוחים האחרים +FullScreen/Caption: מסך מלא +FullScreen/Hint: היכנס או צא ממסך מלא +Heading1/Caption: כותרת 1 +Heading1/Hint: יישם עיצוב כותרת ברמה 1 לשורות המכילות את הבחירה +Heading2/Caption: כותרת 2 +Heading2/Hint: יישם עיצוב כותרת ברמה 2 לשורות המכילות את הבחירה +Heading3/Caption: כותרת 3 +Heading3/Hint: יישם עיצוב כותרת ברמה 3 לשורות המכילות את הבחירה +Heading4/Caption: כותרת 4 +Heading4/Hint: יישם עיצוב כותרת ברמה 4 לשורות המכילות את הבחירה +Heading5/Caption: כותרת 5 +Heading5/Hint: יישם עיצוב כותרת ברמה 5 לשורות המכילות את הבחירה +Heading6/Caption: כותרת 6 +Heading6/Hint: יישם עיצוב כותרת ברמה 6 לשורות המכילות את הבחירה +Help/Caption: עזרה +Help/Hint: הראה פנל עזרה +HideSideBar/Caption: הסתר סרגל צידי +HideSideBar/Hint: הסתר סרגל צידי +Home/Caption: בית +Home/Hint: פתח את טידלרי ברירת המחדל +Import/Caption: יבא +Import/Hint: ייבא סוגים רבים של קבצים כולל טקסט, תמונה TIDDLYWIKI ו JSON +Info/Caption: מידע +Info/Hint: הראה מידע לטידלר זה +Italic/Caption: נטוי +Italic/Hint: יישם עצוב טקסט נטוי לבחירה +Language/Caption: שפה +Language/Hint: בחר את שפת ממשק המשתמש +LineWidth/Caption: רוחב שורה +LineWidth/Hint: קבע רוחב שורה לציור +Link/Caption: קישור +Link/Hint: צור קישור WikiText +ListBullet/Caption: רשימה עם תבליטים +ListBullet/Hint: הוסף תבליטים לשורות שנבחרו +ListNumber/Caption: רשימה ממוספרת +ListNumber/Hint: מספר את השורות שנבחרו +MonoBlock/Caption: בלוק בריווח אחיד +MonoBlock/Hint: יישם ריווח אחיד לטקסט שנבחר +MonoLine/Caption: בריווח אחיד +MonoLine/Hint: ישם ריווח אחיד לטקסט שנבחרn +More/Caption: עוד +More/Hint: פעולות נוספות +NewHere/Caption: חדש כאן +NewHere/Hint: צור טידלר חדש מתויג בנוכחי +NewImage/Caption: תמונה חדשה +NewImage/Hint: צור טילדר תמונה חדש +NewJournal/Caption: יומן חדש +NewJournal/Hint: צור טידלר יומן חדש +NewJournalHere/Caption: יומן חדש כאן +NewJournalHere/Hint: צור טידלר יומן חדש מתויג בטידלר הנוכחי +NewMarkdown/Caption: טידלר מרקדאון חדש +NewMarkdown/Hint: צור טידלר מרקדאון חדש +NewTiddler/Caption: טידלר חדש +NewTiddler/Hint: צור טידלר חדש +Opacity/Caption: שקיפות +Opacity/Hint: קבע את שקיפות הציור +OpenWindow/Caption: פתח בחלון חדש +OpenWindow/Hint: פתח טידלר בחלון חדש +Paint/Caption: צבע ציור +Paint/Hint: קבע את צבע הציור +Palette/Caption: פלטת צבעים +Palette/Hint: בחר את פלטת הצבעים +Permalink/Caption: קישור קבוע +Permalink/Hint: כוון את הדפדפן לקישור ישיר לטידלר זה +Permaview/Caption: מבט קבוע +Permaview/Hint: כוון את הדפדפן לקישור ישיר לכל הטידלרים שבסיפור זה +Picture/Caption: תמונה +Picture/Hint: הכנס תמונה +Preview/Caption: מבט מקדים +Preview/Hint: הראה את פנל המבט המקדים +PreviewType/Caption: סוג המבט המקדים +PreviewType/Hint: בחר סוג מבט מקדים +Quote/Caption: צטט +Quote/Hint: עיצוב ציטוט לבחירה +Refresh/Caption: רענן +Refresh/Hint: בצע רענון מלא של הויקי הזה +Save/Caption: אשר +Save/Hint: אשר שינויים לטידלר זה +SaveWiki/Caption: שמור שינויים +SaveWiki/Hint: שמור שינויים +ShowSideBar/Caption: הראה פנל צד +ShowSideBar/Hint: הראה פנל צד +Size/Caption: גודל תמונה +Size/Caption/Height: גובה +Size/Caption/Resize: שנה גודל תמונה +Size/Caption/Width: רוחב: +Size/Hint: קבע גודל תמונה +Stamp/Caption: חותמת +Stamp/Caption/New: הוסף את שלך +Stamp/Hint: הכנס קטע טקסט מוכן מראש +Stamp/New/Text: הטקסט להכניס (זכור להוסיף כותרת אינפורמטיבית בשדה הכותרת) +Stamp/New/Title: שם כמופיע בתפריט +StoryView/Caption: מבט סיפור +StoryView/Hint: בחר את ויזואליזציית הסיפור +Strikethrough/Caption: קו מוחק +Strikethrough/Hint: הוסף קו מחיקה לבחירה +Subscript/Caption: כתב תחתי +Subscript/Hint: עצב את הבחירה ככתב תחתי +Superscript/Caption: כתב עילי +Superscript/Hint: עצב את הבחירה ככתב עילי +TagManager/Caption: מנהל תגים +TagManager/Hint: פתח את מנהל התגים +Theme/Caption: תימה +Theme/Hint: בחר את התימה להצגה +Underline/Caption: קו תחתי +Underline/Hint: עצב את הבחירה עם קו תחתי +Unfold/Caption: הראה טידלר +Unfold/Hint: הראהאת גוף הטידלר הזה +UnfoldAll/Caption: הראה את כל הטידלרים +UnfoldAll/Hint: הראה את הגופים של כל הטידלרים הפתוחים diff --git a/languages/he-IL/ControlPanel.multids b/languages/he-IL/ControlPanel.multids new file mode 100644 index 000000000..fb76bbccc --- /dev/null +++ b/languages/he-IL/ControlPanel.multids @@ -0,0 +1,150 @@ +title: $:/language/ControlPanel/ + +Advanced/Caption: מתקדם +Advanced/Hint: מידע פנימי על הטידליויקי הזה +Appearance/Caption: תצוגה +Appearance/Hint: דרכים להתאים את התוגה של הטידלי ויקי שלך +Basics/AnimDuration/Prompt: זמן אנימציה: +Basics/Caption: יסודות +Basics/DefaultTiddlers/Prompt: טידלרי ברירת מחדל: +Basics/DefaultTiddlers/TopHint: בחר איזה טידלרים יוצגו בהתחלה: +Basics/Language/Prompt: השפה הנוכחית: +Basics/NewJournal/Tags/Prompt: תגים לטידלרי יומן חדשים +Basics/NewJournal/Title/Prompt: כותרת לטידלרי יומן חדשים: +Basics/OverriddenShadowTiddlers/Prompt: מספר טידלרי צל שנעקפו: +Basics/ShadowTiddlers/Prompt: מספר טידלרי צל: +Basics/Subtitle/Prompt: תת כותרת: +Basics/SystemTiddlers/Prompt: מספר טידלרי מערכת: +Basics/Tags/Prompt: מספר תגיות: +Basics/Tiddlers/Prompt: מספר טידלרים: +Basics/Title/Prompt: הכותרת של הטידליויקי הזה: +Basics/Username/Prompt: שם משתמש לחתימה על עריכות: +Basics/Version/Prompt: גרסת טידליויקי: +EditorTypes/Caption: סוגי עורכים: +EditorTypes/Editor/Caption: עורך +EditorTypes/Hint: הטידלרים האלה קובעים איזה עורך ישמש לכל סוג תוכן +EditorTypes/Type/Caption: סוג +Info/Caption: מידע +Info/Hint: מידע על הטידליויקי הזה +KeyboardShortcuts/Add/Caption: הוסף קיצור דרך +KeyboardShortcuts/Add/Prompt: כתוב את קיצור הדרך כאן: +KeyboardShortcuts/Caption: קיצורי דרך ללוח המקשים +KeyboardShortcuts/Hint: קיצורי לוח מקשים +KeyboardShortcuts/NoShortcuts/Caption: אין קיצורי לוח מקשים +KeyboardShortcuts/Platform/All: כל הפלטפורמות +KeyboardShortcuts/Platform/Linux: רק פלטפורמת לינוקס +KeyboardShortcuts/Platform/Mac: רק פלטפורמת מקינטוש +KeyboardShortcuts/Platform/NonLinux: רק פלטפורמת לא לינוקס +KeyboardShortcuts/Platform/NonMac: רק פלטפורמות לא לינוקס +KeyboardShortcuts/Platform/NonWindows: רק פלטפורמות לא חלונות +KeyboardShortcuts/Platform/Windows: רק פלטפורמת חלונות +KeyboardShortcuts/Remove/Hint: הסר מקש קיצור +LoadedModules/Caption: מודולים טעונים +LoadedModules/Hint: אלה הם הטידלרים הטעונים כעת, קשורים לטידלרי המקור שלהם. מודןלים בכתב נטוי הם ללא טידלר מקור, בדרך כלל משום שהם נקבעו בעת תהליך הטעינה. +Palette/Caption: לוח צבעים +Palette/Editor/Clone/Caption: שכפל +Palette/Editor/Clone/Prompt: מומלץ שתשכפל את הפלטה הזו לפני שתערוך אותה +Palette/Editor/Prompt: עריכה +Palette/Editor/Prompt/Modified: פלטת צל זו שונתה +Palette/Editor/Reset/Caption: אתחל +Palette/HideEditor/Caption: הסתר עורך +Palette/Prompt: פלטה נוכחית: +Palette/ShowEditor/Caption: הראה עורך +Parsing/Block/Caption: כללי פריסה של הבלוק +Parsing/Caption: פריסה +Parsing/Inline/Caption: כללי פריסה מובנים +Parsing/Pragma/Caption: כללי פריסה פרגמה +Plugins/Add/Caption: השג עוד פלאגינים +Plugins/Add/Hint: התקן פלאגינים מהספרייה הרשמית +Plugins/AlreadyInstalled/Hint: הפלאגין הזה כבר מותקן בגירסה <$text text=<<installedVersion>>/> +Plugins/Caption: פלאגינים +Plugins/Disable/Caption: הפסק +Plugins/Disable/Hint: הפסק פלאגין זה בטעינת עמוד +Plugins/Disabled/Status: (משותק) +Plugins/Empty/Hint: אין +Plugins/Enable/Caption: אפשר +Plugins/Enable/Hint: אפשר פלאגין זה כשטוענים עמוד מחדש +Plugins/Install/Caption: התקן +Plugins/Installed/Hint: הפלאגינים המותקנים כעת: +Plugins/Languages/Caption: שפות +Plugins/Languages/Hint: פלאגינים של חבילות שפה +Plugins/NoInfoFound/Hint: ''"<$text text=<<currentTab>>/>"'' לא נמצא +Plugins/NotInstalled/Hint: פלאגין זה לא מותקן כעת +Plugins/OpenPluginLibrary: פתח את ספריית הפלאגין +Plugins/Plugins/Caption: פלאגינים +Plugins/Plugins/Hint: פלאגינים +Plugins/Reinstall/Caption: התקן מחדש +Plugins/Themes/Caption: תימות +Plugins/Themes/Hint: פלאגינים של תימות +Saving/Caption: שמיה +Saving/Heading: שמירה +Saving/TiddlySpot/Advanced/Heading: קביעות מתקדמות +Saving/TiddlySpot/BackupDir: מחיצת גיבוי +Saving/TiddlySpot/Backups: גיבוי +Saving/TiddlySpot/Filename: שם קובץ לטעינה +Saving/TiddlySpot/Password: סיסמה +Saving/TiddlySpot/ServerURL: כתובת שרת +Saving/TiddlySpot/UploadDir: מחיצת העלאה +Saving/TiddlySpot/UserName: שם ויקי +Settings/AutoSave/Caption: שמירה אוטומטית +Settings/AutoSave/Disabled/Description: אל שתמור שינויים אוטוטמטית +Settings/AutoSave/Enabled/Description: שמור שינויים אוטומטית +Settings/AutoSave/Hint: שמור שינויים אוטומטית בעת עריכה +Settings/Caption: קביעות +Settings/DefaultSidebarTab/Caption: לשונית סרגל צד ברירת מחדך +Settings/DefaultSidebarTab/Hint: קבע איזו לשונית בסרגל הצד מוצגת כברירת מחדל +Settings/EditorToolbar/Caption: סרגל כלים של העורך +Settings/EditorToolbar/Description: הראה את סרגל הכלים של העורך +Settings/EditorToolbar/Hint: הפעל או כבה את סרגל הכלים של העורך +Settings/Hint: קביעות אלו עוזרות לך לקסטם את התנהגות טידליויקי +Settings/LinkToBehaviour/Caption: התנהגות הפתיחה של טידלר +Settings/LinkToBehaviour/InsideRiver/Hint: ניווט מתוך ובתוך נהר הסיפורים +Settings/LinkToBehaviour/OpenAbove: פתח מעל הטידלר הנוכחי +Settings/LinkToBehaviour/OpenAtBottom: פתח בתחתית נהר הסיפורים הנוכחי +Settings/LinkToBehaviour/OpenAtTop: פתח בראש נהר הסיפורים +Settings/LinkToBehaviour/OpenBelow: פתח מתחת לטידלר הנוכחי +Settings/LinkToBehaviour/OutsideRiver/Hint: ניווט מחוץ לנהר הסיפורים +Settings/MissingLinks/Caption: קישורי ויקי +Settings/MissingLinks/Description: אפשר קישורים לטידלרים חסרים +Settings/MissingLinks/Hint: בחר האם לקשר לטידלרים שאינם קיימים עדיין +Settings/NavigationAddressBar/Caption: התנהגות סרגל ניווט הכתובת +Settings/NavigationAddressBar/Hint: התנהגות סרגל ניווט הכתובת של הדפדפן כשמנווטים לטידלר +Settings/NavigationAddressBar/No/Description: אל תעדכן את סרגל הכתובת +Settings/NavigationAddressBar/Permalink/Description: כלול את טידלר המטרה +Settings/NavigationAddressBar/Permaview/Description: כלול את טידלר המטרה ואת רצף הסיפור הנוכחי +Settings/NavigationHistory/Caption: הסטורית ניווט +Settings/NavigationHistory/Hint: עדכן ביטרית גלישה כשמנווטים לטידלר +Settings/NavigationHistory/No/Description: אל תעדכן היסטוריה +Settings/NavigationHistory/Yes/Description: עדכן היסטוריה +Settings/PerformanceInstrumentation/Caption: מעקב לביצועים +Settings/PerformanceInstrumentation/Description: אפשר מעקב ביצועים +Settings/TitleLinks/Caption: כותרות טידלרים +Settings/TitleLinks/Hint: אופציונלית הצג כותרות טידלרים כקישורים +Settings/TitleLinks/No/Description: אל תראה כותרות טידלרים כקישורים +Settings/TitleLinks/Yes/Description: הראה כותרות טידלרים כקישורים +Settings/ToolbarButtons/Caption: כפתורי סרגל כלים +Settings/ToolbarButtons/Hint: ברירת מחדל של כפתורי סרגל כלים: +Settings/ToolbarButtons/Icons/Description: כלול צללמית +Settings/ToolbarButtons/Text/Description: כלול טקסט +Settings/ToolbarButtonStyle/Caption: סגנון כפתור בסרגל כלים +Settings/ToolbarButtonStyle/Hint: בחר סגנון לכפתורי סרגל כלים +Settings/ToolbarButtonStyle/Styles/Borderless: ללא גבול +Settings/ToolbarButtonStyle/Styles/Boxed: בקופסה +Settings/ToolbarButtonStyle/Styles/Rounded: מעוגלים +StoryView/Caption: מבט סיפור +StoryView/Prompt: מבט נוכחי: +Theme/Caption: תימה +Theme/Prompt: תימה נוכחית: +TiddlerFields/Caption: שדות טידלר +TiddlerFields/Hint: רשימה המלאה של שדות טידלרים בויקי זה (including system tiddlers but excluding shadow tiddlers). +Toolbars/Caption: סרגלי כלים +Toolbars/EditorToolbar/Caption: סרגל כלים עורך +Toolbars/EditorToolbar/Hint: בחר את הכפתורים שיוצגו בסרגל הכלים של העורך. שים לב שכפתורים מסויימים יוצגו רק עבור סוגים מסויימים של טידלרים +Toolbars/EditToolbar/Caption: סרגל כלים עריכה +Toolbars/EditToolbar/Hint: בחר את הכפתורים שיוצגו לטידלרים במצב עריכה +Toolbars/Hint: בחר איזה כפתורי סרגל כלים יוצגו +Toolbars/PageControls/Caption: סרגל כלים של עמוד +Toolbars/PageControls/Hint: בחר איזה כפתורים יוצגו בסרגל הכלים העיקרי +Toolbars/ViewToolbar/Caption: סרגל כלים של מבטים +Toolbars/ViewToolbar/Hint: בחר איזה כפתורים יוצגו לטידלרים במצב צפייה +Tools/Download/Full/Caption: הורד את הויקי המלא diff --git a/languages/he-IL/CoreReadMe.tid b/languages/he-IL/CoreReadMe.tid new file mode 100644 index 000000000..65fc5fa2d --- /dev/null +++ b/languages/he-IL/CoreReadMe.tid @@ -0,0 +1,8 @@ +title: $:/core/readme + +הפלאגין הזה כולל רכיבים מרכזיים בטידלי-ויקי הכוללים: + +* JavaScript code modules +* Icons +* Templates needed to create TiddlyWiki's user interface +* British English (''en-GB'') translations of the localisable strings used by the core diff --git a/languages/he-IL/Dates.multids b/languages/he-IL/Dates.multids new file mode 100644 index 000000000..ee3a297f4 --- /dev/null +++ b/languages/he-IL/Dates.multids @@ -0,0 +1,87 @@ +title: $:/language/ + +Date/DaySuffix/1: +Date/DaySuffix/10: +Date/DaySuffix/11: +Date/DaySuffix/12: +Date/DaySuffix/13: +Date/DaySuffix/14: +Date/DaySuffix/15: +Date/DaySuffix/16: +Date/DaySuffix/17: +Date/DaySuffix/18: +Date/DaySuffix/19: +Date/DaySuffix/2: +Date/DaySuffix/20: +Date/DaySuffix/21: +Date/DaySuffix/22: +Date/DaySuffix/23: +Date/DaySuffix/24: +Date/DaySuffix/25: +Date/DaySuffix/26: +Date/DaySuffix/27: +Date/DaySuffix/28: +Date/DaySuffix/29: +Date/DaySuffix/3: +Date/DaySuffix/30: +Date/DaySuffix/31: +Date/DaySuffix/4: +Date/DaySuffix/5: +Date/DaySuffix/6: +Date/DaySuffix/7: +Date/DaySuffix/8: +Date/DaySuffix/9: +Date/Long/Day/0: ראשון +Date/Long/Day/1: שני +Date/Long/Day/2: שלישי +Date/Long/Day/3: רביעי +Date/Long/Day/4: חמישי +Date/Long/Day/5: שישי +Date/Long/Day/6: שבת +Date/Long/Month/1: ינואר +Date/Long/Month/10: אוקטובר +Date/Long/Month/11: נובמבר +Date/Long/Month/12: דצמבר +Date/Long/Month/2: פברואר +Date/Long/Month/3: מרץ +Date/Long/Month/4: אפריל +Date/Long/Month/5: מאי +Date/Long/Month/6: יוני +Date/Long/Month/7: יולי +Date/Long/Month/8: אוגוסט +Date/Long/Month/9: ספטמבר +Date/Period/am: לפנה"צ +Date/Period/pm: אחה"צ +Date/Short/Day/0: ראש +Date/Short/Day/1: שני +Date/Short/Day/2: שלי +Date/Short/Day/3: רבי +Date/Short/Day/4: חמי +Date/Short/Day/5: שיש +Date/Short/Day/6: שבת +Date/Short/Month/1: ינו +Date/Short/Month/10: אוק +Date/Short/Month/11: נוב +Date/Short/Month/12: דצמ +Date/Short/Month/2: פבר +Date/Short/Month/3: מרץ +Date/Short/Month/4: אפר +Date/Short/Month/5: מאי +Date/Short/Month/6: יון +Date/Short/Month/7: יול +Date/Short/Month/8: אוג +Date/Short/Month/9: ספט +RelativeDate/Future/Days: <<period>> ימים מעכשיו +RelativeDate/Future/Hours: <<period>> שעות מעכשיו +RelativeDate/Future/Minutes: <<period>> דקות מעכשיו +RelativeDate/Future/Months: <<period>> חודשים מעכשיו +RelativeDate/Future/Second: 1 שנייה מעכשיו +RelativeDate/Future/Seconds: <<period>> שניות מעכשיו +RelativeDate/Future/Years: <<period>> שנים מעכשיו +RelativeDate/Past/Days: <<period>> ימים קודם +RelativeDate/Past/Hours: <<period>> שעות קודם +RelativeDate/Past/Minutes: <<period>> דקות קודם +RelativeDate/Past/Months: <<period>> חודשים קודם +RelativeDate/Past/Second: 1 שנייה קודם +RelativeDate/Past/Seconds: <<period>> שניות קודם +RelativeDate/Past/Years: <<period>> שנים קודם diff --git a/languages/he-IL/Docs/ModuleTypes.multids b/languages/he-IL/Docs/ModuleTypes.multids new file mode 100644 index 000000000..2d153de4e --- /dev/null +++ b/languages/he-IL/Docs/ModuleTypes.multids @@ -0,0 +1,22 @@ +title: $:/language/Docs/ModuleTypes/ + +animation: אנימציות שאפשר להתשמש בהן עם RevealWidget. +command: פקודות שאפשר להפעיל תחת Node.js. +config: נתונים להכנסה לתוך `$tw.config`. +filteroperator: מתודות אופרטוראי פילטר אינדיבידואליות +global: נתונים גלובלים להכנסה לתוך `$tw`. +isfilteroperator: אופרנדים עבור ''is'' אופרטור פילטר +macro: JavaScript הגדרות מקרו +parser: פורשים לסוגי תוכן שונים +saver: שומרים מטפלים בשיטות שונות לשמירת קובץ מהדפדפן +startup: פונקציות אתחול +storyview: מבטי סיפור מקסטמים את ההנפשה וההתגנהגות של וידג'טי רשימה +tiddlerdeserializer: ממירים סוגי תוכן שונים לטידלרים +tiddlerfield: מגדירים את ההתנהגות של שדות טידלרים אינדיבידואליים. +tiddlermethod: מוסיף שיטות ל `$tw.Tiddler` אב הטיפוס +upgrader: מיישם עיבוד שדרוג לטידלרים בזמן ייבוא/שדרוג +utils: מוסיף שיטות ל `$tw.utils`. +utils-node: מוסיף Node.js-specific שיטות ל `$tw.utils`. +widget: וידג'טים העוטפים DOM התוויה ועדכון +wikimethod: מוסיף שיטות ל `$tw.Wiki`. +wikirule: חוקי פרישה אינדיבידואלים עבור WikiText פורש העיקרי diff --git a/languages/he-IL/Docs/PaletteColours.multids b/languages/he-IL/Docs/PaletteColours.multids new file mode 100644 index 000000000..9eab689c8 --- /dev/null +++ b/languages/he-IL/Docs/PaletteColours.multids @@ -0,0 +1,105 @@ +title: $:/language/Docs/PaletteColours/ + +alert-background: רקע התראה +alert-border: גבול התראה +alert-highlight: הדגשת התראה +alert-muted-foreground: קדומני התראה מושתקת +background: רקע כללי +blockquote-bar: סרגל ציטוט +button-background: רקע כפתור ברירת מחדל +button-border: גבול כפתור ברירת מחדל +button-foreground: קדומני כפתור ברירת מחדל +code-background: רקע קוד +code-border: גבול קוד +code-foreground: קדומני קוד +dirty-indicator: מסמן שינויים לא שמורים +download-background: רקע כפתור הורדה +download-foreground: קדומני כפתור הורדה +dragger-background: רקע גורר +dragger-foreground: קדומני גורר +dropdown-background: רקע גלילה למטה +dropdown-border: גבול גלילה למטה +dropdown-tab-background: רקע לשונית גלילה למטה +dropdown-tab-background-selected: רקע לשונית גלילה למטה ללשוניות בחורות +dropzone-background: רקע אזור עזיבה +external-link-background: רקע קישור חיצוני +external-link-background-hover: רקע בריחוף מעל קישור חיצוני +external-link-background-visited: רקע קישור חיצוני שבוקר +external-link-foreground: קדומני קישור חיצוני +external-link-foreground-hover: קדומני בריחוף מעל קישור חיצוני +external-link-foreground-visited: קדומני בקישור חיצוני שבוקר +foreground: קדומני כללי +message-background: רקע תיבת הודעה +message-border: גבול תיבת הודעה +message-foreground: קדומני תיבת הודעה +modal-backdrop: "ווילוון" מודאלי +modal-background: רקע מודאלי +modal-border: גבול מודאלי +modal-footer-background: רקע לכותרת תחתית מודאלית +modal-footer-border: גבול כותרת תחתית מודאלית +modal-header-border: גבול כותרת עילית מודאלית +muted-foreground: קדומני מושתק כללי +notification-background: רקע הודעות +notification-border: גובל הודעות +page-background: רקע עמוד +pre-background: רקע קוד מעוצב מראש +pre-border: גבול קוד מעוצב מראש +primary: ראשוני כללי +sidebar-button-foreground: קדומני כפתור סרגל צד +sidebar-controls-foreground: קדומני לבקרות סרגל צד +sidebar-controls-foreground-hover: ריחוף מעל קדומני לבקרות סרגל צד +sidebar-foreground: קדומני סרגל צד +sidebar-foreground-shadow: צל קדומני סרגל צד +sidebar-muted-foreground: קדומני מושתק סרגל צד +sidebar-muted-foreground-hover: ריחוף מעל קדומני מושתק סרגל צד +sidebar-tab-background: רקע לשונית סרגל צד +sidebar-tab-background-selected: רקע לשונית סרגל צד ללשוניות בחורות +sidebar-tab-border: גבול לשונית סרגל צד +sidebar-tab-border-selected: גבול לשונית סרגל צד ללשוניות בחורות +sidebar-tab-divider: מפריד לשונית סרגל צד +sidebar-tab-foreground: קדומני לשונית סרגל צד +sidebar-tab-foreground-selected: קדומני לשונית סרגל צד ללשוניות בחורות +sidebar-tiddler-link-foreground: קדומני לקישור טידלרים בסרגל צד +sidebar-tiddler-link-foreground-hover: קדומני לריחוף מעל לקישור טידלרים בסרגל צד +site-title-foreground: קדומני לכותרת האתר +static-alert-foreground: קדומני לאתראה סטטית +tab-background: רקע ללשונית +tab-background-selected: רקע ללשונית ללשוניות בחורות +tab-border: גבול לשונית +tab-border-selected: גבול לשונית ללשוניות בחורות +tab-divider: מפריד לשוניות +tab-foreground: קדומני ללשונית +tab-foreground-selected: קדומני ללשונית ללשוניות בחורות +table-border: גבול טבלה +table-footer-background: רקע לכותרת תחתית לטבלה +table-header-background: רקע לכותרת עילית לטבלה +tag-background: רקע לתגית +tag-foreground: קדומני לתגית +tiddler-background: רקע לטידלר +tiddler-border: גבול לטידלר +tiddler-controls-foreground: קדומני לבקרות טידלר +tiddler-controls-foreground-hover: קדומני ךריחוף מעל לבקרות טידלר +tiddler-controls-foreground-selected: קדומני לבקרות טידלר לטידלרים נבחרים +tiddler-editor-background: רקע לעורך טידלרים +tiddler-editor-border: גבול לעורך טידלרים +tiddler-editor-border-image: תמונת גבול עורך טידלרים +tiddler-editor-fields-even: רקע עורך טידלרים שדות זוגיים +tiddler-editor-fields-odd: רקע עורך טידלרים שדות אי זוגיים +tiddler-info-background: רקע ללוח מידע טידלר +tiddler-info-border: גבול ללוח מידע טידלר +tiddler-info-tab-background: גבול ללשונית לוח מידע טידלר +tiddler-link-background: רקע קישור טידלר +tiddler-link-foreground: קדומני קישור טידלר +tiddler-subtitle-foreground: רקע לתת-כותרת טידלר +tiddler-title-foreground: קודמני לכותרת טידלר +toolbar-cancel-button: קדומני לכפתור בטל בסרגל +toolbar-close-button: קדומני לכפתור סגורבסרגל +toolbar-delete-button: קדומני לכפתור מחקבסרגל +toolbar-done-button: קדומני לכפתור עשוי בסרגל +toolbar-edit-button: קדומני לכפתור ערוך בסרגל +toolbar-info-button: קדומני לכפתור מידע בסרגל +toolbar-new-button: קדומני לכפתור טידלר חדש בסרגל +toolbar-options-button: קדומני לכפתור אפשרויות בסרגל +toolbar-save-button: קדומני לכפתור שמור בסרגל +untagged-background: רקע לגלולה לא מסומנת +very-muted-foreground: קדומני מאוד מושתק diff --git a/languages/he-IL/EditTemplate.multids b/languages/he-IL/EditTemplate.multids new file mode 100644 index 000000000..f198c813d --- /dev/null +++ b/languages/he-IL/EditTemplate.multids @@ -0,0 +1,26 @@ +title: $:/language/EditTemplate/ + +Body/External/Hint: זהו טידלר חיצוני המוחסן מחוץ לקובץ העיקרי של הטידליויקי. אתה יכול לערוך את התגים והשדות אבל לא ישירות את התוכן עצמו. +Body/Placeholder: הקש את הטקסט לטידלר הזה +Body/Preview/Type/Output: פלט +Field/Remove/Caption: הסר שדה +Field/Remove/Hint: הסר שדה +Fields/Add/Button: הוסף +Fields/Add/Dropdown/System: שדות מערכת +Fields/Add/Dropdown/User: שדות משתמש +Fields/Add/Name/Placeholder: שם שדה +Fields/Add/Prompt: הוסף שדה חדש: +Fields/Add/Value/Placeholder: ערך השדה +Shadow/OverriddenWarning: זהו טידלר צל ששונה. אתה יכול לחזור לגרסה המקורית שבפלאגין<<pluginLink>> על ידי מחיקת הטידלר הזה +Shadow/Warning: זהו טידלר צל. כל שינוי יחליף למעשה את הגריסה המקורית מהפלאגין <<pluginLink>> +Tags/Add/Button: הוסף +Tags/Add/Placeholder: שם התג +Tags/Dropdown/Caption: רשימת תגים +Tags/Dropdown/Hint: הראה רשימת תגים +Title/BadCharacterWarning: אזהרה: הימנע משימוש בסימנים <<bad-chars>> בשמות טידלרים +Type/Delete/Caption: מחק סוג תוכן +Type/Delete/Hint: מחק סוג תוכן +Type/Dropdown/Caption: רשימת סוגי תוכן +Type/Dropdown/Hint: הראה רשימת סוגי תוכן +Type/Placeholder: סוג תוכן +Type/Prompt: סוג: diff --git a/languages/he-IL/Exporters.multids b/languages/he-IL/Exporters.multids new file mode 100644 index 000000000..87d7ade8f --- /dev/null +++ b/languages/he-IL/Exporters.multids @@ -0,0 +1,6 @@ +title: $:/language/Exporters/ + +CsvFile: CSV קובץ +JsonFile: JSON קובץ +StaticRiver: סטטי HTML +TidFile: ".tid" קובץ diff --git a/languages/he-IL/Fields.multids b/languages/he-IL/Fields.multids new file mode 100644 index 000000000..ddc1418d0 --- /dev/null +++ b/languages/he-IL/Fields.multids @@ -0,0 +1,35 @@ +title: $:/language/Docs/Fields/ + +_canonical_uri: ה URL השלם של טידלר תמונה חיצונית +bag: שם השק ממנו בא הטידלר +caption: הטקסט להצגה על צ=לשונית או כפתור +color: ערך הצבע של CSS המקושר לטידלר זה +component: שם הרכיב האחראי ל [[alert tiddler|AlertMechanism]] +created: התאריך בו נוצר הטידלר +creator: שם האדם שיצר את הטידלר +current-tiddler: משמש לאגירת הטידלר העליון ב [[history list|HistoryMechanism]] +dependents: עבור פלאגין רושם את שמות הפלאגינים התלויים בו +description: התיאור של פלאגין או דיאלוג מודאלי +draft.of: עבור טידלרי טיוטה, מכיל את כותרת הטידלר שעבורו הוא טיוטה +draft.title: עבור טידלרי טיוטה, מכיל את הכותרת החדשה לטידלר המוצע +footer: כותרת תחתונה לוויזארד +hack-to-give-us-something-to-compare-against: שדה אחסון זמני המשמש ב [[$:/core/templates/static.content]] +icon: שם הטידלר המכיל את הצלמית המקושרת לטידלר +library: אם "yes" מציין שהטידלר צריך להישמר כספריית ג'אווהסקריפט +list: רשימה סדורה של שמות טידלרים המקושרים לטידלר +list-after: אם מכיל ערך, הכותרת של הטידלר שאחריו הטידלר הזה צריך להיות מוסף לרשימה הסדורה של כותרות טידלרים +list-before: אם מכיל ערך, הכותרת של הטידלר שלפניו הטידלר הזה צריך להיות מוסף לרשימה הסדורה של כותרות טידלרים או בתחילת הרשימה אם השדה נמצא אך ריק +modified: התאריך והזמן בהם טידלר זה שונה לאחרונה +modifier: שם הטידלר המזוהה עם האדם ששינה טידלר זה לאחרונה +name: השם הקריא המקושר עם טידלר פלאגין +plugin-priority: ערך מספרי המציין את העדיפות של טידלר פלאגין +plugin-type: סוג הלאגין בטידלר פלאגין +released: תאריך הגירסה של טידליויקי +revision: גרסת הטידלר המוחזקת בשרת +source: URL המקור המקושר לטידלר זה +subtitle: תת הכותרת של הוויזארד +tags: רשימת תגים המקושרץ לטידלר +text: הטקסט העיקרי של הטידלר +title: השם הייחודי של הטידלר +type: סוג התוכן של הטידלר +version: מידע גירסה לפלאגין diff --git a/languages/he-IL/Filters.multids b/languages/he-IL/Filters.multids new file mode 100644 index 000000000..04531dd87 --- /dev/null +++ b/languages/he-IL/Filters.multids @@ -0,0 +1,14 @@ +title: $:/language/Filters/ + +AllTags: כל התגים חוץ מתגי מערכת +AllTiddlers: כל הטידלרים חוץ מטידלרי מערכת +Drafts: טידלרי טיוטה +Missing: טידלרים חסרים +Orphans: טידלרים יתומים +OverriddenShadowTiddlers: טידלרי צל שכוסו +RecentSystemTiddlers: טידלרים ששונו לארונה, כולל מערכת +RecentTiddlers: טידלרים ששונו לאחרונה +ShadowTiddlers: טידלרי צל +SystemTags: תגיות מערכת +SystemTiddlers: טידלרי מערכת +TypedTiddlers: טידלרים שאינם בויקי-טקסט diff --git a/languages/he-IL/GettingStarted.tid b/languages/he-IL/GettingStarted.tid new file mode 100644 index 000000000..043ae5c5b --- /dev/null +++ b/languages/he-IL/GettingStarted.tid @@ -0,0 +1,17 @@ +title: GettingStarted + +\define lingo-base() $:/language/ControlPanel/Basics/ +~TiddlyWiki ולקהילת ~TiddlyWiki ברוך הבא ל + +לפני שאתה מתחיל לאגור מידע חשוב ~TiddlyWiki חשוב לוודא שאתה יכול לשומרם באופן אמין. ראה https://tiddlywiki.com/#GettingStarted לפרטים + +!! אתחל ~TiddlyWiki + +<div class="tc-control-panel"> + +|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> | +|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> | +|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// | +</div> + +ראה [[control panel|$:/ControlPanel]] לאופציות נוספות. diff --git a/languages/he-IL/Import.multids b/languages/he-IL/Import.multids new file mode 100644 index 000000000..700427933 --- /dev/null +++ b/languages/he-IL/Import.multids @@ -0,0 +1,15 @@ +title: $:/language/Import/ + +Imported/Hint: הטידלרים הבאים ייובאו: +Listing/Cancel/Caption: בטל +Listing/Hint: טידלרים אלה מוכנים לייבוא: +Listing/Import/Caption: יבא +Listing/Select/Caption: בחר +Listing/Status/Caption: סטטוס +Listing/Title/Caption: כותרת +Upgrader/Plugins/Suppressed/Incompatible: פלאגין חסום, לא תואם או פג-תוקף +Upgrader/Plugins/Suppressed/Version: פלאגין חסום (בגלל <<incoming>> ישן יותר מאשר <<existing>>) +Upgrader/Plugins/Upgraded: עודכן פלאגין מ <<incoming>> ל <<upgraded>> +Upgrader/State/Suppressed: טידלר במצב זמני נחסם +Upgrader/System/Suppressed: טידלר מערכת חסום +Upgrader/ThemeTweaks/Created: יובא שינוי תימה <$text text=<<from>>/> diff --git a/languages/he-IL/Misc.multids b/languages/he-IL/Misc.multids new file mode 100644 index 000000000..f6e5de043 --- /dev/null +++ b/languages/he-IL/Misc.multids @@ -0,0 +1,45 @@ +title: $:/language/ + +BinaryWarning/Prompt: הטידלר הזה כולל נתונים בינאריים +ClassicWarning/Upgrade/Caption: שדרג +CloseAll/Button: סגור הכל +ColourPicker/Recent: אחרונים: +ConfirmCancelTiddler: האם אתה רוצה לוותר על השינויים בטידלר "<$text text=<<title>>/>"? +ConfirmDeleteTiddler: האם אתה רוצה למחוק את הטידלר "<$text text=<<title>>/>"? +ConfirmOverwriteTiddler: האם אתה רוצה להחליף את הטידלר "<$text text=<<title>>/>"? +Count: מספר +DefaultNewTiddlerTitle: טידלר חדש: +DropMessage: שמוט כאן (או השתמש ב ESCAPE לבטל) +Encryption/Cancel: בטל +Encryption/ConfirmClearPassword: האם אתה רוצה לנקות את הסיסמה? זה יבטל את ההצפנה של הטידלי-ויקי הזה +Encryption/Password: סיסמה +Encryption/PasswordNoMatch: סיסמאות לא מתאימות +Encryption/PromptSetPassword: קבע סיסמה חדשה לטידליויקי זה +Encryption/RepeatPassword: סיסמה שוב +Encryption/SetPassword: קבע סיסמה +Encryption/Username: שם משתמש +Error/Caption: שגיאה +Error/Filter: שגיאת פילטר +Error/FilterSyntax: שגיאת תחביר בביטוי פילטר +Error/IsFilterOperator: שגיאת פילטר: אופרנד לא ידוע לאופרטור 'is' +Error/LoadingPluginLibrary: שגיאה בטעינת ספריית פלאגין +Error/RecursiveTransclusion: שגיאת טרנסקלוזיה רקורסיבית בוידג'ט הטרנסקלוזיה +Error/RetrievingSkinny: שגיאה באחזור רשימת טידלרים סקיניים +Error/SavingToTWEdit: שגיאה בשמירה TWEdit +Error/WhileSaving: שגיאה בשמירה +Error/XMLHttpRequest: XMLHttpRequest קוד שגיאה +InternalJavaScriptError/Hint: מביך, אך מומלץ שתאתחל מחדש על ידי רפרוש הדפדפן +InvalidFieldName: סימנים לא חוקיים בשם השדה "<$text text=<<fieldName>>/>". Fields can only contain lowercase letters, digits and the characters underscore (`_`), hyphen (`-`) and period (`.`) +LoginToTiddlySpace: היכנס ל TiddlySpace +MissingTiddler/Hint: טידלר חסר "<$text text=<<currentTiddler>>/>" -לחץ {{||$:/core/ui/Buttons/edit}} כדי ליצור +No: לא +OfficialPluginLibrary: רשמית~TiddlyWiki ספריית פלאגינים +PluginReloadWarning: נא שמור {{$:/core/ui/Buttons/save-wiki}} וטען מחדש {{$:/core/ui/Buttons/refresh}} כדי לאפשר לשינויי הפלאגינים להיכנס לתוקף +SystemTiddler/Tooltip: זהו טידלר מערכת +TagManager/Colour/Heading: צבע +TagManager/Count/Heading: מספר +TagManager/Icon/Heading: צלמית +TagManager/Info/Heading: מידע +TagManager/Tag/Heading: תג +UnsavedChangesWarning: יש לך שינויים לא שמורים בטידלי-ויקי +Yes: כן diff --git a/languages/he-IL/NewJournal.multids b/languages/he-IL/NewJournal.multids new file mode 100644 index 000000000..08bdfc5ec --- /dev/null +++ b/languages/he-IL/NewJournal.multids @@ -0,0 +1,3 @@ +title: $:/config/NewJournal/ + +Tags: יומן diff --git a/languages/he-IL/Notifications.multids b/languages/he-IL/Notifications.multids new file mode 100644 index 000000000..80ea62b11 --- /dev/null +++ b/languages/he-IL/Notifications.multids @@ -0,0 +1,4 @@ +title: $:/language/Notifications/ + +Save/Done: ויקי נשמר +Save/Starting: מתחיל לשמור ויקי diff --git a/languages/he-IL/Search.multids b/languages/he-IL/Search.multids new file mode 100644 index 000000000..c89d4ca72 --- /dev/null +++ b/languages/he-IL/Search.multids @@ -0,0 +1,14 @@ +title: $:/language/Search/ + +DefaultResults/Caption: רשימה +Filter/Caption: פילטר +Filter/Hint: חפש דרך [[filter expression|https://tiddlywiki.com/static/Filters.html]] +Matches/All: כל ההתאמות: +Matches/Title: התאמות שם: +Search: חפש +Shadows/Caption: צללים +Shadows/Hint: חפש טידלרי צללים +Standard/Caption: רגיל +Standard/Hint: חפש טידלרים רגילים +System/Caption: מערכת +System/Hint: חפש טידלרי מערכת diff --git a/languages/he-IL/SideBar.multids b/languages/he-IL/SideBar.multids new file mode 100644 index 000000000..584e199d4 --- /dev/null +++ b/languages/he-IL/SideBar.multids @@ -0,0 +1,16 @@ +title: $:/language/SideBar/ + +All/Caption: הכל +Contents/Caption: תוכן +Drafts/Caption: טיוטות +Missing/Caption: חסרים +More/Caption: עוד +Open/Caption: פתוחים +Orphans/Caption: יתומים +Recent/Caption: אחרונים +Shadows/Caption: צללים +System/Caption: מערכת +Tags/Caption: תגים +Tags/Untagged/Caption: לא מתויגים +Tools/Caption: כלים +Types/Caption: סוגים diff --git a/languages/he-IL/SiteSubtitle.tid b/languages/he-IL/SiteSubtitle.tid new file mode 100644 index 000000000..fdf79fc71 --- /dev/null +++ b/languages/he-IL/SiteSubtitle.tid @@ -0,0 +1,3 @@ +title: $:/SiteSubtitle + +יומן רשת אישי לא-לינארי \ No newline at end of file diff --git a/languages/he-IL/SiteTitle.tid b/languages/he-IL/SiteTitle.tid new file mode 100644 index 000000000..8529a6878 --- /dev/null +++ b/languages/he-IL/SiteTitle.tid @@ -0,0 +1,3 @@ +title: $:/SiteTitle + +ה ~TiddlyWiki שלי \ No newline at end of file diff --git a/languages/he-IL/Snippets/ListByTag.tid b/languages/he-IL/Snippets/ListByTag.tid new file mode 100644 index 000000000..220d9ed89 --- /dev/null +++ b/languages/he-IL/Snippets/ListByTag.tid @@ -0,0 +1,5 @@ +title: $:/language/Snippets/ListByTag +tags: $:/tags/TextEditor/Snippet +caption: רשימת טידלרים לפי תג + +<<list-links "[tag[task]sort[title]]">> diff --git a/languages/he-IL/Snippets/MacroDefinition.tid b/languages/he-IL/Snippets/MacroDefinition.tid new file mode 100644 index 000000000..8fa8164e2 --- /dev/null +++ b/languages/he-IL/Snippets/MacroDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/MacroDefinition +tags: $:/tags/TextEditor/Snippet +caption: הגדרות מקרו + +\define macroName(param1:"default value",param2) +Text of the macro +\end diff --git a/languages/he-IL/Snippets/Table4x3.tid b/languages/he-IL/Snippets/Table4x3.tid new file mode 100644 index 000000000..53f207a2c --- /dev/null +++ b/languages/he-IL/Snippets/Table4x3.tid @@ -0,0 +1,8 @@ +title: $:/language/Snippets/Table4x3 +tags: $:/tags/TextEditor/Snippet +caption: טבלה בת 4 עמודות ו 3 שורות + +|! |!Alpha |!Beta |!Gamma |!Delta | +|!One | | | | | +|!Two | | | | | +|!Three | | | | | diff --git a/languages/he-IL/Snippets/TableOfContents.tid b/languages/he-IL/Snippets/TableOfContents.tid new file mode 100644 index 000000000..06e2f49bc --- /dev/null +++ b/languages/he-IL/Snippets/TableOfContents.tid @@ -0,0 +1,9 @@ +title: $:/language/Snippets/TableOfContents +tags: $:/tags/TextEditor/Snippet +caption: תוכן העניינים + +<div class="tc-table-of-contents"> + +<<toc-selective-expandable 'TableOfContents'>> + +</div> \ No newline at end of file diff --git a/languages/he-IL/ThemeTweaks.multids b/languages/he-IL/ThemeTweaks.multids new file mode 100644 index 000000000..c83204345 --- /dev/null +++ b/languages/he-IL/ThemeTweaks.multids @@ -0,0 +1,41 @@ +title: $:/language/ThemeTweaks/ + +Metrics: גדלים +Metrics/BodyFontSize: גודל גופן לגוף הטידלר +Metrics/BodyLineHeight: גובה שורה לגוף הטידלר +Metrics/FontSize: גודל גופן +Metrics/LineHeight: גובה שורה +Metrics/SidebarBreakpoint: נקודת השבירה של סרגל הצד +Metrics/SidebarBreakpoint/Hint: רוחב דף מינימלי בו הסיפור וסרגל הצד יופיעו צד לצד +Metrics/SidebarWidth: רוחב סרגל צד +Metrics/SidebarWidth/Hint: רוחב סרגל צד במתווה סורם-קבוע +Metrics/StoryLeft: מיקום שמאל הסיפור +Metrics/StoryLeft/Hint: כמה רחוק שול שמאל של הטידלרים משול שמאל של העמוד +Metrics/StoryRight: ימין הסיפור +Metrics/StoryRight/Hint: כמה רחוק שול שמאל של סרגל הצד משול שמאל של העמוד +Metrics/StoryTop: המיקום העליון של הסיפור +Metrics/StoryTop/Hint: מרחק ראש הסיפור מראש הדף +Metrics/StoryWidth: רוחב הסיפור +Metrics/StoryWidth/Hint: הרוחב הכולל של נהר הסיפורים +Metrics/TiddlerWidth: רוחב הטידלר +Metrics/TiddlerWidth/Hint: בתוך נהר הסיפורים +Options: אפשרויות +Options/CodeWrapping: קפל שורות ארוכות בבלוקי קוד +Options/SidebarLayout: מתווה סרגל צד +Options/SidebarLayout/Fixed-Fluid: סיפור קבוע לוח צד גמיש +Options/SidebarLayout/Fluid-Fixed: סיפור גמיש לוח צד קבוע +Options/StickyTitles: כותרות דביקות +Options/StickyTitles/Hint: גורם לכותרות טידלרים להידבק לראש חלון הדפדפן. לא עובד כלל בכרום וגורם בעיות מתווה בפירפוקס +Settings: קביעות +Settings/BackgroundImage: תמונת רקע של עמוד +Settings/BackgroundImageAttachment: תמונת רקע עמוד מוצמדת +Settings/BackgroundImageAttachment/Fixed: קבוע לחלון +Settings/BackgroundImageAttachment/Scroll: גלגל עם טידלרים +Settings/BackgroundImageSize: גודל תמונת רקע עמוד +Settings/BackgroundImageSize/Auto: אוטומטי +Settings/BackgroundImageSize/Contain: מכיל +Settings/BackgroundImageSize/Cover: כיסוי +Settings/CodeFontFamily: משפחת גופני קוד +Settings/FontFamily: משפחת גופנים +ThemeTweaks: התאמות תימה +ThemeTweaks/Hint: אתה יכול להתאים היבטים מסויימים של תימת הווניל diff --git a/languages/he-IL/TiddlerInfo.multids b/languages/he-IL/TiddlerInfo.multids new file mode 100644 index 000000000..4eccda074 --- /dev/null +++ b/languages/he-IL/TiddlerInfo.multids @@ -0,0 +1,21 @@ +title: $:/language/TiddlerInfo/ + +Advanced/Caption: מתקדם +Advanced/PluginInfo/Empty/Hint: ללא +Advanced/PluginInfo/Heading: פרטי פלאגין +Advanced/PluginInfo/Hint: פלאגין זה כולל את טידלרי הצל הבאים: +Advanced/ShadowInfo/Heading: מצב צל +Advanced/ShadowInfo/NotShadow/Hint: הטידלר <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> אינו טידלר צל +Advanced/ShadowInfo/OverriddenShadow/Hint: הוא ממוסך על ידי טידלר אחר +Advanced/ShadowInfo/Shadow/Hint: הטידלר <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> הוא טילדר צל +Advanced/ShadowInfo/Shadow/Source: הוא מוגדר בפלאגין <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link> +Fields/Caption: שדות +List/Caption: רשימה +List/Empty: לטידלר זה אין רשימה +Listed/Caption: רשום +Listed/Empty: הטידלר אינו רשום על ידי אחרים +References/Caption: התייחסויות +References/Empty: אין טידלרים המקושרים לזה +Tagging/Caption: תיוג +Tagging/Empty: אין טידלרים המתויגים על ידי זה +Tools/Caption: כלים diff --git a/languages/he-IL/Types/application%2Fjavascript.tid b/languages/he-IL/Types/application%2Fjavascript.tid new file mode 100644 index 000000000..cdd451e45 --- /dev/null +++ b/languages/he-IL/Types/application%2Fjavascript.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/application/javascript +description: JavaScript קוד +name: application/javascript +group: מפתח diff --git a/languages/he-IL/Types/application%2Fjson.tid b/languages/he-IL/Types/application%2Fjson.tid new file mode 100644 index 000000000..59742a242 --- /dev/null +++ b/languages/he-IL/Types/application%2Fjson.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/application/json +description: JSON נתוני +name: application/json +group: מפתח diff --git a/languages/he-IL/Types/application%2Fx-tiddler-dictionary.tid b/languages/he-IL/Types/application%2Fx-tiddler-dictionary.tid new file mode 100644 index 000000000..a47ecb54b --- /dev/null +++ b/languages/he-IL/Types/application%2Fx-tiddler-dictionary.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/application/x-tiddler-dictionary +description: מילון נתונים +name: application/x-tiddler-dictionary +group: מפתח diff --git a/languages/el-GR/Types/image_gif.tid b/languages/he-IL/Types/image%2Fgif.tid similarity index 52% rename from languages/el-GR/Types/image_gif.tid rename to languages/he-IL/Types/image%2Fgif.tid index f2dc0a913..537830ab5 100644 --- a/languages/el-GR/Types/image_gif.tid +++ b/languages/he-IL/Types/image%2Fgif.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/image/gif -description: Εικόνα GIF +description: GIF תמונת name: image/gif -group: Εικόνα +group: תמונה diff --git a/languages/el-GR/Types/image_jpeg.tid b/languages/he-IL/Types/image%2Fjpeg.tid similarity index 52% rename from languages/el-GR/Types/image_jpeg.tid rename to languages/he-IL/Types/image%2Fjpeg.tid index d3be94598..7b517f191 100644 --- a/languages/el-GR/Types/image_jpeg.tid +++ b/languages/he-IL/Types/image%2Fjpeg.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/image/jpeg -description: Εικόνα JPEG +description: JPEG תמונת name: image/jpeg -group: Εικόνα +group: תמונה diff --git a/languages/he-IL/Types/image%2Fpng.tid b/languages/he-IL/Types/image%2Fpng.tid new file mode 100644 index 000000000..d0e7930d8 --- /dev/null +++ b/languages/he-IL/Types/image%2Fpng.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/image/png +description: PNG תמונת +name: image/png +group: תמונה diff --git a/languages/he-IL/Types/image%2Fsvg%2Bxml.tid b/languages/he-IL/Types/image%2Fsvg%2Bxml.tid new file mode 100644 index 000000000..bd324a1a8 --- /dev/null +++ b/languages/he-IL/Types/image%2Fsvg%2Bxml.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/image/svg+xml +description: Structured Vector Graphics תמונת +name: image/svg+xml +group: תמונה diff --git a/languages/he-IL/Types/image%2Fx-icon.tid b/languages/he-IL/Types/image%2Fx-icon.tid new file mode 100644 index 000000000..55a37c04a --- /dev/null +++ b/languages/he-IL/Types/image%2Fx-icon.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/image/x-icon +description: ICO format קובץ סמליל +name: image/x-icon +group: תמונה diff --git a/languages/he-IL/Types/text%2Fcss.tid b/languages/he-IL/Types/text%2Fcss.tid new file mode 100644 index 000000000..af2293056 --- /dev/null +++ b/languages/he-IL/Types/text%2Fcss.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/css +description: גליון עיצוב סטטי +name: text/css +group: מפתח diff --git a/languages/he-IL/Types/text%2Fhtml.tid b/languages/he-IL/Types/text%2Fhtml.tid new file mode 100644 index 000000000..b97a3c115 --- /dev/null +++ b/languages/he-IL/Types/text%2Fhtml.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/html +description: HTML טקסט +name: text/html +group: טקסט diff --git a/languages/he-IL/Types/text%2Fplain.tid b/languages/he-IL/Types/text%2Fplain.tid new file mode 100644 index 000000000..fb6789e17 --- /dev/null +++ b/languages/he-IL/Types/text%2Fplain.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/plain +description: טקסט רגיל +name: text/plain +group: טקסט diff --git a/languages/el-GR/Types/text_vnd.tiddlywiki.tid b/languages/he-IL/Types/text%2Fvnd.tiddlywiki.tid similarity index 82% rename from languages/el-GR/Types/text_vnd.tiddlywiki.tid rename to languages/he-IL/Types/text%2Fvnd.tiddlywiki.tid index eda080b4e..417efc1c4 100644 --- a/languages/el-GR/Types/text_vnd.tiddlywiki.tid +++ b/languages/he-IL/Types/text%2Fvnd.tiddlywiki.tid @@ -1,4 +1,4 @@ title: $:/language/Docs/Types/text/vnd.tiddlywiki description: TiddlyWiki 5 name: text/vnd.tiddlywiki -group: Κείμενο +group: טקסט diff --git a/languages/he-IL/Types/text%2Fx-tiddlywiki.tid b/languages/he-IL/Types/text%2Fx-tiddlywiki.tid new file mode 100644 index 000000000..a2049dd2a --- /dev/null +++ b/languages/he-IL/Types/text%2Fx-tiddlywiki.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/x-tiddlywiki +description: TiddlyWiki Classic +name: text/x-tiddlywiki +group: טקסט diff --git a/languages/he-IL/icon.tid b/languages/he-IL/icon.tid new file mode 100644 index 000000000..c18b4a158 --- /dev/null +++ b/languages/he-IL/icon.tid @@ -0,0 +1,38 @@ +title: $:/languages/he-IL/icon +type: image/svg+xml + +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" + "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg xmlns="http://www.w3.org/2000/svg" version="1.1" + xmlns:xlink="http://www.w3.org/1999/xlink" + width="660" height="480" viewBox="0 0 220 160"> + <desc>Flag of Israel</desc> + <defs> + <!-- Specs are taken from "The Provisional Council of State Proclamation of + the Flag of the State of Israel," 25 Tishrei 5709 (28 October 1948) + For Magen David, the "Israel Science and Technology Homepage" at + http://www.science.co.il/Israel-flag.asp specifies each side as 60 cm. + Outer radius is then 30 / cos(30) = 20 * sqrt(3) + For equilateral triangles, middle radius = outer radius - width: + 20 * sqrt(3) - 5.5 + Coordinates for upward-pointing triangle relative to center are then: + ( 0,-(20*sqrt(3) - 5.5) ) + (-(20*sqrt(3) - 5.5) * cos(30), (20*sqrt(3) - 5.5) * sin(30)) + ( (20*sqrt(3) - 5.5) * cos(30), (20*sqrt(3) - 5.5) * sin(30)) --> + <polygon id="triangle" points="0,-29.1410161513775421 + -25.2368602791855814, 14.5705080756887710 + 25.2368602791855814, 14.5705080756887710" + stroke="#0038b8" stroke-width="5.5" fill-opacity="0"/> + </defs> + <!-- "The flag is 220 cm long and 160 cm wide. The background is white" --> + <rect width="220" height="160" fill="white"/> + <!-- "...two stripes of dark sky-blue, 25 cm broad, over the whole length of + the flag, at a distance of 15 cm from the top and from the bottom..." + Legislation does not specify exact shade of blue; "#0038b8" is typical of + flags used in Israel --> + <rect width="220" height="25" fill="#0038b8" y="15"/> + <rect width="220" height="25" fill="#0038b8" y="120"/> + <use xlink:href="#triangle" transform="translate(110,80)"/> + <use xlink:href="#triangle" transform="translate(110,80) rotate(180)"/> +</svg> diff --git a/languages/he-IL/plugin.info b/languages/he-IL/plugin.info new file mode 100644 index 000000000..61e6be6cd --- /dev/null +++ b/languages/he-IL/plugin.info @@ -0,0 +1,9 @@ +{ + "title": "$:/languages/he-IL", + "name": "he-IL", + "plugin-type": "language", + "description": "Hebrew (Israel)", + "author": "DoronTzur", + "core-version": ">=5.0.0", + "text-direction": "rtl" +} \ No newline at end of file diff --git a/languages/hi-IN/GettingStarted.tid b/languages/hi-IN/GettingStarted.tid index d81abdfa9..e0fca191a 100644 --- a/languages/hi-IN/GettingStarted.tid +++ b/languages/hi-IN/GettingStarted.tid @@ -3,7 +3,7 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ ~ टिड्लीविकि और ~ टिड्लीविकि समुदाय में आपका स्वागत है -आप ~ टिड्लीविकि में महत्वपूर्ण जानकारी के भंडारण शुरू करने से पहले यह तुम मज़बूती परिवर्तन बचा सकता है कि यह सुनिश्चित करना महत्वपूर्ण है। जानकारी के लिए http://tiddlywiki.com/#GettingStarted देखें +आप ~ टिड्लीविकि में महत्वपूर्ण जानकारी के भंडारण शुरू करने से पहले यह तुम मज़बूती परिवर्तन बचा सकता है कि यह सुनिश्चित करना महत्वपूर्ण है। जानकारी के लिए https://tiddlywiki.com/#GettingStarted देखें !! Set up this ~TiddlyWiki diff --git a/languages/hi-IN/Misc.multids b/languages/hi-IN/Misc.multids index fc85bb858..50ae3ad2c 100644 --- a/languages/hi-IN/Misc.multids +++ b/languages/hi-IN/Misc.multids @@ -1,7 +1,7 @@ title: $:/language/ BinaryWarning/Prompt: इस tiddler बाइनरी डेटा शामिल -ClassicWarning/Hint: इस tiddler टिड्लीविकि संस्करण 5. देखने के साथ पूरी तरह से संगत नहीं है जो टिड्लीविकि क्लासिक विकी टेक्स्ट प्रारूप में लिखा है,http://tiddlywiki.com/static/Upgrading.html for more details. +ClassicWarning/Hint: इस tiddler टिड्लीविकि संस्करण 5. देखने के साथ पूरी तरह से संगत नहीं है जो टिड्लीविकि क्लासिक विकी टेक्स्ट प्रारूप में लिखा है,https://tiddlywiki.com/static/Upgrading.html for more details. ClassicWarning/Upgrade/Caption: उन्नत करना CloseAll/Button: करीब सभी ConfirmCancelTiddler: क्या आप tiddler के लिए परिवर्तनों को छोड़ना चाहते हैं "<$text text=<<title>>/>"? diff --git a/languages/hi-IN/Modals/Download.tid b/languages/hi-IN/Modals/Download.tid index bd0e089e0..ead4cb9f7 100644 --- a/languages/hi-IN/Modals/Download.tid +++ b/languages/hi-IN/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Download changes footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html आपका ब्राउज़र केवल मार्गदर्शन बचत का समर्थन करता है। diff --git a/languages/hi-IN/Modals/SaveInstructions.tid b/languages/hi-IN/Modals/SaveInstructions.tid index ef3ff3e12..56aef1273 100644 --- a/languages/hi-IN/Modals/SaveInstructions.tid +++ b/languages/hi-IN/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Save your work footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html इस विकि में आपके परिवर्तन एक ~ टिड्लीविकि HTML फ़ाइल के रूप में सहेजा जाना चाहिए। diff --git a/languages/ia-IA/GettingStarted.tid b/languages/ia-IA/GettingStarted.tid index b79c7ca01..327a7e660 100644 --- a/languages/ia-IA/GettingStarted.tid +++ b/languages/ia-IA/GettingStarted.tid @@ -3,7 +3,7 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ Benvenite a ~TiddlyWiki e le communitate de ~TiddlyWiki -Ante que tu comencia salvar informationes importante in ~TiddlyWiki, il es importante assecurar que tu pote salvar cambios con fide. Vide http://tiddlywiki.com/#GettingStarted pro detalios +Ante que tu comencia salvar informationes importante in ~TiddlyWiki, il es importante assecurar que tu pote salvar cambios con fide. Vide https://tiddlywiki.com/#GettingStarted pro detalios !! Prepara iste ~TiddlyWiki diff --git a/languages/ia-IA/Misc.multids b/languages/ia-IA/Misc.multids index a4eda66a4..23b9616a7 100644 --- a/languages/ia-IA/Misc.multids +++ b/languages/ia-IA/Misc.multids @@ -1,7 +1,7 @@ title: $:/language/ BinaryWarning/Prompt: Iste nota contine datos binari -ClassicWarning/Hint: Iste nota es scribite in le formato textual wiki TiddlyWiki Classic, que non es plenmente compatibile con TiddlyWiki version 5. Vide http://tiddlywiki.com/static/Upgrading.html pro plus de detalios. +ClassicWarning/Hint: Iste nota es scribite in le formato textual wiki TiddlyWiki Classic, que non es plenmente compatibile con TiddlyWiki version 5. Vide https://tiddlywiki.com/static/Upgrading.html pro plus de detalios. ClassicWarning/Upgrade/Caption: modernisa CloseAll/Button: claude omnes ConfirmCancelTiddler: Desira tu annullar cambios al nota "<$text text=<<title>>/>"? @@ -13,7 +13,7 @@ DropMessage: Lassa cader ci (o clicca Esc pro cancellar) Encryption/ConfirmClearPassword: Desira tu remover le contrasigno? Isto va remover le usate codification quando iste wiki es conservate Encryption/PromptSetPassword: Fixa un nove contrasigno pro iste TiddlyWiki InvalidFieldName: Signos illegal in le quadro "<$text text=<<fieldName>>/>". Quadros pote solmente continer litteras minuscule, cifras e le signos sublineate (`_`), ligamine (`-`) and puncto (`.`) -MissingTiddler/Hint: Notas mancante "<$text text=<<currentTiddler>>/>" - clicca {{$:/core/images/edit-button}} pro crear +MissingTiddler/Hint: Notas mancante "<$text text=<<currentTiddler>>/>" - clicca {{||$:/core/ui/Buttons/edit}} pro crear RecentChanges/DateFormat: le DD de MMM YYYY SystemTiddler/Tooltip: Isto es un notitia de systema TagManager/Colour/Heading: Color diff --git a/languages/ia-IA/Modals/Download.tid b/languages/ia-IA/Modals/Download.tid index 84b99542f..7a2b87d00 100644 --- a/languages/ia-IA/Modals/Download.tid +++ b/languages/ia-IA/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Download changes footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html Tu navigator supporta solmente que on salva manualmente. diff --git a/languages/ia-IA/Modals/SaveInstructions.tid b/languages/ia-IA/Modals/SaveInstructions.tid index 7c3904648..845aea300 100644 --- a/languages/ia-IA/Modals/SaveInstructions.tid +++ b/languages/ia-IA/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Save your work footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html Tu cambios a iste wiki debe esser salvate como un file HTML ~TiddlyWiki. diff --git a/languages/ia-IA/Search.multids b/languages/ia-IA/Search.multids index c2c7a3d72..3b2683d74 100644 --- a/languages/ia-IA/Search.multids +++ b/languages/ia-IA/Search.multids @@ -2,7 +2,7 @@ title: $:/language/Search/ DefaultResults/Caption: Lista Filter/Caption: Filtro -Filter/Hint: Cerca via un [[filter expression|http://tiddlywiki.com/static/Filters.html]] +Filter/Hint: Cerca via un [[filter expression|https://tiddlywiki.com/static/Filters.html]] Filter/Matches: //<small><<resultCount>> resultatos</small>// Matches: //<small><<resultCount>> resultatos</small>// Shadows/Caption: Umbras diff --git a/languages/it-IT/ControlPanel.multids b/languages/it-IT/ControlPanel.multids index 42aa6b730..9d00c86b8 100644 --- a/languages/it-IT/ControlPanel.multids +++ b/languages/it-IT/ControlPanel.multids @@ -12,6 +12,7 @@ Basics/DefaultTiddlers/TopHint: Scegli quali frammenti vuoi visualizzare all'avv Basics/Language/Prompt: Ciao! Scegli la lingua: Basics/NewJournal/Tags/Prompt: Etichette per i nuovi frammenti diario Basics/NewJournal/Title/Prompt: Titolo dei nuovi frammenti diario +Basics/NewTiddler/Title/Prompt: Titolo dei nuovi frammenti Basics/OverriddenShadowTiddlers/Prompt: Numero di frammenti nascosti annullati: Basics/ShadowTiddlers/Prompt: Numero di frammenti nascosti: Basics/Subtitle/Prompt: Sottotitolo: diff --git a/languages/it-IT/GettingStarted.tid b/languages/it-IT/GettingStarted.tid index c3c7aaa82..b7639b5f9 100644 --- a/languages/it-IT/GettingStarted.tid +++ b/languages/it-IT/GettingStarted.tid @@ -3,7 +3,7 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ Benvenuto in ~TiddlyWiki e nella ~TiddlyWiki community -Prima di iniziare a memorizzare informazioni importanti in ~TiddlyWiki assicurati di riuscire a salvare in modo affidabile le modifiche. Leggi http://tiddlywiki.com/#GettingStarted per i dettagli. +Prima di iniziare a memorizzare informazioni importanti in ~TiddlyWiki assicurati di riuscire a salvare in modo affidabile le modifiche. Leggi https://tiddlywiki.com/#GettingStarted per i dettagli. !! Imposta questo ~TiddlyWiki diff --git a/languages/it-IT/Misc.multids b/languages/it-IT/Misc.multids index 6e87f8b11..ff497f5f8 100644 --- a/languages/it-IT/Misc.multids +++ b/languages/it-IT/Misc.multids @@ -1,7 +1,7 @@ title: $:/language/ BinaryWarning/Prompt: Questo frammento contiene dati binari -ClassicWarning/Hint: Questo frammento è scritto nel formato testo wiki di TiddlyWiki Classic e non è pienamente compatibile con TiddlyWiki versione 5. Vedi http://tiddlywiki.com/static/Upgrading.html per maggiori dettagli a riguardo +ClassicWarning/Hint: Questo frammento è scritto nel formato testo wiki di TiddlyWiki Classic e non è pienamente compatibile con TiddlyWiki versione 5. Vedi https://tiddlywiki.com/static/Upgrading.html per maggiori dettagli a riguardo ClassicWarning/Upgrade/Caption: Aggiorna CloseAll/Button: Chiudi tutto ConfirmCancelTiddler: Vuoi annullare le modifiche al frammento "<$text text=<<title>>/>"? @@ -20,10 +20,10 @@ Encryption/RepeatPassword: Ripeti password Encryption/SetPassword: Imposta password Encryption/Username: NomeUtente InvalidFieldName: Caratteri non consentiti nel campo nome "<$text text=<<fieldName>>/>". I campi nome possono solo contenere lettere minuscole, numeri ed i caratteri sottolineato (`_`), meno (`-`) e punto (`.`) -MissingTiddler/Hint: Frammento mancante "<$text text=<<currentTiddler>>/>" - clicca {{$:/core/images/edit-button}} per crearlo +MissingTiddler/Hint: Frammento mancante "<$text text=<<currentTiddler>>/>" - clicca {{||$:/core/ui/Buttons/edit}} per crearlo OfficialPluginLibrary: Libreria ufficiale plugin ~TiddlyWiki PluginReloadWarning: Salva {{$:/core/ui/Buttons/save-wiki}} e ricarica {{$:/core/ui/Buttons/refresh}} per consentire alle modifiche ai plugin di avere effetto -RecentChanges/DateFormat: GG MM AAAA +RecentChanges/DateFormat: DD MM YYYY SystemTiddler/Tooltip: Questo è un frammento di sistema TagManager/Colour/Heading: Colore TagManager/Count/Heading: Conteggio diff --git a/languages/it-IT/Modals/Download.tid b/languages/it-IT/Modals/Download.tid index a323d3cb4..efeddc4fc 100644 --- a/languages/it-IT/Modals/Download.tid +++ b/languages/it-IT/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Download changes footer: <$button message="tm-close-tiddler">Chiudi</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html Il tuo browser supporta solo il salvataggio manuale. diff --git a/languages/it-IT/Modals/SaveInstructions.tid b/languages/it-IT/Modals/SaveInstructions.tid index 4f57a2244..58dec62cd 100644 --- a/languages/it-IT/Modals/SaveInstructions.tid +++ b/languages/it-IT/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Save your work footer: <$button message="tm-close-tiddler">Chiudi</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html Le modifiche a questo wiki devono essere salvate come un file ~TiddlyWiki HTML. diff --git a/languages/it-IT/Search.multids b/languages/it-IT/Search.multids index a44fc732b..a604f2c8e 100644 --- a/languages/it-IT/Search.multids +++ b/languages/it-IT/Search.multids @@ -3,7 +3,7 @@ title: $:/language/Search/ Advanced/Matches: //<small><<resultCount>> corrispondenze</small>// DefaultResults/Caption: Lista Filter/Caption: Filtro -Filter/Hint: Cerca attraverso un [[filtro|http://tiddlywiki.com/static/Filters.html]] +Filter/Hint: Cerca attraverso un [[filtro|https://tiddlywiki.com/static/Filters.html]] Filter/Matches: //<small><<resultCount>> corrispondenze</small>// Matches: //<small><<resultCount>> corrispondenze</small>// Shadows/Caption: Nascosti diff --git a/languages/ja-JP/GettingStarted.tid b/languages/ja-JP/GettingStarted.tid index 551c5b427..bd4d97e15 100644 --- a/languages/ja-JP/GettingStarted.tid +++ b/languages/ja-JP/GettingStarted.tid @@ -3,7 +3,7 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ ~TiddlyWikiにようこそ。これは個人で使えるWeb ノートです。 -作業を開始する前に保存機能が正しく使えるかどうかをご確認ください。 - 詳細は http://tiddlywiki.com/ の説明をご覧ください。 +作業を開始する前に保存機能が正しく使えるかどうかをご確認ください。 - 詳細は https://tiddlywiki.com/ の説明をご覧ください。 それでは始めましょう: diff --git a/languages/ja-JP/Misc.multids b/languages/ja-JP/Misc.multids index c72c057aa..041b57795 100644 --- a/languages/ja-JP/Misc.multids +++ b/languages/ja-JP/Misc.multids @@ -1,7 +1,7 @@ title: $:/language/ BinaryWarning/Prompt: このtiddlerにはバイナリデータが含まれています。 -ClassicWarning/Hint: この tiddler はクラシックスタイルのTiddlyWikiフォーマットで書かれています。このフォーマットはTiddlyWiki5との完全な互換性はありません。詳しくは http://tiddlywiki.com/static/Upgrading.html を参照してください。 +ClassicWarning/Hint: この tiddler はクラシックスタイルのTiddlyWikiフォーマットで書かれています。このフォーマットはTiddlyWiki5との完全な互換性はありません。詳しくは https://tiddlywiki.com/static/Upgrading.html を参照してください。 ClassicWarning/Upgrade/Caption: アップグレード CloseAll/Button: すべて閉じる ConfirmCancelTiddler: 本当にこのtiddler "<$text text=<<title>>/>" の編集内容を取り消しますか？ @@ -12,7 +12,7 @@ DropMessage: ドロップしてください。（止めるには、キャンセ Encryption/ConfirmClearPassword: パスワードを削除すると暗号化も解除されますが、本当にパスワードを削除しますか？ Encryption/PromptSetPassword: パスワードを入力してください。 InvalidFieldName: フィールド名に不正な文字が使われています "<$text text=<<fieldName>>/>". フィールド名に使用できるのは英小文字かアンダースコア(`_`)、ハイフン(`-`)、ピリオド(`.`)のみです。 -MissingTiddler/Hint: 未作成の tiddler "<$text text=<<currentTiddler>>/>" - クリック {{$:/core/images/edit-button}} して作成 +MissingTiddler/Hint: 未作成の tiddler "<$text text=<<currentTiddler>>/>" - クリック {{||$:/core/ui/Buttons/edit}} して作成 RecentChanges/DateFormat: YYYY-MM-DD SystemTiddler/Tooltip: これはシステム tiddler です TagManager/Colour/Heading: 色 diff --git a/languages/ja-JP/Modals/Download.tid b/languages/ja-JP/Modals/Download.tid index c4152d5a8..24f7c7fa9 100644 --- a/languages/ja-JP/Modals/Download.tid +++ b/languages/ja-JP/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: 変更のダウンロード footer: <$button message="tm-close-tiddler">閉じる</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html このブラウザは手動での保存しかできません。 diff --git a/languages/ja-JP/Modals/SaveInstructions.tid b/languages/ja-JP/Modals/SaveInstructions.tid index 025bc6fab..b042e9c78 100644 --- a/languages/ja-JP/Modals/SaveInstructions.tid +++ b/languages/ja-JP/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: 作業内容を保存する footer: <$button message="tm-close-tiddler">閉じる</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html この wiki への変更内容を ~TiddlyWiki HTML ファイルとして保存する必要があります。 diff --git a/languages/ja-JP/Search.multids b/languages/ja-JP/Search.multids index bb7230b56..6b87e4520 100644 --- a/languages/ja-JP/Search.multids +++ b/languages/ja-JP/Search.multids @@ -3,7 +3,7 @@ title: $:/language/Search/ Advanced/Matches: //<small><<resultCount>> 件一致</small>// DefaultResults/Caption: List Filter/Caption: フィルタ -Filter/Hint: [[フィルタ|http://tiddlywiki.com/static/Filters.html]]で検索します。 +Filter/Hint: [[フィルタ|https://tiddlywiki.com/static/Filters.html]]で検索します。 Filter/Matches: //<small><<resultCount>> 件一致</small>// Matches: //<small><<resultCount>> 件一致</small>// Shadows/Caption: 隠し diff --git a/languages/ko-KR/ControlPanel.multids b/languages/ko-KR/ControlPanel.multids index c91040132..003bad1cc 100644 --- a/languages/ko-KR/ControlPanel.multids +++ b/languages/ko-KR/ControlPanel.multids @@ -53,7 +53,7 @@ Palette/Prompt: 현재 팔레트: Palette/ShowEditor/Caption: 편집기 보이기 Parsing/Block/Caption: 블록 파서 규칙 Parsing/Caption: 구문 분석 -Parsing/Hint: 여기서 개별 위키 파서 규칙을 전역으로 비활성화할 수 있습니다. 어떤 파서 규칙을 비활성화하면 티들리위키가 제대로 작동하는 것을 막을 수 있으므로 주의하십시오 ([[안전 모드|http://tiddlywiki.com/#SafeMode]]로 정상 작동하도록 복구할 수 있습니다) +Parsing/Hint: 여기서 개별 위키 파서 규칙을 전역으로 비활성화할 수 있습니다. 어떤 파서 규칙을 비활성화하면 티들리위키가 제대로 작동하는 것을 막을 수 있으므로 주의하십시오 ([[안전 모드|https://tiddlywiki.com/#SafeMode]]로 정상 작동하도록 복구할 수 있습니다) Parsing/Inline/Caption: 인라인 파서 규칙 Parsing/Pragma/Caption: 플라그마 파서 규칙 Plugins/Add/Caption: 더 많은 플러그인 얻기 @@ -71,7 +71,6 @@ Plugins/Installed/Hint: 현재 설치된 플러그인: Plugins/Languages/Caption: 언어 Plugins/Languages/Hint: 언어 팩 플러그인 Plugins/NoInfoFound/Hint: ''"<$text text=<<currentTab>>/>"'' 찾을 수 없음 -Plugins/NoInformation/Hint: 제공된 정보 없음 Plugins/NotInstalled/Hint: 이 플러그인은 현재 설치되어 있지 않습니다 Plugins/OpenPluginLibrary: 플러그인 라이브러리 열기 Plugins/Plugins/Caption: 플러그인 diff --git a/languages/ko-KR/GettingStarted.tid b/languages/ko-KR/GettingStarted.tid index fa2e90a62..1350013dd 100644 --- a/languages/ko-KR/GettingStarted.tid +++ b/languages/ko-KR/GettingStarted.tid @@ -3,7 +3,7 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ 티들리위키와 티들리위키 공동체에 오신 것을 환영합니다 -티들리위키에 중요한 정보를 저장하는 것을 시작하기 전에 확실히 바뀜을 저장할 수 있는지 확인하는 것이 중요합니다. 자세한 사항은 [[http://tiddlywiki.com/#GettingStarted]]를 보세요 +티들리위키에 중요한 정보를 저장하는 것을 시작하기 전에 확실히 바뀜을 저장할 수 있는지 확인하는 것이 중요합니다. 자세한 사항은 [[https://tiddlywiki.com/#GettingStarted]]를 보세요 !! 이 티들리위키 설정하기 diff --git a/languages/ko-KR/Misc.multids b/languages/ko-KR/Misc.multids index 99b7ec8bf..19bd58fa1 100644 --- a/languages/ko-KR/Misc.multids +++ b/languages/ko-KR/Misc.multids @@ -1,8 +1,8 @@ title: $:/language/ -AboveStory/ClassicPlugin/Warning: 티들리위키 클래식용으로 설계된 플러그인을 불러오려고 하는 것 같아 보입니다. [[이러한 플러그인은 티들리위키 버전 5.x.x에 동작하지 않음|http://tiddlywiki.com/#TiddlyWikiClassic]]을 참고하세요. 티들리위키 클래식 플러그인이 감지되었습니다: +AboveStory/ClassicPlugin/Warning: 티들리위키 클래식용으로 설계된 플러그인을 불러오려고 하는 것 같아 보입니다. [[이러한 플러그인은 티들리위키 버전 5.x.x에 동작하지 않음|https://tiddlywiki.com/#TiddlyWikiClassic]]을 참고하세요. 티들리위키 클래식 플러그인이 감지되었습니다: BinaryWarning/Prompt: 이 티들러는 바이너리 데이터를 포함합니다 -ClassicWarning/Hint: 이 티들러는 티들리위키 클래식 위키 텍스트 형식으로 쓰여져 있으며, 티들리위키 버전 5와 완전히 호환되지 않습니다. 자세한 사항은 [[http://tiddlywiki.com/static/Upgrading.html]]을 보세요. +ClassicWarning/Hint: 이 티들러는 티들리위키 클래식 위키 텍스트 형식으로 쓰여져 있으며, 티들리위키 버전 5와 완전히 호환되지 않습니다. 자세한 사항은 [[https://tiddlywiki.com/static/Upgrading.html]]을 보세요. ClassicWarning/Upgrade/Caption: 업그레이드 CloseAll/Button: 모두 닫기 ColourPicker/Recent: 최근: @@ -34,9 +34,9 @@ Error/XMLHttpRequest: XMLHttpRequest 오류 코드 InternalJavaScriptError/Hint: 아이 창피해. 브라우저를 새로 고쳐 티들리위키를 다시 시작할 것을 권장합니다 InternalJavaScriptError/Title: 내부 자바스크립트 오류 InvalidFieldName: "<$text text=<<fieldName>>/>" 필드 이름에 잘못된 문자가 있습니다. 필드는 소문자, 숫자 및 밑줄 문자 (`_`), 하이픈 (`-`) 및 마침표 (`.`)만을 포함할 수 있습니다. -LazyLoadingWarning: <p>''<$text text={{!!_canonical_uri}}/>''에서 바깥 텍스트를 불러오는 중입니다</p><p>이 메시지가 사라지지 않으면 이 구성에서 바깥 텍스트를 지원하지 않는 브라우저를 사용하고 있을 수 있습니다. [[http://tiddlywiki.com/#ExternalText]]를 보세요</p> +LazyLoadingWarning: <p>''<$text text={{!!_canonical_uri}}/>''에서 바깥 텍스트를 불러오는 중입니다</p><p>이 메시지가 사라지지 않으면 이 구성에서 바깥 텍스트를 지원하지 않는 브라우저를 사용하고 있을 수 있습니다. [[https://tiddlywiki.com/#ExternalText]]를 보세요</p> LoginToTiddlySpace: TiddlySpace에 로그인 -MissingTiddler/Hint: "<$text text=<<currentTiddler>>/>" 티들러가 없습니다 - 만드려면 {{$:/core/images/edit-button}}을 클릭하세요 +MissingTiddler/Hint: "<$text text=<<currentTiddler>>/>" 티들러가 없습니다 - 만드려면 {{||$:/core/ui/Buttons/edit}}을 클릭하세요 No: 아니오 OfficialPluginLibrary: 공식 티들리위키 플러그인 라이브러리 OfficialPluginLibrary/Hint: tiddlywiki.com에서의 공식 티들리위키 플러그인 라이브러리입니다. 플러그인, 테마 및 언어 팩은 코어 팀이 유지 관리하고 있습니다. diff --git a/languages/ko-KR/Modals/Download.tid b/languages/ko-KR/Modals/Download.tid index 203eb7b16..f56e83a73 100644 --- a/languages/ko-KR/Modals/Download.tid +++ b/languages/ko-KR/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: 바뀜 다운로드 footer: <$button message="tm-close-tiddler">{{$:/language/Buttons/Close/Caption}}</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html 브라우저가 수동 저장만을 지원합니다. diff --git a/languages/ko-KR/Modals/SaveInstructions.tid b/languages/ko-KR/Modals/SaveInstructions.tid index f1ae913b7..36ef0b3d3 100644 --- a/languages/ko-KR/Modals/SaveInstructions.tid +++ b/languages/ko-KR/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: 작업 저장 footer: <$button message="tm-close-tiddler">{{$:/language/Buttons/Close/Caption}}</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html 이 위키의 바뀜을 티들리위키 HTML 파일로 저장해야 합니다. diff --git a/languages/ko-KR/Search.multids b/languages/ko-KR/Search.multids index b668d84d4..34bc2e0bf 100644 --- a/languages/ko-KR/Search.multids +++ b/languages/ko-KR/Search.multids @@ -2,7 +2,7 @@ title: $:/language/Search/ DefaultResults/Caption: 목록 Filter/Caption: 필터 -Filter/Hint: [[필터 표현식|http://tiddlywiki.com/static/Filters.html]]을 통해 검색합니다 +Filter/Hint: [[필터 표현식|https://tiddlywiki.com/static/Filters.html]]을 통해 검색합니다 Filter/Matches: //<small><<resultCount>>개 일치</small>// Matches: //<small><<resultCount>>개 일치</small>// Matches/All: 모든 일치: diff --git a/languages/nl-NL/Buttons.multids b/languages/nl-NL/Buttons.multids index 1c5f827de..44b7a66af 100644 --- a/languages/nl-NL/Buttons.multids +++ b/languages/nl-NL/Buttons.multids @@ -18,14 +18,14 @@ CloseOthers/Caption: sluit andere CloseOthers/Hint: Sluit alle andere tiddlers ControlPanel/Caption: bedieningspaneel ControlPanel/Hint: Open bedieningspaneel +CopyToClipboard/Caption: kopieer naar klembord +CopyToClipboard/Hint: Kopieer deze tekst naar het klembord Delete/Caption: verwijder Delete/Hint: Verwijder deze tiddler Edit/Caption: wijzig Edit/Hint: Wijzig deze tiddler EditorHeight/Caption: hoogte van de editor EditorHeight/Caption/Auto: Pas automatisch hoogte aan zodat inhoud past - - EditorHeight/Caption/Fixed: Vaste hoogte: EditorHeight/Hint: Kies de hoogte van de teksteditor Encryption/Caption: versleuteling @@ -87,6 +87,8 @@ Language/Caption: taal Language/Hint: Kies de taal voor de gebruikersomgeving LineWidth/Caption: lijnbreedte LineWidth/Hint: Stel lijnbreedte in +Link/Hint: Maak een wikitext link +Linkify/Hint: Zet selectie tussen vierkante haakjes ListBullet/Caption: lijst met opsommingstekens ListBullet/Hint: Maak van selectie een lijst met opsommingstekens ListNumber/Caption: genummerde lijst @@ -100,7 +102,6 @@ More/Hint: Meer mogelijkheden NewHere/Caption: nieuw hier NewHere/Hint: Maak een nieuwe tiddler gelabeld met deze tiddler NewImage/Caption: nieuwe afbeelding - NewImage/Hint: Maak een nieuwe afbeelding NewJournal/Caption: nieuw journaal NewJournal/Hint: Maak een nieuwe journaaltiddler @@ -115,7 +116,6 @@ Opacity/Hint: Stel de ondoorzichtigheid in OpenWindow/Caption: open in een nieuw venster OpenWindow/Hint: Open tiddler in nieuw venster Paint/Caption: kleur om te tekenen - Paint/Hint: Kies kleur om te tekenen Palette/Caption: palet Palette/Hint: Kies het kleurpalet @@ -129,10 +129,14 @@ Preview/Caption: voorbeeldweergave Preview/Hint: Toon voorbeeldweergavepaneel PreviewType/Caption: type voorbeeldweergave PreviewType/Hint: Kies type voorbeeldweergave +Print/Caption: druk pagina af +Print/Hint: Druk the actuele pagina af Quote/Caption: 'blockquote' Quote/Hint: Maak van selectie een 'blockqoute' Refresh/Caption: ververs Refresh/Hint: Ververs deze wiki +RotateLeft/Caption: Roteer linksom +RotateLeft/Hint: Roteer 90 graden linksom Save/Caption: opslaan Save/Hint: Sla deze tiddler op SaveWiki/Caption: opslaan @@ -161,6 +165,14 @@ TagManager/Caption: labelmanager TagManager/Hint: Open labelmanager Theme/Caption: thema Theme/Hint: Kies het thema +Timestamp/Caption: tijdstempels +Timestamp/Hint: Kies of veranderingen de tijdstempels bijwerken +Timestamp/Off/Caption: tijdstempels zijn uit +Timestamp/Off/Hint: Werk tijdstempels niet bij als tiddlers veranderd zijn +Timestamp/On/Caption: tijdstempels zijn aan +Timestamp/On/Hint: Werk tijdstempels bij als tiddlers veranderd zijn +Transcludify/Caption: transclusie +Transcludify/Hint: Zet selectie tussen accolades Underline/Caption: onderstreept Underline/Hint: Onderstreep het geselecteerde Unfold/Caption: klap tiddler uit diff --git a/languages/nl-NL/ControlPanel.multids b/languages/nl-NL/ControlPanel.multids index 48f734fc8..a8eef984a 100644 --- a/languages/nl-NL/ControlPanel.multids +++ b/languages/nl-NL/ControlPanel.multids @@ -11,7 +11,9 @@ Basics/DefaultTiddlers/Prompt: Standaard tiddlers: Basics/DefaultTiddlers/TopHint: Kies welke tiddlers bij opstarten getoond worden: Basics/Language/Prompt: Hallo! Huidige taal: Basics/NewJournal/Tags/Prompt: Labels voor nieuwe journaaltiddlers +Basics/NewJournal/Text/Prompt: Tekst voor nieuwe journaaltiddlers Basics/NewJournal/Title/Prompt: Titel voor nieuwe journaaltiddlers +Basics/NewTiddler/Title/Prompt: Titel voor nieuwe tiddlers Basics/OverriddenShadowTiddlers/Prompt: Aantal overschreven schaduwtiddlers: Basics/ShadowTiddlers/Prompt: Aantal schaduwtiddlers: Basics/Subtitle/Prompt: Ondertitel: @@ -53,13 +55,14 @@ Palette/Prompt: Huidig palet: Palette/ShowEditor/Caption: toon editor Parsing/Block/Caption: 'Block parse' regels Parsing/Caption: 'Parsing' (ontleding) -Parsing/Hint: Hier kan je globaal individuele wiki 'parser' regels uitzetten. Wees voorzichtig daar het uitzetten van sommige 'parser' regels het juist functioneren van ~Tiddlywiki kan beletten (je kan het normale gedrag herstellen met [['safe mode'|http://tiddlywiki.com/#SafeMode]]) +Parsing/Hint: Hier kan je globaal individuele wiki 'parser' regels uitzetten. Wees voorzichtig daar het uitzetten van sommige 'parser' regels het juist functioneren van ~Tiddlywiki kan beletten (je kan het normale gedrag herstellen met [['safe mode'|https://tiddlywiki.com/#SafeMode]]) Parsing/Inline/Caption: 'Inline parse' regels Parsing/Pragma/Caption: 'Pragma parse' regels Plugins/Add/Caption: Verkrijg meer plugins Plugins/Add/Hint: Installeer plugins van de officiële bibliotheek Plugins/AlreadyInstalled/Hint: Deze plugin is al geïnstalleerd met versie <$text text=<<installedVersion>>/> Plugins/Caption: Plugins +Plugins/ClosePluginLibrary: schakel pluginbibliotheek uit Plugins/Disable/Caption: schakel uit Plugins/Disable/Hint: Schakel deze plugin uit na verversen van deze pagina Plugins/Disabled/Status: (uitgeschakeld) @@ -71,16 +74,23 @@ Plugins/Installed/Hint: Geïnstalleerde plugins: Plugins/Language/Prompt: Talen Plugins/Languages/Caption: Talen Plugins/Languages/Hint: Taal plugins -Plugins/NoInformation/Hint: Geen informatie beschikbaar +Plugins/NoInfoFound/Hint: ''"<$text text=<<currentTab>>/>"'' niet gevonden Plugins/NotInstalled/Hint: Deze plugin is nu niet geïnstalleerd -Plugins/OpenPluginLibrary: open plugin bibliotheek +Plugins/OpenPluginLibrary: open pluginbibliotheek Plugins/Plugin/Prompt: Plugins Plugins/Reinstall/Caption: herinstalleer Plugins/Theme/Prompt: Thema's Plugins/Themes/Caption: Thema's Plugins/Themes/Hint: Thema plugins Saving/Caption: Opslaan +Saving/DownloadSaver/AutoSave/Description: Sta automatisch opslaan toe voor de opslagmodule +Saving/DownloadSaver/AutoSave/Hint: Sla automatisch op voor de opslagmodule +Saving/DownloadSaver/Caption: Opslagmodule +Saving/DownloadSaver/Hint: Deze instellingen gelden voor de HTML5 compatibele opslagmodule +Saving/General/Caption: Algemeen +Saving/General/Hint: Deze instellingen gelden voor alle geladen opslagmodules Saving/Heading: Opslaan +Saving/Hint: Instellingen voor opslaan van de gehele TiddlyWiki als één bestand via een opslagmodule Saving/TiddlySpot/Advanced/Heading: Geavanceerde instellingen Saving/TiddlySpot/BackupDir: Backup folder Saving/TiddlySpot/Backups: Backups @@ -97,12 +107,21 @@ Settings/AutoSave/Disabled/Description: Sla veranderingen niet automatisch op Settings/AutoSave/Enabled/Description: Sla veranderingen automatisch op Settings/AutoSave/Hint: Sla veranderingen tijdens wijzigen automatisch op Settings/CamelCase/Caption: 'Camel Case' wiki links -Settings/CamelCase/Description: Zet automatisch ~CamelCase linken aan -Settings/CamelCase/Hint: Je kan globaal het automatisch linken van ~CamelCase woorden uitzetten. Dit vereist herladen van de wiki om effect te hebben. +Settings/CamelCase/Description: Zet automatisch 'Camel Case' linken aan +Settings/CamelCase/Hint: Je kan globaal het automatisch linken van 'Camel Case' woorden uitzetten. Dit vereist herladen van de wiki om effect te hebben. Settings/Caption: Instellingen +Settings/DefaultMoreSidebarTab/Caption: Standaard 'Meer' zijpaneel tab +Settings/DefaultMoreSidebarTab/Hint: Geef aan welke 'Meer' tab in het zijpaneel standaard wordt getoond Settings/DefaultSidebarTab/Caption: Standaard tab in zijpaneel Settings/DefaultSidebarTab/Hint: Geef aan welke tab in het zijpaneel standaard wordt getoond +Settings/EditorToolbar/Caption: Editor knoppenbalk +Settings/EditorToolbar/Description: Toon editor knoppenbalk +Settings/EditorToolbar/Hint: Zet editor knoppenbalk aan of uit: Settings/Hint: Met deze instellingen kun je het gedrag van TiddlyWiki veranderen. +Settings/InfoPanelMode/Caption: Tiddler infopaneel modus +Settings/InfoPanelMode/Hint: Controleer wanneer het tiddler infopaneel sluit: +Settings/InfoPanelMode/Popup/Description: Tiddler informatiepaneel sluit automatisch +Settings/InfoPanelMode/Sticky/Description: Tiddler informatiepaneel blijft open staan tot expliciet sluiten Settings/LinkToBehaviour/Caption: Waar een tiddler opent Settings/LinkToBehaviour/InsideRiver/Hint: Navigatie //vanuit// de 'story river' Settings/LinkToBehaviour/OpenAbove: Open boven de huidige tiddler @@ -110,6 +129,7 @@ Settings/LinkToBehaviour/OpenAtBottom: Open onderaan de 'story river' Settings/LinkToBehaviour/OpenAtTop: Open bovenaan de 'story river' Settings/LinkToBehaviour/OpenBelow: Open beneden de huidige tiddler Settings/LinkToBehaviour/OutsideRiver/Hint: Navigatie //van buiten// de 'story river' +Settings/MissingLinks/Caption: Wiki links Settings/MissingLinks/Description: Sta links naar ontbrekende tiddlers toe Settings/MissingLinks/Hint: Kies om te linken naar nog niet bestaande tiddlers Settings/NavigationAddressBar/Caption: Navigatie adresbalk @@ -120,12 +140,12 @@ Settings/NavigationAddressBar/Permaview/Description: Voeg alle open tiddlers toe Settings/NavigationHistory/Caption: Navigeer-geschiedenis Settings/NavigationHistory/Hint: Werk de browsergeschiedenis bij als er naar een tiddler genavigeerd wordt: Settings/NavigationHistory/No/Description: Werk de browsergeschiedenis niet bij -Settings/NavigationHistory/Yes/Description: Werk de browsergeschiedenis bij +Settings/NavigationHistory/Yes/Description: Werk de browsergeschiedenis bij Settings/PerformanceInstrumentation/Caption: Prestatiemeting Settings/PerformanceInstrumentation/Description: Zet prestatiemeting aan Settings/PerformanceInstrumentation/Hint: Toont prestatiestatistieken in de 'browser console'. Dit vereist herladen van de wiki om effect te hebben Settings/TitleLinks/Caption: Titels van tiddlers -Settings/TitleLinks/Hint: Toon (optioneel) tiddler titels als link +Settings/TitleLinks/Hint: Toon (optioneel) tiddler titels als links Settings/TitleLinks/No/Description: Toon tiddler titels niet als links Settings/TitleLinks/Yes/Description: Toon tiddler titels als links Settings/ToolbarButtons/Caption: Knoppen van knoppenbalk @@ -139,17 +159,22 @@ Settings/ToolbarButtonStyle/Styles/Boxed: Vierkante rand Settings/ToolbarButtonStyle/Styles/Rounded: Ronde rand StoryView/Caption: 'Story' view StoryView/Prompt: Huidige view: +Stylesheets/Caption: Stijlbladen +Stylesheets/Expand/Caption: Klap alles uit +Stylesheets/Hint: Dit is de getoonde CSS van de huidige stijlblad-tiddlers gelabeld met <<tag "$:/tags/Stylesheet">> +Stylesheets/Restore/Caption: Herstel Theme/Caption: Thema Theme/Prompt: Huidig thema: TiddlerFields/Caption: Tiddler velden TiddlerFields/Hint: Dit is de complete reeks tiddlervelden in gebruik bij deze wiki (inclusief systeemtiddlers maar exclusief schaduwtiddlers). Toolbars/Caption: Knoppenbalken -Toolbars/EditorToolbar/Hint: Kies welke knoppen in de editor knoppenbalk getoond worden. Sommige knoppen worden alleen getoond bij een bepaald tiddler type +Toolbars/EditorToolbar/Caption: Editor knoppenbalk +Toolbars/EditorToolbar/Hint: Kies welke knoppen in de editor knoppenbalk getoond worden. Sommige knoppen worden alleen getoond bij een bepaald type tiddler Toolbars/EditToolbar/Caption: Knoppenbalk bij wijzigen Toolbars/EditToolbar/Hint: Kies welke knoppen getoond worden voor tiddlers in wijzigmode Toolbars/Hint: Kies welke knoppen getoond worden Toolbars/PageControls/Caption: Pagina-knoppenbalk -Toolbars/PageControls/Hint: Kies welke knoppen getoond worden op de knoppenbalk van de pagina-knoppenbalk +Toolbars/PageControls/Hint: Kies welke knoppen getoond worden op de pagina-knoppenbalk Toolbars/ViewToolbar/Caption: Knoppenbalk bij weergave Toolbars/ViewToolbar/Hint: Kies welke knoppen zichtbaar zijn bij weergave Tools/Download/Full/Caption: Download complete wiki (inclusief documentatie) diff --git a/languages/nl-NL/Docs/ModuleTypes.multids b/languages/nl-NL/Docs/ModuleTypes.multids index dcd7ad27c..650212024 100644 --- a/languages/nl-NL/Docs/ModuleTypes.multids +++ b/languages/nl-NL/Docs/ModuleTypes.multids @@ -1,16 +1,21 @@ title: $:/language/Docs/ModuleTypes/ +allfilteroperator: Een sub-operator voor de ''all'' filter operator. animation: Animaties die door de RevealWidget gebruikt kunnen worden. +bitmapeditoroperation: Een 'bitmap'-editor knoppenbalkbewerking. command: Commando's die onder Node.js gebruikt kunnen worden. config: Data die aan `$tw.config` moet worden toegevoegd. filteroperator: Individuele methodes voor een filter operator. global: Globale data die aan `$tw.config` moet worden toegevoegd. +info: Publiceert systeeminformatie via de [[$:/temp/info-plugin]] pseudo-plugin. isfilteroperator: Operands voor de ''is'' filter operator. +library: Algemeen module type voor algemene JavaScript modules. macro: JavaScript macro definities. parser: 'Parsers' voor verschillende inhoudstypes. -saver: 'Savers' gebruiken verschillende methodes voor het opslaan van bestanden vanuit de browser. +saver: 'Savers' (opslagmodules) gebruiken verschillende methodes voor het opslaan van bestanden vanuit de browser. startup: Startup functies. -storyview: Story views passen de animatie en het gedrag van 'list' widgets aan. +storyview: 'Story views' passen de animatie en het gedrag van 'list' widgets aan. +texteditoroperation: Een teksteditor knoppenbalkbewerking. tiddlerdeserializer: Zet verschillende inhoudstypes in tiddlers om. tiddlerfield: Bepaalt het gedrag van een individueel tiddlerveld. tiddlermethod: Voegt methodes aan het `$tw.Tiddler` prototype toe. diff --git a/languages/nl-NL/Docs/PaletteColours.multids b/languages/nl-NL/Docs/PaletteColours.multids index 6ae797c2a..0e4aeff5d 100644 --- a/languages/nl-NL/Docs/PaletteColours.multids +++ b/languages/nl-NL/Docs/PaletteColours.multids @@ -2,10 +2,13 @@ title: $:/language/Docs/PaletteColours/ alert-background: Achtergrond alarm alert-border: Rand alarm -alert-highlight: Geaccentueerd alarm +alert-highlight: Geaccentueerd alarm alert-muted-foreground: Gedimde voorgrond alarm background: Algemene achtergrond blockquote-bar: Citaatbalk +button-background: Standaard knopachtergrond +button-border: Standaard knoprand +button-foreground: Standaard knop voorgrond code-background: Achtergrond code code-border: Rand code code-foreground: Voorgrond code @@ -20,10 +23,10 @@ dropdown-tab-background: Achtergrond dropdown tab dropdown-tab-background-selected: Achtergrond dropdown tab voor geselecteerde tabs dropzone-background: Achtergrond 'dropzone' external-link-background: Achtergrond externe link -external-link-background-hover: Achtergrond 'mouseover' externe link +external-link-background-hover: Achtergrond 'mouseover' externe link external-link-background-visited: Achtergrond bezochte externe link external-link-foreground: Voorgrond externe link -external-link-foreground-hover: Voorgrond mouseover externe link +external-link-foreground-hover: Voorgrond mouseover externe link external-link-foreground-visited: Voorgrond bezochte externe link foreground: Voorgrond algemeen message-background: Achtergrond berichtenpaneel diff --git a/languages/nl-NL/EditTemplate.multids b/languages/nl-NL/EditTemplate.multids index 412641bda..f0370abda 100644 --- a/languages/nl-NL/EditTemplate.multids +++ b/languages/nl-NL/EditTemplate.multids @@ -2,13 +2,15 @@ title: $:/language/EditTemplate/ Body/External/Hint: Dit is een externe tiddler die niet in de TiddlyWiki opgeslagen is. Je kan labels en velden wijzigen maar de tekst zelf niet. Body/Placeholder: Typ de tekst voor deze tiddler +Field/Dropdown/Caption: veldenlijst +Field/Dropdown/Hint: Toon veldenlijst Field/Remove/Caption: verwijder veld Field/Remove/Hint: Verwijder veld Fields/Add/Button: + Fields/Add/Dropdown/System: Systeemvelden Fields/Add/Dropdown/User: Gebruikersvelden Fields/Add/Name/Placeholder: veldnaam -Fields/Add/Prompt: Voeg een nieuw veld toe: +Fields/Add/Prompt: Voeg nieuw veld toe: Fields/Add/Value/Placeholder: veldwaarde Shadow/OverriddenWarning: Dit is een aangepaste schaduwtiddler. Door deze tiddler te verwijderen wordt de standaard schaduwtiddler weer actief Shadow/Warning: Dit is een schaduwtiddler. Elke verandering overschrijft de standaardversie @@ -16,6 +18,9 @@ Tags/Add/Button: + Tags/Add/Placeholder: labelnaam Tags/Dropdown/Caption: labellijst Tags/Dropdown/Hint: Toon labellijst +Title/BadCharacterWarning: Waarschuwing: vermijd elk karakter van <<bad-chars>> in tiddler titels +Title/Exists/Prompt: Doeltiddler bestaat al +Title/Relink/Prompt: Werk ''<$text text=<<fromTitle>>/>'' naar ''<$text text=<<toTitle>>/>'' bij in de //label// en //lijst// velden van andere tiddlers Type/Delete/Caption: verwijder inhoudstype Type/Delete/Hint: Verwijder inhoudstype Type/Dropdown/Caption: lijst van inhoudstypes diff --git a/languages/nl-NL/Fields.multids b/languages/nl-NL/Fields.multids index 30fa560cd..14556084d 100644 --- a/languages/nl-NL/Fields.multids +++ b/languages/nl-NL/Fields.multids @@ -12,7 +12,7 @@ dependents: De lijst van plugintitels waarvan een plugin afhankelijk is description: De beschrijvende tekst voor een plugin of een modale dialoog draft.of: Voor concepttiddlers; bevat de titel van de te maken tiddler draft.title: Voor concepttiddlers; bevat de voorgestelde titel van de tiddler -footer: De voettekst van een wizard +footer: De voettekst van een 'wizard' hack-to-give-us-something-to-compare-against: Een tijdelijk opslagveld dat in [[$:/core/templates/static.content]] gebruikt wordt icon: De titel van de pictogramtiddler die met deze tiddler gekoppeld is library: Als 'yes' ingevuld is, dient de tiddler als JavaScript-bibliotheek opgeslagen te worden diff --git a/languages/nl-NL/Filters.multids b/languages/nl-NL/Filters.multids index 76dbd8c69..c60073392 100644 --- a/languages/nl-NL/Filters.multids +++ b/languages/nl-NL/Filters.multids @@ -9,5 +9,7 @@ OverriddenShadowTiddlers: Overschreven schaduwtiddlers RecentSystemTiddlers: Onlangs gewijzigde tiddlers inclusief systeemtiddlers RecentTiddlers: Onlangs gewijzigde tiddlers ShadowTiddlers: Schaduwtiddlers +StoryList: Tiddlers in de 'story river' behalve <$text text="$:/AdvancedSearch"/> SystemTags: Systeemlabels SystemTiddlers: Systeemtiddlers +TypedTiddlers: Niet-wikitekst tiddlers diff --git a/languages/nl-NL/GettingStarted.tid b/languages/nl-NL/GettingStarted.tid index e735a0ba3..8cf7d3aa2 100644 --- a/languages/nl-NL/GettingStarted.tid +++ b/languages/nl-NL/GettingStarted.tid @@ -3,7 +3,7 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ Welkom bij ~TiddlyWiki en de ~TiddlyWiki gemeenschap -Controleer eerst of je veranderingen op kan slaan voordat je belangrijke informatie aan ~TiddlyWiki toevoegt. Zie http://tiddlywiki.com/#GettingStarted voor details +Controleer eerst of je veranderingen op kan slaan voordat je belangrijke informatie aan ~TiddlyWiki toevoegt. Zie https://tiddlywiki.com/#GettingStarted voor details !! Configureer deze ~TiddlyWiki diff --git a/languages/nl-NL/Help/default.tid b/languages/nl-NL/Help/default.tid index f230de309..46cc3b665 100644 --- a/languages/nl-NL/Help/default.tid +++ b/languages/nl-NL/Help/default.tid @@ -5,7 +5,7 @@ description: $:/language/Help/$(command)$ \end ``` -usage: tiddlywiki [<wikifolder>] [--<command> [<args>...]...] +usage: tiddlywiki [<wikifolder>] [--<commando> [<argumenten>...]...] ``` Beschikbare commando's: @@ -19,5 +19,5 @@ Beschikbare commando's: Om gedetaillerde hulp over een commando te krijgen: ``` -tiddlywiki --help <command> +tiddlywiki --help <commando> ``` diff --git a/languages/nl-NL/Help/fetch.tid b/languages/nl-NL/Help/fetch.tid new file mode 100644 index 000000000..0e29a0e24 --- /dev/null +++ b/languages/nl-NL/Help/fetch.tid @@ -0,0 +1,27 @@ +title: $:/language/Help/fetch +description: 'Fetch' tiddlers van wiki via URL + +'Fetch' één of meer bestanden over HTTP/HTTPS en importeer de tiddlers die aan een filter voldoen (en optioneel aanpassen van de titles). + +``` +--fetch file <url> <import-filter> <transform-filter> +--fetch files <url-filter> <import-filter> <transform-filter> +``` + +Met de "file" variant wordt alleen een enkel bestand 'gefetched' en de eerste parameter is de URL van het te lezen bestand. + +Met de "files" variant worden meerdere bestanden 'gefetched' en de eerste parameter is een filter dat een lijst oplevert van URL's van te lezen bestanden. B.v., als een reeks tiddlers gelabeld met "remote-server" een veld "url" hebben, zal het filter `[tag[remote-server]get[url]]` alle beschikbare URL's ophalen. + +De `<import-filter>` parameter specificeert een filter dat bepaalt welke tiddlers worden geïmporteerd. Zonder filter wordt het standaard `[all[tiddlers]]` gebruikt. + +De `<transform-filter>` parameter specificeert een optioneel filter dat de titels van de geïmporteerde tiddlers aanpast. B.v. `[addprefix[$:/myimports/]]` voegt `$:/myimports/` toe aan het begin van elke titel. + +Als het `--fetch` commando voorafgegaan wordt door `--verbose`, wordt voortgangsinformatie gedurende het importeren gegeven. + +Merk op dat TiddlyWiki geen oudere versie van een reeds geladen plugin zal 'fetchen'. + +Het volgende voorbeeld haalt alle non-system tiddlers op van https://tiddlywiki.com en slaat die op als een JSON bestand: + +``` +tiddlywiki --verbose --fetch file "https://tiddlywiki.com/" "[!is[system]]" "" --rendertiddler "$:/core/templates/exporters/JsonFile" output.json text/plain "" exportFilter "[!is[system]]" +``` diff --git a/languages/nl-NL/Help/help.tid b/languages/nl-NL/Help/help.tid index 6c7fcc6f6..01fe403cc 100644 --- a/languages/nl-NL/Help/help.tid +++ b/languages/nl-NL/Help/help.tid @@ -4,7 +4,7 @@ description: Toont hulp voor een TiddlyWiki commando Toont hulptekst voor een commando: ``` ---help [<command>] +--help [<commando>] ``` wordt de commandonaam weggelaten dan wordt een lijst van beschikbare commando's getoond. diff --git a/languages/nl-NL/Help/import.tid b/languages/nl-NL/Help/import.tid new file mode 100644 index 000000000..9443cf812 --- /dev/null +++ b/languages/nl-NL/Help/import.tid @@ -0,0 +1,24 @@ +title: $:/language/Help/import +description: Importeer tiddlers van een bestand + +Importeer tiddlers van TiddlyWiki (`.html`), `.tiddler`, `.tid`, `.json` of andere lokale bestanden. De 'deserializer' moet expliciet gespecificeerd worden, anderes dan bij het 'load' commando dat de deserializer afleidt uit de extensie. + +``` +--import <bestandspad> <deserializer> [<titel>] [<codering>] +``` + +De deserializers in de core begrijpen: + +* application/javascript +* application/json +* application/x-tiddler +* application/x-tiddler-html-div +* application/x-tiddlers +* text/html +* text/plain + +Standaard is de bestandsnaam de titel van de geïmporteerde tiddler. + +Standaard is de codering "utf8", maar dit kan "base64" zijn voor importeren van binaire bestanden. + +N.B. TiddlyWiki importeert geen oudere versie van een al geladen plugin. diff --git a/languages/nl-NL/Help/init.tid b/languages/nl-NL/Help/init.tid index 8fa34fc64..5b1e2d106 100644 --- a/languages/nl-NL/Help/init.tid +++ b/languages/nl-NL/Help/init.tid @@ -4,13 +4,13 @@ description: Initialiseer een nieuwe wiki folder Initialiseer een lege [[WikiFolder|WikiFolders]] met een kopie van de gespecificeerde editie. ``` ---init <edition> [<edition> ...] +--init <editie> [<editie> ...] ``` B.v.: ``` -tiddlywiki ./MyWikiFolder --init empty +tiddlywiki ./MijnWikiFolder --init empty ``` N.B.: diff --git a/languages/nl-NL/Help/load.tid b/languages/nl-NL/Help/load.tid index 38b85cbea..b81dd9438 100644 --- a/languages/nl-NL/Help/load.tid +++ b/languages/nl-NL/Help/load.tid @@ -4,13 +4,13 @@ description: Laadt tiddlers van bestand Laadt tiddlers van 2.x.x TiddlyWiki bestanden (`.html`), `.tiddler`, `.tid`, `.json` of andere bestanden ``` ---load <filepath> +--load <bestandspad> ``` Om tiddlers van een versleuteld TiddlyWiki bestand te laden dien je eerst het wachtwoord met het wachtwoordcommando te geven, b.v.: ``` -tiddlywiki ./MyWiki --password pa55w0rd --load my_encrypted_wiki.html +tiddlywiki ./MijnWiki --password pa55w0rd --load mijn_versleutelde_wiki.html ``` -N.B.: TiddlyWiki zal geen plugin laden die ouder is dan de al aanwezige plugin. \ No newline at end of file +N.B.: TiddlyWiki laadt geen plugin die ouder is dan de al aanwezige plugin. \ No newline at end of file diff --git a/languages/nl-NL/Help/makelibrary.tid b/languages/nl-NL/Help/makelibrary.tid index c031115ab..a3b28bcec 100644 --- a/languages/nl-NL/Help/makelibrary.tid +++ b/languages/nl-NL/Help/makelibrary.tid @@ -8,7 +8,7 @@ De upgradebibliotheek is opgemaakt als een normale plugin tiddler van het plugin Dit commando is bedoeld voor intern gebruik; het is alleen relevant voor gebruikers die een eigen upgradeprocedure maken. ``` ---makelibrary <title> +--makelibrary <titel> ``` Het titelargument is standaard `$:/UpgradeLibrary`. diff --git a/languages/nl-NL/Help/output.tid b/languages/nl-NL/Help/output.tid index 2a3b51950..f9ecd1f6d 100644 --- a/languages/nl-NL/Help/output.tid +++ b/languages/nl-NL/Help/output.tid @@ -4,8 +4,8 @@ description: Stelt de basis output folder voor volgende commando's in Stelt de basis output folder voor volgende commando's in. De standaard outputfolder is de `output` subfolder van de editiefolder. ``` ---output <pathname> +--output <bestandspad> ``` -Als de gespecificeerde padnaam relatief is zal die relatief zijn t.o.v. de werkfolder. B.v. `--output .` stelt de outputfolder in als huidige werkfolder. +Als het gespecificeerde bestandspad relatief is zal dit relatief zijn t.o.v. de werkfolder. B.v. `--output .` stelt de outputfolder in als huidige werkfolder. diff --git a/languages/nl-NL/Help/password.tid b/languages/nl-NL/Help/password.tid index 17f4c4000..c45f19e79 100644 --- a/languages/nl-NL/Help/password.tid +++ b/languages/nl-NL/Help/password.tid @@ -4,6 +4,6 @@ description: Vul een wachtwoord in voor volgende versleuteloperarties Vul een wachtwoord in voor volgende versleuteloperarties ``` ---password <password> +--password <wachtwoord> ``` diff --git a/languages/nl-NL/Help/render.tid b/languages/nl-NL/Help/render.tid new file mode 100644 index 000000000..deafbe0d2 --- /dev/null +++ b/languages/nl-NL/Help/render.tid @@ -0,0 +1,33 @@ +title: $:/language/Help/render +description: Rendert individuele tiddlers naar bestanden + + +Render (toon) gefilterde individuele tiddlers en sla de resultaten op in de gespecificeerde bestanden. + +Optioneel kan de titel van een template tiddler gespecificeerd worden. I.p.v. direct renderen van de tiddler wordt de template tiddler gerenderd met de "currentTiddler" variabele gezet als titel van de tiddler die wordt gerenderd. + +Een naam en waarde voor een additionele variabele kan optioneel gespecificeerd worden. + +``` +--render <tiddler-filter> [<bestandsnaam-filter>] [<render-type>] [<template>] [<naam>] [<waarde>] +``` + +* ''tiddler-filter'': Een filter dat bepaalt welke tiddler(s) getoond worden +* ''bestandsnaam-filter'': Optioneel filter dat tiiddler titels omzet in padnamen. Standaard (geen optioneel filter) `[is[tiddler]addsuffix[.html]]`, hetgeen de onveranderde tiddler titel als bestandsnaam gebruikt +* ''template'': Optionele template die gebruikt wordt om elke tiddler te renderen +* ''render-type'': Optioneel render type: `text/html` (standaard) geeft de volledige HTML tekst en `text/plain` geeft de kale tekst (negeert HTML labels en ander niet te printen materiaal) +* ''naam'': Naam van de optionele variabele +* ''waarde'': Waarde van de optionele variabele + +Standaard is de bestandsnaam relatief t.o.v. de `output` subfolder van de editiefolder. Het `--output` commando kan gebruikt worden om output naar een andere folder te leiden. + +N.B.: +* De output folder wordt niet leeg gemaakt +* Elke ontbrekende folder in het pad naar de bestandsnaam wordt automatisch aangemaakt +* In het geval van een tiddler met spaties in de titel, gebruik zowel de aanhalingstekens die vereist zijn voor de commando shell en ook TiddlyWiki's dubbele vierkante haken : `--render "[[Motovun Jack.jpg]]"` +* Het bestandsnaam filter wordt geëvalueerd met de gekozen onderdelen, gezet voor de titel van de te renderen tiddler, waarbij de titel als basis dient om de bestandsnaam te bepalen. B.v. `[encodeuricomponent[]addprefix[static/]]` past URI encoding toe op elke titel, en voegt dan de prefix `static/` toe +* Het `--render` commando is een uitgebreidere vervanging voor de verouderde `--rendertiddler` en `--rendertiddlers` commando's + +Voorbeelden: + +* `--render "[!is[system]]" "[encodeuricomponent[]addprefix[tiddlers/]addsuffix[.html]]"` -- rendert alle non-system tiddlers als bestanden in the subfolder "tiddlers" met URL-encoded titels en de extensie HTML \ No newline at end of file diff --git a/languages/nl-NL/Help/rendertiddler.tid b/languages/nl-NL/Help/rendertiddler.tid index 859fb9617..f6e6c4c7f 100644 --- a/languages/nl-NL/Help/rendertiddler.tid +++ b/languages/nl-NL/Help/rendertiddler.tid @@ -4,7 +4,7 @@ description: Render (toon) een individuele tiddler als een gegeven inhoudstype Render (toon) een individuele tiddler als een gegeven inhoudstype (standaard `text/html`) en sla deze op met de gegeven bestandsnaam: ``` ---rendertiddler <title> <filename> [<type>] +--rendertiddler <titel> <bestandsnaam> [<type>] ``` Standaard is de bestandsnaam relatief t.o.v. de `output` subfolder van de editiefolder. diff --git a/languages/nl-NL/Help/rendertiddlers.tid b/languages/nl-NL/Help/rendertiddlers.tid index 57ce403c4..7f9719a88 100644 --- a/languages/nl-NL/Help/rendertiddlers.tid +++ b/languages/nl-NL/Help/rendertiddlers.tid @@ -4,7 +4,7 @@ description: Render (toon) een reeks tiddlers die aan een filter voldoen tot sep Render (toon) een reeks tiddlers die aan een filter voldoen tot separate tiddlers van een gegeven inhoudstype (standaard `text/html`) en extensie (standaard `.html`). ``` ---rendertiddlers <filter> <template> <pathname> [<type>] [<extension>] +--rendertiddlers <filter> <template> <bestandspad> [<type>] [<extensie>] ``` B.v.: diff --git a/languages/nl-NL/Help/save.tid b/languages/nl-NL/Help/save.tid new file mode 100644 index 000000000..245e08065 --- /dev/null +++ b/languages/nl-NL/Help/save.tid @@ -0,0 +1,24 @@ +title: $:/language/Help/save +description: Slaat individuele ruwe tiddlers in bestanden op + +Slaat gefilterde individuele tiddlers op in gespecificeerde bestanden als ruwe tekst of in binair formaat. + +``` +--save <tiddler-filter> <bestandsnaam-filter> +``` + +* ''tiddler-filter'': Een filter dat bepaalt welke tiddler(s) opgeslagen moeten worden +* ''bestandsnaam-filter'': Optioneel filter dat tiddler titels omzet in padnamen. Standaard (geen optioneel filter) `[is[tiddler]]`, hetgeen de onveranderde tiddler titel als bestandsnaam gebruikt + +Standaard is de bestandsnaam relatief t.o.v. de `output` subfolder van de editiefolder. Het `--output` commando kan gebruikt worden om output naar een andere folder te leiden. + +N.B.: +* De output folder wordt niet leeg gemaakt +* Elke ontbrekende folder in het pad naar de bestandsnaam wordt automatisch aangemaakt +* In het geval van een tiddler met spaties in de titel, gebruik zowel de aanhalingstekens die vereist zijn voor de commando shell en ook TiddlyWiki's dubbele vierkante haken : `--render "[[Motovun Jack.jpg]]"` +* Het bestandsnaam filter wordt geëvalueerd met de gekozen onderdelen, gezet voor de titel van de te tiddler die opgeslagen wordt, waarbij de titel als basis dient om de bestandsnaam te bepalen. B.v. `[encodeuricomponent[]addprefix[static/]]` past URI encoding toe op elke titel, en voegt dan de prefix `static/` toe +* Het `--save` commando is een uitgebreidere vervanging voor de verouderde `--savetiddler` en `--savetiddlers` commando's + +Voorbeelden: + + * `--save "[!is[system]is[image]]" "[encodeuricomponent[]addprefix[tiddlers/]]"` -- slaat alle non-system afbeeldingstiddlers als bestanden op in the subfolder "tiddlers" met URL-encoded titels \ No newline at end of file diff --git a/languages/nl-NL/Help/savetiddler.tid b/languages/nl-NL/Help/savetiddler.tid index 1b981e1b4..f3d4db0e5 100644 --- a/languages/nl-NL/Help/savetiddler.tid +++ b/languages/nl-NL/Help/savetiddler.tid @@ -4,7 +4,7 @@ description: Slaat een ruwe tiddler op in een bestand Slaat een individuele tiddler op in ruwe tekst of binair formaat met de gegeven bestandsnaam. ``` ---savetiddler <title> <filename> +--savetiddler <titel> <bestandsnaam> ``` Standaard is de bestandsnaam relatief t.o.v. de `output` subfolder van de editiefolder. Het `--output` commando kan worden gebruikt om de output naar een andere folder te sturen. diff --git a/languages/nl-NL/Help/savetiddlers.tid b/languages/nl-NL/Help/savetiddlers.tid index 2cba16c32..e722192bf 100644 --- a/languages/nl-NL/Help/savetiddlers.tid +++ b/languages/nl-NL/Help/savetiddlers.tid @@ -4,7 +4,7 @@ description: Slaat een groep ruwe tiddlers op in een folder. Slaat een groep tiddlers op in ruwe tekst of binair formaat in de gegeven folder. ``` ---savetiddlers <filter> <pathname> +--savetiddlers <filter> <padnaam> ``` Standaard is de padnaam relatief t.o.v. de `output` subfolder van de editiefolder. Het `--output` commando kan worden gebruikt om de output naar een andere folder te sturen. diff --git a/languages/nl-NL/Help/server.tid b/languages/nl-NL/Help/server.tid index d6a21bc21..af4ffad4e 100644 --- a/languages/nl-NL/Help/server.tid +++ b/languages/nl-NL/Help/server.tid @@ -7,19 +7,19 @@ De server kan specifieke tiddlers in het gegeven formaat tonen. Daarnaast kunnen De ondersteunde HTTP-functies zijn: `GET`, `PUT` en `DELETE`. ``` ---server <port> <roottiddler> <rendertype> <servetype> <username> <password> <host> <pathprefix> +--server <poort> <roottiddler> <rendertype> <servetype> <gebruikersnaam> <wachtwoord> <host> <padprefix> ``` De parameters zijn: -* ''port'' - poortnummer voor communicatie (standaard "8080") +* ''poort'' - poortnummer voor communicatie (standaard "8080") * ''roottiddler'' - de tiddler die als basistiddler gebruikt wordt (standaard "$:/core/save/all") * ''rendertype'' - het inhoudstype waarmee de basistiddler getoond wordt (standaard "text/plain") * ''servetype'' - het inhoudstype waarmee de basistiddler uitgeleverd wordt (standaard "text/html") -* ''username'' - de standaard gebruikersnaam waarmee wijzigingen gesigneerd worden -* ''password'' - optioneel wachtwoord voor simpele verificatie +* ''gebruikersnaam'' - de standaard gebruikersnaam waarmee wijzigingen gesigneerd worden +* ''wachtwoord'' - optioneel wachtwoord voor simpele verificatie * ''host'' - optionele hostnaam waarmee uitgeleverd wordt (standaard "127.0.0.1" oftewel "localhost") -* ''pathprefix'' - optioneel voorvoegsel voor paden +* ''padprefix'' - optioneel voorvoegsel voor paden Als een wachtwoord gegeven wordt zal de browser om gebruikersnaam en wachtwoord vragen. N.B. het wachtwoord wordt als platte tekst verzonden en dit is dus niet geschikt voor algemeen internetgebruik. @@ -29,7 +29,7 @@ B.v.: --server 8080 $:/core/save/all text/plain text/html MyUserName passw0rd ``` -De gebruikersnaam en het wachtwoord kunnen als lege "strings" ("") gespecificeerd worden als je "hostname" of "pathprefix" wil geven zonder wachtwoord: +De gebruikersnaam en het wachtwoord kunnen als lege "strings" ("") gespecificeerd worden als je "hostnaam" of "padprefix" wil geven zonder wachtwoord: ``` --server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245 diff --git a/languages/nl-NL/Help/setfield.tid b/languages/nl-NL/Help/setfield.tid index af9ceb7d2..807ba6b31 100644 --- a/languages/nl-NL/Help/setfield.tid +++ b/languages/nl-NL/Help/setfield.tid @@ -6,12 +6,12 @@ description: Maakt externe tiddlers voor gebruik gereed Zet het gespecificeerde veld van een groep tiddlers via een filter. Een sjabloon wordt "gewikificeerd" (wikified) en het resultaat aan het veld toegekend. De `currentTiddler` variabele wordt aan de respectievelijke tiddler toegekend. ``` ---setfield <filter> <fieldname> <templatetitle> <rendertype> +--setfield <filter> <veldnaam> <templatetitel> <rendertype> ``` De parameters zijn: * ''filter'' - filter dat de tiddlers selecteert -* ''fieldname'' - het betreffende veld (standaard "text") -* ''templatetitle'' - de tiddler die in het betreffende veld gewikificeerd moet worden. In geval van een leeg of ontbrekend veld wordt het veld verwijderd +* ''veldnaam'' - het betreffende veld (standaard "text") +* ''templatetitel'' - de tiddler die in het betreffende veld gewikificeerd moet worden. In geval van een leeg of ontbrekend veld wordt het veld verwijderd * ''rendertype'' - het teksttype om te renderen (tonen) - standaard "text/plain"; "text/html" kan worden gebruikt om HTML-elementen te kunnen gebruiken diff --git a/languages/nl-NL/Help/unpackplugin.tid b/languages/nl-NL/Help/unpackplugin.tid index a86d04e8b..b57363805 100644 --- a/languages/nl-NL/Help/unpackplugin.tid +++ b/languages/nl-NL/Help/unpackplugin.tid @@ -1,4 +1,4 @@ title: $:/language/Help/unpackplugin description: Extraheer de 'payload' tiddlers van een plugin -Extraheer de 'payload' tiddlers van een plugin en maak er gewone tiddlers van:```--unpackplugin <title>``` \ No newline at end of file +Extraheer de 'payload' tiddlers van een plugin en maak er gewone tiddlers van:```--unpackplugin <titel>``` \ No newline at end of file diff --git a/languages/nl-NL/Import.multids b/languages/nl-NL/Import.multids index cb351e328..526c84e6d 100644 --- a/languages/nl-NL/Import.multids +++ b/languages/nl-NL/Import.multids @@ -1,9 +1,15 @@ title: $:/language/Import/ -Imported/Hint: De volgende tiddlers werden geïmporteerd: +Imported/Hint: De volgende tiddlers werden geïmporteerd: Listing/Cancel/Caption: Annuleer Listing/Hint: Deze tiddlers staan klaar voor import: Listing/Import/Caption: Importeer +Listing/Preview: Voorvertoning: +Listing/Preview/Diff: Verschil +Listing/Preview/DiffFields: Verschil (Velden) +Listing/Preview/Fields: Velden +Listing/Preview/Text: Tekst +Listing/Preview/TextRaw: Tekst (Ruw) Listing/Select/Caption: Selecteer Listing/Status/Caption: Status Listing/Title/Caption: Titel diff --git a/languages/nl-NL/Misc.multids b/languages/nl-NL/Misc.multids index b7a4d8293..3be185c70 100644 --- a/languages/nl-NL/Misc.multids +++ b/languages/nl-NL/Misc.multids @@ -1,8 +1,8 @@ title: $:/language/ -AboveStory/ClassicPlugin/Warning: Het lijkt erop dat je probeert een ~TiddlyWiki Classic plugin te laden. [[Deze plugins werken niet met ~TiddlyWiki version 5.x.x|http://tiddlywiki.com/#TiddlyWikiClassic]]. Gedetecteerde ~TiddlyWiki Classic plugins: +AboveStory/ClassicPlugin/Warning: Het lijkt erop dat je probeert een ~TiddlyWiki Classic plugin te laden. [[Deze plugins werken niet met ~TiddlyWiki version 5.x.x|https://tiddlywiki.com/#TiddlyWikiClassic]]. Gedetecteerde ~TiddlyWiki Classic plugins: BinaryWarning/Prompt: Deze tiddler bevat binaire data -ClassicWarning/Hint: Deze tiddler is in TiddlyWiki Classic wiki tekstformaat geschreven dat niet geheel compatibel is met TiddlyWiki versie 5. Zie http://tiddlywiki.com/static/Upgrading.html voor meer details. +ClassicWarning/Hint: Deze tiddler is in TiddlyWiki Classic wiki tekstformaat geschreven dat niet geheel compatibel is met TiddlyWiki versie 5. Zie https://tiddlywiki.com/static/Upgrading.html voor meer details. ClassicWarning/Upgrade/Caption: upgrade CloseAll/Button: sluit alle ConfirmCancelTiddler: Wil je gemaakte wijzigingen aan de tiddler "<$text text=<<title>>/>" annuleren? @@ -11,25 +11,56 @@ ConfirmEditShadowTiddler: Je staat op het punt een schaduwtiddler te wijzigen. T ConfirmOverwriteTiddler: Wil je de tiddler "<$text text=<<title>>/>" overschrijven? Count: aantal DefaultNewTiddlerTitle: Nieuwe tiddler +Diffs/CountMessage: <<diff-count>> verschillen DropMessage: 'Drop' hier (of klik escape om te annuleren) Encryption/Cancel: Annuleer Encryption/ConfirmClearPassword: Wil je het wachtwoord verwijderen? Dan wordt de wiki onversleuteld opgeslagen. Encryption/Password: Wachtwoord -Encryption/PasswordNoMatch: Wachtwoorden komen niet overeen +Encryption/PasswordNoMatch: Wachtwoorden matchen niet Encryption/PromptSetPassword: Vul een nieuw wachtwoord in voor deze TiddlyWiki Encryption/RepeatPassword: Herhaal wachtwoord Encryption/SetPassword: Vul wachtwoord in Encryption/Username: Gebruikersnaam +Error/Caption: Fout +Error/EditConflict: Bestand gewijzigd op server +Error/Filter: Filterfout +Error/FilterSyntax: Syntaxfout in filter expressie +Error/IsFilterOperator: Filterfout: Onbekende operand voor het 'is' filter +Error/LoadingPluginLibrary: Fout bij laden van de pluginbibliotheek +Error/RecursiveTransclusion: Recursieve transclusiefout in 'transclude' widget +Error/RetrievingSkinny: Fout bij ophalen van de 'skinny' tiddlerlijst +Error/SavingToTWEdit: Fout bij opslaan naar TWEdit +Error/WhileSaving: Fout bij opslaan +Error/XMLHttpRequest: XMLHttpRequest foutcode InternalJavaScriptError/Hint: Er is een probleem. Herstart TiddlyWiki door je browser te verversen -InternalJavaScriptError/Title: Interne JavaScript Error +InternalJavaScriptError/Title: Interne JavaScript fout InvalidFieldName: Illegale lettertekens in veldnaam "<$text text=<<fieldName>>/>". Velden kunnen alleen kleine letters, cijfers en de lettertekens liggend streepje (`_`), koppelteken (`-`) en punt (`.`) -LazyLoadingWarning: <p>Er wordt externe tekst geladen van ''<$text text={{!!_canonical_uri}}/>''</p><p>Als deze mededeling niet verdwijnt ondersteunt de gebruikte browser in deze configuratie mogelijk geen externe tekst. Zie http://tiddlywiki.com/#ExternalText</p> -MissingTiddler/Hint: Ontbrekende tiddler "<$text text=<<currentTiddler>>/>" - klik {{$:/core/images/edit-button}} om hem aan te maken -OfficialPluginLibrary: Officiële ~TiddlyWiki plugin-bibliotheek +LazyLoadingWarning: <p>Er wordt externe tekst geladen van ''<$text text={{!!_canonical_uri}}/>''</p><p>Als deze mededeling niet verdwijnt ondersteunt de gebruikte browser in deze configuratie mogelijk geen externe tekst. Zie https://tiddlywiki.com/#ExternalText</p> +LoginToTiddlySpace: Login bij TiddlySpace +Manager/Controls/FilterByTag/None: (geen) +Manager/Controls/FilterByTag/Prompt: Filter d.m.v. label: +Manager/Controls/Order/Prompt: Omgekeerde volgorde +Manager/Controls/Search/Placeholder: Zoek +Manager/Controls/Search/Prompt: Zoek: +Manager/Controls/Show/Option/Tags: labels +Manager/Controls/Show/Prompt: Toon: +Manager/Controls/Sort/Prompt: Sorteer op: +Manager/Item/Colour: Kleur +Manager/Item/Fields: Velden +Manager/Item/Icon: Pictogram (icon) +Manager/Item/Icon/None: (geen) +Manager/Item/RawText: Ruwe tekst +Manager/Item/Tags: Labels +Manager/Item/Tools: Gereedschappen +Manager/Item/WikifiedText: 'Wikified' tekst +MissingTiddler/Hint: Ontbrekende tiddler "<$text text=<<currentTiddler>>/>" - klik {{||$:/core/ui/Buttons/edit}} om hem aan te maken +No: Nee +OfficialPluginLibrary: Officiële ~TiddlyWiki pluginbibliotheek OfficialPluginLibrary/Hint: De officiële ~TiddlyWiki pluginbibliotheek op tiddlywiki.com. Plugins, thema's en taalpaketten worden door het core team onderhouden. PluginReloadWarning: Sla op {{$:/core/ui/Buttons/save-wiki}} en ververs {{$:/core/ui/Buttons/refresh}} om wijzigingen aan plugins door te voeren RecentChanges/DateFormat: DD MMM YYYY SystemTiddler/Tooltip: Dit is een systeem tiddler +SystemTiddlers/Include/Prompt: Inclusief systeem tiddlers TagManager/Colour/Heading: Kleur TagManager/Count/Heading: Aantal TagManager/Icon/Heading: Pictogram (icon) @@ -37,3 +68,4 @@ TagManager/Info/Heading: Info TagManager/Tag/Heading: Label Tiddler/DateFormat: DD MMM YYYY om hh12:0mmam UnsavedChangesWarning: Er zijn niet-opgeslagen veranderingen in TiddlyWiki +Yes: Ja diff --git a/languages/nl-NL/Modals/Download.tid b/languages/nl-NL/Modals/Download.tid index 4d1e9adc0..4a6229d6b 100644 --- a/languages/nl-NL/Modals/Download.tid +++ b/languages/nl-NL/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Download changes footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html Je browser ondersteunt alleen handmatig opslaan. diff --git a/languages/nl-NL/Modals/SaveInstructions.tid b/languages/nl-NL/Modals/SaveInstructions.tid index b96ff130d..fa4859450 100644 --- a/languages/nl-NL/Modals/SaveInstructions.tid +++ b/languages/nl-NL/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Save your work footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html Je veranderingen aan deze wiki dienen als een ~TiddlyWiki HTML bestand opgeslagen te worden. diff --git a/languages/nl-NL/Notifications.multids b/languages/nl-NL/Notifications.multids index a5f37127c..343f851f5 100644 --- a/languages/nl-NL/Notifications.multids +++ b/languages/nl-NL/Notifications.multids @@ -1,4 +1,6 @@ title: $:/language/Notifications/ +CopiedToClipboard/Failed: Kopie naar klembord mislukt! +CopiedToClipboard/Succeeded: Gekopieerd! Save/Done: Wiki opgeslagen Save/Starting: Begonnen met wiki op te slaan diff --git a/languages/nl-NL/Search.multids b/languages/nl-NL/Search.multids index b891c1a53..de23e92c8 100644 --- a/languages/nl-NL/Search.multids +++ b/languages/nl-NL/Search.multids @@ -2,17 +2,18 @@ title: $:/language/Search/ DefaultResults/Caption: Lijst Filter/Caption: Filter -Filter/Hint: Zoek via een [[filter expressie|http://tiddlywiki.com/static/Filters.html]] +Filter/Hint: Zoek via een [[filter expressie|https://tiddlywiki.com/static/Filters.html]] Filter/Matches: //<small><<resultCount>> resultaten</small>// Matches: //<small><<resultCount>> resultaten</small>// Matches/All: Alle resultaten: Matches/Title: Titel resultaten: Search: Zoek +Search/TooShort: Zoektekst te kort Shadows/Caption: Schaduwen Shadows/Hint: Zoek schaduwtiddlers Shadows/Matches: //<small><<resultCount>> resultaten</small>// Standard/Caption: Standaard -Standard/Hint: Zoek standaard tiddlers +Standard/Hint: Zoek (in) standaard tiddlers Standard/Matches: //<small><<resultCount>> resultaten</small>// System/Caption: Systeem System/Hint: Zoek systeemtiddlers diff --git a/languages/nl-NL/SideBar.multids b/languages/nl-NL/SideBar.multids index 9626a8cbb..a9aa6ad48 100644 --- a/languages/nl-NL/SideBar.multids +++ b/languages/nl-NL/SideBar.multids @@ -3,6 +3,7 @@ title: $:/language/SideBar/ All/Caption: Alle Contents/Caption: Inhoud Drafts/Caption: Concepten +Explorer/Caption: Verkenner Missing/Caption: Ontbrekend More/Caption: Meer Open/Caption: Open diff --git a/languages/nl-NL/Snippets/ListByTag.tid b/languages/nl-NL/Snippets/ListByTag.tid index 20d7b139c..c3f29f75e 100644 --- a/languages/nl-NL/Snippets/ListByTag.tid +++ b/languages/nl-NL/Snippets/ListByTag.tid @@ -1,5 +1,5 @@ title: $:/language/Snippets/ListByTag tags: $:/tags/TextEditor/Snippet -caption: Lijst van tiddlers met tag ... +caption: Lijst van tiddlers met label ... <<list-links "[tag[task]sort[title]]">> diff --git a/languages/nl-NL/ThemeTweaks.multids b/languages/nl-NL/ThemeTweaks.multids new file mode 100644 index 000000000..39ec601e3 --- /dev/null +++ b/languages/nl-NL/ThemeTweaks.multids @@ -0,0 +1,41 @@ +title: $:/language/ThemeTweaks/ + +Metrics: Afmetingen +Metrics/BodyFontSize: Lettergrootte voor tiddlertekst +Metrics/BodyLineHeight: Regelhoogte voor tiddlertekst +Metrics/FontSize: Lettergrootte +Metrics/LineHeight: Regelhoogte +Metrics/SidebarBreakpoint: Breekpunt voor zijpaneel +Metrics/SidebarBreakpoint/Hint: de minimale paginabreedte waarbij de 'story river'<br>en het zijpaneel naast elkaar getoond worden +Metrics/SidebarWidth: Breedte zijpaneel +Metrics/SidebarWidth/Hint: de breedte van het zijpaneel in 'fluid-fixed' layout +Metrics/StoryLeft: Linker story-positie +Metrics/StoryLeft/Hint: hoe ver de linkermarge van de 'story river'<br>(tiddler oppervlak) is van de linkerzijde van de pagina +Metrics/StoryRight: Rechter story-positie +Metrics/StoryRight/Hint: hoe ver de linkermarge van het zijpaneel<br>is van de linkerkant van de pagina +Metrics/StoryTop: Bovenkant story +Metrics/StoryTop/Hint: hoe ver de bovenmarge van de 'story river'<br>is van de bovenkant van de pagina +Metrics/StoryWidth: Story-breedte +Metrics/StoryWidth/Hint: de totale breedte van de 'story river' +Metrics/TiddlerWidth: Tiddler-breedte +Metrics/TiddlerWidth/Hint: binnen de 'story river' +Options: Opties +Options/CodeWrapping: Breek lange regels in code-blokken af (word wrap) +Options/SidebarLayout: Zijpaneel layout +Options/SidebarLayout/Fixed-Fluid: 'Fixed story', 'fluid' zijpaneel +Options/SidebarLayout/Fluid-Fixed: 'Fluid' story, 'fixed' zijpaneel +Options/StickyTitles: Vaststaande ('sticky') titels +Options/StickyTitles/Hint: Doet tiddler-titels vaststaan ('stick') aan de bovenkant van het browserscherm. Waarschuwing: Werkt niet bij alle browsers +Settings: Instellingen +Settings/BackgroundImage: Pagina achtergrond afbeelding +Settings/BackgroundImageAttachment: Binding van pagina achtergrond afbeelding +Settings/BackgroundImageAttachment/Fixed: Vast aan het scherm +Settings/BackgroundImageAttachment/Scroll: 'Scroll' met tiddlers +Settings/BackgroundImageSize: Pagina achtergrond afbeeldingsmaat +Settings/BackgroundImageSize/Contain: 'Contain' +Settings/BackgroundImageSize/Cover: 'Cover' +Settings/CodeFontFamily: Lettertype voor code +Settings/EditorFontFamily: Lettertype voor editor +Settings/FontFamily: Lettertype +ThemeTweaks: Thema 'tweaks' +ThemeTweaks/Hint: Je kan bepaalde aspecten van het ''Vanilla'' thema 'tweaken' diff --git a/languages/pa-IN/GettingStarted.tid b/languages/pa-IN/GettingStarted.tid index 8d0b4814b..8cec366f6 100644 --- a/languages/pa-IN/GettingStarted.tid +++ b/languages/pa-IN/GettingStarted.tid @@ -1,3 +1,3 @@ title: GettingStarted -\ lingo-ਅਧਾਰ ਨੂੰ ਪ੍ਰਭਾਸ਼ਿਤ () $ / ਭਾਸ਼ਾ / ControlPanel / ਇਸ ਨੂੰ ਤੁਹਾਨੂੰ ਭਰੋਸੇਯੋਗ ਬਦਲਾਅ ਨੂੰ ਬਚਾ ਸਕਦਾ ਹੈ, ਜੋ ਕਿ ਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਜ਼ਰੂਰੀ ਹੈ ਕਿ ਤੁਹਾਨੂੰ ~ TiddlyWiki ਵਿਚ ਅਹਿਮ ਜਾਣਕਾਰੀ ਨੂੰ ਸੰਭਾਲਣ ਸ਼ੁਰੂ ~ TiddlyWiki ਅਤੇ ~ TiddlyWiki communityBefore ਨੂੰ / Welcome ਜਾਣਕਾਰੀ. ਜਾਣਕਾਰੀ ਲਈ http://tiddlywiki.com/#GettingStarted ਵੇਖੋ !! ਇਸ ਨੂੰ ~ TiddlyWiki ਸੈੱਟ ਅੱਪ ਕਰੋ | <= "$: / SiteTitle" ਕਰਨ ਲਈ ਲਿੰਕ ਨੂੰ $> << lingo ਟਾਈਟਲ / ਪੁੱਛੋ >> </ $ link> | <$ ਸੋਧ-ਪਾਠ ਨੂੰ tiddler = "$: / SiteTitle" ਮੂਲ = "" ਟੈਗ = ਨੂੰ = "ਇੰਪੁੱਟ" /> || <$ ਲਿੰਕ ਨੂੰ "$: / SiteSubtitle"> << lingo ਟਾਇਟਲ / ਪੁੱਛੋ >> </ $ link> | <$ ਸੋਧ-ਪਾਠ ਨੂੰ tiddler = "$: / SiteSubtitle" ਮੂਲ = "$ "ਟੈਗ =" ਇੰਪੁੱਟ "= ਨੂੰ /> || <$ ਲਿੰਕ ਹੈ": / DefaultTiddlers "> << lingo DefaultTiddlers / ਪੁੱਛੋ >> </ $ link> | << lingo DefaultTiddlers / TopHint >> Undefined widget '' << lingo DefaultTiddlers / BottomHint >> | [| $ [ਕੰਟਰੋਲ ਪੈਨਲ: / ControlPanel]] ਵੇਖੋ ਹੋਰ ਚੋਣ ਲਈ. \ No newline at end of file +\ lingo-ਅਧਾਰ ਨੂੰ ਪ੍ਰਭਾਸ਼ਿਤ () $ / ਭਾਸ਼ਾ / ControlPanel / ਇਸ ਨੂੰ ਤੁਹਾਨੂੰ ਭਰੋਸੇਯੋਗ ਬਦਲਾਅ ਨੂੰ ਬਚਾ ਸਕਦਾ ਹੈ, ਜੋ ਕਿ ਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਜ਼ਰੂਰੀ ਹੈ ਕਿ ਤੁਹਾਨੂੰ ~ TiddlyWiki ਵਿਚ ਅਹਿਮ ਜਾਣਕਾਰੀ ਨੂੰ ਸੰਭਾਲਣ ਸ਼ੁਰੂ ~ TiddlyWiki ਅਤੇ ~ TiddlyWiki communityBefore ਨੂੰ / Welcome ਜਾਣਕਾਰੀ. ਜਾਣਕਾਰੀ ਲਈ https://tiddlywiki.com/#GettingStarted ਵੇਖੋ !! ਇਸ ਨੂੰ ~ TiddlyWiki ਸੈੱਟ ਅੱਪ ਕਰੋ | <= "$: / SiteTitle" ਕਰਨ ਲਈ ਲਿੰਕ ਨੂੰ $> << lingo ਟਾਈਟਲ / ਪੁੱਛੋ >> </ $ link> | <$ ਸੋਧ-ਪਾਠ ਨੂੰ tiddler = "$: / SiteTitle" ਮੂਲ = "" ਟੈਗ = ਨੂੰ = "ਇੰਪੁੱਟ" /> || <$ ਲਿੰਕ ਨੂੰ "$: / SiteSubtitle"> << lingo ਟਾਇਟਲ / ਪੁੱਛੋ >> </ $ link> | <$ ਸੋਧ-ਪਾਠ ਨੂੰ tiddler = "$: / SiteSubtitle" ਮੂਲ = "$ "ਟੈਗ =" ਇੰਪੁੱਟ "= ਨੂੰ /> || <$ ਲਿੰਕ ਹੈ": / DefaultTiddlers "> << lingo DefaultTiddlers / ਪੁੱਛੋ >> </ $ link> | << lingo DefaultTiddlers / TopHint >> Undefined widget '' << lingo DefaultTiddlers / BottomHint >> | [| $ [ਕੰਟਰੋਲ ਪੈਨਲ: / ControlPanel]] ਵੇਖੋ ਹੋਰ ਚੋਣ ਲਈ. \ No newline at end of file diff --git a/languages/pa-IN/Misc.multids b/languages/pa-IN/Misc.multids index d1abf58ae..2cdd9f767 100644 --- a/languages/pa-IN/Misc.multids +++ b/languages/pa-IN/Misc.multids @@ -1,7 +1,7 @@ title: $:/language/ BinaryWarning/Prompt: ਇਹ tiddler ਬਾਇਨਰੀ ਦਾ ਡਾਟਾ ਰੱਖਦਾ ਹੈ -ClassicWarning/Hint: ਇਹ tiddler 5. ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ http://tiddlywiki.com/static/Upgrading.html ਵੇਖੋ TiddlyWiki ਵਰਜਨ ਨਾਲ ਅਨੁਕੂਲ ਪੂਰੀ ਨਹੀ ਹੈ, ਜੋ ਕਿ TiddlyWiki ਕਲਾਸਿਕ ਵਿਕਿ ਟੈਕਸਟ ਫਾਰਮੈਟ ਹੈ, ਵਿੱਚ ਲਿਖਿਆ ਗਿਆ ਹੈ. +ClassicWarning/Hint: ਇਹ tiddler 5. ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ https://tiddlywiki.com/static/Upgrading.html ਵੇਖੋ TiddlyWiki ਵਰਜਨ ਨਾਲ ਅਨੁਕੂਲ ਪੂਰੀ ਨਹੀ ਹੈ, ਜੋ ਕਿ TiddlyWiki ਕਲਾਸਿਕ ਵਿਕਿ ਟੈਕਸਟ ਫਾਰਮੈਟ ਹੈ, ਵਿੱਚ ਲਿਖਿਆ ਗਿਆ ਹੈ. ClassicWarning/Upgrade/Caption: ਅੱਪਗਰੇਡ CloseAll/Button: ਸਭ ਨੂੰ ਬੰਦ ਕਰੋ ConfirmCancelTiddler: ਤੁਸੀ "<$ ਪਾਠ = << >> ਦੇ ਸਿਰਲੇਖ />" tiddler ਲਈ ਤਬਦੀਲੀ ਰੱਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ? diff --git a/languages/pa-IN/Modals/Download.tid b/languages/pa-IN/Modals/Download.tid index bff91d64d..bbd00a1fa 100644 --- a/languages/pa-IN/Modals/Download.tid +++ b/languages/pa-IN/Modals/Download.tid @@ -2,6 +2,6 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Download changes footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html ਤੁਹਾਡਾ ਬਰਾਊਜ਼ਰ ਸਿਰਫ, ਆਪਣੇ ਵਿਕਿ ਨੂੰ ਸੋਧਿਆ ਨੂੰ ਬਚਾਉਣ ਦਾ ਹੱਕ ਹੇਠ ਡਾਊਨਲੋਡ ਲਿੰਕ ਤੇ ਕਲਿੱਕ ਕਰੋ ਅਤੇ "ਡਾਊਨਲੋਡ ਫਾਇਲ ਨੂੰ" ਜ "ਫਾਇਲ ਨੂੰ ਸੰਭਾਲੋ" ਦੀ ਚੋਣ ਕਰੋ, ਅਤੇ ਤੁਹਾਨੂੰ ਮਾਮੂਲੀ ਨੂੰ ਕਲਿੱਕ ਕਰ ਕੇ ਕੁਝ ਨੂੰ ਤੇਜ਼ ਕਰ ਸਕਦਾ .// ਫਿਰ ਫੋਲਡਰ ਹੈ ਅਤੇ ਫਾਇਲ ਦੀ ਚੋਣ ਕਰੋ saving.To ਦਸਤਾਵੇਜ਼ ਨੂੰ ਸਹਿਯੋਗ ਦਿੰਦਾ ਹੈ ਕੰਟਰੋਲ ਕੁੰਜੀ (Windows) ਜ ਚੋਣ / Alt ਸਵਿੱਚ (Mac OS X) ਨਾਲ ਸਬੰਧ ਨੂੰ. ਤੁਹਾਨੂੰ ਫੋਲਡਰ ਫਾਇਲ ਲਈ ਪੁੱਛਿਆ ਜਾ ਨਹੀ ਜਾਵੇਗਾ, ਪਰ ਤੁਹਾਡੇ ਬਰਾਊਜ਼ਰ ਇਸ ਨੂੰ ਇਕ ਬੇਪਛਾਣ ਨਾਮ ਦੇਣ ਦੀ ਸੰਭਾਵਨਾ ਹੈ, - ਤੁਹਾਨੂੰ ਇਸ ਨਾਲ ਲਾਭਦਾਇਕ ਕੁਝ ਵੀ ਕਰ ਸਕਦਾ ਹੈ ਅੱਗੇ ਇੱਕ `.html` ਐਕਸ਼ਟੇਸ਼ਨ ਦਾ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਫਾਇਲ ਨੂੰ ਕਰਨ ਦੀ ਲੋੜ ਹੋ ਸਕਦੀ ਹੈ .// ਵਿਕਿ ਆਮ ਤੌਰ 'ਤੇ ਬਚਾਇਆ ਜਾ ਸਕਦਾ ਹੈ, ਜਿੱਥੇ ਇੱਕ ਡੈਸਕਟਾਪ ਨੂੰ ਕੰਪਿਊਟਰ ਨੂੰ ਆਪਣੇ ਬੁੱਕਮਾਰਕ ਸਮਕਾਲੀ ਫਿਰ ਫਾਇਲ ਤੁਹਾਨੂੰ ਇਸ ਦੀ ਬਜਾਏ ਲਿੰਕ ਨੂੰ ਬੁੱਕਮਾਰਕ ਕਰ ਸਕਦੇ ਹਨ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ, ਅਤੇ ਨਾ ਹੈ ਕਿ ਸਮਾਰਟ ਫੋਨ' ਤੇ. \ No newline at end of file diff --git a/languages/pa-IN/Modals/SaveInstructions.tid b/languages/pa-IN/Modals/SaveInstructions.tid index 2b78e5844..bee9d5b5d 100644 --- a/languages/pa-IN/Modals/SaveInstructions.tid +++ b/languages/pa-IN/Modals/SaveInstructions.tid @@ -2,6 +2,6 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Save your work footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html ਇਸ ਵਿਕੀ 'ਨੂੰ ਆਪਣੇ ਬਦਲਾਅ ਲਈ ਇੱਕ ~ TiddlyWiki ਨੂੰ HTML ਫਾਇਲ ਦੇ ਤੌਰ ਤੇ ਸੰਭਾਲਿਆ ਜਾ ਕਰਨ ਦੀ ਲੋੜ ਹੈ. !!! ਡੈਸਕਟਾਪ ਮੇਨੂ # 'ਵੈੱਬਪੇਜ, HTML ਸਿਰਫ' 'ਜ ਇਸੇ # ਕੁਝ ਬਰਾਊਜ਼ਰ ਵੀ ਤੁਹਾਨੂੰ ਸਪਸ਼ਟ' ਦੇ ਤੌਰ ਤੇ ਫਾਰਮੈਟ ਵਿੱਚ ਸੰਭਾਲਣ ਲਈ ਫਾਇਲ ਨੂੰ ਨਿਰਧਾਰਿਤ ਕਰਨ ਲਈ ਲੋੜ ਹੈ * ਇੱਕ ਫਾਇਲ ਅਤੇ ਟਿਕਾਣਾ # ਚੁਣੋ '' '' ਫਾਇਲ 'ਤੱਕ # ਚੁਣੋ' 'ਸੰਭਾਲੋ' 'ਬਰਾਊਜ਼ਰ ਇਹ ਟੈਬ ਬੰਦ ਕਰੋ !!! ਸਮਾਰਟਫੋਨ ਬਰਾਊਜ਼ਰ # ਤੁਹਾਨੂੰ iCloud ਜ Google ਸਮਕਾਲਤਾ ਤਦ ਬੁੱਕਮਾਰਕ ਨੂੰ ਆਪਣੇ ਆਪ ਹੀ ਇਹ ਟੈਬ // ਖੋਲ੍ਹਣ ਜੇ ਤੁਹਾਨੂੰ ਇਸ ਨੂੰ ਖੋਲ ਸਕਦੇ ਹਨ, ਜਿੱਥੇ ਆਪਣੇ ਡੈਸਕਟਾਪ ਨੂੰ ਸਮਕਾਲੀ ਕਰਨ ਤੇ ਅਤੇ # Close ਉਪਰ ਦੇ ਰੂਪ ਵਿੱਚ ਇਸ ਨੂੰ ਬਚਾ ਕਰੇਗਾ ਸੈੱਟ ਅੱਪ ਮਿਲ ਜੇ ਇਸ ਸਫ਼ੇ # * ਕਰਨ ਲਈ ਇੱਕ ਬੁੱਕਮਾਰਕ ਬਣਾਓ ਬੁੱਕਮਾਰਕ ਨੂੰ ਫਿਰ ਮੋਬਾਈਲ ਸਫਾਰੀ ਵਿੱਚ ਤੁਹਾਨੂੰ ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਕੇ ਜਾਵੇਗਾ. ਤੁਹਾਨੂੰ ਅੱਗੇ ਜਾਣ ਅਤੇ ਫਾਇਲ ਨੂੰ ਇਸਤੇਮਾਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ, ਨੂੰ ਸਿਰਫ਼ // ਹੇਠ '' ਬੰਦ ਕਰੋ '' ਬਟਨ ਨੂੰ ਦਬਾਉ \ No newline at end of file diff --git a/languages/pt-BR/Buttons.multids b/languages/pt-BR/Buttons.multids new file mode 100644 index 000000000..963217190 --- /dev/null +++ b/languages/pt-BR/Buttons.multids @@ -0,0 +1,179 @@ +title: $:/language/Buttons/ + +AdvancedSearch/Caption: Pesquisa Avançada +AdvancedSearch/Hint: Pesquisa Avançada +Bold/Caption: Negrito +Bold/Hint: Formatar a seleção como negrito +Cancel/Caption: Cancelar +Cancel/Hint: Cancelar a edição deste tiddler +Clear/Caption: Limpar +Clear/Hint: Preencher o quadro com cor +Clone/Caption: Duplicar +Clone/Hint: Duplicar este tiddler +Close/Caption: Fechar +Close/Hint: Fechar este Tiddler +CloseAll/Caption: Fechar Todos +CloseAll/Hint: Fechar Todos os Tiddlers +CloseOthers/Caption: Fechar Outros +CloseOthers/Hint: Fechar os Outros Tiddlers +ControlPanel/Caption: Painel de Controle +ControlPanel/Hint: Abrir o Painel de Controle +Delete/Caption: Apagar +Delete/Hint: Apagar este Tiddler +Edit/Caption: Editar +Edit/Hint: Editar este Tiddler +EditorHeight/Caption: Altura do Editor +EditorHeight/Caption/Auto: Ajustar automaticamente a altura ao tamanho do conteúdo +EditorHeight/Caption/Fixed: Altura Fixa: +EditorHeight/Hint: Escolha a altura do editor de texto +Encryption/Caption: Criptografia +Encryption/ClearPassword/Caption: Limpar Senha +Encryption/ClearPassword/Hint: Limpar a senha e salvar esta wiki sem criptografia +Encryption/Hint: Definir ou limpar a senha de gravação desta wiki +Encryption/SetPassword/Caption: Definir Senha +Encryption/SetPassword/Hint: Definir a senha para salvar esta wiki com criptografia +Excise/Caption: Separar +Excise/Caption/Excise: Executar separação +Excise/Caption/MacroName: Nome da Macro: +Excise/Caption/NewTitle: Título do novo tiddler: +Excise/Caption/Replace: Substituir texto separado por: +Excise/Caption/Replace/Link: Link +Excise/Caption/Replace/Macro: Macro +Excise/Caption/Replace/Transclusion: Inclusão +Excise/Caption/Tag: Etiquetar novo tiddler com o título deste tiddler +Excise/Caption/TiddlerExists: Atenção: Esse tiddler já existente +Excise/Hint: Separar o texto selecionado para um novo tiddler +ExportPage/Caption: Exportar Tudo +ExportPage/Hint: Exportar Todos os Tiddlers +ExportTiddler/Caption: Exportar Tiddler +ExportTiddler/Hint: Exportar Tiddler +ExportTiddlers/Caption: Exportar Tiddlers +ExportTiddlers/Hint: Exportar Tiddlers +Fold/Caption: Fechar Tiddler +Fold/FoldBar/Caption: Menu-Lateral +Fold/FoldBar/Hint: Barra de menu opcional para fechar e abrir tiddlers +Fold/Hint: Fechar o conteúdo deste Tiddler +FoldAll/Caption: Fechar todos os Tiddlers +FoldAll/Hint: Fechar o conteúdo de todos os tiddlers abertos +FoldOthers/Caption: Fechar outros Tiddlers +FoldOthers/Hint: Fechar o conteúdo dos outros tiddlers abertos +FullScreen/Caption: Tela Cheia +FullScreen/Hint: Entrar ou sair do modo tela cheia +Heading1/Caption: Cabeçalho 1 +Heading1/Hint: Formatar todas linhas selecionadas com o nível 1 de cabeçalho +Heading2/Caption: Cabeçalho 2 +Heading2/Hint: Formatar todas linhas selecionadas com o nível 2 de cabeçalho +Heading3/Caption: Cabeçalho 3 +Heading3/Hint: Formatar todas linhas selecionadas com o nível 3 de cabeçalho +Heading4/Caption: Cabeçalho 4 +Heading4/Hint: Formatar todas linhas selecionadas com o nível 4 de cabeçalho +Heading5/Caption: Cabeçalho 5 +Heading5/Hint: Formatar todas linhas selecionadas com o nível 5 de cabeçalho +Heading6/Caption: Cabeçalho 6 +Heading6/Hint: Formatar todas linhas selecionadas com o nível 6 de cabeçalho +Help/Caption: Ajuda +Help/Hint: Mostrar Painel de Ajuda +HideSideBar/Caption: Ocultar Barra de Menu +HideSideBar/Hint: Ocultar a barra lateral +Home/Caption: Início +Home/Hint: Abrir os tiddlers padrão +Import/Caption: Importar +Import/Hint: Importar arquivos de vários formatos, incluindo texto, imagem, Tiddlywiki ou JSON +Info/Caption: Informação +Info/Hint: Mostrar informações sobre este tiddler +Italic/Caption: Itálico +Italic/Hint: Aplicar formatação itálico a seleção +Language/Caption: Idioma +Language/Hint: Escolher a idioma da interface do usuário +LineWidth/Caption: espessura da linha +LineWidth/Hint: Definir a espessura da linha d caneta +Link/Caption: Link +Link/Hint: Criar link em wikitext +ListBullet/Caption: Lista com marcador circular) +ListBullet/Hint: Formatar a seleção com marcadores circular +ListNumber/Caption: Lista Numerada +ListNumber/Hint: Gerenciador Tiddler +Manager/Caption: Gerenciador Tiddler +Manager/Hint: Abrir Gerenciador Tiddler +MonoBlock/Caption: Justificado +MonoBlock/Hint: Justificar bloco selecionado +MonoLine/Caption: Espaçamento Uniforme +MonoLine/Hint: Aplicar o espaçamento uniforme formatação da seleção +More/Caption: Mais +More/Hint: Mais Opções +NewHere/Caption: Novo +NewHere/Hint: Criar um novo tiddler no mesmo assunto +NewImage/Caption: Nova Imagem +NewImage/Hint: Criar novo tiddler de desenho +NewJournal/Caption: Nova Edição +NewJournal/Hint: Criar uma nova edição +NewJournalHere/Caption: Nova edição aqui +NewJournalHere/Hint: Criar uma nova edição do mesmo assunto +NewMarkdown/Caption: Criar tiddler Marcado +NewMarkdown/Hint: Criar um novo tiddler marcado +NewTiddler/Caption: Novo Tiddler +NewTiddler/Hint: Criar um novo tiddler +Opacity/Caption: Opacidade +Opacity/Hint: Definir opacidade de desenho +OpenWindow/Caption: Abrir em nova janela +OpenWindow/Hint: Abrir tiddler em nova janela +Paint/Caption: Cor de desenho +Paint/Hint: Definir a cor de desenho +Palette/Caption: Cores +Palette/Hint: Escolher a paleta de cores +Permalink/Caption: Link Permanente +Permalink/Hint: Configure um link direto na barra de endereços do navegador para todos os tiddlers neste assunto +Permaview/Caption: Exibido agora +Permaview/Hint: Definir na endereço do navegador uma URL que inclui todos os tiddlers visiveis agora +Picture/Caption: Imagem +Picture/Hint: Inserir imagem +Preview/Caption: Pré-visualizar +Preview/Hint: Mostrar pré-visualização +PreviewType/Caption: pré-visualização por tipo de arquivo +PreviewType/Hint: Escolher o tipo de pré-visualização +Print/Caption: Imprimir página +Print/Hint: Imprimir a página atual +Quote/Caption: Citação +Quote/Hint: Formatar as linhas selecionadas como citação +Refresh/Caption: Atualizar +Refresh/Hint: Recarregar totalmente a wiki atual +Save/Caption: Salvar +Save/Hint: Salvar este tiddler +SaveWiki/Caption: Salvar alterações +SaveWiki/Hint: Salvar as alterações +ShowSideBar/Caption: Exibir barra lateral +ShowSideBar/Hint: Exibir a barra lateral +Size/Caption: Tamanho da imagem +Size/Caption/Height: Altura: +Size/Caption/Resize: Redimensionar imagem +Size/Caption/Width: Largura: +Size/Hint: Definir tamanho da imagem +Stamp/Caption: Selo +Stamp/Caption/New: Adicione o seu +Stamp/Hint: Inserir um trecho de texto pré configurado +Stamp/New/Text: Novo trecho de texto (Lembre-se de adicionar um título. +Stamp/New/Title: Nome exibido no menu +StoryView/Caption: Estilo de exibição +StoryView/Hint: Escolher o estilo de exibição principal +Strikethrough/Caption: Riscado +Strikethrough/Hint: Formatar o texto selecionado com riscado +Subscript/Caption: Subscrito +Subscript/Hint: Formatar o texto selecionado com subscrito +Superscript/Caption: Sobrescrito +Superscript/Hint: Formatar o texto selecionado com sobrescrito +TagManager/Caption: Gerenciador de Assuntos (Tags) +TagManager/Hint: Abrir gerenciador de assuntos(Tags) +Theme/Caption: Estilo +Theme/Hint: Escolher o tema de exibição +Timestamp/Caption: Data e hora +Timestamp/Hint: Define atualização de Data/Hora +Timestamp/Off/Caption: Data/Hora Desativado +Timestamp/Off/Hint: Não atualizar data e hora quando os tiddlers forem modificados +Timestamp/On/Caption: Data/Hora Ativado +Timestamp/On/Hint: Atualizar data e hora quando os tiddlers forem modificados +Underline/Caption: Sublinhado +Underline/Hint: Formatar a seleção como texto sublinhado +Unfold/Caption: Abrir tiddler +Unfold/Hint: Abrir o conteúdo deste tiddler +UnfoldAll/Caption: Abrir todos os tiddlers +UnfoldAll/Hint: Abrir o conteúdo de todos os tiddlers diff --git a/languages/pt-BR/ControlPanel.multids b/languages/pt-BR/ControlPanel.multids new file mode 100644 index 000000000..a7d6143d1 --- /dev/null +++ b/languages/pt-BR/ControlPanel.multids @@ -0,0 +1,173 @@ +title: $:/language/ControlPanel/ + +Advanced/Caption: Avançado +Advanced/Hint: Informações Interna sobre esta TiddlyWiki +Appearance/Caption: Aparência +Appearance/Hint: Formas de personalizar a aparência da sua TiddlyWiki. +Basics/AnimDuration/Prompt: Duração da animação: +Basics/Caption: Básicos +Basics/DefaultTiddlers/BottomHint: Utilize [[colchetes ]] para títulos com espaços. Ou então <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">Clique aqui para inserir a ordem cronológica</$button> +Basics/DefaultTiddlers/Prompt: Tiddlers Padrão: +Basics/DefaultTiddlers/TopHint: Escolha quais tiddlers serão exibidos ao iniciar: +Basics/Language/Prompt: Seleção do Idioma: +Basics/NewJournal/Tags/Prompt: Assunto das novas edições +Basics/NewJournal/Title/Prompt: Título das novas edições tiddlers +Basics/OverriddenShadowTiddlers/Prompt: Tiddlers-Sombra Sobrescritos: +Basics/ShadowTiddlers/Prompt: Tiddlers-Sombra: +Basics/Subtitle/Prompt: Subtítulo: +Basics/SystemTiddlers/Prompt: Tiddlers de Sistema: +Basics/Tags/Prompt: Assuntos(Tags): +Basics/Tiddlers/Prompt: Tiddlers: +Basics/Title/Prompt: Título desta ~TiddlyWiki: +Basics/Username/Prompt: Nome de usuário para assinar edições: +Basics/Version/Prompt: Versão da ~TiddlyWiki: +EditorTypes/Caption: Tipos de Editor +EditorTypes/Editor/Caption: Editor +EditorTypes/Hint: Estes tiddlers determinam qual editor é utilizado para editar os tipos específicos de tiddler. +EditorTypes/Type/Caption: Tipo +Info/Caption: Opções do Wiki +Info/Hint: Opções e informações sobre desta TiddlyWiki +KeyboardShortcuts/Add/Caption: Adicionar Atalho +KeyboardShortcuts/Add/Prompt: Digite o atalho aqui +KeyboardShortcuts/Caption: Atalhos de Teclado +KeyboardShortcuts/Hint: Definir atalhos de teclado +KeyboardShortcuts/NoShortcuts/Caption: Nenhuns atalhos de teclado foi definidos +KeyboardShortcuts/Platform/All: Todas as plataformas +KeyboardShortcuts/Platform/Linux: Apenas plataforma Linux +KeyboardShortcuts/Platform/Mac: Apenas plataforma Macintosh +KeyboardShortcuts/Platform/NonLinux: Apenas plataformas não Linux +KeyboardShortcuts/Platform/NonMac: Apenas plataformas não Macintosh +KeyboardShortcuts/Platform/NonWindows: Apenas plataformas não Windows +KeyboardShortcuts/Platform/Windows: Apenas plataforma Windows +KeyboardShortcuts/Remove/Hint: remover atalho de teclado +LoadedModules/Caption: Módulos Carregados +LoadedModules/Hint: Estes módulos tiddler são carregados junto com seus tiddlers fonte. Módulos em itálico não têm tiddler fonte, geralmente por serem carregados durante a inicialização. +Palette/Caption: Paleta de Cores +Palette/Editor/Clone/Caption: Duplicar +Palette/Editor/Clone/Prompt: Recomenda-se que duplique esta paleta-sombra antes de editá-la +Palette/Editor/Prompt: Edição +Palette/Editor/Prompt/Modified: Esta paleta-sombra foi modificada +Palette/Editor/Reset/Caption: Reiniciar +Palette/HideEditor/Caption: Ocultar Editor +Palette/Prompt: Paleta Ativa: +Palette/ShowEditor/Caption: Mostrar Editor +Parsing/Block/Caption: Regras de análise de blocos +Parsing/Caption: Análise +Parsing/Hint: Aqui você pode desativar globalmente as regras de analise individuais do wiki. Tome cuidado, algumas delas quando desligadas podem causar erros no ~TiddlyWiki, Se isso acontecer use o modo de recuperação para corrigir. [[modo de recuperação|http://tiddlywiki.com/#SafeMode]] ) +Parsing/Inline/Caption: Regras de Análise em Linha +Parsing/Pragma/Caption: Regras de Análise Pragma +Plugins/Add/Caption: Importar mais extensões +Plugins/Add/Hint: Instalar extensões da biblioteca de extensões oficial +Plugins/AlreadyInstalled/Hint: Esta extensão já está instalada com está versão<$text text=<<installedVersion>>/> +Plugins/Caption: Extensões +Plugins/Disable/Caption: Desativar +Plugins/Disable/Hint: Desativar esta extensão quando reiniciar a página +Plugins/Disabled/Status: (desativado) +Plugins/Empty/Hint: Nenhum +Plugins/Enable/Caption: ativar +Plugins/Enable/Hint: Ativar esta extensão quando reiniciar a página +Plugins/Install/Caption: Instalar +Plugins/Installed/Hint: Extensões instaladas: +Plugins/Language/Prompt: Idiomas +Plugins/Languages/Caption: Idiomas +Plugins/Languages/Hint: Extensões de pacotes de idiomas +Plugins/NoInfoFound/Hint: ''"<$text text=<<currentTab>>/>"'' não encontrado +Plugins/NoInformation/Hint: Nenhuma informação fornecida +Plugins/NotInstalled/Hint: Esta extensão não está instalada +Plugins/OpenPluginLibrary: Abrir biblioteca de extensões +Plugins/Plugin/Prompt: Extensões +Plugins/Plugins/Caption: Extensões +Plugins/Plugins/Hint: Extensões +Plugins/Reinstall/Caption: Reinstalar +Plugins/Theme/Prompt: Estilos +Plugins/Themes/Caption: Estilo da Página +Plugins/Themes/Hint: Extensões de Temas +Saving/Caption: Backups +Saving/DownloadSaver/AutoSave/Description: Aplicar as configurações a todas copias protegidas +Saving/DownloadSaver/Caption: Geral +Saving/DownloadSaver/Hint: Aplica configurações compatível com HTML5- no Download Seguro +Saving/General/Caption: Download Seguro +Saving/General/Hint: Ativar Autosalvar no Download Seguro +Saving/Heading: Salvando +Saving/Hint: Configurações usadas para salvar todo o TiddlyWiki como um único arquivo através do módulo de proteção +Saving/TiddlySpot/Advanced/Heading: Definições Avançadas +Saving/TiddlySpot/BackupDir: Diretório de cópias de segurança +Saving/TiddlySpot/Backups: Cópias de Segurança +Saving/TiddlySpot/Description: Estas definições só serão utilizadas quando gravar para http://tiddlyspot.com ou um servidor remoto compatível +Saving/TiddlySpot/Filename: Nome do arquivo para envio +Saving/TiddlySpot/Heading: ~TiddlySpot +Saving/TiddlySpot/Hint: //O URL por padrão será `http://<wikiname>.tiddlyspot.com/store.cgi` e pode ser alterado para utilizar um endereço de servidor personalizado// +Saving/TiddlySpot/Password: Senha +Saving/TiddlySpot/ServerURL: URL do Servidor +Saving/TiddlySpot/UploadDir: Diretório de Envio +Saving/TiddlySpot/UserName: Usuário de acesso +Settings/AutoSave/Caption: Gravação Automática +Settings/AutoSave/Disabled/Description: Não fazer gravação automática +Settings/AutoSave/Enabled/Description: Fazer gravação automática +Settings/AutoSave/Hint: Salvar alterações automaticamente durante a edição +Settings/CamelCase/Caption: Link Wiki em Camel Case +Settings/CamelCase/Description: Ativar link em frases ~CamelCase automaticamente +Settings/CamelCase/Hint: Pode desativar a criação automática de link em frases em ~CamelCase. Requer reiniciar o texto para que tome efeito +Settings/Caption: Definições +Settings/DefaultSidebarTab/Caption: Separador da barra lateral pré-definido +Settings/DefaultSidebarTab/Hint: Definir que separador da barra lateral é exibido por padrão +Settings/EditorToolbar/Caption: Barra de Ferramentas do Editor +Settings/EditorToolbar/Description: Mostrar barra de ferramentas do editor +Settings/EditorToolbar/Hint: Ativar ou desativar a barra de ferramentas do editor +Settings/Hint: Estas definições permitem personalizar o comportamento da TiddlyWiki. +Settings/InfoPanelMode/Caption: Modo Painel de Informações do Tiddler +Settings/InfoPanelMode/Hint: Controle quando o painel informações tiddler fecha: +Settings/InfoPanelMode/Popup/Description: Painel informações Tiddler fecha automaticamente +Settings/InfoPanelMode/Sticky/Description: Manter o Painel informações Tiddler aberto até ser explicitamente fechado +Settings/LinkToBehaviour/Caption: Comportamento de Abertura de Tiddlers +Settings/LinkToBehaviour/InsideRiver/Hint: Navegação do //interior// do frame de tiddlers +Settings/LinkToBehaviour/OpenAbove: Abrir acima do tiddler atual +Settings/LinkToBehaviour/OpenAtBottom: Abrir no fim do frame de tiddlers +Settings/LinkToBehaviour/OpenAtTop: Abrir no topo do frame de tiddlers +Settings/LinkToBehaviour/OpenBelow: Abrir abaixo do tiddler atual +Settings/LinkToBehaviour/OutsideRiver/Hint: Navegação do //exterior // do frame de tiddlers +Settings/MissingLinks/Caption: Link Wiki +Settings/MissingLinks/Description: Ativar link para tiddlers em falta +Settings/MissingLinks/Hint: Selecione se quiser link para tiddlers que ainda não existem +Settings/NavigationAddressBar/Caption: Barra de Endereços de Navegação +Settings/NavigationAddressBar/Hint: Comportamento da barra de endereços do navegador quando abrir um tiddler: +Settings/NavigationAddressBar/No/Description: Não atualizar a barra de endereços +Settings/NavigationAddressBar/Permalink/Description: Incluir o tiddler de destino +Settings/NavigationAddressBar/Permaview/Description: Incluir o tiddler de destino e toda a sequência em exibição +Settings/NavigationHistory/Caption: Histórico de Navegação +Settings/NavigationHistory/Hint: Atualizar o histórico do navegador quando navegar para um tiddler +Settings/NavigationHistory/No/Description: Não atualizar o histórico +Settings/NavigationHistory/Yes/Description: Atualizar o histórico +Settings/PerformanceInstrumentation/Caption: O painel de instrumentos de desempenho +Settings/PerformanceInstrumentation/Description: Ativar instrumentos de desempenho +Settings/PerformanceInstrumentation/Hint: Exibe estatísticas de performance na consola de desenvolvimento do navegador. Requer recarregamento para que tome efeito +Settings/TitleLinks/Caption: Títulos dos Tiddlers +Settings/TitleLinks/Hint: Exibir opcionalmente títulos dos tiddlers como link +Settings/TitleLinks/No/Description: Não exibir títulos dos tiddlers como link +Settings/TitleLinks/Yes/Description: Exibir títulos dos tiddlers como link +Settings/ToolbarButtons/Caption: Botões da Barra de Ferramentas +Settings/ToolbarButtons/Hint: Aparência pré definida dos botões da barra de ferramentas: +Settings/ToolbarButtons/Icons/Description: Incluir ícone +Settings/ToolbarButtons/Text/Description: Incluir texto +Settings/ToolbarButtonStyle/Caption: Estilo dos botões da barra de ferramentas +Settings/ToolbarButtonStyle/Hint: Escolha o estilo dos botões da barra de ferramentas: +Settings/ToolbarButtonStyle/Styles/Borderless: Sem moldura +Settings/ToolbarButtonStyle/Styles/Boxed: Caixa +Settings/ToolbarButtonStyle/Styles/Rounded: Arredondados +StoryView/Caption: Estilo de Exibição +StoryView/Prompt: Estilo: +Theme/Caption: Estilo +Theme/Prompt: O tema que está usado agora é o +TiddlerFields/Caption: Campos dos Tiddlers +TiddlerFields/Hint: Esta é uma lista completa dos campos dos tiddlers em utilização nesta wiki (incluindo tiddlers de sistema mas excluindo tiddlers-sombra). +Toolbars/Caption: Botões de Controle +Toolbars/EditorToolbar/Caption: Botões do editor de textos +Toolbars/EditorToolbar/Hint: Escolha que botões devem ser exibidos na barra de ferramentas do editor. Alguns botões só serão exibidos enquanto edita tiddlers de um determinado formato +Toolbars/EditToolbar/Caption: Botões do modo de edição +Toolbars/EditToolbar/Hint: Escolher que botões são exibidos para tiddlers em modo de edição +Toolbars/Hint: Seleccionar que botões da barra de ferramentas são exibidos +Toolbars/PageControls/Caption: Botões da barra de menu +Toolbars/PageControls/Hint: Escolher que botões são exibidos na barra de ferramentas principal da página +Toolbars/ViewToolbar/Caption: Botões de opções do tiddler +Toolbars/ViewToolbar/Hint: Escolher que botões são exibidos para tiddlers em modo de visualização +Tools/Download/Full/Caption: Transferir wiki completa diff --git a/languages/pt-BR/CoreReadMe.tid b/languages/pt-BR/CoreReadMe.tid new file mode 100644 index 000000000..6ad384e93 --- /dev/null +++ b/languages/pt-BR/CoreReadMe.tid @@ -0,0 +1,8 @@ +title: $:/core/pt-BR/readme + +Esta extensão contém os componentes principais da TiddlyWiki compostos por: + +* Módulos de código JavaScript +* Ícones +* Modelos necessários para criar o interface do usuário da TiddlyWiki +* Traduções em Inglês Britânico (en-GB) dos textos traduzíveis utilizados pelo núcleo diff --git a/languages/pt-BR/Dates.multids b/languages/pt-BR/Dates.multids new file mode 100644 index 000000000..ee11671cd --- /dev/null +++ b/languages/pt-BR/Dates.multids @@ -0,0 +1,86 @@ +title: $:/language/ + +Date/DaySuffix/1: ° +Date/DaySuffix/10: +Date/DaySuffix/11: +Date/DaySuffix/12: +Date/DaySuffix/13: +Date/DaySuffix/14: +Date/DaySuffix/15: +Date/DaySuffix/16: +Date/DaySuffix/17: +Date/DaySuffix/18: +Date/DaySuffix/19: +Date/DaySuffix/2: +Date/DaySuffix/20: +Date/DaySuffix/21: +Date/DaySuffix/22: +Date/DaySuffix/23: +Date/DaySuffix/24: +Date/DaySuffix/25: +Date/DaySuffix/26: +Date/DaySuffix/27: +Date/DaySuffix/28: +Date/DaySuffix/29: +Date/DaySuffix/3: +Date/DaySuffix/30: +Date/DaySuffix/31: +Date/DaySuffix/4: +Date/DaySuffix/5: +Date/DaySuffix/6: +Date/DaySuffix/7: +Date/DaySuffix/8: +Date/DaySuffix/9: +Date/Long/Day/0: Domingo +Date/Long/Day/1: Segunda +Date/Long/Day/2: Terça +Date/Long/Day/3: Quarta +Date/Long/Day/4: Quinta +Date/Long/Day/5: Sexta +Date/Long/Day/6: Sábado +Date/Long/Month/1: Janeiro +Date/Long/Month/10: Outubro +Date/Long/Month/11: Novembro +Date/Long/Month/12: Dezembro +Date/Long/Month/2: Fevereiro +Date/Long/Month/3: Março +Date/Long/Month/4: Abril +Date/Long/Month/5: Maio +Date/Long/Month/6: Junho +Date/Long/Month/7: Julho +Date/Long/Month/8: Agosto +Date/Long/Month/9: Setembro +Date/Period/pm: pm +Date/Short/Day/0: Dom +Date/Short/Day/1: Seg +Date/Short/Day/2: Ter +Date/Short/Day/3: Qua +Date/Short/Day/4: Qui +Date/Short/Day/5: Sex +Date/Short/Day/6: Sab +Date/Short/Month/1: Jan +Date/Short/Month/10: Out +Date/Short/Month/11: Nov +Date/Short/Month/12: Dez +Date/Short/Month/2: Fev +Date/Short/Month/3: Mar +Date/Short/Month/4: Abr +Date/Short/Month/5: Mai +Date/Short/Month/6: Jun +Date/Short/Month/7: Jul +Date/Short/Month/8: Ago +Date/Short/Month/9: Set +RelativeDate/Future/Days: Dentro de <<period>> dias +RelativeDate/Future/Hours: Dentro de <<period>> horas +RelativeDate/Future/Minutes: Dentro de <<period>> minutos +RelativeDate/Future/Months: Dentro de <<period>> meses +RelativeDate/Future/Second: Daqui a 1 segundo +RelativeDate/Future/Seconds: Dentro de <<period>> segundos +RelativeDate/Future/Years: Dentro de <<period>> anos +RelativeDate/Past/Days: Há <<period>> dias +RelativeDate/Past/Hours: Há <<period>> horas +RelativeDate/Past/Minutes: Há <<period>> minutos +RelativeDate/Past/Months: Há <<period>> meses +RelativeDate/Past/Second: Há 1 segundo +RelativeDate/Past/Seconds: Há <<period>> segundos +RelativeDate/Past/Years: Há <<period>> anos diff --git a/languages/pt-BR/Docs/ModuleTypes.multids b/languages/pt-BR/Docs/ModuleTypes.multids new file mode 100644 index 000000000..e5193f105 --- /dev/null +++ b/languages/pt-BR/Docs/ModuleTypes.multids @@ -0,0 +1,27 @@ +title: $:/language/Docs/ModuleTypes/ + +allfilteroperator: Uma sub-operador para "todos" operadoradores de filtro. +animation: Animações que podem ser utilizadas com a RevealWidget. +bitmapeditoroperation: Uma barra de ferramentas para edições de bitmap. +command: Comandos que podem ser executados no Node.js. +config: Informação a ser inserida em `$tw.config`. +filteroperator: Métodos de filtragem individuais. +global: Informação global a ser inserida em `$tw`. +info: Publica informações do sistema através do [[$:/temp/info-plugin]] pseudo-plugin. +isfilteroperator: Operandos para o operador de filtragem ''is''. +library: Tipo de módulo genérico para fins gerais de módulos JavaScript. +macro: Definições de macros JavaScript. +parser: Interpretadores para diferentes tipos de conteúdo. +saver: Os savers controlam diferentes métodos para salvar arquivos a partir do navegador. +startup: Funções de arranque. +storyview: As story views personalizam as animações e comportamento das ferramentas de listagem. +texteditoroperation: Uma barra de ferramentas do editor de texto. +tiddlerdeserializer: Converte diferentes tipos de conteúdo em tiddlers. +tiddlerfield: Define o comportamento individual de um campo de tiddler. +tiddlermethod: Adiciona um método ao protótipo `$tw.Tiddler`. +upgrader: Aplica processamento de atualização durante o processo de importação/atualização de versão. +utils: Adiciona métodos a `$tw.utils`. +utils-node: Adiciona métodos específicos para o Node.js a `$tw.utils`. +widget: As ferramentas widgets contém representação e atualização de DOM. +wikimethod: Adiciona métodos a `$tw.Wiki`. +wikirule: Regras individuais de interpretação para o interpretador principal de WikiText. diff --git a/languages/pt-BR/Docs/PaletteColours.multids b/languages/pt-BR/Docs/PaletteColours.multids new file mode 100644 index 000000000..04b710833 --- /dev/null +++ b/languages/pt-BR/Docs/PaletteColours.multids @@ -0,0 +1,105 @@ +title: $:/language/Docs/PaletteColours/ + +alert-background: Fundo de alertas +alert-border: Margem de alertas +alert-highlight: Realce de alertas +alert-muted-foreground: Fundo de alertas silenciados +background: Fundo geral +blockquote-bar: Barra de citação +button-background: Fundo de botão pré-definido +button-border: Moldura de botão pré-definido +button-foreground: Primeiro plano de botão pré-definido +code-background: Fundo de código +code-border: Margem de código +code-foreground: Primeiro plano de código +dirty-indicator: Indicador de alterações por salvar +download-background: Fundo do botão de transferências +download-foreground: Primeiro plano do botão de transferências +dragger-background: Fundo da zona de arrasto +dragger-foreground: Primeiro plano da zona de arrasto +dropdown-background: Fundo de menu suspenso +dropdown-border: Margem de menu suspenso +dropdown-tab-background: Fundo de separador suspenso +dropdown-tab-background-selected: Fundo para separador suspenso selecionado +dropzone-background: Fundo de zona de largada +external-link-background: Fundo do link externa +external-link-background-hover: Fundo do link externa sob o cursor +external-link-background-visited: Fundo do link externa visitada +external-link-foreground: Primeiro plano do link externa +external-link-foreground-hover: Primeiro plano do link externa sob o cursor +external-link-foreground-visited: Primeiro plano do link externa visitada +foreground: Primeiro plano geral +message-background: Fundo de caixa de mensagem +message-border: Margem de caixa de mensagem +message-foreground: Primeiro plano de caixa de mensagem +modal-backdrop: Cenário de modal +modal-background: Fundo de modal +modal-border: Margem de modal +modal-footer-background: Fundo do rodapé modal +modal-footer-border: Margem do rodapé modal +modal-header-border: Margem do cabeçalho modal +muted-foreground: Primeiro plano silenciado geral +notification-background: Fundo de notificação +notification-border: Margem de notificação +page-background: Fundo de página +pre-background: Fundo de código pré formatado +pre-border: Margem de código pré formatado +primary: Primário geral +sidebar-button-foreground: Fundo de botões da barra lateral +sidebar-controls-foreground: Primeiro plano de controles da barra lateral +sidebar-controls-foreground-hover: Primeiro plano de controles da barra lateral sob cursor +sidebar-foreground: Primeiro plano da barra lateral +sidebar-foreground-shadow: Sombra de primeiro plano da barra lateral +sidebar-muted-foreground: Primeiro plano silenciado da barra lateral +sidebar-muted-foreground-hover: Primeiro plano silenciado da barra lateral sob cursor +sidebar-tab-background: Fundo de separador da barra lateral +sidebar-tab-background-selected: Fundo de separador selecionado da barra lateral +sidebar-tab-border: Margem de separador da barra lateral +sidebar-tab-border-selected: Margem de separador selecionado da barra lateral +sidebar-tab-divider: Divisão de separador da barra lateral +sidebar-tab-foreground: Primeiro plano de separador da barra lateral +sidebar-tab-foreground-selected: Primeiro plano de separador selecionado da barra lateral +sidebar-tiddler-link-foreground: Primeiro plano do link para tiddler na barra lateral +sidebar-tiddler-link-foreground-hover: Primeiro plano do link para tiddler na barra lateral sob o cursor +site-title-foreground: Primeiro plano do site +static-alert-foreground: Primeiro plano de alerta estático +tab-background: Fundo de separador +tab-background-selected: Fundo de separador selecionado +tab-border: Margem de separador +tab-border-selected: Margem de separador selecionado +tab-divider: Divisão de separador +tab-foreground: Primeiro plano de separador +tab-foreground-selected: Primeiro plano de separadores selecionados +table-border: Margem de tabela +table-footer-background: Fundo de rodapé de tabela +table-header-background: Fundo de cabeçalho de tabela +tag-background: Cor de fundo do botão assunto +tag-foreground: Primeiro plano de assunto +tiddler-background: Cor de fundo doe Tiddler +tiddler-border: Margem de Tiddler +tiddler-controls-foreground: Primeiro plano de controles dos Tiddlers +tiddler-controls-foreground-hover: Primeiro plano de controles dos Tiddlers sob o cursor +tiddler-controls-foreground-selected: Primeiro plano de controles dos Tiddlers selecionados +tiddler-editor-background: Fundo do editor de Tiddlers +tiddler-editor-border: Margem do editor de Tiddlers +tiddler-editor-border-image: Imagem de margem do editor de Tiddlers +tiddler-editor-fields-even: Fundo de campos pares do editor de Tiddlers +tiddler-editor-fields-odd: Fundo de campos ímpares do editor de Tiddlers +tiddler-info-background: Fundo do painel de informação de Tiddlers +tiddler-info-border: Margem do painel de informação de Tiddlers +tiddler-info-tab-background: Fundo de separadores do painel de informação de Tiddlers +tiddler-link-background: Fundo do link para Tiddlers +tiddler-link-foreground: Primeiro plano do link para Tiddlers +tiddler-subtitle-foreground: Primeiro plano de subtítulo de Tiddlers +tiddler-title-foreground: Primeiro plano de título de Tiddlers +toolbar-cancel-button: Botão 'cancelar' da barra de ferramentas +toolbar-close-button: Botão 'fechar' da barra de ferramentas +toolbar-delete-button: Botão 'apagar' da barra de ferramentas +toolbar-done-button: Botão 'concluir' da barra de ferramentas +toolbar-edit-button: Botão 'editar' da barra de ferramentas +toolbar-info-button: Botão 'informação' da barra de ferramentas +toolbar-new-button: Botão 'novo tiddler' da barra de ferramentas +toolbar-options-button: Botão 'opções' da barra de ferramentas +toolbar-save-button: Botão 'salvar' da barra de ferramentas +untagged-background: Fundo de cápsula sem assunto +very-muted-foreground: Fundo muito silenciado diff --git a/languages/pt-BR/EditTemplate.multids b/languages/pt-BR/EditTemplate.multids new file mode 100644 index 000000000..3b7340864 --- /dev/null +++ b/languages/pt-BR/EditTemplate.multids @@ -0,0 +1,28 @@ +title: $:/language/EditTemplate/ + +Body/External/Hint: Este é um tiddler armazenado fora do arquivo principal da Tiddlywiki. Pode mudar os assuntos mas não pode editar o seu conteúdo +Body/Placeholder: Escreva o texto para este tiddler +Body/Preview/Type/Output: resultado +Field/Remove/Caption: remover campo +Field/Remove/Hint: Remover campo +Fields/Add/Button: adicionar +Fields/Add/Dropdown/System: Campos de Sistema +Fields/Add/Dropdown/User: Campos do usuário +Fields/Add/Name/Placeholder: nome do campo +Fields/Add/Prompt: Adicionar novo campo +Fields/Add/Value/Placeholder: valor do campo +Shadow/OverriddenWarning: Isto é um tiddler-sombra modificado. Pode voltar à configuração pré-definida apagando este tiddler +Shadow/Warning: Isto é um tiddler-sombra. Quaisquer alterações irão sobrepor-se à versão pré-definida +Tags/Add/Button: adicionar +Tags/Add/Placeholder: nome do assunto +Tags/Dropdown/Caption: lista de assuntos +Tags/Dropdown/Hint: Mostrar a lista de assuntos +Title/BadCharacterWarning: Atenção: Evite utilizar os caracteres <<bad-chars>> no título de tiddlers +Title/Exists/Prompt: O Tiddler especificado já existe +Title/Relink/Prompt: Substituindo ''<$text text=<<fromTitle>>/>'' por ''<$text text=<<toTitle>>/>'' nas //lista//, //tags// e campos de outros tiddlers +Type/Delete/Caption: apagar formato de arquivo +Type/Delete/Hint: Apagar formato de arquivo +Type/Dropdown/Caption: Lista de formato de arquivo +Type/Dropdown/Hint: Mostrar a lista de formato de arquivo +Type/Placeholder: formato de arquivo +Type/Prompt: Tipo: diff --git a/languages/pt-BR/Exporters.multids b/languages/pt-BR/Exporters.multids new file mode 100644 index 000000000..0810530dc --- /dev/null +++ b/languages/pt-BR/Exporters.multids @@ -0,0 +1,6 @@ +title: $:/language/Exporters/ + +CsvFile: Arquivos CSV dos tiddlers +JsonFile: Arquivos JSON dos tiddlers +StaticRiver: Sequência de tiddlers como arquivo estático HTML +TidFile: Tiddler individual em arquivo ".tid" diff --git a/languages/pt-BR/Fields.multids b/languages/pt-BR/Fields.multids new file mode 100644 index 000000000..40858179d --- /dev/null +++ b/languages/pt-BR/Fields.multids @@ -0,0 +1,35 @@ +title: $:/language/Docs/Fields/ + +_canonical_uri: O URI completo dum tiddler de imagem externa +bag: O nome do saco de onde veio o tiddler +caption: O texto a exibir num separador ou botão +color: O valor CSS da cor associada ao tiddler +component: O nome do componente responsável por um [[tiddler alerta|AlertMechanism]] +created: A data de criação do tiddler +creator: O nome da pessoa que criou o tiddler +current-tiddler: Utilizado para armazenar o primeiro tiddler numa [[lista de histórico|HistoryMechanism]] +dependents: Para uma extensão, lista os títulos de extensões dependentes +description: O texto descritivo de uma extensão, ou diálogo modal +draft.of: Para tiddlers rascunho, contém o título do tiddler do qual este é rascunho +draft.title: Para tiddlers rascunho, contém o título proposto para o novo tiddler +footer: O texto de rodapé para um assistente +hack-to-give-us-something-to-compare-against: Um campo temporário utilizado em [[$:/core/templates/static.content]] +icon: O título do tiddler que contém o ícone associado com determinado tiddler +library: Se definido como "yes" indica que o tiddler deve ser gravado como uma biblioteca JavaScript +list: Uma lista ordenada de títulos de tiddlers associados com um determinado tiddler +list-after: Se definido, o título do tiddler a seguir ao qual este tiddler deve ser adicionado numa lista ordenada de títulos de tiddlers +list-before: Se definido, o título do tiddler a antes do qual este tiddler deve ser adicionado numa lista ordenada de títulos de tiddlers, ou no início da lista se este campo estiver presente mas vazio +modified: A data e hora da última modificação de um tiddler +modifier: Título do tiddler associado à última pessoa que modificou o tiddler +name: O nome humanamente legível associado a um tiddler extensão +plugin-priority: Valor numérico indicador da prioridade de um tiddler extensão +plugin-type: O tipo de extensão de um tiddler extensão +released: Data de lançamento de uma versão da TiddlyWiki +revision: A revisão do tiddler guardada no servidor +source: O URL fonte associado a um tiddler +subtitle: O texto do subtítulo de um assistente +tags: Lista de assuntos associadas a um tiddler +text: O texto do conteúdo de um tiddler +title: O nome único de um tiddler +type: O formato de arquivo de um tiddler +version: Informação de versão de uma extensão diff --git a/languages/pt-BR/Filters.multids b/languages/pt-BR/Filters.multids new file mode 100644 index 000000000..fe2951ff7 --- /dev/null +++ b/languages/pt-BR/Filters.multids @@ -0,0 +1,15 @@ +title: $:/language/Filters/ + +AllTags: Todas as assuntos exceto os de sistema +AllTiddlers: Todos os tiddlers exceto os tiddlers de sistema +Drafts: Tiddlers rascunho +Missing: Tiddlers em falta +Orphans: Tiddlers órfãos +OverriddenShadowTiddlers: Tiddlers-sombra substituídos +RecentSystemTiddlers: Tiddlers recentemente modificados, incluindo tiddlers de sistema +RecentTiddlers: Tiddlers modificados recentemente +ShadowTiddlers: Tiddlers-sombra +StoryList: Tiddlers no Histórico, escluindo $:/AdvancedSearch +SystemTags: Assuntos de sistema +SystemTiddlers: Tiddlers de sistema +TypedTiddlers: Tiddlers que não são sonWikiText diff --git a/languages/pt-BR/GettingStarted.tid b/languages/pt-BR/GettingStarted.tid new file mode 100644 index 000000000..72c91f7f3 --- /dev/null +++ b/languages/pt-BR/GettingStarted.tid @@ -0,0 +1,17 @@ +title: GettingStarted + +\define lingo-base() $:/language/ControlPanel/Basics/ +Bem vindo à ~TiddlyWiki e à comunidade ~TiddlyWiki + +Antes de começar a armazenar informação importante na ~TiddlyWiki é importante certificar-se que consegue gravar alterações de forma fiável. Para mais detalhes veja http://tiddlywiki.com/#GettingStarted + +!! Configurar esta ~TiddlyWiki + +<div class="tc-control-panel"> + +|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> | +|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> | +|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// | +</div> + +Veja o [[painel de controle|$:/ControlPanel]] para mais opções. diff --git a/languages/pt-BR/Help/build.tid b/languages/pt-BR/Help/build.tid new file mode 100644 index 000000000..aae000c1e --- /dev/null +++ b/languages/pt-BR/Help/build.tid @@ -0,0 +1,11 @@ +title: $:/language/Help/build +description: Executar comandos configurados automaticamente + +Construir os alvos de construção especificados para a wiki atual. Se nenhum alvo for especificado todos os alvos disponíveis serão construídos. + +``` +--build <alvo> [<alvo> ...] +``` + +Os alvos de construção são definidos no arquivo `tiddlywiki.info` na pasta da wiki. + diff --git a/languages/pt-BR/Help/clearpassword.tid b/languages/pt-BR/Help/clearpassword.tid new file mode 100644 index 000000000..ee911e8c9 --- /dev/null +++ b/languages/pt-BR/Help/clearpassword.tid @@ -0,0 +1,8 @@ +title: $:/language/Help/clearpassword +description: Remover senha para as operações criptográficas subsequentes + +Remover a senha para as operações criptográficas subsequentes + +``` +--clearpassword +``` diff --git a/languages/pt-BR/Help/default.tid b/languages/pt-BR/Help/default.tid new file mode 100644 index 000000000..4e3c5ad48 --- /dev/null +++ b/languages/pt-BR/Help/default.tid @@ -0,0 +1,23 @@ +title: $:/language/Help/default +description: + +\define commandTitle() +$:/language/Help/$(command)$ +\end +``` +usage: tiddlywiki [<wikifolder>] [--<command> [<args>...]...] +``` + +Comandos disponíveis: + +<ul> +<$list filter="[commands[]sort[title]]" variable="command"> +<li><$link to=<<commandTitle>>><$macrocall $name="command" $type="text/plain" $output="text/plain"/></$link>: <$transclude tiddler=<<commandTitle>> field="description"/></li> +</$list> +</ul> + +Para obter ajuda detalhada sobre um comando: + +``` +tiddlywiki --help <command> +``` diff --git a/languages/pt-BR/Help/editions.tid b/languages/pt-BR/Help/editions.tid new file mode 100644 index 000000000..c19d885d0 --- /dev/null +++ b/languages/pt-BR/Help/editions.tid @@ -0,0 +1,8 @@ +title: $:/language/Help/editions +description: Lista as edições da TiddlyWiki disponíveis + +Lista os nomes e descrições das edições disponíveis. Pode criar uma nova wiki da edição especificada com o comando `--init` . + +``` +--editions +``` diff --git a/languages/pt-BR/Help/help.tid b/languages/pt-BR/Help/help.tid new file mode 100644 index 000000000..9e4b97687 --- /dev/null +++ b/languages/pt-BR/Help/help.tid @@ -0,0 +1,10 @@ +title: $:/language/Help/help +description: Mostra a ajuda para comandos da TiddlyWiki + +Mostra a ajuda para um comando: + +``` +--help [<command>] +``` + +Se o comando for omitido será exibida uma lista de comandos disponíveis. diff --git a/languages/pt-BR/Help/init.tid b/languages/pt-BR/Help/init.tid new file mode 100644 index 000000000..7afffc42b --- /dev/null +++ b/languages/pt-BR/Help/init.tid @@ -0,0 +1,23 @@ +title: $:/language/Help/init +description: Inicializar uma nova pasta wiki + +Inicializa uma [[PastaWiki|WikiFolders]] vazia com uma cópia da edição especificada. + +``` +--init <edition> [<edition> ...] +``` + +Por exemplo: + +``` +tiddlywiki ./MyWikiFolder --init empty +``` + +Nota: + +* A pasta para a wiki será criada se não existir +* Por omissão a "edition" será ''empty'' +* O comando init irá falhar se a pasta especificada não estiver vazia +* O comando init remove quaisquer definições de `includeWikis` no arquivo `tiddlywiki.info` da edição +* Quando múltiplas edições são especificadas, as edições inicializadas posteriormente substituem quaisquer arquivos partilhados com edições anteriores (de modo que o arquivo `tiddlywiki.info` final será copiado da última edição) +* `--editions` mostra uma lista de edições disponíveis diff --git a/languages/pt-BR/Help/load.tid b/languages/pt-BR/Help/load.tid new file mode 100644 index 000000000..02f37b450 --- /dev/null +++ b/languages/pt-BR/Help/load.tid @@ -0,0 +1,16 @@ +title: $:/language/Help/load +description: Carregar tiddlers de um arquivo + +Carregar tiddlers de arquivos da TiddlyWiki 2.x.x (`.html`), `.tiddler`, `.tid`, `.json` ou outros arquivos + +``` +--load <filepath> +``` + +Para carregar tiddlers de um arquivo TiddlyWiki encriptado deve primeiro especificar uma senha com o comando Password. Por exemplo: + +``` +tiddlywiki ./MyWiki --password pa55w0rd --load my_encrypted_wiki.html +``` + +A TiddlyWiki não carregará uma versão anterior de um plugin já carregado. diff --git a/languages/pt-BR/Help/makelibrary.tid b/languages/pt-BR/Help/makelibrary.tid new file mode 100644 index 000000000..455db09d9 --- /dev/null +++ b/languages/pt-BR/Help/makelibrary.tid @@ -0,0 +1,14 @@ +title: $:/language/Help/makelibrary +description: Constrói a extensão de biblioteca necessária para o processo de atualização + +Constrói o tiddler `$:/UpgradeLibrary` para o processo de atualização. + +A biblioteca de atualização é formatada como uma extensão normal com o tipo de extensão definido como `library`. Contém uma cópia de cada uma das extensões, temas e pacotes de línguas disponíveis dentro do repositório da TiddlyWiki5. + +Este comando é para uso interno; é apenas importante para usuário que criem um processo de atualização personalizado. + +``` +--makelibrary <title> +``` + +Por omissão o argumento será `$:/UpgradeLibrary`. diff --git a/languages/pt-BR/Help/notfound.tid b/languages/pt-BR/Help/notfound.tid new file mode 100644 index 000000000..53e84f34c --- /dev/null +++ b/languages/pt-BR/Help/notfound.tid @@ -0,0 +1,4 @@ +title: $:/language/Help/notfound +description: + +Item de ajuda inexistente \ No newline at end of file diff --git a/languages/pt-BR/Help/output.tid b/languages/pt-BR/Help/output.tid new file mode 100644 index 000000000..aa6273930 --- /dev/null +++ b/languages/pt-BR/Help/output.tid @@ -0,0 +1,11 @@ +title: $:/language/Help/output +description: Define a pasta de destino para os comandos subsequentes + +Define o diretório base de destino para os comandos subsequentes. A pasta de destino pré definida é a sub-pasta `output` dentro da pasta da edição. + +``` +--output <caminho> +``` + +Se o caminho especificado é relativo este será resolvido em relação à atual pasta de trabalho. Por exemplo `--output .` define o diretório de destino para a atual pasta de trabalho. + diff --git a/languages/pt-BR/Help/password.tid b/languages/pt-BR/Help/password.tid new file mode 100644 index 000000000..657f4ffa3 --- /dev/null +++ b/languages/pt-BR/Help/password.tid @@ -0,0 +1,9 @@ +title: $:/language/Help/password +description: Definir senha para operações criptográficas subsequentes + +Define a senha para as operações criptográficas subsequentes + +``` +--password <password> +``` + diff --git a/languages/pt-BR/Help/rendertiddler.tid b/languages/pt-BR/Help/rendertiddler.tid new file mode 100644 index 000000000..eef9538fe --- /dev/null +++ b/languages/pt-BR/Help/rendertiddler.tid @@ -0,0 +1,12 @@ +title: $:/language/Help/rendertiddler +description: Interpretar tiddler individual conforme tipo ContentType especificado + +Interpreta um tiddler individual conforme o ContentType especificado, pré definição é `text/html`, e guarda-o para o arquivo especificado: + +``` +--rendertiddler <título> <caminho> [<tipo>] +``` + +Por padrão, o caminho é resolvido relativamente à sub-pasta `output` do diretório de edição. O comando `--output` pode ser utilizado para redireccionar para umo diretório de destino diferente. + +Quaisquer pastas em falta no caminho de destino serão automaticamente criadas. diff --git a/languages/pt-BR/Help/rendertiddlers.tid b/languages/pt-BR/Help/rendertiddlers.tid new file mode 100644 index 000000000..30906f04a --- /dev/null +++ b/languages/pt-BR/Help/rendertiddlers.tid @@ -0,0 +1,18 @@ +title: $:/language/Help/rendertiddlers +description: Interpretar tiddlers respeitantes de um filtro para o ContentType especificado + +Interpreta um conjunto de tiddlers respeitante de um determinado filtro para arquivos separados de um determinado ContentType (por padrão `text/html`) e extensão (por padrão `.html`). + +``` +--rendertiddlers <filtro> <modelo> <caminho> [<tipo>] [<extensão>] +``` + +Por exemplo: + +``` +--rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html ./static text/plain +``` + +Por padrão, o caminho é resolvido relativamente à sub-pasta `output` do diretório de edição. O comando `--output` pode ser utilizado para redireccionar para umo diretório de destino diferente. + +Quaisquer arquivos no diretório de destino serão apagados. Quaisquer pastas em falta nos caminhos de destino serão automaticamente criadas se em falta. diff --git a/languages/pt-BR/Help/savetiddler.tid b/languages/pt-BR/Help/savetiddler.tid new file mode 100644 index 000000000..b405699e0 --- /dev/null +++ b/languages/pt-BR/Help/savetiddler.tid @@ -0,0 +1,12 @@ +title: $:/language/Help/savetiddler +description: Salva tiddler em bruto para um arquivo + +Salva um tiddler individual no seu formato bruto texto ou binário para o caminho especificado. + +``` +--savetiddler <título> <nome do arquivo> +``` + +Por padrão, o caminho é resolvido relativamente à sub-pasta `output` do diretório de edição. O comando `--output` pode ser utilizado para redireccionar para umo diretório de destino diferente. + +Quaisquer pastas em falta no caminho de destino serão automaticamente criadas. diff --git a/languages/pt-BR/Help/savetiddlers.tid b/languages/pt-BR/Help/savetiddlers.tid new file mode 100644 index 000000000..67c8a199e --- /dev/null +++ b/languages/pt-BR/Help/savetiddlers.tid @@ -0,0 +1,12 @@ +title: $:/language/Help/savetiddlers +description: Salva um conjunto de tiddlers em bruto para uma pasta + +Salva um conjunto de tiddlers no seu formato bruto texto ou binário para o caminho especificado. + +``` +--savetiddlers <filtro> <caminho> +``` + +Por padrão, o caminho é resolvido relativamente à sub-pasta `output` do diretório de edição. O comando `--output` pode ser utilizado para redireccionar para umo diretório de destino diferente. + +Quaisquer pastas em falta no caminho de destino serão automaticamente criadas. diff --git a/languages/pt-BR/Help/server.tid b/languages/pt-BR/Help/server.tid new file mode 100644 index 000000000..6cdda642e --- /dev/null +++ b/languages/pt-BR/Help/server.tid @@ -0,0 +1,37 @@ +title: $:/language/Help/server +description: Atribui um interface de servidor HTTP à TiddlyWiki + +O servidor incluído na TiddlyWiki 5 é muito elementar. Apesar de compatível com a TiddlyWeb não suporta muitas das funcionalidades necessárias para utilização robusta com interface pela Internet. + +Na sua forma mais elementar serve a representação de um tiddler específico. Com parâmetros adicionais serve tiddlers codificados em JSON, e suporta operações HTTP básicas para `GET`, `PUT` e `DELETE`. + +``` +--server <port> <roottiddler> <rendertype> <servetype> <username> <password> <host> <pathprefix> +``` + +Os parâmetros são: + +* ''port'' - número da porta pela qual servir (por padrão "8080") +* ''roottiddler'' - o tiddler a ser servido na raiz (por padrão "$:/core/save/all") +* ''rendertype'' - o formato de arquivo para o qual o tiddler deve ser representado (por padrão "text/plain") +* ''servetype'' - o formato de arquivo para o qual o tiddler deve ser apresentado (por padrão "text/html") +* ''username'' - o nome de usuário pré definido com o qual se assinam as edições +* ''password'' - senha opcional para autenticação básica +* ''host'' - endereço opcional do servidor de onde servir (por padrão "127.0.0.1" conhecido como "localhost") +* ''pathprefix'' - prefixo opcional para caminhos + +Se o parâmetro senha for especificado o navegador irá pedir ao usuário um nome e senha. Tenha em atenção que a senha é transmitida em texto simples tornando esta implementação imprópria para utilização geral + +Por exemplo: + +``` +--server 8080 $:/core/save/all text/plain text/html MyUserName passw0rd +``` + +O nome de usuário e a senha podem ser vazios se necessitar de definir o nome do servidor ou prefixo para caminhos e não pretender que a senha seja requerida: + +``` +--server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245 +``` + +Para correr servidores TiddlyWiki múltiplos ao mesmo tempo é necessário colocar cada um numa porta diferente. diff --git a/languages/pt-BR/Help/setfield.tid b/languages/pt-BR/Help/setfield.tid new file mode 100644 index 000000000..41ece4466 --- /dev/null +++ b/languages/pt-BR/Help/setfield.tid @@ -0,0 +1,17 @@ +title: $:/language/Help/setfield +description: Prepara tiddlers externos para utilização + +//Este comando é experimental e pode mudar ou ser substituído antes de ser finalizado// + +Define um determinado campo de um grupo de tiddlers para o resultado de interpretar um tiddler modelo com a variável `currentTiddler` definida como o tiddler. + +``` +--setfield <filter> <fieldname> <templatetitle> <rendertype> +``` + +Os parâmetros são: + +* ''filter'' - filtro que selecciona os tiddlers a ser afectados +* ''fieldname'' - nome do campo a modificar (por padrão "texto") +* ''templatetitle'' - o tiddler a interpretar para o campo especificado. Se for deixado em branco ou estiver em falta o campo especificado será eliminado +* ''rendertype'' - O tipo de texto a interpretar (por padrão "text/plain"; "text/html" pode ser utilizado para incluir assuntos HTML) diff --git a/languages/pt-BR/Help/unpackplugin.tid b/languages/pt-BR/Help/unpackplugin.tid new file mode 100644 index 000000000..b9d3b2c5c --- /dev/null +++ b/languages/pt-BR/Help/unpackplugin.tid @@ -0,0 +1,8 @@ +title: $:/language/Help/unpackplugin +description: Extrair tiddlers de conteúdo de uma extensão + +Extrai o conteúdo de uma extensão, recriando-o como tiddlers vulgares: + +``` +--unpackplugin <título> +``` diff --git a/languages/pt-BR/Help/verbose.tid b/languages/pt-BR/Help/verbose.tid new file mode 100644 index 000000000..16dbbe13b --- /dev/null +++ b/languages/pt-BR/Help/verbose.tid @@ -0,0 +1,8 @@ +title: $:/language/Help/verbose +description: Activa o modo de exibição relatório verboso + +Activa a exibição relatório verboso, útil para correcção de erros + +``` +--verbose +``` diff --git a/languages/pt-BR/Help/version.tid b/languages/pt-BR/Help/version.tid new file mode 100644 index 000000000..3fff49b95 --- /dev/null +++ b/languages/pt-BR/Help/version.tid @@ -0,0 +1,8 @@ +title: $:/language/Help/version +description: Mostra o numero da versão da TiddlyWiki. + +Mostra o numero da versão da TiddlyWiki. + +``` +--version +``` diff --git a/languages/pt-BR/Import.multids b/languages/pt-BR/Import.multids new file mode 100644 index 000000000..479f511ff --- /dev/null +++ b/languages/pt-BR/Import.multids @@ -0,0 +1,15 @@ +title: $:/language/Import/ + +Imported/Hint: Os seguintes tiddlers foram importados: +Listing/Cancel/Caption: Cancelar +Listing/Hint: Estes tiddlers estão prontos a importar: +Listing/Import/Caption: Importar +Listing/Select/Caption: Seleccionar +Listing/Status/Caption: Estado +Listing/Title/Caption: Título +Upgrader/Plugins/Suppressed/Incompatible: Extensões bloqueadas, incompatíveis ou obsoletas +Upgrader/Plugins/Suppressed/Version: Extensão bloqueada (devido a <<incoming>> ser anterior à <<existing>> existente) +Upgrader/Plugins/Upgraded: Extensão atualizada de <<incoming>> para <<upgraded>> +Upgrader/State/Suppressed: Tiddler de estado temporário bloqueado +Upgrader/System/Suppressed: Tiddler de sistema bloqueado +Upgrader/ThemeTweaks/Created: Tema migrado ajustado de <$text text=<<from>>/> diff --git a/languages/pt-BR/Misc.multids b/languages/pt-BR/Misc.multids new file mode 100644 index 000000000..41d9ca66d --- /dev/null +++ b/languages/pt-BR/Misc.multids @@ -0,0 +1,71 @@ +title: $:/language/ + +AboveStory/ClassicPlugin/Warning: Parece que está tentando caregar um plugin desenvolvido para o ~TiddlyWiki Classic. <br> +BinaryWarning/Prompt: Este tiddler contém informação binária +ClassicWarning/Hint: Este tiddler está escrito no formato de texto wiki da TiddlyWiki Clássica, que não é totalmente compatível com a TiddlyWiki versão 5. Veja http://tiddlywiki.com/static/Upgrading.html para mais detalhes. +ClassicWarning/Upgrade/Caption: Atualizar +CloseAll/Button: Fechar Todos +ColourPicker/Recent: Últimas cores usadas: +ConfirmCancelTiddler: Gostaria de descartar as alterações feitas no tiddler "<$text text=<<title>>/>"? +ConfirmDeleteTiddler: Gostaria apagar o tiddler "<$text text=<<title>>/>"? +ConfirmEditShadowTiddler: Está prestes a editar um Tiddler-Sombra. Quaisquer alterações sobrepor-se-ão aos valores padrão de sistema, tornando futuras atualizações mais complexas. Tenha a certeza que pretende editar "<$text text=<<title>>/>"? +ConfirmOverwriteTiddler: Gostaria de substituir o tiddler "<$text text=<<title>>/>"? +Count: contagem +DefaultNewTiddlerTitle: Novo Tiddler +DropMessage: Arraste e solte aqui os seus arquivos, imagens, tiddlers ou plugins para adicioná-los (ou tecle Esc para cancelar) +Encryption/Cancel: Cancelar +Encryption/ConfirmClearPassword: Gostaria remover a senha? Isso irá removerá a criptografia aplicada quando salvar esta wiki +Encryption/Password: Senha +Encryption/PasswordNoMatch: As senhas devem ser iguais nos dois campos +Encryption/PromptSetPassword: Definir nova senha para esta TiddlyWiki +Encryption/RepeatPassword: Repetir senha +Encryption/SetPassword: Definir senha +Encryption/Username: Nome de usuário +Error/Caption: Erro +Error/Filter: Erro de filtro +Error/FilterSyntax: Erro de sintaxe na expressão do filtro +Error/IsFilterOperator: Erro de Filtro: Operando desconhecido para o operador de filtro 'is' +Error/LoadingPluginLibrary: Erro ao carregar a biblioteca de extensões +Error/RecursiveTransclusion: Erro de transclusão recursiva na widget de transclusão +Error/RetrievingSkinny: Erro ao obter a lista simples de tiddlers +Error/SavingToTWEdit: Erro ao gravar em TWEdit +Error/WhileSaving: Erro ao gravar +Error/XMLHttpRequest: Código de erro XMLHttpRequest +InternalJavaScriptError/Hint: Bem, isto é embaraçoso. Para corrigir, reinicie a sua TiddlyWiki recarregando a página em seu navegador. Normalmente o atalho é (F5) +InternalJavaScriptError/Title: Erro interno JavaScript +InvalidFieldName: Caracteres ilegais no nome do arquivo "<$text text=<<fieldName>>/>". Os campos apenas podem conter letras minúsculas, dígitos e os caracteres sublinhado (`_`), hífen (`-`) e ponto final (`.`) +LazyLoadingWarning: <p>Carregando um texto externo de ''<$text text={{!!_canonical_uri}}/>''</p><p>Se esta mensagem não desaparecer pode ser que esteja usando um navegador que não suporte textos remoto com esta configuração. Veja http://tiddlywiki.com/#ExternalText</p> +LoginToTiddlySpace: Entrar em TiddlySpace +Manager/Controls/FilterByTag/None: (nenhum) +Manager/Controls/FilterByTag/Prompt: Filtrar por Tag: +Manager/Controls/Order/Prompt: Inverter a ordem +Manager/Controls/Search/Placeholder: Pesquisar +Manager/Controls/Search/Prompt: Pesquisar: +Manager/Controls/Show/Option/Tags: tags +Manager/Controls/Show/Option/Tiddlers: tiddlers +Manager/Controls/Show/Prompt: Exibir: +Manager/Controls/Sort/Prompt: Organizar por: +Manager/Item/Colour: Cores +Manager/Item/Fields: Campos +Manager/Item/Icon: Icones +Manager/Item/Icon/None: (nenhum) +Manager/Item/RawText: Texto bruto +Manager/Item/Tags: Tags +Manager/Item/Tools: Ferramentas +Manager/Item/WikifiedText: Texto Wikified +MissingTiddler/Hint: Tiddler "<$text text=<<currentTiddler>>/>" não existe - clique {{$:/core/images/edit-button}} para criar +No: Não +OfficialPluginLibrary: Biblioteca de Extensões Official ~TiddlyWiki +OfficialPluginLibrary/Hint: A Biblioteca de Extensões Official ~TiddlyWiki em tiddlywiki.com. Extensões temas e pacotes de idiomas são mantidos pela equipa principal. +PluginReloadWarning: Por favor grave {{$:/core/ui/Buttons/save-wiki}} e recarregue {{$:/core/ui/Buttons/refresh}} para que as alterações às extensões tomem efeito +RecentChanges/DateFormat: DD MMM YYYY às hh:0mm +SystemTiddler/Tooltip: Este é um tiddler de sistema +SystemTiddlers/Include/Prompt: Incluir tiddlers do sistema +TagManager/Colour/Heading: Cor +TagManager/Count/Heading: Quantia +TagManager/Icon/Heading: Ícone +TagManager/Info/Heading: Infos +TagManager/Tag/Heading: Assunto +Tiddler/DateFormat: DD de MMM de YYYY às hh:0mm +UnsavedChangesWarning: Têm alterações não guardadas na TiddlyWiki +Yes: Sim diff --git a/languages/pt-BR/Modals/Download.tid b/languages/pt-BR/Modals/Download.tid new file mode 100644 index 000000000..b6c47c7c6 --- /dev/null +++ b/languages/pt-BR/Modals/Download.tid @@ -0,0 +1,13 @@ +title: $:/language/Modals/Download +type: text/vnd.tiddlywiki +subtitle: Download changes +footer: <$button message="tm-close-tiddler">Close</$button> +help: http://tiddlywiki.com/static/DownloadingChanges.html + +O seu navegador apenas suporta gravação manual. + +Para salvar a sua wiki modificada clique no botão abaixo e selecione "Baixar o arquivo" ou "Salvar Arquivo", então escolha uma pasta e um nome para o arquivo. + +//Pode-se acelerar o processo pressionando a tecla Control enquanto clica no link (Windows) ou a tecla Options/Alt (Mac OS X). Não será pedido que especifique uma pasta ou nome para o arquivo, mas provavelmente o navegador irá criar um nome irreconhecível -- poderá ter de alterar o nome de modo a incluir a extensão '.html' antes de conseguir usa-lo.// + +Nos dispositivos móveis que não permitem copia de arquivos a alternativa é salvar o link nos seus favoritos, e no seu computador sincronizar e então gravar normalmente. \ No newline at end of file diff --git a/languages/pt-BR/Modals/SaveInstructions.tid b/languages/pt-BR/Modals/SaveInstructions.tid new file mode 100644 index 000000000..546be1885 --- /dev/null +++ b/languages/pt-BR/Modals/SaveInstructions.tid @@ -0,0 +1,22 @@ +title: $:/language/Modals/SaveInstructions +type: text/vnd.tiddlywiki +subtitle: Save your work +footer: <$button message="tm-close-tiddler">Close</$button> +help: http://tiddlywiki.com/static/SavingChanges.html + +As suas alterações a esta wiki necessitam ser gravadas como um arquivo HTML ~TiddlyWiki + +!!! Navegadores de computador pessoal + +# Selecione ''Salvar como'' do menu ''Arquivo'' +# Escolha um nome e uma localização para o seu arquivo +#* Alguns navegadores necessitam que se especifique explicitamente o formato de gravação como ''Página da Internet, apenas HTML'' ou algo similar +# Fechar esta guia + +!!! Navegadores em smartfones, tablets e celulares + +# Crie um marcador ou favorito desta página +#* Se tiver o iCloud ou Google Sync configurados o seu marcador irá ser automaticamente sincronizado com o seu computador pessoal onde poderá abrir e gravar conforme indicado acima +# Fechar esta guia + +//Se abrir o marcador outra vez no Mobile Safari verá esta mensagem outra vez. Se quiser prosseguir e utilizar o arquivo, clique no botão ''fechar'' abaixo// diff --git a/languages/pt-BR/NewJournal.multids b/languages/pt-BR/NewJournal.multids new file mode 100644 index 000000000..39a92e99f --- /dev/null +++ b/languages/pt-BR/NewJournal.multids @@ -0,0 +1,4 @@ +title: $:/config/NewJournal/ + +Tags: Edições +Title: DD de MMM de YYYY diff --git a/languages/pt-BR/Notifications.multids b/languages/pt-BR/Notifications.multids new file mode 100644 index 000000000..796649b73 --- /dev/null +++ b/languages/pt-BR/Notifications.multids @@ -0,0 +1,4 @@ +title: $:/language/Notifications/ + +Save/Done: Wiki gravada +Save/Starting: A iniciar processo de gravação da wiki diff --git a/languages/pt-BR/Search.multids b/languages/pt-BR/Search.multids new file mode 100644 index 000000000..c7cbdc5e3 --- /dev/null +++ b/languages/pt-BR/Search.multids @@ -0,0 +1,20 @@ +title: $:/language/Search/ + +DefaultResults/Caption: Lista +Filter/Caption: Filtro +Filter/Hint: Procurar através de [[expressão de filtros|http://tiddlywiki.com/static/Filters.html]] +Filter/Matches: //<small><<resultCount>> resultados</small>// +Matches: //<small><<resultCount>> resultados</small>// +Matches/All: Todas as correspondências: +Matches/Title: Correspondências em títulos: +Search: Pesquisar +Search/TooShort: Pesquisa de textos pequenos +Shadows/Caption: Sombras +Shadows/Hint: Procurar tiddlers-sombra +Shadows/Matches: //<small><<resultCount>> resultados</small>// +Standard/Caption: Padrão +Standard/Hint: Procurar tiddlers normais +Standard/Matches: //<small><<resultCount>> resultados</small>// +System/Caption: Sistema +System/Hint: Procurar tiddlers de sistema +System/Matches: //<small><<resultCount>> resultados</small>// diff --git a/languages/pt-BR/SideBar.multids b/languages/pt-BR/SideBar.multids new file mode 100644 index 000000000..cf240787e --- /dev/null +++ b/languages/pt-BR/SideBar.multids @@ -0,0 +1,16 @@ +title: $:/language/SideBar/ + +All/Caption: Todos +Contents/Caption: Assuntos +Drafts/Caption: Rascunhos +Missing/Caption: Ausentes: +More/Caption: Mais +Open/Caption: Abrir +Orphans/Caption: Órfãos: +Recent/Caption: Recentes +Shadows/Caption: Sombras: +System/Caption: Sistema: +Tags/Caption: Assuntos: +Tags/Untagged/Caption: sem assuntos +Tools/Caption: Opções +Types/Caption: Por Tipo: diff --git a/languages/pt-BR/SiteSubtitle.tid b/languages/pt-BR/SiteSubtitle.tid new file mode 100644 index 000000000..6bd443d7f --- /dev/null +++ b/languages/pt-BR/SiteSubtitle.tid @@ -0,0 +1,3 @@ +title: $:/SiteSubtitle + +Tradução em Português do Brasil \ No newline at end of file diff --git a/languages/pt-BR/SiteTitle.tid b/languages/pt-BR/SiteTitle.tid new file mode 100644 index 000000000..7cb2a1d43 --- /dev/null +++ b/languages/pt-BR/SiteTitle.tid @@ -0,0 +1,3 @@ +title: $:/SiteTitle + +~TiddlyWiki 5 - Brasil \ No newline at end of file diff --git a/languages/pt-BR/Snippets/ListByTag.tid b/languages/pt-BR/Snippets/ListByTag.tid new file mode 100644 index 000000000..2c72afb31 --- /dev/null +++ b/languages/pt-BR/Snippets/ListByTag.tid @@ -0,0 +1,5 @@ +title: $:/language/Snippets/ListByTag +tags: $:/tags/TextEditor/Snippet +caption: Lista de tiddlers por assunto + +<<list-links "[tag[task]sort[title]]">> diff --git a/languages/pt-BR/Snippets/MacroDefinition.tid b/languages/pt-BR/Snippets/MacroDefinition.tid new file mode 100644 index 000000000..0be62b5b6 --- /dev/null +++ b/languages/pt-BR/Snippets/MacroDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/MacroDefinition +tags: $:/tags/TextEditor/Snippet +caption: Definição de Macro + +\define macroName(param1:"default value",param2) +Texto da macro +\end diff --git a/languages/pt-BR/Snippets/Table4x3.tid b/languages/pt-BR/Snippets/Table4x3.tid new file mode 100644 index 000000000..74a351694 --- /dev/null +++ b/languages/pt-BR/Snippets/Table4x3.tid @@ -0,0 +1,8 @@ +title: $:/language/Snippets/Table4x3 +tags: $:/tags/TextEditor/Snippet +caption: Tabela com 4 colunas por 3 linhas + +|! |!Alfa |!Beta |!Gama |!Delta | +|!Um| | | | | +|!Dois| | | | | +|!Três | | | | | diff --git a/languages/pt-BR/Snippets/TableOfContents.tid b/languages/pt-BR/Snippets/TableOfContents.tid new file mode 100644 index 000000000..3d47a9fe0 --- /dev/null +++ b/languages/pt-BR/Snippets/TableOfContents.tid @@ -0,0 +1,9 @@ +title: $:/language/Snippets/TableOfContents +tags: $:/tags/TextEditor/Snippet +caption: Lista de Assuntos + +<div class="tc-table-of-contents"> + +<<toc-selective-expandable 'TableOfContents'>> + +</div> \ No newline at end of file diff --git a/languages/pt-BR/ThemeTweaks.multids b/languages/pt-BR/ThemeTweaks.multids new file mode 100644 index 000000000..b24695a53 --- /dev/null +++ b/languages/pt-BR/ThemeTweaks.multids @@ -0,0 +1,41 @@ +title: $:/language/ThemeTweaks/ + +Metrics: Dimensões +Metrics/BodyFontSize: Tamanho da fonte no corpo do tiddler +Metrics/BodyLineHeight: Espaçamento entre linha no corpo do tiddler +Metrics/FontSize: Tamanho de fonte +Metrics/LineHeight: Altura de linha +Metrics/SidebarBreakpoint: Ponto de quebra da barra de menu +Metrics/SidebarBreakpoint/Hint: Largura mínima da página exibindo o frame de<br>tiddlers e a barra de menu lado-a-lado +Metrics/SidebarWidth: Largura da barra de menu +Metrics/SidebarWidth/Hint: Largura da barra de menu no esquema fluido-fixo +Metrics/StoryLeft: Margem à esquerda do frame de tiddlers +Metrics/StoryLeft/Hint: Distancia a que a margem esquerda do frame de tiddlers<br>(área dos tiddlers) está da esquerda da página +Metrics/StoryRight: Rolo à direita +Metrics/StoryRight/Hint: distancia da margem esquerda da barra<br>de menu esquerda da página +Metrics/StoryTop: Posição vertical do rolo +Metrics/StoryTop/Hint: distancia da margem superior do<br>frame ao topo da página +Metrics/StoryWidth: Largura do rol +Metrics/StoryWidth/Hint: largura total do frame de tiddlers +Metrics/TiddlerWidth: Largura dos tiddlers +Metrics/TiddlerWidth/Hint: largura do frame de tiddlers +Options: Comportamento da página +Options/CodeWrapping: Dividir linhas longas em blocos de código +Options/SidebarLayout: Comportamento da Página e Menu +Options/SidebarLayout/Fixed-Fluid: Página fixa, Menu fluido +Options/SidebarLayout/Fluid-Fixed: Página fluida, Menu fixo +Options/StickyTitles: Títulos persistentes +Options/StickyTitles/Hint: Torna as barras de título dos tiddlers sempre visíveis, como se ficassem coladas no topo da janela do navegador. Atenção, não funciona de todo com o Chrome, e pode causar problemas de apresentação no Firefox +Settings: Configurações de conteúdo +Settings/BackgroundImage: Imagem do plano de fundo +Settings/BackgroundImageAttachment: Comportamento do plano de fundo +Settings/BackgroundImageAttachment/Fixed: Fixar em relação à janela +Settings/BackgroundImageAttachment/Scroll: Rolar com tiddlers +Settings/BackgroundImageSize: Tamanho da imagem de fundo +Settings/BackgroundImageSize/Auto: Repetir +Settings/BackgroundImageSize/Contain: Estender +Settings/BackgroundImageSize/Cover: Completar +Settings/CodeFontFamily: Família da fonte de código +Settings/FontFamily: Família da fonte +ThemeTweaks: Personalizar Estilo +ThemeTweaks/Hint: Pode ajustar alguns parâmetros do tema ''Vanilla''. diff --git a/languages/pt-BR/TiddlerInfo.multids b/languages/pt-BR/TiddlerInfo.multids new file mode 100644 index 000000000..beab6563b --- /dev/null +++ b/languages/pt-BR/TiddlerInfo.multids @@ -0,0 +1,21 @@ +title: $:/language/TiddlerInfo/ + +Advanced/Caption: Avançado +Advanced/PluginInfo/Empty/Hint: nenhum +Advanced/PluginInfo/Heading: Detalhes da extensão +Advanced/PluginInfo/Hint: Esta extensão contém os seguintes tiddlers-sombra: +Advanced/ShadowInfo/Heading: Estado da Sombra +Advanced/ShadowInfo/NotShadow/Hint: O tiddler <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> não é um tiddler-sombra +Advanced/ShadowInfo/OverriddenShadow/Hint: Sobrescrito por um tiddler normal +Advanced/ShadowInfo/Shadow/Hint: O tiddler <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> é um tiddler sombra +Advanced/ShadowInfo/Shadow/Source: Está definido na extensão <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link> +Fields/Caption: Campos +List/Caption: Lista +List/Empty: Este tiddler não tem uma lista +Listed/Caption: Listado +Listed/Empty: Este tiddler não está listado por nenhum outro +References/Caption: Referências +References/Empty: Nenhum tiddler tem link associado +Tagging/Caption: Assuntos +Tagging/Empty: Nenhum tiddler do mesmo assunto +Tools/Caption: Opções diff --git a/languages/pt-BR/Types/application%2Fjavascript.tid b/languages/pt-BR/Types/application%2Fjavascript.tid new file mode 100644 index 000000000..888998bfb --- /dev/null +++ b/languages/pt-BR/Types/application%2Fjavascript.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/application/javascript +description: Código JavaScript +name: application/javascript +group: Programador diff --git a/languages/pt-BR/Types/application%2Fjson.tid b/languages/pt-BR/Types/application%2Fjson.tid new file mode 100644 index 000000000..d455a74a6 --- /dev/null +++ b/languages/pt-BR/Types/application%2Fjson.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/application/json +description: Informações JSON +name: application/json +group: Programador diff --git a/languages/pt-BR/Types/application%2Fx-tiddler-dictionary.tid b/languages/pt-BR/Types/application%2Fx-tiddler-dictionary.tid new file mode 100644 index 000000000..c3f07b1f7 --- /dev/null +++ b/languages/pt-BR/Types/application%2Fx-tiddler-dictionary.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/application/x-tiddler-dictionary +description: Dicionário de Informações +name: application/x-tiddler-dictionary +group: Programador diff --git a/languages/pt-BR/Types/image%2Fgif.tid b/languages/pt-BR/Types/image%2Fgif.tid new file mode 100644 index 000000000..2577c3287 --- /dev/null +++ b/languages/pt-BR/Types/image%2Fgif.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/image/gif +description: Imagem GIF +name: image/gif +group: Imagem diff --git a/languages/pt-BR/Types/image%2Fjpeg.tid b/languages/pt-BR/Types/image%2Fjpeg.tid new file mode 100644 index 000000000..fe6b1b877 --- /dev/null +++ b/languages/pt-BR/Types/image%2Fjpeg.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/image/jpeg +description: Imagem JPEG +name: image/jpeg +group: Imagem diff --git a/languages/pt-BR/Types/image%2Fpng.tid b/languages/pt-BR/Types/image%2Fpng.tid new file mode 100644 index 000000000..68956ea08 --- /dev/null +++ b/languages/pt-BR/Types/image%2Fpng.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/image/png +description: Imagem PNG +name: image/png +group: Imagem diff --git a/languages/pt-BR/Types/image%2Fsvg%2Bxml.tid b/languages/pt-BR/Types/image%2Fsvg%2Bxml.tid new file mode 100644 index 000000000..63ae739d5 --- /dev/null +++ b/languages/pt-BR/Types/image%2Fsvg%2Bxml.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/image/svg+xml +description: Imagem SVG (Scalable Vector Graphics) +name: image/svg+xml +group: Imagem diff --git a/languages/pt-BR/Types/image%2Fx-icon.tid b/languages/pt-BR/Types/image%2Fx-icon.tid new file mode 100644 index 000000000..2cbf89338 --- /dev/null +++ b/languages/pt-BR/Types/image%2Fx-icon.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/image/x-icon +description: Ícone em formato de arquivo ICO +name: image/x-icon +group: Imagem diff --git a/languages/pt-BR/Types/text%2Fcss.tid b/languages/pt-BR/Types/text%2Fcss.tid new file mode 100644 index 000000000..dee0ff6a8 --- /dev/null +++ b/languages/pt-BR/Types/text%2Fcss.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/css +description: Folha de estilos estática +name: text/css +group: Programador diff --git a/languages/pt-BR/Types/text%2Fhtml.tid b/languages/pt-BR/Types/text%2Fhtml.tid new file mode 100644 index 000000000..b70d2e029 --- /dev/null +++ b/languages/pt-BR/Types/text%2Fhtml.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/html +description: Notação HTML +name: text/html +group: Texto diff --git a/languages/pt-BR/Types/text%2Fplain.tid b/languages/pt-BR/Types/text%2Fplain.tid new file mode 100644 index 000000000..f8890fcd1 --- /dev/null +++ b/languages/pt-BR/Types/text%2Fplain.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/plain +description: Texto Simples +name: text/plain +group: Texto diff --git a/languages/pt-BR/Types/text%2Fvnd.tiddlywiki.tid b/languages/pt-BR/Types/text%2Fvnd.tiddlywiki.tid new file mode 100644 index 000000000..510953fec --- /dev/null +++ b/languages/pt-BR/Types/text%2Fvnd.tiddlywiki.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/vnd.tiddlywiki +description: TiddlyWiki 5 +name: text/vnd.tiddlywiki +group: Texto diff --git a/languages/pt-BR/Types/text%2Fx-tiddlywiki.tid b/languages/pt-BR/Types/text%2Fx-tiddlywiki.tid new file mode 100644 index 000000000..a543cdd1a --- /dev/null +++ b/languages/pt-BR/Types/text%2Fx-tiddlywiki.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/x-tiddlywiki +description: TiddlyWiki Clássica +name: text/x-tiddlywiki +group: Texto diff --git a/languages/pt-BR/icon.tid b/languages/pt-BR/icon.tid new file mode 100644 index 000000000..28daecd9c --- /dev/null +++ b/languages/pt-BR/icon.tid @@ -0,0 +1,54 @@ +title: $:/languages/pt-BR/icon +type: image/svg+xml + +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + style="fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision" + version="1.1" + id="svg2" + viewBox="0 0 120000 80000" + height="400" + width="600" + xml:space="preserve"><defs + id="defs20" /><g + transform="translate(9999.999,4999.999)" + id="g3355"><rect + x="-9999.999" + y="-4999.999" + width="120000" + height="80000" + id="rect4" + style="fill:#00923f" /><g + id="g3348" + transform="translate(-9999.9989,7000.0016)"><path + style="fill:#f8c300" + id="path6" + d="M 60000.001,-3800.0016 10200,27999.999 60000.001,59800 109800,27999.999 60000.001,-3800.0016 Z" /><circle + style="fill:#28166f" + id="circle8" + r="20956.801" + cy="28000" + cx="59955.602" /><path + style="fill:#ffffff" + id="path10" + d="m 62079.601,32520.399 253.2,639.6 685.2,43.2 -528,439.2 169.2,666 -579.6,-368.4 -580.8,368.4 170.4,-666 -529.2,-439.2 685.2,-43.2 254.4,-639.6 z m 15667.201,2236.8 216,544.8 584.4,37.2 -451.2,374.4 145.2,566.4 -494.4,-313.2 -495.6,313.2 145.2,-566.4 -450,-374.4 584.4,-37.2 216,-544.8 z m -2242.8,1736.4 254.4,638.4 685.2,44.4 -529.2,438 170.4,666 -580.8,-367.2 -580.8,367.2 170.4,-666 -529.2,-438 686.4,-44.4 253.2,-638.4 z m -831.6,-2247.6 301.2,757.2 812.4,52.8 -626.4,519.6 201.6,788.4 -688.8,-435.6 -687.6,435.6 201.6,-788.4 -626.4,-519.6 812.4,-52.8 300,-757.2 z m -160.8,3914.4 253.2,638.4 686.4,43.2 -529.2,439.2 170.4,666 -580.8,-368.4 -580.8,368.4 170.4,-666 -529.2,-439.2 685.2,-43.2 254.4,-638.4 z m -1962,1032 216,543.6 584.4,38.4 -450,373.2 145.2,567.6 -495.6,-313.2 -494.4,313.2 145.2,-567.6 -451.2,-373.2 584.4,-38.4 216,-543.6 z m -2017.2,1875.6 254.4,638.4 685.2,44.4 -529.2,438 170.4,666 -580.8,-368.4 -579.6,368.4 169.2,-666 -528,-438 685.2,-44.4 253.2,-638.4 z m -24,2347.2 216,544.8 584.4,37.2 -450,374.4 145.2,567.6 -495.6,-313.2 -494.4,313.2 145.2,-567.6 -451.2,-374.4 584.4,-37.2 216,-544.8 z m -32.4,-4243.2 216,543.6 584.4,37.2 -451.2,374.4 145.2,567.6 -494.4,-313.2 -495.6,313.2 145.2,-567.6 -451.2,-374.4 585.6,-37.2 216,-543.6 z m -2472,486 217.2,544.8 584.4,37.2 -451.2,374.4 145.2,567.6 -495.6,-313.2 -494.4,313.2 145.2,-567.6 -451.2,-374.4 584.4,-37.2 216,-544.8 z m -1585.201,-20113.2 301.2,757.2 812.401,51.6 -626.401,519.6 201.6,788.4 -688.8,-435.6 -687.6,435.6 201.6,-788.4 -626.4,-519.6 812.4,-51.6 300,-757.2 z m -331.2,22032 253.2,639.6 686.4,43.2 -529.2,439.2 170.4,664.8 -580.8,-367.2 -580.8,367.2 170.4,-664.8 -529.2,-439.2 685.2,-43.2 254.4,-639.6 z m -1166.4,-15662.4 217.2,543.6 584.4,38.4 -451.2,373.2 145.2,567.6 -495.6,-313.2 -494.4,313.2 145.2,-567.6 -451.2,-373.2 584.4,-38.4 216,-543.6 z m -555.6,13215.6 216,544.8 584.4,37.2 -450,373.2 145.2,567.6 -495.6,-313.2 -494.4,313.2 145.2,-567.6 -451.2,-373.2 584.4,-37.2 216,-544.8 z m -4207.2,-8406 253.2,638.4 686.4,44.4 -529.2,438 170.4,666 -580.8,-367.2 -580.8,367.2 170.4,-666 -529.2,-438 685.2,-44.4 254.4,-638.4 z m -122.4,5944.8 300,757.2 813.6,51.6 -627.6,519.6 201.6,789.6 -687.6,-435.6 -687.6,435.6 201.6,-789.6 -627.6,-519.6 813.6,-51.6 300,-757.2 z m 68.4,7580.4 115.2,290.4 312,20.4 -240,199.2 76.8,303.6 -264,-168 -264,168 76.8,-303.6 -240,-199.2 312,-20.4 115.2,-290.4 z m -1323.6,-10018.8 162,408 436.8,27.6 -337.2,279.6 109.2,424.8 -370.8,-235.2 -369.6,235.2 108,-424.8 -337.2,-279.6 438,-27.6 160.8,-408 z m -1531.2,-1323.6 216,544.8 584.4,37.2 -451.2,373.2 145.2,567.6 -494.4,-313.2 -495.6,313.2 145.2,-567.6 -451.2,-373.2 585.6,-37.2 216,-544.8 z m -5443.2,-5004 253.2,639.6 685.2,43.2 -528,439.2 169.2,666 -579.6,-368.4 -580.8,368.4 170.4,-666 -529.2,-439.2 685.2,-43.2 254.4,-639.6 z m -613.2,10585.2 300,757.2 813.6,52.8 -627.6,519.6 201.6,788.4 -687.6,-435.6 -688.8,435.6 202.8,-788.4 -627.6,-519.6 812.4,-52.8 301.2,-757.2 z m -2301.6,-4178.4 254.4,638.4 685.2,44.4 -529.2,438 170.4,666 -580.8,-368.4 -579.6,368.4 169.2,-666 -528,-438 685.2,-44.4 253.2,-638.4 z m -758.4,2354.4 216,544.8 584.4,37.2 -451.2,373.2 145.2,567.6 -494.4,-313.2 -495.6,313.2 145.2,-567.6 -451.2,-373.2 584.4,-37.2 217.2,-544.8 z m -1563.6,-5355.6 162,406.8 436.8,28.8 -337.2,279.6 109.2,423.6 -370.8,-234 -369.6,234 108,-423.6 -337.2,-279.6 438,-28.8 160.8,-406.8 z m -1923.6,844.8 300,757.2 813.6,51.6 -627.6,519.6 201.6,789.6 -687.6,-435.6 -687.6,435.6 201.6,-789.6 -627.6,-519.6 813.6,-51.6 300,-757.2 z m -1726.8,-8719.2 301.2,757.2 812.4,51.6 -626.4,519.6 201.6,789.6 -688.8,-435.6 -687.6,435.6 201.6,-789.6 -626.4,-519.6 812.4,-51.6 300,-757.2 z m -472.8,10711.2 254.4,639.6 685.2,43.2 -529.2,439.2 170.4,664.8 -580.8,-367.2 -580.8,367.2 170.4,-664.8 -529.2,-439.2 686.4,-43.2 253.2,-639.6 z" /><path + style="fill:#ffffff" + id="path12" + d="m 47444.401,21525.999 c 12465.6,0 23893.201,4585.2 32685.601,12152.4 290.4,-1020 505.2,-2071.2 638.4,-3146.4 -9116.4,-7394.4 -20718.001,-11834.4 -33324.001,-11834.4 -2185.2,0 -4340.4,136.8 -6458.4,396 -452.4,966 -834,1970.4 -1137.6,3008.4 2478,-379.2 5014.8,-576 7596,-576 z" /><path + style="fill:#00923f" + id="path14" + d="m 42052.801,20437.599 c 16.8,205.2 76.8,360 177.6,465.6 100.8,105.6 232.8,151.2 397.2,138 164.4,-14.4 289.2,-81.6 370.8,-204 82.8,-121.2 114,-284.4 97.2,-489.6 -18,-205.2 -78,-360 -178.8,-465.6 -102,-105.6 -235.2,-151.2 -400.8,-136.8 -164.4,13.2 -286.8,81.6 -368.4,202.8 -80.4,120 -112.8,283.2 -94.8,489.6 z m -391.2,33.6 c -26.4,-301.2 36,-547.2 184.8,-738 148.8,-190.8 362.4,-297.6 640.8,-321.6 278.4,-24 507.6,45.6 687.6,207.6 180,163.2 283.2,394.8 308.4,694.8 26.4,301.2 -36,547.2 -186,738 -148.8,190.8 -363.6,298.8 -640.8,322.8 -279.6,24 -507.6,-45.6 -687.6,-208.8 -178.8,-163.2 -282,-394.8 -307.2,-694.8 z m 3043.2,-348 452.4,-15.6 c 98.4,-3.6 169.2,-25.2 214.8,-67.2 44.4,-40.8 64.8,-104.4 62.4,-189.6 -2.4,-81.6 -27.6,-142.8 -73.2,-182.4 -46.8,-40.8 -114,-60 -202.8,-56.4 l -470.4,15.6 16.8,495.6 z m -349.2,1064.4 -62.4,-1869.6 907.2,-30 c 202.8,-7.2 355.2,31.2 456,115.2 102,84 154.8,216 160.8,394.8 3.6,114 -16.8,210 -62.4,288 -44.4,78 -111.6,132 -200.4,163.2 81.6,26.4 141.6,68.4 177.6,126 36,58.8 58.8,150 68.4,274.8 l 15.6,220.8 c 0,1.2 0,3.6 0,7.2 6,111.6 32.4,178.8 79.2,200.4 l 1.2,57.6 -421.2,14.4 c -14.4,-26.4 -25.2,-57.6 -33.6,-96 -8.4,-38.4 -15.6,-84 -18,-138 l -12,-196.8 c -8.4,-115.2 -32.4,-193.2 -73.2,-231.6 -40.8,-39.6 -112.8,-57.6 -214.8,-54 l -408,13.2 25.2,727.2 -385.2,13.2 z m 2760,-420 308.4,6 c 178.8,3.6 309.6,-40.8 391.2,-133.2 81.6,-91.2 124.8,-243.6 128.4,-452.4 3.6,-210 -30,-363.6 -103.2,-463.2 -73.2,-99.6 -188.4,-151.2 -346.8,-153.6 l -355.2,-7.2 -22.8,1203.6 z m -384,330 36,-1869.6 732,13.2 c 288,6 500.4,87.6 638.4,244.8 138,157.2 204,393.6 198,709.2 -3.6,170.4 -32.4,320.4 -86.4,450 -55.2,129.6 -133.2,232.8 -232.8,310.8 -75.6,57.6 -160.8,98.4 -256.8,122.4 -94.8,24 -228,34.8 -399.6,31.2 l -628.8,-12 z m 2373.6,42 100.8,-1867.2 1357.2,73.2 -18,324 -978,-52.8 -20.4,398.4 892.8,48 -16.8,319.2 -894,-48 -25.2,480 1022.4,55.2 -18,345.6 -1402.8,-75.6 z m 2202,130.8 198,-1860 566.4,60 218.4,1455.6 516,-1376.4 567.6,60 -198,1860 -358.8,-38.4 159.6,-1500 -537.6,1460.4 -391.2,-42 -222,-1540.8 -160.8,1500 -357.6,-38.4 z m 4956,638.4 391.2,-1828.8 1328.4,284.4 -68.4,318 -956.4,-205.2 -84,390 876,187.2 -67.2,313.2 -876,-188.4 -100.8,470.4 1002,214.8 -72,338.4 -1372.8,-294 z m 4950,115.2 360,97.2 c 97.2,25.2 172.8,24 228,-4.8 55.2,-30 96,-90 120,-182.4 24,-85.2 19.2,-156 -12,-212.4 -31.2,-55.2 -90,-94.8 -176.4,-117.6 l -378,-102 -141.6,522 z m -90,326.4 -172.8,642 -372,-99.6 486,-1806 804,216 c 189.6,51.6 319.2,140.4 391.2,264 70.8,124.8 80.4,283.2 28.8,474 -49.2,186 -135.6,316.8 -259.2,391.2 -122.4,75.6 -273.6,88.8 -450,42 l -456,-123.6 z m 2248.8,294 432,133.2 c 93.6,28.8 169.2,31.2 224.4,6 56.4,-24 96,-78 121.2,-159.6 24,-76.8 20.4,-142.8 -9.6,-195.6 -30,-54 -88.8,-93.6 -172.8,-120 l -450,-138 -145.2,474 z m -676.8,892.8 548.4,-1788 867.6,266.4 c 194.4,60 326.4,146.4 394.8,258 68.4,112.8 75.6,254.4 22.8,426 -33.6,109.2 -84,193.2 -152.4,252 -68.4,58.8 -148.8,88.8 -242.4,88.8 68.4,51.6 111.6,110.4 127.2,177.6 14.4,67.2 6,160.8 -25.2,282 l -57.6,213.6 c 0,1.2 -1.2,3.6 -2.4,7.2 -30,106.8 -27.6,178.8 9.6,214.8 l -16.8,55.2 -403.2,-124.8 c -4.8,-28.8 -6,-62.4 -1.2,-102 4.8,-38.4 13.2,-84 27.6,-135.6 l 52.8,-189.6 c 30,-111.6 32.4,-193.2 7.2,-242.4 -26.4,-50.4 -87.6,-91.2 -186,-121.2 l -390,-120 -213.6,694.8 -367.2,-112.8 z m 2847.6,-6 c -70.8,193.2 -81.6,358.8 -34.8,498 45.6,138 146.4,235.2 301.2,291.6 156,56.4 296.4,48 422.4,-27.6 126,-75.6 224.4,-210 295.2,-403.2 69.6,-193.2 81.6,-358.8 34.8,-496.8 -48,-139.2 -150,-237.6 -306,-294 -153.6,-56.4 -294,-46.8 -418.8,27.6 -124.8,75.6 -223.2,210 -294,404.4 z m -368.4,-135.6 c 104.4,-283.2 264,-480 478.8,-590.4 216,-109.2 454.8,-116.4 717.6,-20.4 261.6,96 440.4,255.6 535.2,478.8 94.8,224.4 90,477.6 -14.4,760.8 -103.2,283.2 -262.8,480 -480,589.2 -216,110.4 -456,117.6 -717.6,21.6 -262.8,-96 -440.4,-255.6 -534,-478.8 -93.6,-223.2 -88.8,-477.6 14.4,-760.8 z m 3460.801,2197.2 c -100.8,58.8 -200.4,91.2 -300,97.2 -98.4,6 -202.8,-14.4 -312,-61.2 -240,-103.2 -399.6,-268.8 -477.6,-499.2 -78,-231.6 -58.8,-482.4 56.4,-753.6 117.6,-274.8 285.6,-462 504,-562.8 218.4,-102 452.4,-99.6 699.6,6 216,92.4 369.6,218.4 462,380.4 92.4,160.8 112.8,337.2 61.2,529.2 l -361.2,-153.6 c 16.8,-98.4 1.2,-186 -46.8,-261.6 -46.8,-75.6 -124.8,-135.6 -232.8,-182.4 -144,-61.2 -279.6,-56.4 -406.8,14.4 -127.2,69.6 -230.4,198 -309.6,384 -80.4,187.2 -99.6,351.6 -58.8,494.4 40.8,142.8 135.6,246 284.4,309.6 112.8,46.8 220.8,54 324,20.4 104.4,-34.8 189.6,-105.6 256.8,-212.4 l -390,-166.8 124.8,-294 712.8,303.6 -397.2,931.2 -236.4,-100.8 43.2,-222 z m 1778.4,-49.2 405.6,199.2 c 88.8,43.2 162,56.4 220.8,40.8 58.8,-15.6 106.8,-61.2 145.2,-139.2 34.8,-72 42,-136.8 20.4,-194.4 -21.6,-57.6 -73.2,-105.6 -152.4,-145.2 l -422.4,-206.4 -217.2,445.2 z m -808.8,775.2 822,-1678.8 814.8,398.4 c 183.6,90 300,195.6 349.2,316.8 50.4,121.2 36,262.8 -43.2,423.6 -50.4,103.2 -114,177.6 -189.6,225.6 -76.8,46.8 -162,63.6 -254.4,49.2 60,62.4 92.4,126 98.4,195.6 3.6,68.4 -19.2,159.6 -69.6,273.6 l -90,202.8 c 0,1.2 -1.2,3.6 -3.6,6 -46.8,100.8 -55.2,172.8 -24,214.8 l -25.2,50.4 -379.2,-184.8 c 0,-30 4.8,-63.6 15.6,-100.8 10.8,-38.4 26.4,-81.6 49.2,-129.6 l 81.6,-178.8 c 46.8,-105.6 61.2,-186 44.4,-240 -18,-54 -73.2,-103.2 -164.4,-147.6 l -366,-180 -320.4,652.8 -345.6,-169.2 z m 2090.4,1074 909.6,-1634.4 1186.8,660 -158.4,284.4 -855.6,-476.4 -193.2,349.2 782.4,434.4 -156,279.6 -782.4,-434.4 -234,420 896.4,498 -168,302.4 -1227.6,-682.8 z m 2110.8,579.6 325.2,195.6 c -40.8,94.8 -44.4,182.4 -10.8,260.4 33.6,78 106.8,151.2 219.6,218.4 96,58.8 177.6,85.2 247.2,79.2 69.6,-3.6 123.6,-39.6 164.4,-106.8 57.6,-97.2 -33.6,-261.6 -273.6,-493.2 -3.6,-3.6 -6,-6 -8.4,-8.4 -6,-6 -15.6,-15.6 -28.8,-27.6 -130.8,-123.6 -214.8,-224.4 -253.2,-303.6 -36,-69.6 -49.2,-145.2 -42,-224.4 7.2,-79.2 36,-159.6 86.4,-243.6 93.6,-156 218.4,-242.4 374.4,-262.8 156,-18 334.8,32.4 534,152.4 187.2,112.8 307.2,246 358.8,397.2 52.8,152.4 32.4,310.8 -57.6,475.2 l -316.8,-190.8 c 40.8,-81.6 46.8,-158.4 16.8,-230.4 -28.8,-73.2 -93.6,-140.4 -192,-199.2 -86.4,-52.8 -163.2,-75.6 -230.4,-70.8 -67.2,6 -118.8,39.6 -157.2,102 -51.6,85.2 2.4,202.8 158.4,355.2 42,40.8 75.6,73.2 98.4,96 99.6,100.8 168,174 207.6,219.6 38.4,46.8 69.6,90 93.6,133.2 43.2,75.6 63.6,152.4 60,231.6 -3.6,80.4 -30,162 -80.4,244.8 -100.8,166.8 -234,261.6 -402,285.6 -168,24 -354,-25.2 -558,-148.8 -201.6,-121.2 -332.4,-262.8 -390,-426 -57.6,-162 -39.6,-332.4 56.4,-510 z m 1970.4,1232.4 314.4,213.6 c -45.6,92.4 -52.8,178.8 -22.8,259.2 28.8,79.2 98.4,156 207.6,229.2 92.4,62.4 172.8,93.6 242.4,92.4 69.6,-1.2 126,-33.6 169.2,-98.4 63.6,-94.8 -19.2,-262.8 -247.2,-507.6 -2.4,-2.4 -6,-6 -7.2,-8.4 -7.2,-6 -15.6,-15.6 -27.6,-30 -123.6,-129.6 -202.8,-234 -237.6,-315.6 -31.2,-70.8 -40.8,-147.6 -30,-225.6 12,-79.2 44.4,-158.4 99.6,-238.8 102,-151.2 231.6,-231.6 387.6,-242.4 157.2,-10.8 332.4,49.2 525.6,180 181.2,122.4 292.8,260.4 337.2,415.2 44.4,154.8 16.8,310.8 -82.8,470.4 l -307.2,-206.4 c 45.6,-79.2 55.2,-156 30,-230.4 -25.2,-74.4 -86.4,-144 -181.2,-208.8 -84,-56.4 -159.6,-84 -226.8,-81.6 -67.2,2.4 -121.2,33.6 -162,93.6 -55.2,81.6 -8.4,202.8 139.2,362.4 40.8,43.2 72,78 93.6,102 93.6,104.4 158.4,182.4 195.6,229.2 36,48 64.8,94.8 86.4,138 39.6,78 55.2,156 48,235.2 -7.2,79.2 -38.4,159.6 -93.6,240 -108,160.8 -247.2,249.6 -416.4,264 -169.2,15.6 -351.6,-43.2 -549.6,-177.6 -194.4,-132 -316.8,-280.8 -366,-445.2 -50.4,-165.6 -22.8,-334.8 81.6,-507.6 z m 2377.2,1261.2 c -124.8,164.4 -184.8,320.4 -180,465.6 3.6,146.4 72,268.8 202.8,368.4 132,99.6 270,132 412.8,97.2 141.6,-34.8 274.8,-135.6 399.6,-300 123.6,-163.2 183.6,-319.2 178.8,-465.6 -6,-146.4 -74.4,-270 -206.4,-369.6 -130.8,-99.6 -267.6,-130.8 -409.2,-94.8 -141.6,34.8 -274.8,134.4 -398.4,298.8 z m -313.2,-236.4 c 182.4,-240 392.4,-381.6 630,-424.8 238.8,-42 469.2,21.6 692.4,189.6 223.2,169.2 346.8,373.2 372,615.6 24,241.2 -54,482.4 -235.2,722.4 -182.4,241.2 -393.6,382.8 -632.4,423.6 -238.8,42 -470.4,-20.4 -692.4,-188.4 -223.2,-169.2 -346.8,-374.4 -370.8,-615.6 -24,-240 54,-481.2 236.4,-722.4 z" /></g></g><metadata + id="metadata16"><rdf:RDF><cc:Work + rdf:about=""><dc:title></dc:title><dc:description /><dc:subject><rdf:Bag /></dc:subject><dc:publisher><cc:Agent + rdf:about="http://www.openclipart.org"><dc:title /></cc:Agent></dc:publisher><dc:date /><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><cc:license + rdf:resource=""><dc:date /></cc:license><dc:language /></cc:Work><cc:License + rdf:about="http://web.resource.org/cc/PublicDomain"><cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /><cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /></cc:License></rdf:RDF></metadata></svg> \ No newline at end of file diff --git a/languages/pt-BR/plugin.info b/languages/pt-BR/plugin.info new file mode 100644 index 000000000..f6b33ad14 --- /dev/null +++ b/languages/pt-BR/plugin.info @@ -0,0 +1,8 @@ +{ + "title": "$:/languages/pt-BR", + "name": "pt-BR", + "plugin-type": "language", + "description": "Português (Brasil)", + "author": "Mauricio Lucas", + "core-version": ">=5.1.14" +} diff --git a/languages/pt-PT/Buttons.multids b/languages/pt-PT/Buttons.multids index 764196ab1..44fb59913 100644 --- a/languages/pt-PT/Buttons.multids +++ b/languages/pt-PT/Buttons.multids @@ -92,6 +92,8 @@ ListBullet/Caption: Lista com marcadores ListBullet/Hint: Aplicar formatação de lista com marcadores às linhas contendo selecção ListNumber/Caption: lista numerada ListNumber/Hint: Aplicar formatação de lista numerada às linhas contendo selecção +Manager/Caption: Gestor de tiddlers +Manager/Hint: Abrir gestor de tiddlers MonoBlock/Caption: bloco mono-espaçado MonoBlock/Hint: Aplicar formatação de bloco mono-espaçado às linhas contendo selecção MonoLine/Caption: mono-espaçado @@ -128,6 +130,8 @@ Preview/Caption: pré-visualizar Preview/Hint: Mostrar o painel de pré-visualização PreviewType/Caption: tipo de pré-visualização PreviewType/Hint: Escolher o tipo de pré-visualização +Print/Caption: imprimir página +Print/Hint: Imprimir página atual Quote/Caption: citação Quote/Hint: Aplicar formatação de citação às linhas contendo selecção Refresh/Caption: actualizar @@ -160,6 +164,12 @@ TagManager/Caption: gestor de etiquetas TagManager/Hint: Abrir o gestor de etiquetas Theme/Caption: tema Theme/Hint: Escolher o tema de exibição +Timestamp/Caption: marcações de data/hora +Timestamp/Hint: Escolha se as modificações atualizam as marcações de data/hora +Timestamp/Off/Caption: Marcações de data/hora estão desligadas +Timestamp/Off/Hint: Não atualizar as marcações de data/hora quando as tiddlers são modificadas +Timestamp/On/Caption: Marcações de data/hora estão ligadas +Timestamp/On/Hint: Atualizar as marcações de data/hora quando as tiddlers são modificadas Underline/Caption: sublinhar Underline/Hint: Aplicar formatação sublinhada à selecção Unfold/Caption: desdobrar tiddler diff --git a/languages/pt-PT/ControlPanel.multids b/languages/pt-PT/ControlPanel.multids index c7276462f..eb046645d 100644 --- a/languages/pt-PT/ControlPanel.multids +++ b/languages/pt-PT/ControlPanel.multids @@ -53,10 +53,10 @@ Palette/Prompt: Paleta actual: Palette/ShowEditor/Caption: mostrar editor Parsing/Block/Caption: Regras de análise de blocos Parsing/Caption: Análise -Parsing/Hint: Aqui pode desactivar globalmente regras individuais do analisador de wiki. Tenha em atenção que desactivar certas regras de análise pode impedir a ~TiddlyWiki de funcionar correctamente (pode repor o funcionamento normal com o [[modo de segurança|http://tiddlywiki.com/#SafeMode]] ) +Parsing/Hint: Aqui pode desactivar globalmente regras individuais do analisador de wiki. Tenha em atenção que desactivar certas regras de análise pode impedir a ~TiddlyWiki de funcionar correctamente (pode repor o funcionamento normal com o [[modo de segurança|https://tiddlywiki.com/#SafeMode]] ) Parsing/Inline/Caption: Regras de Análise em Linha Parsing/Pragma/Caption: Regras de Análise Pragma -Plugins/Add/Caption: Obter mais extensões +Plugins/Add/Caption: Obter mais extensões Plugins/Add/Hint: Instalar extensões da biblioteca de extensões oficial Plugins/AlreadyInstalled/Hint: Esta extensão já se encontra instalada com a versão<$text text=<<installedVersion>>/> Plugins/Caption: Extensões @@ -72,7 +72,6 @@ Plugins/Language/Prompt: Linguagens Plugins/Languages/Caption: Linguagens Plugins/Languages/Hint: Extensões de pacotes de idiomas Plugins/NoInfoFound/Hint: ''"<$text text=<<currentTab>>/>"'' não encontrado -Plugins/NoInformation/Hint: Nenhuma informação fornecida Plugins/NotInstalled/Hint: Esta extensão não está actualmente instalada Plugins/OpenPluginLibrary: abrir biblioteca de extensões Plugins/Plugin/Prompt: Extensões @@ -109,6 +108,10 @@ Settings/EditorToolbar/Caption: Barra de Ferramentas do Editor Settings/EditorToolbar/Description: Mostrar barra de ferramentas do editor Settings/EditorToolbar/Hint: Activar ou desactivar a barra de ferramentas do editor Settings/Hint: Estas definições permitem personalizar o comportamento da TiddlyWiki. +Settings/InfoPanelMode/Caption: Modo painel de informação da tiddler +Settings/InfoPanelMode/Hint: Controle quando o painel de informação da tiddler fecha: +Settings/InfoPanelMode/Popup/Description: Painel de informação da tiddler fecha automaticamente +Settings/InfoPanelMode/Sticky/Description: Painel de informação da tiddler fica aberto até ser fechado Settings/LinkToBehaviour/Caption: Comportamento de Abertura de Tiddlers Settings/LinkToBehaviour/InsideRiver/Hint: Navegação do //interior// do rol de tiddlers Settings/LinkToBehaviour/OpenAbove: Abrir acima do tiddler actual @@ -128,8 +131,8 @@ Settings/NavigationHistory/Caption: Histórico de Navegação Settings/NavigationHistory/Hint: Actualizar o histórico do navegador quando navegar para um tiddler Settings/NavigationHistory/No/Description: Não actualizar o histórico Settings/NavigationHistory/Yes/Description: Actualizar o histórico -Settings/PerformanceInstrumentation/Caption: Instrumentação de Performance -Settings/PerformanceInstrumentation/Description: Activar instrumentação de performance +Settings/PerformanceInstrumentation/Caption: Instrumentação de Performance +Settings/PerformanceInstrumentation/Description: Activar instrumentação de performance Settings/PerformanceInstrumentation/Hint: Exibe estatísticas de performance na consola de desenvolvimento do navegador. Requer recarregamento para que tome efeito Settings/TitleLinks/Caption: Títulos dos Tiddlers Settings/TitleLinks/Hint: Exibir opcionalmente títulos dos tiddlers como ligações diff --git a/languages/pt-PT/CoreReadMe.tid b/languages/pt-PT/CoreReadMe.tid index 93f5d5684..c5f869bf0 100644 --- a/languages/pt-PT/CoreReadMe.tid +++ b/languages/pt-PT/CoreReadMe.tid @@ -1,6 +1,6 @@ title: $:/core/readme -Esta extensão contém os componentes principais da TiddlyWiki compostos por: +Esta extensão contém os componentes principais da TiddlyWiki, compostos por: * Módulos de código JavaScript * Ícones diff --git a/languages/pt-PT/Dates.multids b/languages/pt-PT/Dates.multids index 1a0ca5f1c..340d7818e 100644 --- a/languages/pt-PT/Dates.multids +++ b/languages/pt-PT/Dates.multids @@ -1,36 +1,36 @@ title: $:/language/ -Date/DaySuffix/1: º -Date/DaySuffix/10: º -Date/DaySuffix/11: º -Date/DaySuffix/12: º -Date/DaySuffix/13: º -Date/DaySuffix/14: º -Date/DaySuffix/15: º -Date/DaySuffix/16: º -Date/DaySuffix/17: º -Date/DaySuffix/18: º -Date/DaySuffix/19: º -Date/DaySuffix/2: º -Date/DaySuffix/20: º -Date/DaySuffix/21: º -Date/DaySuffix/22: º -Date/DaySuffix/23: º -Date/DaySuffix/24: º -Date/DaySuffix/25: º -Date/DaySuffix/26: º -Date/DaySuffix/27: º -Date/DaySuffix/28: º -Date/DaySuffix/29: º -Date/DaySuffix/3: º -Date/DaySuffix/30: º -Date/DaySuffix/31: º -Date/DaySuffix/4: º -Date/DaySuffix/5: º -Date/DaySuffix/6: º -Date/DaySuffix/7: º -Date/DaySuffix/8: º -Date/DaySuffix/9: º +Date/DaySuffix/1: +Date/DaySuffix/10: +Date/DaySuffix/11: +Date/DaySuffix/12: +Date/DaySuffix/13: +Date/DaySuffix/14: +Date/DaySuffix/15: +Date/DaySuffix/16: +Date/DaySuffix/17: +Date/DaySuffix/18: +Date/DaySuffix/19: +Date/DaySuffix/2: +Date/DaySuffix/20: +Date/DaySuffix/21: +Date/DaySuffix/22: +Date/DaySuffix/23: +Date/DaySuffix/24: +Date/DaySuffix/25: +Date/DaySuffix/26: +Date/DaySuffix/27: +Date/DaySuffix/28: +Date/DaySuffix/29: +Date/DaySuffix/3: +Date/DaySuffix/30: +Date/DaySuffix/31: +Date/DaySuffix/4: +Date/DaySuffix/5: +Date/DaySuffix/6: +Date/DaySuffix/7: +Date/DaySuffix/8: +Date/DaySuffix/9: Date/Long/Day/0: Domingo Date/Long/Day/1: Segunda Date/Long/Day/2: Terça diff --git a/languages/pt-PT/Docs/ModuleTypes.multids b/languages/pt-PT/Docs/ModuleTypes.multids index b707c2e23..8a2209c32 100644 --- a/languages/pt-PT/Docs/ModuleTypes.multids +++ b/languages/pt-PT/Docs/ModuleTypes.multids @@ -1,16 +1,20 @@ title: $:/language/Docs/ModuleTypes/ +allfilteroperator: Um sub-operador para o operador de filtro "All". animation: Animações que podem ser utilizadas com a RevealWidget. command: Comandos que podem ser executados no Node.js. config: Informação a ser inserida em `$tw.config`. filteroperator: Métodos de filtragem individuais. global: Informação global a ser inserida em `$tw`. +info: Publica a informação do sistema através da [[$:/temp/info-plugin]] pseudo-extensão. isfilteroperator: Operandos para o operador de filtragem ''is''. +library: Tipo de módulo genérico para módulos de JavaScript de usos gerais. macro: Definições de macros JavaScript. parser: Interpretadores para diferentes tipos de conteúdo. saver: Os savers controlam diferentes métodos para guardar ficheiros a partir do navegador. startup: Funções de arranque. storyview: As story views personalizam as animações e comportamento das ferramentas de listagem. +texteditoroperation: Uma operação da barra de edição de texto. tiddlerdeserializer: Converte diferentes tipos de conteúdo em tiddlers. tiddlerfield: Define o comportamento individual de um campo de tiddler. tiddlermethod: Adiciona um método ao protótipo `$tw.Tiddler`. diff --git a/languages/pt-PT/Filters.multids b/languages/pt-PT/Filters.multids index af2624ab0..36e0d1cf1 100644 --- a/languages/pt-PT/Filters.multids +++ b/languages/pt-PT/Filters.multids @@ -11,3 +11,4 @@ RecentTiddlers: Tiddlers modificados recentemente ShadowTiddlers: Tiddlers-sombra SystemTags: Etiquetas de sistema SystemTiddlers: Tiddlers de sistema +TypedTiddlers: Tiddlers sem texto wiki diff --git a/languages/pt-PT/GettingStarted.tid b/languages/pt-PT/GettingStarted.tid index c139418c1..98f91f2ae 100644 --- a/languages/pt-PT/GettingStarted.tid +++ b/languages/pt-PT/GettingStarted.tid @@ -3,7 +3,7 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ Bem vindo à ~TiddlyWiki e à comunidade ~TiddlyWiki -Antes de começar a armazenar informação importante na ~TiddlyWiki é importante certificar-se que consegue gravar alterações de forma fiável. Para mais detalhes veja http://tiddlywiki.com/#GettingStarted +Antes de começar a armazenar informação importante na ~TiddlyWiki é importante certificar-se que consegue gravar alterações de forma fiável. Para mais detalhes veja https://tiddlywiki.com/#GettingStarted !! Configurar esta ~TiddlyWiki diff --git a/languages/pt-PT/Misc.multids b/languages/pt-PT/Misc.multids index 5a0067cda..d0730b5a1 100644 --- a/languages/pt-PT/Misc.multids +++ b/languages/pt-PT/Misc.multids @@ -1,7 +1,8 @@ title: $:/language/ +AboveStory/ClassicPlugin/Warning: Parece que você está a tentar instalar uma extensão desenvolvida para a ~TiddlyWiki Classic. Por favor repare que [[estas extensões não funcionam com a TiddlyWiki versão 5.x.x|https://tiddlywiki.com/#TiddlyWikiClassic]]. Extensões ~TiddlyWiki Classic detectadas: BinaryWarning/Prompt: Este tiddler contém informação binária -ClassicWarning/Hint: Este tiddler está escrito no formato de texto wiki da TiddlyWiki Clássica, que não é totalmente compatível com a TiddlyWiki versão 5. Veja http://tiddlywiki.com/static/Upgrading.html para mais detalhes. +ClassicWarning/Hint: Este tiddler está escrito no formato de texto wiki da TiddlyWiki Clássica, que não é totalmente compatível com a TiddlyWiki versão 5. Veja https://tiddlywiki.com/static/Upgrading.html para mais detalhes. ClassicWarning/Upgrade/Caption: actualizar CloseAll/Button: fechar todos ColourPicker/Recent: Recente: @@ -11,10 +12,11 @@ ConfirmEditShadowTiddler: Está prestes a editar um Tiddler-Sombra. Quaisquer al ConfirmOverwriteTiddler: Pretende substituir o tiddler "<$text text=<<title>>/>"? Count: contagem DefaultNewTiddlerTitle: Novo Tiddler -DropMessage: Largue aqui (ou carregue no escape para cancelar) +DropMessage: Largue aqui (ou carregue no Escape para cancelar) Encryption/Cancel: Cancelar Encryption/ConfirmClearPassword: Pretende remover a palavra-passe? Esta acção removerá a encriptação aplicada quando guardar esta wiki Encryption/Password: Palavra Passe +Encryption/PasswordNoMatch: Palavras Passe não são iguais Encryption/PromptSetPassword: Definir nova palavra passe para esta TiddlyWiki Encryption/RepeatPassword: Repetir palavra passe Encryption/SetPassword: Definir palavra passe @@ -32,19 +34,35 @@ Error/XMLHttpRequest: Código de erro XMLHttpRequest InternalJavaScriptError/Hint: Bem, isto é embaraçoso. Recomenda-se que reinicie a sua TiddlyWiki recarregando o seu navegador InternalJavaScriptError/Title: Erro interno JavaScript InvalidFieldName: Caracteres ilegais no nome do ficheiro "<$text text=<<fieldName>>/>". Os campos apenas podem conter letras minúsculas, dígitos e os caracteres subtraço (`_`), hífen (`-`) e ponto final (`.`) -LazyLoadingWarning: <p>A carregar texto externo de ''<$text text={{!!_canonical_uri}}/>''</p><p>Se esta mensagem não desaparecer pode estar a utilizar um navegador que não suporta texto remoto nesta configuração. Veja http://tiddlywiki.com/#ExternalText</p> +LazyLoadingWarning: <p>A carregar texto externo de ''<$text text={{!!_canonical_uri}}/>''</p><p>Se esta mensagem não desaparecer pode estar a utilizar um navegador que não suporta texto remoto nesta configuração. Veja https://tiddlywiki.com/#ExternalText</p> LoginToTiddlySpace: Entrar em TiddlySpace -MissingTiddler/Hint: Tiddler "<$text text=<<currentTiddler>>/>" em falta - clique {{$:/core/images/edit-button}} para criar +Manager/Controls/FilterByTag/Prompt: Filtrar por etiqueta: +Manager/Controls/Order/Prompt: Ordem inversa +Manager/Controls/Search/Placeholder: Procurar +Manager/Controls/Search/Prompt: Procurar: +Manager/Controls/Show/Option/Tags: etiquetas +Manager/Controls/Show/Prompt: Mostrar: +Manager/Controls/Sort/Prompt: Ordenar por: +Manager/Item/Colour: Cor +Manager/Item/Fields: Campos +Manager/Item/Icon: Ícone +Manager/Item/RawText: Código-fonte +Manager/Item/Tags: Etiquetas +Manager/Item/Tools: Ferramentas +Manager/Item/WikifiedText: Texto formatado +MissingTiddler/Hint: Tiddler "<$text text=<<currentTiddler>>/>" em falta - clique {{||$:/core/ui/Buttons/edit}} para criar No: Não OfficialPluginLibrary: Biblioteca de Extensões Official ~TiddlyWiki OfficialPluginLibrary/Hint: A Biblioteca de Extensões Official ~TiddlyWiki em tiddlywiki.com. Extensões temas e pacotes de idiomas são mantidos pela equipa principal. PluginReloadWarning: Por favor grave {{$:/core/ui/Buttons/save-wiki}} e recarregue {{$:/core/ui/Buttons/refresh}} para que as alterações às extensões tomem efeito -RecentChanges/DateFormat: DD MMM AAAA +RecentChanges/DateFormat: DD de MMM de YYYY SystemTiddler/Tooltip: Este é um tiddler de sistema +SystemTiddlers/Include/Prompt: Incluir tiddlers de sistema TagManager/Colour/Heading: Cor TagManager/Count/Heading: Contagem TagManager/Icon/Heading: Ícone TagManager/Info/Heading: Informação TagManager/Tag/Heading: Etiqueta +Tiddler/DateFormat: DD de MMM de YYYY às hh12:0mmam UnsavedChangesWarning: Têm alterações não guardadas na TiddlyWiki Yes: Sim diff --git a/languages/pt-PT/Modals/Download.tid b/languages/pt-PT/Modals/Download.tid index 541d963fe..6c982ca15 100644 --- a/languages/pt-PT/Modals/Download.tid +++ b/languages/pt-PT/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Download changes footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html O seu navegador apenas suporta gravação manual. diff --git a/languages/pt-PT/Modals/SaveInstructions.tid b/languages/pt-PT/Modals/SaveInstructions.tid index 345d4bad8..253213e53 100644 --- a/languages/pt-PT/Modals/SaveInstructions.tid +++ b/languages/pt-PT/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Save your work footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html As suas alterações a esta wiki necessitam de ser gravadas como um ficheiro HTML ~TiddlyWiki diff --git a/languages/pt-PT/NewJournal.multids b/languages/pt-PT/NewJournal.multids index 9e064a86d..a5badbb3b 100644 --- a/languages/pt-PT/NewJournal.multids +++ b/languages/pt-PT/NewJournal.multids @@ -1,4 +1,4 @@ title: $:/config/NewJournal/ Tags: Diário -Title: DD MMM AAAA +Title: DD de MMM de YYYY diff --git a/languages/pt-PT/Search.multids b/languages/pt-PT/Search.multids index 501c61ba6..dbca8934e 100644 --- a/languages/pt-PT/Search.multids +++ b/languages/pt-PT/Search.multids @@ -2,16 +2,17 @@ title: $:/language/Search/ DefaultResults/Caption: Lista Filter/Caption: Filtro -Filter/Hint: Procurar através de [[expressão de filtros|http://tiddlywiki.com/static/Filters.html]] +Filter/Hint: Procurar através de [[expressão de filtros|https://tiddlywiki.com/static/Filters.html]] Filter/Matches: //<small><<resultCount>> resultados</small>// Matches: //<small><<resultCount>> resultados</small>// Matches/All: Todas as correspondências: Matches/Title: Correspondências em títulos: Search: Pesquisar +Search/TooShort: Texto da procura demasiado pequeno Shadows/Caption: Sombras Shadows/Hint: Procurar tiddlers-sombra Shadows/Matches: //<small><<resultCount>> resultados</small>// -Standard/Caption: Standard +Standard/Caption: Padrão Standard/Hint: Procurar tiddlers normais Standard/Matches: //<small><<resultCount>> resultados</small>// System/Caption: Sistema diff --git a/languages/pt-PT/SideBar.multids b/languages/pt-PT/SideBar.multids index 5c4e9acd7..f00fcf648 100644 --- a/languages/pt-PT/SideBar.multids +++ b/languages/pt-PT/SideBar.multids @@ -5,7 +5,7 @@ Contents/Caption: Conteúdos Drafts/Caption: Rascunhos Missing/Caption: Em Falta More/Caption: Mais -Open/Caption: Abrir +Open/Caption: Abertos Orphans/Caption: Órfãos Recent/Caption: Recentes Shadows/Caption: Sombras diff --git a/languages/ru-RU/GettingStarted.tid b/languages/ru-RU/GettingStarted.tid index f5324a3b1..9d4d42ddc 100644 --- a/languages/ru-RU/GettingStarted.tid +++ b/languages/ru-RU/GettingStarted.tid @@ -3,7 +3,7 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ Добро пожаловать в ~TiddlyWiki, нелинейную личную сетевую записную книжку. -Для начала убедитесь, что у вас работает сохранение - подробные инструкции на http://tiddlywiki.com/. +Для начала убедитесь, что у вас работает сохранение - подробные инструкции на https://tiddlywiki.com/. Затем вы можете: diff --git a/languages/ru-RU/Misc.multids b/languages/ru-RU/Misc.multids index ad026bff8..8e20f633f 100644 --- a/languages/ru-RU/Misc.multids +++ b/languages/ru-RU/Misc.multids @@ -1,7 +1,7 @@ title: $:/language/ BinaryWarning/Prompt: Эта заметка содержит двоичные данные -ClassicWarning/Hint: Эта заметка написана в формате TiddlyWiki Classic WikiText, который не совместим с TiddlyWiki 5. Подробнее: http://tiddlywiki.com/static/Upgrading.html +ClassicWarning/Hint: Эта заметка написана в формате TiddlyWiki Classic WikiText, который не совместим с TiddlyWiki 5. Подробнее: https://tiddlywiki.com/static/Upgrading.html ClassicWarning/Upgrade/Caption: обновление CloseAll/Button: закрыть все ConfirmCancelTiddler: Отменить изменения заметки "<$text text=<<title>>/>"? @@ -20,7 +20,7 @@ Encryption/RepeatPassword: Повторите пароль Encryption/SetPassword: Введите пароль Encryption/Username: Имя пользователя InvalidFieldName: Недопустимые символы в названии поля "<$text text=<<fieldName>>/>". Поля могут содержать только латинские буквы нижнего регистра, цифры и символы: подчеркивание (`_`), дефис (`-`) и точку (`.`) -MissingTiddler/Hint: Заметка "<$text text=<<currentTiddler>>/>" отсутствует - нажмите {{$:/core/images/edit-button}} чтобы её создать +MissingTiddler/Hint: Заметка "<$text text=<<currentTiddler>>/>" отсутствует - нажмите {{||$:/core/ui/Buttons/edit}} чтобы её создать OfficialPluginLibrary: Официальная Библиотека Плагинов ~TiddlyWiki PluginReloadWarning: Пожалуйста, сохраните {{$:/core/ui/Buttons/save-wiki}} и перезапустите {{$:/core/ui/Buttons/refresh}} вики, чтобы изменения в плагинах возымели эффект. RecentChanges/DateFormat: DD MMM YYYY diff --git a/languages/ru-RU/Modals/Download.tid b/languages/ru-RU/Modals/Download.tid index f8c65fdc9..b06a7db30 100644 --- a/languages/ru-RU/Modals/Download.tid +++ b/languages/ru-RU/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Скачать изменения footer: <$button message="tm-close-tiddler">Закрыть</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html Ваш браузер поддерживает только ручное сохранение. diff --git a/languages/ru-RU/Modals/SaveInstructions.tid b/languages/ru-RU/Modals/SaveInstructions.tid index ce1c69d4a..8793c5690 100644 --- a/languages/ru-RU/Modals/SaveInstructions.tid +++ b/languages/ru-RU/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Сохраните свою работу footer: <$button message="tm-close-tiddler">Закрыть</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html Изменения должны быть сохранены в виде HTML файла ~TiddlyWiki. diff --git a/languages/ru-RU/Search.multids b/languages/ru-RU/Search.multids index 934f33456..2809811dd 100644 --- a/languages/ru-RU/Search.multids +++ b/languages/ru-RU/Search.multids @@ -2,7 +2,7 @@ title: $:/language/Search/ DefaultResults/Caption: Список Filter/Caption: Фильтр -Filter/Hint: Поиск с помощью [[фильтров|http://tiddlywiki.com/static/Filters.html]] +Filter/Hint: Поиск с помощью [[фильтров|https://tiddlywiki.com/static/Filters.html]] Filter/Matches: //<small><<resultCount>> совпадений</small>// Matches: //<small><<resultCount>> совпадений</small>// Shadows/Caption: Встроенные diff --git a/languages/sk-SK/CoreReadMe.tid b/languages/sk-SK/CoreReadMe.tid index a81f51336..071d1ea3f 100644 --- a/languages/sk-SK/CoreReadMe.tid +++ b/languages/sk-SK/CoreReadMe.tid @@ -1,4 +1,4 @@ -title: $:/core/readme +title: $:/core/sk-SK/readme Tento plugin obsahuje componenty jadra TiddlyWiki, vrátane: diff --git a/languages/sk-SK/GettingStarted.tid b/languages/sk-SK/GettingStarted.tid index a11c3d143..038d29c4c 100644 --- a/languages/sk-SK/GettingStarted.tid +++ b/languages/sk-SK/GettingStarted.tid @@ -3,7 +3,7 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ Vitajte v ~TiddlyWiki a v ~TiddlyWiki komunite -Skôr ako začnete ~TiddlyWiki plniť dôležitými informáciami, uistite sa, že jeho obsah dokážete uložiť. Viď podrobnosti na http://tiddlywiki.com/#GettingStarted +Skôr ako začnete ~TiddlyWiki plniť dôležitými informáciami, uistite sa, že jeho obsah dokážete uložiť. Viď podrobnosti na https://tiddlywiki.com/#GettingStarted !! Nakonfigurujte si tento ~TiddlyWiki diff --git a/languages/sk-SK/Misc.multids b/languages/sk-SK/Misc.multids index 72cb60254..a59bd2397 100644 --- a/languages/sk-SK/Misc.multids +++ b/languages/sk-SK/Misc.multids @@ -1,7 +1,7 @@ title: $:/language/ BinaryWarning/Prompt: Tento tiddler obsahuje binárne dáta -ClassicWarning/Hint: Tento tiddler obsahuje wiki texotový formáte pôvodného TiddlyWiki Classic, ktorý nie je plne kompatibilný s TiddlyWiki verzia 5. Podrobnosti je možné nájsť na http://tiddlywiki.com/static/Upgrading.html +ClassicWarning/Hint: Tento tiddler obsahuje wiki texotový formáte pôvodného TiddlyWiki Classic, ktorý nie je plne kompatibilný s TiddlyWiki verzia 5. Podrobnosti je možné nájsť na https://tiddlywiki.com/static/Upgrading.html ClassicWarning/Upgrade/Caption: upgrade CloseAll/Button: zatvor všetky ConfirmCancelTiddler: Chcete zrušiť zmeny urobené v tiddlere "<$text text=<<title>>/>"? @@ -13,7 +13,7 @@ DropMessage: Dropnúť sem (alebo zrušiť cez escape) Encryption/ConfirmClearPassword: Želáte si zrušiť heslo? Odstráni sa tým šifrovanie obsahu pri ukladaní wiki Encryption/PromptSetPassword: Nastav pre tento TiddlyWiki nové heslo InvalidFieldName: Nepovolené znaky v názve poľa "<$text text=<<fieldName>>/>". Polia môžu obsahovať iba malé písmená, číslice a podčiarnik (`_`), pomlčku (`-`) alebo bodku (`.`) -MissingTiddler/Hint: Chýbajúci tiddler "<$text text=<<currentTiddler>>/>" - ak ho chcete vytvoriť, kliknite {{$:/core/images/edit-button}} +MissingTiddler/Hint: Chýbajúci tiddler "<$text text=<<currentTiddler>>/>" - ak ho chcete vytvoriť, kliknite {{||$:/core/ui/Buttons/edit}} RecentChanges/DateFormat: DDth MMM YYYY SystemTiddler/Tooltip: Toto je systémový tiddler TagManager/Colour/Heading: Farba diff --git a/languages/sk-SK/Modals/Download.tid b/languages/sk-SK/Modals/Download.tid index 54f014f00..42f8dad68 100644 --- a/languages/sk-SK/Modals/Download.tid +++ b/languages/sk-SK/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Download changes footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html Bohužiuľ, Váš browser podporuje len manuálne uloženie wiki. diff --git a/languages/sk-SK/Modals/SaveInstructions.tid b/languages/sk-SK/Modals/SaveInstructions.tid index 8e765a154..5846e1124 100644 --- a/languages/sk-SK/Modals/SaveInstructions.tid +++ b/languages/sk-SK/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Save your work footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html Vaše zmeny v tomto wiki treba uložiť ako ~TiddlyWiki HTML súbor. diff --git a/languages/sk-SK/Search.multids b/languages/sk-SK/Search.multids index 9a8ff81e4..622d09638 100644 --- a/languages/sk-SK/Search.multids +++ b/languages/sk-SK/Search.multids @@ -2,7 +2,7 @@ title: $:/language/Search/ DefaultResults/Caption: Zoznam Filter/Caption: Filter -Filter/Hint: Hľadaj cez [[filter expression|http://tiddlywiki.com/static/Filters.html]] +Filter/Hint: Hľadaj cez [[filter expression|https://tiddlywiki.com/static/Filters.html]] Filter/Matches: //<small><<resultCount>> nájdené</small>// Matches: //<small><<resultCount>> nájdené</small>// Shadows/Caption: Tieňové diff --git a/languages/sl-SI/Buttons.multids b/languages/sl-SI/Buttons.multids new file mode 100644 index 000000000..7b529bab7 --- /dev/null +++ b/languages/sl-SI/Buttons.multids @@ -0,0 +1,179 @@ +title: $:/language/Buttons/ + +AdvancedSearch/Caption: napredno iskanje +AdvancedSearch/Hint: Napredno iskanje +Bold/Caption: krepko +Bold/Hint: Označite izbrano besedilo kot krepko +Cancel/Caption: prekliči +Cancel/Hint: Zavrzite spremembe tega tiddlerja +Clear/Caption: počisti +Clear/Hint: Počistite sliko v polno barvo +Clone/Caption: kloniraj +Clone/Hint: Klonirajte ta tiddler +Close/Caption: zapri +Close/Hint: Zaprite ta tiddler +CloseAll/Caption: zapri vse +CloseAll/Hint: Zaprite vse tiddlerje +CloseOthers/Caption: zapri ostale +CloseOthers/Hint: Zaprite ostale tiddlerje +ControlPanel/Caption: nadzorna plošča +ControlPanel/Hint: Odprite nadzorno ploščo +Delete/Caption: izbriši +Delete/Hint: Izbrišite ta tiddler +Edit/Caption: uredi +Edit/Hint: Uredite ta tiddler +EditorHeight/Caption: višina urejevalnika +EditorHeight/Caption/Auto: Samodejno prilagodi višino, da ustreza vsebini +EditorHeight/Caption/Fixed: Stalna višina: +EditorHeight/Hint: Izberite višino urejevalnika besedil +Encryption/Caption: šifriranje +Encryption/ClearPassword/Caption: izbriši geslo +Encryption/ClearPassword/Hint: Izbrišite geslo in shranite ta wiki brez šifriranja +Encryption/Hint: Nastavite ali izbrišite geslo za shranjevanje tega wikija +Encryption/SetPassword/Caption: nastavi geslo +Encryption/SetPassword/Hint: Nastavite geslo za shranjevanje tega wikija s šifriranjem +Excise/Caption: izreži +Excise/Caption/Excise: Izvedite izrezek +Excise/Caption/MacroName: Ime makra: +Excise/Caption/NewTitle: Naslov novega tiddlerja: +Excise/Caption/Replace: Zamenjajte izrezano besedilo z: +Excise/Caption/Replace/Link: povezava +Excise/Caption/Replace/Macro: makro +Excise/Caption/Replace/Transclusion: transkluzija +Excise/Caption/Tag: Označite nov tiddler z naslovom tega tiddlerja +Excise/Caption/TiddlerExists: Pozor: tiddler že obstaja +Excise/Hint: Izbrano besedilo izrežite v nov tiddler +ExportPage/Caption: izvozi vse +ExportPage/Hint: Izvozite vse tiddlerje +ExportTiddler/Caption: izvozi tiddler +ExportTiddler/Hint: Izvozite tiddler +ExportTiddlers/Caption: izvozi tiddlerje +ExportTiddlers/Hint: Izvozite tiddlerje +Fold/Caption: strni tiddler +Fold/FoldBar/Caption: strni/razširi besedilo +Fold/FoldBar/Hint: Izbirni gumbi za strnitev in razširitev tiddlerjev +Fold/Hint: Strnite besedilo tega tiddlerja +FoldAll/Caption: strni vse tiddlerje +FoldAll/Hint: Strnite besedilo vseh odprtih tiddlerjev +FoldOthers/Caption: strni besedilo ostalih tiddlerjev +FoldOthers/Hint: Strnite besedilo ostalih odprtih tiddlerjev +FullScreen/Caption: celozaslonsko +FullScreen/Hint: Vklopite ali izkolpite celozaslonski način +Heading1/Caption: Naslov 1 +Heading1/Hint: Na izbranih vrsticah uporabite oblikovanje naslova ravni 1 +Heading2/Caption: Naslov 2 +Heading2/Hint: Na izbranih vrsticah uporabite oblikovanje naslova ravni 2 +Heading3/Caption: Naslov 3 +Heading3/Hint: Na izbranih vrsticah uporabite oblikovanje naslova ravni 3 +Heading4/Caption: Naslov 4 +Heading4/Hint: Na izbranih vrsticah uporabite oblikovanje naslova ravni 4 +Heading5/Caption: Naslov 5 +Heading5/Hint: Na izbranih vrsticah uporabite oblikovanje naslova ravni 5 +Heading6/Caption: Naslov 6 +Heading6/Hint: Na izbranih vrsticah uporabite oblikovanje naslova ravni 6 +Help/Caption: pomoč +Help/Hint: Prikaži pomoč +HideSideBar/Caption: skrij stransko orodno vrstico +HideSideBar/Hint: Skrijte stransko orodno vrstico +Home/Caption: domov +Home/Hint: Odprite privzete tiddlerje +Import/Caption: uvoz +Import/Hint: Uvozite več vrst datotek, vključno z besedilom, sliko, TiddlyWiki ali JSON +Info/Caption: info +Info/Hint: Pokaži informacije za ta tiddler +Italic/Caption: ležeče +Italic/Hint: Označite izbrano besedilo kot ležeče +Language/Caption: jezik +Language/Hint: Izberite jezik uporabniškega vmesnika +LineWidth/Caption: širina črte +LineWidth/Hint: Nastavite širino črte za slikanje +Link/Caption: povezava +Link/Hint: Ustvarite povezavo wiki +ListBullet/Caption: označen seznam +ListBullet/Hint: Na izbranih vrsticah uporabite oblikovanje označenega seznama +ListNumber/Caption: oštevilčen seznam +ListNumber/Hint: Na izbranih vrsticah uporabite oblikovanje oštevilčenega seznama +Manager/Caption: upravljalnik tiddlerjev +Manager/Hint: Odprite upravljalnik tiddlerjev +MonoBlock/Caption: blok besedila stalne širine +MonoBlock/Hint: Na izbranih vrsticah uporabite oblikovanje blok besedila stalne širine +MonoLine/Caption: pisava stalne širine +MonoLine/Hint: Izbor oblikujte s pisavo stalne širine +More/Caption: več +More/Hint: Več dejanj +NewHere/Caption: nov tukaj +NewHere/Hint: Ustvarite nov tiddler, ki je označen z imenom tega tiddlerja +NewImage/Caption: nova slika +NewImage/Hint: Ustvarite novo sliko +NewJournal/Caption: nov dnevnik +NewJournal/Hint: Ustvarite nov dnevnik +NewJournalHere/Caption: nov dnevnik tukaj +NewJournalHere/Hint: Ustvarite nov dnevnik, ki je označen z imenom tega tiddlerja +NewMarkdown/Caption: nov Markdown tiddler +NewMarkdown/Hint: Ustvarite nov Markdown tiddler +NewTiddler/Caption: nov tiddler +NewTiddler/Hint: Ustvarite nov tiddler +Opacity/Caption: prosojnost +Opacity/Hint: Nastavite prosojnost slikanja +OpenWindow/Caption: odpri v novem oknu +OpenWindow/Hint: Odpri tiddler v novem oknu +Paint/Caption: barva +Paint/Hint: Nastavite barvo slikanja +Palette/Caption: paleta +Palette/Hint: Izberite barvno paleto +Permalink/Caption: permalink +Permalink/Hint: Naslovno vrstico brskalnika nastavite na neposredno povezavo do tega tiddlerja +Permaview/Caption: permaview +Permaview/Hint: Naslovno vrstico brskalnika nastavite na neposredno povezavo do vseh tiddlerjev v tej zgodbi +Picture/Caption: slika +Picture/Hint: Vstavite sliko +Preview/Caption: predogled +Preview/Hint: Pokažite podokno za predogled +PreviewType/Caption: vrsta predogleda +PreviewType/Hint: Izberite vrsto predogleda +Print/Caption: natisni stran +Print/Hint: Natisnite trenutno stran +Quote/Caption: citat +Quote/Hint: Na izbranih vrsticah uporabite oblikovanje citata +Refresh/Caption: osveži +Refresh/Hint: Popolnoma osvežite wiki +Save/Caption: v redu +Save/Hint: Potrdite spremembe tega tiddlerja +SaveWiki/Caption: shrani spremembe +SaveWiki/Hint: Shranite spremembe +ShowSideBar/Caption: pokaži stransko vrstico +ShowSideBar/Hint: Pokažite stransko vrstico +Size/Caption: velikost slike +Size/Caption/Height: Višina: +Size/Caption/Resize: Spremeni velikost slike +Size/Caption/Width: Širina: +Size/Hint: Nastavite velikost slike +Stamp/Caption: žig +Stamp/Caption/New: Dodajte svoje +Stamp/Hint: Vstavite vnaprej konfiguriran izrezek besedila +Stamp/New/Text: Besedilo izrezka. (Ne pozabite dodati opisnega naslova v polju napisa). +Stamp/New/Title: Ime, kot je prikazano v meniju +StoryView/Caption: pogled zgodbe +StoryView/Hint: Izberite upodobitev zgodbe +Strikethrough/Caption: prečrtano +Strikethrough/Hint: Prečrtajte izbrano besedilo +Subscript/Caption: podpisano +Subscript/Hint: Izbrano besedilo oblikujte podpisano +Superscript/Caption: nadpisano +Superscript/Hint: Izbrano besedilo oblikujte nadpisano +TagManager/Caption: upravitelj oznak +TagManager/Hint: Odprite upravitelja oznak +Theme/Caption: tema +Theme/Hint: Izberite temo +Timestamp/Caption: časovni žigi +Timestamp/Hint: Izberite, ali spremembe posodobijo časovne žige +Timestamp/Off/Caption: časovni žigi so izključeni +Timestamp/Off/Hint: Ne posodobi časovnih žigov, ko so tiddlerji spremenjeni +Timestamp/On/Caption: časovni žigi so vključeni +Timestamp/On/Hint: Posodobite časovne žige, ko so tiddlerji spremenjeni +Underline/Caption: podčrtano +Underline/Hint: Podčrtajte izbrano besedilo +Unfold/Caption: razširi tiddler +Unfold/Hint: Razširi besedilo tega tiddlerja +UnfoldAll/Caption: razširi vse tiddlerje +UnfoldAll/Hint: Razširi besedilo vseh odprtih tiddlerjev diff --git a/languages/sl-SI/ControlPanel.multids b/languages/sl-SI/ControlPanel.multids new file mode 100644 index 000000000..6f7eeeba9 --- /dev/null +++ b/languages/sl-SI/ControlPanel.multids @@ -0,0 +1,173 @@ +title: $:/language/ControlPanel/ + +Advanced/Caption: Napredno +Advanced/Hint: Interne informacije o tem TiddlyWikiju +Appearance/Caption: Videz +Appearance/Hint: Načini prilagoditve videza vašega TiddlyWikija. +Basics/AnimDuration/Prompt: Trajanje animacije: +Basics/Caption: Osnove +Basics/DefaultTiddlers/BottomHint: Za naslove s presledki uporabite [[double square brackets]]. Ali pa kliknite, <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">da bi ob nalaganju obnovili odprte tiddlerje.</$button> +Basics/DefaultTiddlers/Prompt: Privzeti tiddlerji: +Basics/DefaultTiddlers/TopHint: Izberite, kateri tiddlerji so prikazani ob zagonu: +Basics/Language/Prompt: Zdravo! Trenutni jezik: +Basics/NewJournal/Tags/Prompt: Oznake za nove dnevniške tiddlerje +Basics/NewJournal/Text/Prompt: Besedilo za nove dnevniške tiddlerje +Basics/NewJournal/Title/Prompt: Naslov za nove dnevniške tiddlerje +Basics/OverriddenShadowTiddlers/Prompt: Število prepisanih senčnih tiddlerjev: +Basics/ShadowTiddlers/Prompt: Število senčnih tiddlerjev: +Basics/Subtitle/Prompt: Podnaslov: +Basics/SystemTiddlers/Prompt: Število sistemskih tiddlerjev: +Basics/Tags/Prompt: Število oznak: +Basics/Tiddlers/Prompt: Število tiddlerjev: +Basics/Title/Prompt: Naslov tega ~TiddlyWikija: +Basics/Username/Prompt: Uporabniško ime za podpisovanje sprememb: +Basics/Version/Prompt: različica ~TiddlyWikija +EditorTypes/Caption: Vrste urejevalnikov +EditorTypes/Editor/Caption: Urejevalnik +EditorTypes/Hint: Ti tiddlerji določajo, kateri urejevalnik se uporablja za urejanje določenih vrst tiddlerjev. +EditorTypes/Type/Caption: vrsta MIME +Info/Caption: Info +Info/Hint: Informacije o tem TiddlyWikiju +KeyboardShortcuts/Add/Caption: dodajte bližnjico +KeyboardShortcuts/Add/Prompt: Tukaj vnesite bližnjico +KeyboardShortcuts/Caption: Bližnjice na tipkovnici +KeyboardShortcuts/Hint: Upravljanje dodelitev bližnjic na tipkovnici +KeyboardShortcuts/NoShortcuts/Caption: Ni dodeljenih bližnjičnih tipk +KeyboardShortcuts/Platform/All: Vse platforme +KeyboardShortcuts/Platform/Linux: Samo Linux +KeyboardShortcuts/Platform/Mac: Samo Macintosh +KeyboardShortcuts/Platform/NonLinux: Vse platforme razen Linux +KeyboardShortcuts/Platform/NonMac: Vse platforme razen Macintosh +KeyboardShortcuts/Platform/NonWindows: Vse platforme razen Windows +KeyboardShortcuts/Platform/Windows: Samo Windows +KeyboardShortcuts/Remove/Hint: odstranite bližnjico na tipkovnici +LoadedModules/Caption: Naloženi moduli +LoadedModules/Hint: To so trenutno naloženi tiddler moduli, povezani z njihovimi izvornimi tiddlerji. Moduli zapisani kurzivno nimajo izvornega tiddlerja, običajno zato, ker so bili nastavljeni med zagonom. +Palette/Caption: Paleta +Palette/Editor/Clone/Caption: kloniraj +Palette/Editor/Clone/Prompt: Priporočamo, da klonirate to senčno paleto, preden jo urejate. +Palette/Editor/Prompt: Urejanje +Palette/Editor/Prompt/Modified: Ta senčna paleta je bila spremenjena +Palette/Editor/Reset/Caption: ponastaviti +Palette/HideEditor/Caption: skrij urejevalnik +Palette/Prompt: Trenutna paleta: +Palette/ShowEditor/Caption: pokaži urejevalnik +Parsing/Block/Caption: Pravila razčlenjevanja blokov +Parsing/Caption: Razčlenjevanje +Parsing/Hint: Tukaj lahko globalno onemogočite/omogočite pravila wiki razčlenjevalnika. Če želite da začnejo spremembe veljati, shranite in znova naložite svoj wiki. Če onemogočite določena pravila razčlenjevalnika, lahko preprečite da, <$ text text="TiddlyWiki"/> pravilno deluje. Uporabite [[varen način|http: //tiddlywiki.com/#SafeMode]] za obnovitev normalnega delovanja. +Parsing/Inline/Caption: Znotrajvrstična pravila razčlenjevanja +Parsing/Pragma/Caption: Pragma pravila razčlenjevanja +Plugins/Add/Caption: Pridobite več vtičnikov +Plugins/Add/Hint: Namestite vtičnike iz uradne knjižnice +Plugins/AlreadyInstalled/Hint: Ta vtičnik je že nameščen. Različica: <$ text text=<< installedVersion>>/> +Plugins/Caption: Vtičniki +Plugins/ClosePluginLibrary: zapri knjižnico vtičnikov +Plugins/Disable/Caption: onemogoči +Plugins/Disable/Hint: Onemogoči ta vtičnik pri ponovnem nalaganju strani +Plugins/Disabled/Status: (onemogočen) +Plugins/Empty/Hint: Nič +Plugins/Enable/Caption: omogoči +Plugins/Enable/Hint: Omogočite ta vtičnik pri ponovnem nalaganju strani +Plugins/Install/Caption: namesti +Plugins/Installed/Hint: Trenutno nameščeni vtičniki: +Plugins/Languages/Caption: Jeziki +Plugins/Languages/Hint: Vtičniki jezikovnih paketov +Plugins/NoInfoFound/Hint: Noben ''"<$text text=<<currentTab>>/>"'' ni bil najden +Plugins/NoInformation/Hint: Ni podatkov +Plugins/NotInstalled/Hint: Ta vtičnik trenutno ni nameščen +Plugins/OpenPluginLibrary: odpri knjižnico vtičnikov +Plugins/Plugins/Caption: Vtičniki +Plugins/Plugins/Hint: Vtičniki +Plugins/Reinstall/Caption: ponovno namestite +Plugins/Themes/Caption: Teme +Plugins/Themes/Hint: Vtičniki tem +Saving/Caption: Shranjevanje +Saving/DownloadSaver/AutoSave/Description: Dovolite samodejno shranjevanje za "download saver" +Saving/DownloadSaver/AutoSave/Hint: Omogočite samodejno shranjevanje za "Download Saver" +Saving/DownloadSaver/Caption: Download Saver +Saving/DownloadSaver/Hint: Te nastavitve veljajo za "download saver", ki je združljiv z HTML5 +Saving/General/Caption: Splošno +Saving/General/Hint: Te nastavitve veljajo za vse mehanizme shranjevanja +Saving/Hint: Nastavitve, uporabljene za shranjevanje celotnega TiddlyWikija kot posamezne datoteke prek shranjevalnega modula +Saving/TiddlySpot/Advanced/Heading: Napredne nastavitve +Saving/TiddlySpot/BackupDir: Imenik za varnostno kopiranje +Saving/TiddlySpot/Backups: Varnostne kopije +Saving/TiddlySpot/Caption: Shrani v ~TiddlySpot +Saving/TiddlySpot/Description: Te nastavitve se uporabljajo samo pri shranjevanju na http://tiddlyspot.com ali združljivem strežniku +Saving/TiddlySpot/Filename: Ime datoteke za nalaganje +Saving/TiddlySpot/Heading: ~TiddlySpot +Saving/TiddlySpot/Hint: //URL strežnika je privzeto nastavljen na `http://<wikiname>.tiddlyspot.com/store.cgi` in ga je mogoče spremeniti, če želite uporabiti naslov strežnika po meri, npr. `http://example.com/store.php`.// +Saving/TiddlySpot/Password: Geslo +Saving/TiddlySpot/ServerURL: URL strežnika +Saving/TiddlySpot/UploadDir: Imenik za nalaganje +Saving/TiddlySpot/UserName: Ime wikija +Settings/AutoSave/Caption: Samodejno shrani +Settings/AutoSave/Disabled/Description: Ne shrani sprememb samodejno +Settings/AutoSave/Enabled/Description: Samodejno shrani spremembe +Settings/AutoSave/Hint: Samodejno shrani spremembe med urejanjem, če shranjevalni modul to podpira +Settings/CamelCase/Caption: Camel Case wiki povezave +Settings/CamelCase/Description: Omogoči samodejno povezovanje ~CamelCase +Settings/CamelCase/Hint: Globalno onemogočite samodejno povezovanje stavkov ~CamelCase. Ponovno naložite stran, da aktivirate nastavitev! +Settings/Caption: Nastavitve +Settings/DefaultSidebarTab/Caption: Privzeti zavihek v stranski vrstici +Settings/DefaultSidebarTab/Hint: Določite, kateri zavihek stranske vrstice je privzeto prikazan +Settings/EditorToolbar/Caption: Orodna vrstica urejevalnika +Settings/EditorToolbar/Description: Pokaži orodno vrstico urejevalnika +Settings/EditorToolbar/Hint: Omogočite ali onemogočite orodno vrstico urejevalnika: +Settings/Hint: Te nastavitve vam omogočajo, da prilagodite vedenje TiddlyWikija. +Settings/InfoPanelMode/Caption: Obnašanje informacijskega pulta tiddlerja +Settings/InfoPanelMode/Hint: Nastavitev, kdaj se informacijski pult tiddlerja zapre +Settings/InfoPanelMode/Popup/Description: Informacijski pult tiddlerja se zapre samodejno +Settings/InfoPanelMode/Sticky/Description: Informacijski pult tiddlerja ostane odprt dokler ga ne zapremo +Settings/LinkToBehaviour/Caption: Obnašanje tiddlerjev pri odpiranju +Settings/LinkToBehaviour/InsideRiver/Hint: Navigacija //znotraj// zgodbe (reke tiddlerjev) +Settings/LinkToBehaviour/OpenAbove: Odpri nad trenutnim tiddlerjem +Settings/LinkToBehaviour/OpenAtBottom: Odpri na dnu zgodbe (reke tiddlerjev) +Settings/LinkToBehaviour/OpenAtTop: Odpri na vrhu zgodbe (reke tiddlerjev) +Settings/LinkToBehaviour/OpenBelow: Odpri pod trenutnim tiddlerjem +Settings/LinkToBehaviour/OutsideRiver/Hint: Navigacija //izven// zgodbe (reke tiddlerjev) +Settings/MissingLinks/Caption: Wiki povezave +Settings/MissingLinks/Description: Omogoči povezave do manjkajočih tiddlerjev +Settings/MissingLinks/Hint: Izberite, ali se naj omogočijo povezave do tiddlerjev, ki še ne obstajajo +Settings/NavigationAddressBar/Caption: Naslovna vrstica za navigacijo +Settings/NavigationAddressBar/Hint: Obnašanje naslovne vrstice brskalnika pri krmarjenju do tiddlerja: +Settings/NavigationAddressBar/No/Description: Ne posodobi naslovne vrstice +Settings/NavigationAddressBar/Permalink/Description: Vključi trenutni tiddler +Settings/NavigationAddressBar/Permaview/Description: Vključi vse odprte tiddlerje +Settings/NavigationHistory/Caption: Zgodovina brskanja +Settings/NavigationHistory/Hint: Posodobi zgodovino brskalnika pri krmarjenju do tiddlerja: +Settings/NavigationHistory/No/Description: Ne posodobi zgodovine +Settings/NavigationHistory/Yes/Description: Posodobi zgodovino +Settings/PerformanceInstrumentation/Caption: Merjenje učinkovitosti +Settings/PerformanceInstrumentation/Description: Omogoči merjenje učinkovitosti +Settings/PerformanceInstrumentation/Hint: Prikaže statistiko učinkovitosti v konzoli za razvijalce brskalnika. Ponovno naložite stran, da aktivirate nastavitev! +Settings/TitleLinks/Caption: Naslovi tiddlerjev +Settings/TitleLinks/Hint: Prikaži naslove tiddlerjev kot povezave +Settings/TitleLinks/No/Description: Ne prikaži naslove tiddlerjev kot povezave +Settings/TitleLinks/Yes/Description: Prikaži naslove tiddlerjev kot povezave +Settings/ToolbarButtons/Caption: Gumbi orodne vrstice +Settings/ToolbarButtons/Hint: Privzeti izgled gumba orodne vrstice: +Settings/ToolbarButtons/Icons/Description: Prikaži ikono +Settings/ToolbarButtons/Text/Description: Prikaži besedilo +Settings/ToolbarButtonStyle/Caption: Slog gumba orodne vrstice +Settings/ToolbarButtonStyle/Hint: Izberite slog za gumbe orodne vrstice: +Settings/ToolbarButtonStyle/Styles/Borderless: Brez roba +Settings/ToolbarButtonStyle/Styles/Boxed: Uokvirjeno +Settings/ToolbarButtonStyle/Styles/Rounded: Zaokroženo +StoryView/Caption: Pogled +StoryView/Prompt: Trenutni pogled: +Theme/Caption: Tema +Theme/Prompt: Trenutna tema: +TiddlerFields/Caption: Polja tiddlerja +TiddlerFields/Hint: To je celoten seznam [[polj tiddlerjev|TiddlerFields]], ki se uporabljajo v tem wikiju (vključno s sistemskimi tiddlerji, vendar brez senčnih tiddlerjev). +Toolbars/Caption: Orodne vrstice +Toolbars/EditorToolbar/Caption: Orodna vrstica urejevalnika +Toolbars/EditorToolbar/Hint: Izberite, kateri gumbi so prikazani v orodni vrstici urejevalnika. Upoštevajte, da se nekateri gumbi prikažejo samo pri urejanju tiddlerjev določene vrste. Povlecite in spustite, da spremenite vrstni red. +Toolbars/EditToolbar/Caption: Orodna vrstica načina urejanja +Toolbars/EditToolbar/Hint: Izberite, kateri gumbi so prikazani za tiddlerje v načinu urejanja. Povlecite in spustite, da spremenite vrstni red. +Toolbars/Hint: Izberite, kateri gumbi so prikazani +Toolbars/PageControls/Caption: Orodna vrstica strani +Toolbars/PageControls/Hint: Izberite, kateri gumbi so prikazani na orodni vrstici strani. Povlecite in spustite, da spremenite vrstni red. +Toolbars/ViewToolbar/Caption: Orodna vrstica načina pogleda +Toolbars/ViewToolbar/Hint: Izberite, kateri gumbi so prikazani za tiddlerje v načinu pogleda. Povlecite in spustite, da spremenite vrstni red. +Tools/Download/Full/Caption: Prenesite celoten wiki diff --git a/languages/sl-SI/CoreReadMe.tid b/languages/sl-SI/CoreReadMe.tid new file mode 100644 index 000000000..c5c9209bf --- /dev/null +++ b/languages/sl-SI/CoreReadMe.tid @@ -0,0 +1,8 @@ +title: $:/core/sl-SI/readme + +Ta vtičnik vsebuje osnovne TiddlyWiki komponente, ki jih sestavljajo: + +* moduli JavaScript kode. +* ikone +* predloge, potrebne za ustvarjanje vmesnika TiddlyWiki +* prevodna besedila v britanska angleščina (' en-GB''), ki jih uporablja jedro Tiddlywiki. \ No newline at end of file diff --git a/languages/sl-SI/Dates.multids b/languages/sl-SI/Dates.multids new file mode 100644 index 000000000..5175c972d --- /dev/null +++ b/languages/sl-SI/Dates.multids @@ -0,0 +1,87 @@ +title: $:/language/ + +Date/DaySuffix/1: . +Date/DaySuffix/10: . +Date/DaySuffix/11: . +Date/DaySuffix/12: . +Date/DaySuffix/13: . +Date/DaySuffix/14: . +Date/DaySuffix/15: . +Date/DaySuffix/16: . +Date/DaySuffix/17: . +Date/DaySuffix/18: . +Date/DaySuffix/19: . +Date/DaySuffix/2: . +Date/DaySuffix/20: . +Date/DaySuffix/21: . +Date/DaySuffix/22: . +Date/DaySuffix/23: . +Date/DaySuffix/24: . +Date/DaySuffix/25: . +Date/DaySuffix/26: . +Date/DaySuffix/27: . +Date/DaySuffix/28: . +Date/DaySuffix/29: . +Date/DaySuffix/3: . +Date/DaySuffix/30: . +Date/DaySuffix/31: . +Date/DaySuffix/4: . +Date/DaySuffix/5: . +Date/DaySuffix/6: . +Date/DaySuffix/7: . +Date/DaySuffix/8: . +Date/DaySuffix/9: . +Date/Long/Day/0: nedelja +Date/Long/Day/1: ponedeljek +Date/Long/Day/2: torek +Date/Long/Day/3: sreda +Date/Long/Day/4: četrtek +Date/Long/Day/5: petek +Date/Long/Day/6: sobota +Date/Long/Month/1: januar +Date/Long/Month/10: oktober +Date/Long/Month/11: november +Date/Long/Month/12: december +Date/Long/Month/2: februar +Date/Long/Month/3: marec +Date/Long/Month/4: april +Date/Long/Month/5: maj +Date/Long/Month/6: junij +Date/Long/Month/7: julij +Date/Long/Month/8: avgust +Date/Long/Month/9: september +Date/Period/am: dop +Date/Period/pm: pop +Date/Short/Day/0: ned +Date/Short/Day/1: pon +Date/Short/Day/2: tor +Date/Short/Day/3: sre +Date/Short/Day/4: čet +Date/Short/Day/5: pet +Date/Short/Day/6: sob +Date/Short/Month/1: jan +Date/Short/Month/10: okt +Date/Short/Month/11: nov +Date/Short/Month/12: dec +Date/Short/Month/2: feb +Date/Short/Month/3: mar +Date/Short/Month/4: apr +Date/Short/Month/5: maj +Date/Short/Month/6: jun +Date/Short/Month/7: jul +Date/Short/Month/8: aug +Date/Short/Month/9: sep +RelativeDate/Future/Days: čez <<period>> dni +RelativeDate/Future/Hours: čez <<period>> ur +RelativeDate/Future/Minutes: čez <<period>> minut +RelativeDate/Future/Months: čez <<period>> mesecev +RelativeDate/Future/Second: čez eno sekundo +RelativeDate/Future/Seconds: čez <<period>> sekund +RelativeDate/Future/Years: čez <<period>> let +RelativeDate/Past/Days: pred <<period>> dnevi +RelativeDate/Past/Hours: pred <<period>> urami +RelativeDate/Past/Minutes: pred <<period>> minutami +RelativeDate/Past/Months: pred <<period>> meseci +RelativeDate/Past/Second: pred eno sekundo +RelativeDate/Past/Seconds: pred <<period>> sekundami +RelativeDate/Past/Years: pred <<period>> leti diff --git a/languages/sl-SI/Docs/ModuleTypes.multids b/languages/sl-SI/Docs/ModuleTypes.multids new file mode 100644 index 000000000..acf23713b --- /dev/null +++ b/languages/sl-SI/Docs/ModuleTypes.multids @@ -0,0 +1,30 @@ +title: $:/language/Docs/ModuleTypes/ + +allfilteroperator: Podrejeni operator za ''all'' filter operator. +animation: Animacije, ki se lahko uporabljajo z RevealWidget. +bitmapeditoroperation: Operacija orodne vrstice urejevalnika bitnih slik. +command: Ukazi, ki se lahko izvajajo pod Node.js. +config: Podatki, ki se vstavijo v `$ tw.config`. +filteroperator: Posamezne funkcije za filter operator. +global: Globalni podatki, ki bodo vstavljeni v `$tw`. + +info: Objavlja sistemske informacije s psevdo-vtičnikom [[$:/temp/info-plugin]]. + +isfilteroperator: Operand za ''is'' filter operator. +library: Generični tip modula za splošne module JavaScript. +macro: Makro definicije v JavaScriptu. +parser: Razčlenjevalci za različne vrste vsebin. +saver: "Savers" omogočajo različne načine za shranjevanje datotek iz brskalnika. +startup: Zagonske funkcije. +storyview: Pogledi zgodbe (Story view) prilagodijo animacijo in obnašanje seznamskih gradnikov (ListWidget), ki upravljajo glavni prikaz tiddlerjev. +texteditoroperation: Operacija orodne vrstice urejevalnika besedil. +tiddlerdeserializer: Pretvori različne vrste vsebin v tiddlerje. +tiddlerfield: Določa vedenje posameznega polja tiddlerja. +tiddlermethod: Doda metode v prototip `$tw.Tiddler`. + +upgrader: Izvaja posebne spremembe med nadgradnjo ali uvozom. +utils: Doda metode v `$tw.utils`. +utils-node: Doda metode, specifične za Node.js, v `$tw.utils`. +widget: Gradniki prikažejo in osvežujejo prikaz v DOM. +wikimethod: Doda metode v `$tw.Wiki`. +wikirule: Posamezna razčlenjevalna pravila za glavni WikiText razčlenjevalnik. diff --git a/languages/sl-SI/Docs/PaletteColours.multids b/languages/sl-SI/Docs/PaletteColours.multids new file mode 100644 index 000000000..71bdd56e3 --- /dev/null +++ b/languages/sl-SI/Docs/PaletteColours.multids @@ -0,0 +1,105 @@ +title: $:/language/Docs/PaletteColours/ + +alert-background: Ozadje opozorila +alert-border: Rob opozorila +alert-highlight: Poudarek opozorila +alert-muted-foreground: Ospredje izklopljenega opozorila +background: Splošno ozadje +blockquote-bar: Oznaka citata +button-background: Privzeto ozadje gumba +button-border: Privzeta rob gumba +button-foreground: Privzeto ospredje gumba +code-background: Ozadje kode +code-border: Rob kode +code-foreground: Ospredje kode +dirty-indicator: Indikator neshranjenih sprememb +download-background: Ozadje gumba prejemanje +download-foreground: Ospredje gumba prejemanje +dragger-background: Ozadje vlečenja +dragger-foreground: Ospredje vlečenja +dropdown-background: Ozadje pogovornega okna za izbiro +dropdown-border: Rob pogovornega okna za izbiro +dropdown-tab-background: Ozadje zavihka pogovornega okna za izbiro +dropdown-tab-background-selected: Ozadje izbranega zavihka pogovornega okna za izbiro +dropzone-background: Ozadje uvozne cone +external-link-background: Ozadje zunanje povezave +external-link-background-hover: Ozadje zunanje povezave ob prehodu +external-link-background-visited: Ozadje obiskane zunanje povezave +external-link-foreground: Ospredje zunanje povezave +external-link-foreground-hover: Ospredje zunanje povezave ob prehodu +external-link-foreground-visited: Ospredje obiskane zunanje povezave +foreground: Splošno ospredje +message-background: Ozadje sporočilnega polja +message-border: Rob sporočilnega polja +message-foreground: Ospredje sporočilnega polja +modal-backdrop: Zatemnjeno modalno pogovorno okno +modal-background: Ozadje modalnega pogovornega okna +modal-border: Rob modalnega pogovornega okna +modal-footer-background: Ozadje noge modalnega pogovornega okna +modal-footer-border: Rob noge modalnega pogovornega okna +modal-header-border: Rob glave modalnega pogovornega okna +muted-foreground: Splošno izklopljeno ospredje +notification-background: Ozadje obvestila +notification-border: Rob obvestila +page-background: Ozadje strani +pre-background: Ozadje predoblikovane kode +pre-border: Rob predoblikovane kode +primary: Splošna osnovna barva +sidebar-button-foreground: Ospredje gumba v stranski vrstici +sidebar-controls-foreground: Ospredje nadzornih elementov v stranski vrstici +sidebar-controls-foreground-hover: Ospredje nadzornih elementov v stranski vrstici ob prehodu +sidebar-foreground: Ospredje stranske vrstice +sidebar-foreground-shadow: Senčno ospredje stranske vrstice +sidebar-muted-foreground: Izklopljeno ospredje stranske vrstice +sidebar-muted-foreground-hover: Izklopljeno ospredje stranske vrstice ob prehodu +sidebar-tab-background: Ozadje zavihka v stranski vrstici +sidebar-tab-background-selected: Ozadje izbranega zavihka v stranski vrstici +sidebar-tab-border: Rob zavihka v stranski vrstici +sidebar-tab-border-selected: Rob izbranega zavihka v stranski vrstici +sidebar-tab-divider: Razdelilnik zavihkov v stranski vrstici +sidebar-tab-foreground: Ospredje zavihka v stranski vrstici +sidebar-tab-foreground-selected: Ospredje izbranega zavihka v stranski vrstici +sidebar-tiddler-link-foreground: Ospredje povezave do tiddlerja v stranski vrstici +sidebar-tiddler-link-foreground-hover: Ospredje povezave do tiddlerja v stranski vrstici ob prehodu +site-title-foreground: Ospredje naslova strani +static-alert-foreground: Ospredje statičnega opozorila +tab-background: Ozadje zavihka +tab-background-selected: Ozadje izbranega zavihka +tab-border: Rob zavihka +tab-border-selected: Rob izbranih zavihkov +tab-divider: Razdelilnik zavihkov +tab-foreground: Ospredje zavihkov +tab-foreground-selected: Ospredje izbranih zavihkov +table-border: Rob tabele +table-footer-background: Ozadje noge tabele +table-header-background: Ozadje glave tabele +tag-background: Ozadje oznake +tag-foreground: Ospredje oznake +tiddler-background: Ozadje tiddlerja +tiddler-border: Rob tiddlerja +tiddler-controls-foreground: Ospredje nadzornih elementov tiddlerja +tiddler-controls-foreground-hover: Ospredje nadzornih elementov tiddlerja ob prehodu +tiddler-controls-foreground-selected: Ospredje izbranih nadzornih elementov tiddlerja +tiddler-editor-background: Ozadje urejevalnika tiddlerja +tiddler-editor-border: Rob urejevalnika tiddlerja +tiddler-editor-border-image: Rob urejevalnika slikovnega tiddlerja +tiddler-editor-fields-even: Ozadje urejevalnika tiddlerja za soda polja +tiddler-editor-fields-odd: Ozadje urejevalnika tiddlerja za liha polja +tiddler-info-background: Ozadje informacijske plošče tiddlerja +tiddler-info-border: Rob informacijske plošče tiddlerja +tiddler-info-tab-background: Ozadje zavihka informacijske plošče tiddlerja +tiddler-link-background: Ozadje povezave do tiddlerja +tiddler-link-foreground: Ospredje povezave do tiddlerja +tiddler-subtitle-foreground: Ospredje podnaslova tiddlerja +tiddler-title-foreground: Ospredje naslova tiddlerja +toolbar-cancel-button: Ospredje 'cancel' gumba orodne vrstice +toolbar-close-button: Ospredje 'close' gumba orodne vrstice +toolbar-delete-button: Ospredje 'delete' gumba orodne vrstice +toolbar-done-button: Ospredje 'done' gumba orodne vrstice +toolbar-edit-button: Ospredje 'edit' gumba orodne vrstice +toolbar-info-button: Ospredje 'info' gumba orodne vrstice +toolbar-new-button: Ospredje 'new tiddler' gumba orodne vrstice +toolbar-options-button: Ospredje 'options' gumba orodne vrstice +toolbar-save-button: Ospredje 'save' gumba orodne vrstice +untagged-background: Ozadje neoznačene pilule +very-muted-foreground: Zelo zatemnjeno ospredje diff --git a/languages/sl-SI/EditTemplate.multids b/languages/sl-SI/EditTemplate.multids new file mode 100644 index 000000000..8ddfef32f --- /dev/null +++ b/languages/sl-SI/EditTemplate.multids @@ -0,0 +1,28 @@ +title: $:/language/EditTemplate/ + +Body/External/Hint: To je zunanji tiddler, shranjen zunaj glavne datoteke TiddlyWiki. Urejate lahko oznake in polja, vendar ne morete neposredno urediti vsebine. +Body/Placeholder: Vnesite besedilo za ta tiddler +Body/Preview/Type/Output: prikaz +Field/Remove/Caption: odstrani polje +Field/Remove/Hint: Odstranite polje +Fields/Add/Button: dodaj +Fields/Add/Dropdown/System: Sistemska polja +Fields/Add/Dropdown/User: Uporabniška polja +Fields/Add/Name/Placeholder: ime polja +Fields/Add/Prompt: Dodaj novo polje: +Fields/Add/Value/Placeholder: vrednost/besedilo polja +Shadow/OverriddenWarning: To je spremenjen senčni tiddler. Lahko se vrnete na privzeto različico v vtičniku <<pluginLink>> tako, da izbrišete ta tiddler. +Shadow/Warning: To je senčni tiddler. Vse spremembe, ki jih naredite, bodo razveljavile privzeto različico iz vtičnika <<pluginLink>>. +Tags/Add/Button: dodaj +Tags/Add/Placeholder: ime oznake +Tags/Dropdown/Caption: seznam oznak +Tags/Dropdown/Hint: Pokaži seznam oznak +Title/BadCharacterWarning: Opozorilo: izogibajte se uporabi znakov <<bad-chars>> v naslovih tiddler +Title/Exists/Prompt: Ciljni tiddler že obstaja +Title/Relink/Prompt: Spremeni iz ''<$text text=<<fromTitle>>/>'' v ''<$text text=<<toTitle>>/>'' v //oznakah// in //seznamskih// poljih ostalih tiddlerjev +Type/Delete/Caption: izbriši vrsto vsebine +Type/Delete/Hint: Izbrišite vrsto vsebine +Type/Dropdown/Caption: seznam vrst vsebine +Type/Dropdown/Hint: Pokaži seznam vrst vsebine +Type/Placeholder: vrsta vsebine +Type/Prompt: Vrsta: diff --git a/languages/sl-SI/Exporters.multids b/languages/sl-SI/Exporters.multids new file mode 100644 index 000000000..e012c7b97 --- /dev/null +++ b/languages/sl-SI/Exporters.multids @@ -0,0 +1,6 @@ +title: $:/language/Exporters/ + +CsvFile: CSV datoteka +JsonFile: JSON datoteka +StaticRiver: Statični HTML +TidFile: ".tid" datoteka diff --git a/languages/sl-SI/Fields.multids b/languages/sl-SI/Fields.multids new file mode 100644 index 000000000..7ab36cc37 --- /dev/null +++ b/languages/sl-SI/Fields.multids @@ -0,0 +1,35 @@ +title: $:/language/Docs/Fields/ + +_canonical_uri: Celoten URI zunanjega slikovnega tiddlerja. URI = Enotni identifikator virov, identifikator za vire na internetu. +bag: Ime ~TiddlyWeb "torbe", iz katere je prišel tiddler. +caption: Besedilo, ki se prikaže na zavihku ali gumbu +color: Barvna vrednost CSS, povezana s tiddlerjem +component: Ime komponente, odgovorne za [[opozorilni tiddler|AlertMechanism]] +created: Datum, ko je bil tiddler ustvarjen +creator: Ime osebe, ki je ustvarila tiddler +current-tiddler: Uporablja se za predpomnjenje vrhnjega tiddlerja na [[seznamu zgodovine|HistoryMechanism]] +dependents: Navede odvisnosti za "vtičnike". +description: Opisno besedilo za vtičnik ali modalni dialog +draft.of: Osnutek od - vsebuje naslov tiddlerja, h kateremu spada ta osnutek +draft.title: Za osnutek tiddlerja vsebuje predlagani novi naslov tiddlerja +footer: Besedilo noge za čarovnika +hack-to-give-us-something-to-compare-against: Polje za začasno shranjevanje, uporabljeno v [[$:/core/templates/static.content]] +icon: Naslov tiddlerja, ki vsebuje ikono, povezano s tem tiddlerjem +library: Če je nastavljeno na "da", bo tiddler shranjen kot knjižnica JavaScript +list: Urejen seznam naslovov tiddlerjev, povezanih s tem tiddlerjem +list-after: Če je nastavljen, pomeni naslov tiddlerja, za katerim se ta tiddler dodaja na urejeni seznam naslovov tiddlerjev +list-before: Če je nastavljen, pomeni naslov tiddlerja, pred katerim se ta tiddler dodaja na urejeni seznam naslovov tiddlerjev, ali na začetek seznama, če je to polje prazno +modified: Datum in čas, ko je bil tiddler nazadnje spremenjen +modifier: Ime osebe, ki je nazadnje spremenila tiddler. +name: Človeško berljivo ime za "vtičnik" tiddler. +plugin-priority: Številčna vrednost, ki kaže prednost vtičnika +plugin-type: Vrsta vtičnika +released: Datum izdaje TiddlyWiki +revision: Različica tiddlerja shranjena na strežniku +source: Izvorni URL, povezan s tiddlerjem +subtitle: Podnaslov za pogovorno okno čarovnika +tags: Seznam oznak, povezanih s tiddlerjem +text: Telo besedila tiddlerja +title: Edinstveno ime tiddlerja. +type: Vrsta vsebine tiddlerja +version: Informacije o različici za vtičnik diff --git a/languages/sl-SI/Filters.multids b/languages/sl-SI/Filters.multids new file mode 100644 index 000000000..635f75432 --- /dev/null +++ b/languages/sl-SI/Filters.multids @@ -0,0 +1,15 @@ +title: $:/language/Filters/ + +AllTags: Vse oznake razen sistemskih oznak +AllTiddlers: Vsi tiddlerji razen sistemskih tiddlerjev +Drafts: Osnutki tiddlerjev +Missing: Manjkajoči tiddlerji +Orphans: Tiddlerji sirote +OverriddenShadowTiddlers: Prepisani senčni tiddlerji +RecentSystemTiddlers: Nedavno spremenjeni tiddlerji, vključno s sistemskimi tiddlerji +RecentTiddlers: Nedavno spremenjeni tiddlerji +ShadowTiddlers: Senčni tiddlerji +StoryList: Tiddlerji v zgodbi (reka tiddlerjev), brez <$text text="$:/AdvancedSearch"/> +SystemTags: Sistemske oznake +SystemTiddlers: Sistemski tiddlerji +TypedTiddlers: Tiddlerji, ki ne vsebujejo "wiki-text" diff --git a/languages/sl-SI/GettingStarted.tid b/languages/sl-SI/GettingStarted.tid new file mode 100644 index 000000000..6cbfe22d2 --- /dev/null +++ b/languages/sl-SI/GettingStarted.tid @@ -0,0 +1,17 @@ +title: GettingStarted + +\define lingo-base() $:/language/ControlPanel/Basics/ +Dobrodošli v ~TiddlyWiki in skupnost ~TiddlyWiki + +Preden začnete shranjevati pomembne informacije v ~TiddlyWiki, je pomembno, da se prepričate, da lahko varno shranite spremembe. Za podrobnosti si oglejte http://tiddlywiki.com/#GettingStarted + +!! Nastavite ta ~TiddlyWiki + +<div class="tc-control-panel"> + +|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> | +|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> | +|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// | +</div> + +Za več možnosti si oglejte [[nadzorno ploščo|$:/ControlPanel]]. diff --git a/languages/sl-SI/Help/build.tid b/languages/sl-SI/Help/build.tid new file mode 100644 index 000000000..fd9d7be5a --- /dev/null +++ b/languages/sl-SI/Help/build.tid @@ -0,0 +1,11 @@ +title: $:/language/Help/build +description: Samodejno zaženite nastavljene ukaze + +Ta ukaz zgradi določene cilje gradnje za trenutni wiki. Če ni določen noben cilj gradnje, bodo zgrajeni vsi razpoložljivi cilji. + +``` +--build <target> [<target> ...] +``` + +Cilji gradnje so definirani v datoteki `tiddlywiki.info` v mapi wiki. + diff --git a/languages/sl-SI/Help/clearpassword.tid b/languages/sl-SI/Help/clearpassword.tid new file mode 100644 index 000000000..078afd65f --- /dev/null +++ b/languages/sl-SI/Help/clearpassword.tid @@ -0,0 +1,8 @@ +title: $:/language/Help/clearpassword +description: Ta ukaz izbriše geslo za poznejše šifriranje + +Ta ukaz izbriše geslo za poznejše šifriranje + +``` +--clearpassword +``` diff --git a/languages/sl-SI/Help/default.tid b/languages/sl-SI/Help/default.tid new file mode 100644 index 000000000..162331bb9 --- /dev/null +++ b/languages/sl-SI/Help/default.tid @@ -0,0 +1,23 @@ +title: $:/language/Help/default +description: + +\define commandTitle() +$:/language/Help/$(command)$ +\end +``` +uporaba: tiddlywiki [<wikifolder>] [--<command> [<args>...]...] +``` + +ukazi, ki so na voljo: + +<ul> +<$list filter="[commands[]sort[title]]" variable="command"> +<li><$link to=<<commandTitle>>><$macrocall $name="command" $type="text/plain" $output="text/plain"/></$link>: <$transclude tiddler=<<commandTitle>> field="description"/></li> +</$list> +</ul> + +Podrobne informacije o ukazih: + +``` +tiddlywiki --help <command> +``` diff --git a/languages/sl-SI/Help/editions.tid b/languages/sl-SI/Help/editions.tid new file mode 100644 index 000000000..cd9bff3db --- /dev/null +++ b/languages/sl-SI/Help/editions.tid @@ -0,0 +1,8 @@ +title: $:/language/Help/editions +description: Navede razpoložljive izdaje TiddlyWiki + +Navede imena in opise razpoložljivih izdaj. Z ukazom "--init" lahko ustvarite nov wiki določene izdaje. + +``` +--editions +``` diff --git a/languages/sl-SI/Help/fetch.tid b/languages/sl-SI/Help/fetch.tid new file mode 100644 index 000000000..605e83ad3 --- /dev/null +++ b/languages/sl-SI/Help/fetch.tid @@ -0,0 +1,27 @@ +title: $:/language/Help/fetch +description: Pridobi tiddlerje iz wikija na URL naslovu + +Pridobite eno ali več datotek prek HTTP / HTTPS in uvozite tiddlerje, ki se ujemajo s filtrom, po potrebi pa spremenite dohodne naslove. + +``` +--fetch file <url> <import-filter> <transform-filter> +--fetch files <url-filter> <import-filter> <transform-filter> +``` +Če se uporablja parameter "file", se pridobi samo ena datoteka. Prvi parameter je URL, iz katerega je treba naložiti datoteko. + +Če je uporabljen parameter `files`, se prenašajo več datotek. V tem primeru je prvi parameter filter, ki vsebuje seznam URL-jev, iz katerih je treba brati datoteke. Na primer: več tiddlerjev je označenih z: "remote-server" in vsebujejo polje: "url". Vtem primeru bo filter `[tag[remote-server]get[url]]` bo pridobil vse razpoložljive URL-je. + +Parameter `<import-filter>` določa, katere tiddlers želite uvoziti. Privzeto je: `[all [tiddlers]]`, če nič ni podano. + +Parameter `<transform-filter>` določa neobvezni filter, ki spreminja naslove uvoženih tiddlerjev. Na primer, `[addprefix[$:/myimports/]]` v vsak naslov. + +Če se pred ukazom `--fetch` uporabi `--verbose`, se izpišejo razširjene diagnostične informacije. + +Upoštevajte, da TiddlyWiki ne bo uvozil starejše različice že naloženega vtičnika. + +Naslednji primer prikliče vse nesistemske tiddlerje iz http://tiddlywiki.com in jih shrani v datoteko JSON: + +``` +tiddlywiki --verbose --fetch file "http://tiddlywiki.com/" "[!is[system]]" "" --rendertiddler "$:/core/templates/exporters/JsonFile" output.json text/plain "" exportFilter "[!is[system]]" +``` + diff --git a/languages/sl-SI/Help/help.tid b/languages/sl-SI/Help/help.tid new file mode 100644 index 000000000..b61a1cd83 --- /dev/null +++ b/languages/sl-SI/Help/help.tid @@ -0,0 +1,10 @@ +title: $:/language/Help/help +description: Prikaže pomoč za ukaze TiddlyWiki + +Prikaže besedilo pomoči za ukaz: + +``` +--help [<command>] +``` + +Če je ime ukaza izpuščeno, se prikaže seznam razpoložljivih ukazov. diff --git a/languages/sl-SI/Help/init.tid b/languages/sl-SI/Help/init.tid new file mode 100644 index 000000000..7e860eea7 --- /dev/null +++ b/languages/sl-SI/Help/init.tid @@ -0,0 +1,23 @@ +title: $:/language/Help/init +description: Inicializira novo mapo wiki + +Inicializira prazen [[WikiFolder|WikiFolders]] s kopijo navedene izdaje. + +``` +--init <edition> [<edition> ...] +``` + +Na primer: + +``` +tiddlywiki ./MyWikiFolder --init empty +``` + +Opomba: + +* Po potrebi bo ustvarjen imenik mape wiki +* Parameter "izdaja" je privzeto "empty" +* Ukaz za init ne bo uspešen, če mapa wiki ni prazna +* Ukaz init odstrani vse definicije `includeWikis` v datoteki `tiddlywiki.info` izdaje +* Če je določenih več izdaj, bodo inicializirane izdaje kasneje prepisale vse datoteke, ki so deljene s prejšnjimi izdajami (tako bo končna datoteka `tiddlywiki.info` kopirana iz zadnje izdaje) +* `--editions` vrne seznam razpoložljivih izdaj diff --git a/languages/sl-SI/Help/load.tid b/languages/sl-SI/Help/load.tid new file mode 100644 index 000000000..2c2a8b352 --- /dev/null +++ b/languages/sl-SI/Help/load.tid @@ -0,0 +1,16 @@ +title: $:/language/Help/load +description: Naloži tiddlerje iz datoteke + +Naloži tiddlerje iz 2.x.x TiddlyWiki datotek (`.html`),` .tiddler`, `.tid`,` .json` ali druge datotek + +``` +--load <filepath> +``` + +Če želite naložiti podatke iz šifrirane datoteke TiddlyWiki, morate najprej določiti geslo s parametrom "password". Na primer: + +``` +tiddlywiki ./MyWiki --password pa55w0rd --load my_encrypted_wiki.html +``` + +Upoštevajte, da TiddlyWiki ne bo naložil starejše različice že naloženega vtičnika. diff --git a/languages/sl-SI/Help/makelibrary.tid b/languages/sl-SI/Help/makelibrary.tid new file mode 100644 index 000000000..31f0deada --- /dev/null +++ b/languages/sl-SI/Help/makelibrary.tid @@ -0,0 +1,14 @@ +title: $:/language/Help/makelibrary +description: Ustvari knjižnico, ki je potrebna za postopek nadgradnje. + +Ustvari tiddler `$:/UpgradeLibrary`, ki je potreben za postopek nadgradnje. + +Knjižnica za nadgradnjo je oblikovana kot navaden vtičnik tiddler z tipom vtičnika `library`. Vsebuje kopijo vsakega vtičnika, tem in jezikovnih paketov, ki so na voljo v skladišču TiddlyWiki5. + +Ta ukaz je namenjen za interno uporabo; velja samo za uporabnike, ki si želijo izdelati postopek nadgradnje po meri. + +``` +--makelibrary <title> +``` + +Argument "title" je privzeto `$:/UpgradeLibrary`. diff --git a/languages/sl-SI/Help/notfound.tid b/languages/sl-SI/Help/notfound.tid new file mode 100644 index 000000000..1d7c82055 --- /dev/null +++ b/languages/sl-SI/Help/notfound.tid @@ -0,0 +1,4 @@ +title: $:/language/Help/notfound +description: + +Na to temo ni nobene pomoči! \ No newline at end of file diff --git a/languages/sl-SI/Help/output.tid b/languages/sl-SI/Help/output.tid new file mode 100644 index 000000000..ae404a474 --- /dev/null +++ b/languages/sl-SI/Help/output.tid @@ -0,0 +1,10 @@ +title: $:/language/Help/output +description: Nastavi osnovni izhodni imenik za naslednje ukaze. + +Nastavi osnovni izhodni imenik za naslednje ukaze. Privzeti izhodni imenik je poddirektorij `output` v imeniku izdaje. + +``` +--output <pathname> +``` + +Če je podan imenik "relativen", ga ustvari glede na obstoječi delovni imenik. Na primer `--output .` nastavi trenutni delovni imenik kot izhodni imenik. diff --git a/languages/sl-SI/Help/password.tid b/languages/sl-SI/Help/password.tid new file mode 100644 index 000000000..e81c040b5 --- /dev/null +++ b/languages/sl-SI/Help/password.tid @@ -0,0 +1,10 @@ +title: $:/language/Help/password +description: Nastavi geslo za poznejše šifriranje + +Nastavi geslo za poznejše šifriranje + +``` +--password <password> +``` + +Opomba: te možnosti ni mogoče uporabiti za nastavitev »gesla za strežnik«! Za informacije o geslu strežnika si oglejte ukaz "--server". diff --git a/languages/sl-SI/Help/rendertiddler.tid b/languages/sl-SI/Help/rendertiddler.tid new file mode 100644 index 000000000..7e2d2e883 --- /dev/null +++ b/languages/sl-SI/Help/rendertiddler.tid @@ -0,0 +1,22 @@ +title: $:/language/Help/rendertiddler +description: Izpiše posamezen tiddler v določeni obliki + +Izpiše posamezni tiddler v določeni obliki, privzeto "text/html" in ga shrani v podano ime datoteke. + +Izbirno je mogoče podati naslov tiddler predloge. Spremenljivka "currentTiddler", je pri tem nastavljena na tiddler, ki ga želimo izpisati (prva vrednost parametra). + +Opcijsko je mogoče tudi določiti ime in vrednost za dodatno spremenljivko. + +``` +--rendertiddler <title> <filename> [<type>] [<template>] [<name>] [<value>] +``` + +Privzeto je pot do izhodne datoteke relativna glede na podimenik `output` v imeniku izdaje. Ukaz `--output` lahko uporabite za usmerjanje izhoda v drug imenik. + +Vsi manjkajoči imeniki na poti do imena datoteke se samodejno ustvarijo. + +Naslednji ukaz na primer shrani vse tiddlerje, ki se ujemajo s filtrom `[tag[done]]` `v datoteko JSON z naslovom `output.json`, tako da uporabijo osnovno predlogo `$:/core/templates/exporters/JsonFile`. + +``` +--rendertiddler "$:/core/templates/exporters/JsonFile" output.json text/plain "" exportFilter "[tag[done]]" +``` diff --git a/languages/sl-SI/Help/rendertiddlers.tid b/languages/sl-SI/Help/rendertiddlers.tid new file mode 100644 index 000000000..d318f4f13 --- /dev/null +++ b/languages/sl-SI/Help/rendertiddlers.tid @@ -0,0 +1,18 @@ +title: $:/language/Help/rendertiddlers +description: Tiddlerje, ki se ujemajo s filtrom, izpiše v določeni obliki + +Tiddlerje, ki se ujemajo s filtrom, izpiše v posamezne datoteke v določeni obliki, (privzeto `text/html`) in končnico (privzeto `.html`). + +``` +--rendertiddlers <filter> <template> <pathname> [<type>] [<extension>] ["noclean"] +``` + +Na primer: + +``` +--rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html ./static text/plain +``` + +Privzeto je pot do izhodne datoteke relativna glede na podimenik `output` v imeniku izdaje. Ukaz `--output` lahko uporabite za usmerjanje izhoda v drug imenik. + +Vse datoteke v ciljnem imeniku se izbrišejo, razen če je podan parameter ''noclean''. Ciljni imenik je rekurzivno ustvarjen, če manjka. diff --git a/languages/sl-SI/Help/savetiddler.tid b/languages/sl-SI/Help/savetiddler.tid new file mode 100644 index 000000000..fc48e29a5 --- /dev/null +++ b/languages/sl-SI/Help/savetiddler.tid @@ -0,0 +1,12 @@ +title: $:/language/Help/savetiddler +description: Shrani tiddler v datoteko + +Shrani posamezni tiddler v obliki besedila ali v binarni obliki v podano ime datoteke. + +``` +--savetiddler <title> <filename> +``` + +Privzeto je pot do izhodne datoteke relativna glede na podimenik `output` v imeniku izdaje. Ukaz `--output` lahko uporabite za usmerjanje izhoda v drug imenik. + +Vsi manjkajoči imeniki na poti do imena datoteke se samodejno ustvarijo. diff --git a/languages/sl-SI/Help/savetiddlers.tid b/languages/sl-SI/Help/savetiddlers.tid new file mode 100644 index 000000000..efc8d1b6a --- /dev/null +++ b/languages/sl-SI/Help/savetiddlers.tid @@ -0,0 +1,15 @@ +title: $:/language/Help/savetiddlers +description: Saves a group of raw tiddlers to a directory + +Shrani skupino tiddlerjev v obliki besedila ali v binarni obliki v določen imenik. +Saves a group of tiddlers in their raw text or binary format to the specified directory. + +``` +--savetiddlers <filter> <pathname> ["noclean"] +``` + +Privzeto je pot do izhodne datoteke relativna glede na podimenik `output` v imeniku izdaje. Ukaz `--output` lahko uporabite za usmerjanje izhoda v drug imenik. + +Ko uporabite ta ukaz se vse datoteke v izhodnem imeniku samodejno izbrišejo. Da bi to preprečili, lahko uporabite parameter ''noclean''. + +Vsi manjkajoči imeniki na poti do imena datoteke se samodejno ustvarijo. diff --git a/languages/sl-SI/Help/server.tid b/languages/sl-SI/Help/server.tid new file mode 100644 index 000000000..933126743 --- /dev/null +++ b/languages/sl-SI/Help/server.tid @@ -0,0 +1,38 @@ +title: $:/language/Help/server +description: Zagotavlja HTTP strežnik za TiddlyWiki. + +Strežnik, vgrajen v TiddlyWiki5, je zelo preprost. Čeprav je združljiv s TiddlyWeb, ne podpira številnih funkcij, potrebnih za robustno uporabo v internetu. + +V osnovi omogoča streže prikaz določenega tiddlerja. Poleg tega pa omogoča še strežbo posameznih tiddlerjev kodiranih v JSON formatu ter podpira osnovne operacije HTTP za `GET`,` PUT` in `DELETE`. + + +``` +--server <port> <roottiddler> <rendertype> <servetype> <username> <password> <host> <pathprefix> +``` + +Parametri so: + +* ''port'' - številka vrat, s katerih naj se streže (privzeto je "8080") +* ''roottiddler'' - tiddler, ki bo osnovni tiddler (privzeto "$:/core/save/all") +* ''rendertype'' - vrsto vsebine, v kateri na bo naj bo prikazan osnovni tiddler (privzeto je "text / plain") +* ''servetype'' - vrsto vsebine, v kateri naj bo strežen osnovni tiddler (privzeto je "text / html") +* ''username''- privzeto uporabniško ime za podpisovanje sprememb +* ''password'' - izbirno geslo za osnovno overjanje +* ''gostitelj'' - neobvezno ime gostitelja, s katerega se streže (privzeto je "127.0.0.1" ali "localhost") +* ''pathprefix'' - neobvezna predpona za poti + +Če je parameter gesla določen, bo brskalnik uporabnika pozval za uporabniško ime in geslo. Geslo se pošilja v nešifriranem besedilu, zato ta implementacija ni primerna za splošno uporabo. + +Na primer: + +``` +--server 8080 $:/core/save/all text/plain text/html MyUserName passw0rd +``` + +Če morate nastaviti ime gostitelja ali pathprefix in ne želite zahtevati gesla je mogoče za uporabniško ime in geslo uporabiti prazen niz: + +``` +--server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245 +``` + +Če želite zagnati več TiddlyWiki strežnikov hkrati, morate vsakemu nastaviti svoja vrata (port). diff --git a/languages/sl-SI/Help/setfield.tid b/languages/sl-SI/Help/setfield.tid new file mode 100644 index 000000000..029e2a5d3 --- /dev/null +++ b/languages/sl-SI/Help/setfield.tid @@ -0,0 +1,17 @@ +title: $:/language/Help/setfield +description: Eksperimentalno - nastavi "polje" tiddlerja na določeno vrednost + +//Upoštevajte, da je ta ukaz poskusen in se lahko spremeni ali pa bo zamenjan, preden bo dokončan// + +Nastavi navedeno polje skupine tiddlerjev na rezultat "wikizacije" predloge tiddler, pri čemer je spremenljivka `currentTiddler` nastavljena na ustrezni tiddler. + +``` +--setfield <filter> <fieldname> <templatetitle> <rendertype> +``` + +Parametri so: + +* ''filter'' - filter, ki izbere tiddlerje za spremembo +* ''fieldname'' - polje za spreminjanje (privzeto je "text") +* ''templatetitle'' - tiddler predloga, ki se vnese v navedeno polje. Če je parameter prazen ali manjka, se podano polje izbriše +* ''rendertype'' - tip besedila, ki ga želite prikazati (privzeto je "text/plain"; besedilo "html" se lahko uporablja za vključitev oznak HTML) diff --git a/languages/sl-SI/Help/unpackplugin.tid b/languages/sl-SI/Help/unpackplugin.tid new file mode 100644 index 000000000..66f1329c0 --- /dev/null +++ b/languages/sl-SI/Help/unpackplugin.tid @@ -0,0 +1,8 @@ +title: $:/language/Help/unpackplugin +description: Ekstrahira tiddlerje iz vtičnika + +Ekstrahira vse tiddlerje iz vtičnika in jih zapiše kot posamezne datoteke: + +``` +--unpackplugin <title> +``` diff --git a/languages/sl-SI/Help/verbose.tid b/languages/sl-SI/Help/verbose.tid new file mode 100644 index 000000000..d8d74841e --- /dev/null +++ b/languages/sl-SI/Help/verbose.tid @@ -0,0 +1,8 @@ +title: $:/language/Help/verbose +description: Omogoči razširjen izhodni način + +Omogoči razširjen izpis, uporaben za odpravljanje napak + +``` +--verbose +``` diff --git a/languages/sl-SI/Help/version.tid b/languages/sl-SI/Help/version.tid new file mode 100644 index 000000000..8dea8c3fd --- /dev/null +++ b/languages/sl-SI/Help/version.tid @@ -0,0 +1,8 @@ +title: $:/language/Help/version +description: Prikaže številko različice TiddlyWiki. + +Prikaže številko različice TiddlyWiki. + +``` +--version +``` diff --git a/languages/sl-SI/Import.multids b/languages/sl-SI/Import.multids new file mode 100644 index 000000000..1ac22a051 --- /dev/null +++ b/languages/sl-SI/Import.multids @@ -0,0 +1,15 @@ +title: $:/language/Import/ + +Imported/Hint: Uvoženi so bili naslednji tiddlerji: +Listing/Cancel/Caption: Prekliči +Listing/Hint: Ti tiddlerji so pripravljeni za uvoz: +Listing/Import/Caption: Uvoz +Listing/Select/Caption: Izbor +Listing/Status/Caption: Status +Listing/Title/Caption: Naslov +Upgrader/Plugins/Suppressed/Incompatible: Blokiran nezdružljiv ali zastarel vtičnik +Upgrader/Plugins/Suppressed/Version: Blokiran vtičnik (uvoženi vtičnik <<incoming>> je starejši od obstoječega <<existing>>) +Upgrader/Plugins/Upgraded: Nadgrajen vtičnik iz <<incoming>> na <<upgraded>> +Upgrader/State/Suppressed: Blokiran tiddler začasnega stanja +Upgrader/System/Suppressed: Blokiran sistemski tiddler +Upgrader/ThemeTweaks/Created: Prenesena prilagoditev teme iz <$text text=<<from>>/> diff --git a/languages/sl-SI/Misc.multids b/languages/sl-SI/Misc.multids new file mode 100644 index 000000000..e4d977e29 --- /dev/null +++ b/languages/sl-SI/Misc.multids @@ -0,0 +1,72 @@ +title: $:/language/ + +AboveStory/ClassicPlugin/Warning: Videti je, da poskušate naložiti vtičnik, oblikovan za ~TiddlyWiki Classic. Upoštevajte, da [[ti vtičniki ne delujejo s TiddlyWiki različico 5.x.x|http://tiddlywiki.com/#TiddlyWikiClassic]]. Zaznani ~TiddlyWiki Classic vtičniki: +BinaryWarning/Prompt: Ta tiddler vsebuje binarne podatke +ClassicWarning/Hint: Ta tiddler je napisan v besedilnem formatu TiddlyWiki Classic, ki ni v celoti združljiv z različico TiddlyWiki 5. Za več informacij obiščite http://tiddlywiki.com/static/Upgrading.html. +ClassicWarning/Upgrade/Caption: nadgradnja +CloseAll/Button: zapri vse +ColourPicker/Recent: Nedavno: +ConfirmCancelTiddler: Želite zavreči spremembe v tiddlerju: "<$text text=<<title>>/>"? +ConfirmDeleteTiddler: Želite izbrisati tiddler "<$text text=<<title>>/>"? +ConfirmEditShadowTiddler: Spremenili boste senčni tiddler. Vse spremembe bodo prepisale privzeti sistem, zaradi česar bodo prihodnje nadgradnje ne-trivialne. Vaše spremembe lahko razveljavite tako, da izbrišete ta tiddler. Ali ste prepričani, da želite urediti "<$text text=<<title>>/>"? +ConfirmOverwriteTiddler: Želite prepisati tiddler "<$text text=<<title>>/>"? +Count: število +DefaultNewTiddlerTitle: Nov tiddler +DropMessage: Spustite tukaj (ali uporabite tipko »Escape« za preklic) +Encryption/Cancel: Prekliči +Encryption/ConfirmClearPassword: Ali želite izbrisati geslo? To bo odstranilo šifriranje, uporabljeno pri shranjevanju tega wikija +Encryption/Password: geslo +Encryption/PasswordNoMatch: geslo se ne ujema +Encryption/PromptSetPassword: Nastavite novo geslo za ta TiddlyWiki +Encryption/RepeatPassword: Ponovite geslo +Encryption/SetPassword: Nastavite geslo +Encryption/Username: Uporabniško ime +Error/Caption: Napaka +Error/EditConflict: Datoteka je spremenjena na strežniku +Error/Filter: Filter napaka +Error/FilterSyntax: Sintaktična napaka v izrazu filtra +Error/IsFilterOperator: Filter napaka: neznan operand za 'is' operator filtra +Error/LoadingPluginLibrary: Napaka pri nalaganju knjižnice vtičnikov +Error/RecursiveTransclusion: Rekurzivna napaka transkluzije v "transclude widget" +Error/RetrievingSkinny: Napaka pri pridobivanju "skinny" seznama tiddlerjev +Error/SavingToTWEdit: Napaka pri shranjevanju v TWEdit +Error/WhileSaving: Napaka med shranjevanjem +Error/XMLHttpRequest: Koda napake XMLHttpRequest +InternalJavaScriptError/Hint: No, to je neprijetno. Priporočamo, da znova zaženete TiddlyWiki tako, da osvežite brskalnik +InternalJavaScriptError/Title: Notranja napaka JavaScript +InvalidFieldName: Neveljavni znaki v imenu polja "<$text text=<<fieldName>>/>". Imena polj lahko vsebujejo samo male črke, številke, podčrtaj (`_`), minus (`-`) in piko (`.`). +LazyLoadingWarning: <p>Nalaganje zunanjega besedila z ''<$text text={{!!_canonical_uri}}/>''</p><p>Če to sporočilo ne izgine, morda uporabljate brskalnik, ki ne podpira zunanjega besedila v tej konfiguraciji. Oglejte si http://tiddlywiki.com/#ExternalText</p> +LoginToTiddlySpace: Prijavite se v TiddlySpace +Manager/Controls/FilterByTag/None: (nobena) +Manager/Controls/FilterByTag/Prompt: Filtriraj po oznaki: +Manager/Controls/Order/Prompt: Obratni vrstni red +Manager/Controls/Search/Placeholder: Iskanje +Manager/Controls/Search/Prompt: Iskanje: +Manager/Controls/Show/Option/Tags: oznake +Manager/Controls/Show/Option/Tiddlers: tiddlerji +Manager/Controls/Show/Prompt: Prikaži: +Manager/Controls/Sort/Prompt: Razvrsti po: +Manager/Item/Colour: Barva +Manager/Item/Fields: Polja +Manager/Item/Icon: Ikona +Manager/Item/Icon/None: (nobena) +Manager/Item/RawText: Surovo besedilo +Manager/Item/Tags: Oznake +Manager/Item/Tools: Orodja +Manager/Item/WikifiedText: Wikificirano besedilo +MissingTiddler/Hint: Manjkajoč tiddler "<$text text=<<currentTiddler>>/>" - kliknite {{$:/core/images/edit-button}}, da ga ustvarite +No: Ne +OfficialPluginLibrary: Uradna ~TiddlyWiki knjižnica vtičnikov +OfficialPluginLibrary/Hint: Uradna knjižnica vtičnikov ~TiddlyWiki na naslovu tiddlywiki.com. Vtičnike, teme in jezikovne pakete vzdržuje osrednja ekipa. +PluginReloadWarning: Prosimo, shranite {{$:/core/ui/Buttons/save-wiki}} in znova naložite {{$:/core/ui/Buttons/refresh}}, da bodo spremembe v vtičnikih lahko začele veljati +RecentChanges/DateFormat: DD. MMM YYYY +SystemTiddler/Tooltip: To je sistemski tiddler +SystemTiddlers/Include/Prompt: Vključi sistemske tiddlerje +TagManager/Colour/Heading: Barva +TagManager/Count/Heading: Število +TagManager/Icon/Heading: ikona +TagManager/Info/Heading: Info +TagManager/Tag/Heading: Oznaka +Tiddler/DateFormat: DD. MMM YYYY ob hh12:0mm am +UnsavedChangesWarning: TiddlyWiki je bil spremenjen, vendar še ni shranjen! +Yes: Da diff --git a/languages/sl-SI/Modals/Download.tid b/languages/sl-SI/Modals/Download.tid new file mode 100644 index 000000000..0f1b72574 --- /dev/null +++ b/languages/sl-SI/Modals/Download.tid @@ -0,0 +1,13 @@ +title: $:/language/Modals/Download +type: text/vnd.tiddlywiki +subtitle: Download changes +footer: <$button message="tm-close-tiddler">Close</$button> +help: http://tiddlywiki.com/static/DownloadingChanges.html + +Vaš brskalnik podpira le ročno shranjevanje. + +Če želite shraniti spremenjeni wiki, z desnim gumbom kliknite povezavo prenosa spodaj in izberite »Prenesi datoteko« ali »Shrani datoteko« in nato izberite mapo in ime datoteke. + +// Lahko malo izboljšate stvari, tako da kliknete povezavo s ctrl tipko (Windows) ali alt tipko (Mac OS X). Ne boste pozvani da izberete mapo ali ime datoteke, vendar bo vaš brskalnik verjetno dal neprepoznavno ime - morda boste morali preimenovati datoteko, da vključite končnico `.html`, preden lahko naredite kaj koristnega z njo.// + +Na pametnih telefonih, ki ne dovoljujejo nalaganja datotek, lahko namesto tega dodate povezavo med zaznamke in nato svoje zaznamke sinhronizirate z namiznim računalnikom, iz katerega lahko običajno shranite wiki. \ No newline at end of file diff --git a/languages/sl-SI/Modals/SaveInstructions.tid b/languages/sl-SI/Modals/SaveInstructions.tid new file mode 100644 index 000000000..2b224488f --- /dev/null +++ b/languages/sl-SI/Modals/SaveInstructions.tid @@ -0,0 +1,22 @@ +title: $:/language/Modals/SaveInstructions +type: text/vnd.tiddlywiki +subtitle: Save your work +footer: <$button message="tm-close-tiddler">Close</$button> +help: http://tiddlywiki.com/static/SavingChanges.html + +Vaše spremembe v tem wikiju je treba shraniti kot datoteko HTML TiddlyWiki. + +!!! Namizni brskalniki + +# V meniju »Datoteka« izberite »Shrani kot« +# Izberite ime datoteke in lokacijo +#* Nekateri brskalniki zahtevajo, da izrecno določite obliko shranjevanja datoteke kot »spletna stran, samo HTML« ali podobno +# Zaprite ta zavihek + +!!! Brskalniki na pametnih telefonih + +# Stran dodajte med zaznamke +#* Če imate nastavljeno možnost iCloud ali Google Sync, se zaznamek samodejno sinhronizira z namizjem, kjer ga lahko odprete in ga shranite, kot je navedeno zgoraj +# Zaprite ta zavihek + +//Če zaznamek znova odprete v aplikaciji Mobile Safari, se to sporočilo znova prikaže. Če želite nadaljevati in uporabiti datoteko, kliknite gumb »Zapri« spodaj// \ No newline at end of file diff --git a/languages/sl-SI/NewJournal.multids b/languages/sl-SI/NewJournal.multids new file mode 100644 index 000000000..696e1f1fc --- /dev/null +++ b/languages/sl-SI/NewJournal.multids @@ -0,0 +1,5 @@ +title: $:/config/NewJournal/ + +Tags: Dnevnik +Text: +Title: DD. MMM YYYY diff --git a/languages/sl-SI/Notifications.multids b/languages/sl-SI/Notifications.multids new file mode 100644 index 000000000..d6b803c37 --- /dev/null +++ b/languages/sl-SI/Notifications.multids @@ -0,0 +1,4 @@ +title: $:/language/Notifications/ + +Save/Done: Wiki je shranjen! +Save/Starting: Začenjam shranjevati wiki diff --git a/languages/sl-SI/Search.multids b/languages/sl-SI/Search.multids new file mode 100644 index 000000000..b059e9477 --- /dev/null +++ b/languages/sl-SI/Search.multids @@ -0,0 +1,20 @@ +title: $:/language/Search/ + +DefaultResults/Caption: Seznam +Filter/Caption: Filter +Filter/Hint: Išči po [[izrazu filtra|http://tiddlywiki.com/static/Filters.html]] +Filter/Matches: //<small><<resultCount>> zadetkov</small>// +Matches: //<small><<resultCount>> zadetkov</small>// +Matches/All: Vsi zadetki: +Matches/Title: Zadetki v naslovih +Search: Iskanje +Search/TooShort: Iskalni niz je prekratek +Shadows/Caption: Sence +Shadows/Hint: Išči v senčnih tiddlerjih +Shadows/Matches: //<small><<resultCount>> zadetkov</small>// +Standard/Caption: Standard +Standard/Hint: Išči v standardnih tiddlerjih +Standard/Matches: //<small><<resultCount>> zadetkov</small>// +System/Caption: Sistem +System/Hint: Išči v sistemskih tiddlerjih +System/Matches: //<small><<resultCount>> zadetkov</small>// diff --git a/languages/sl-SI/SideBar.multids b/languages/sl-SI/SideBar.multids new file mode 100644 index 000000000..c046a56da --- /dev/null +++ b/languages/sl-SI/SideBar.multids @@ -0,0 +1,16 @@ +title: $:/language/SideBar/ + +All/Caption: Vsi +Contents/Caption: Vsebina +Drafts/Caption: Osnutki +Missing/Caption: Manjkajoči +More/Caption: Več +Open/Caption: Odprti +Orphans/Caption: Sirote +Recent/Caption: Nedavni +Shadows/Caption: Sence +System/Caption: Sistem +Tags/Caption: Oznake +Tags/Untagged/Caption: neoznačeni +Tools/Caption: Orodja +Types/Caption: Tipi diff --git a/languages/sl-SI/SiteSubtitle.tid b/languages/sl-SI/SiteSubtitle.tid new file mode 100644 index 000000000..b80e5c336 --- /dev/null +++ b/languages/sl-SI/SiteSubtitle.tid @@ -0,0 +1,3 @@ +title: $:/SiteSubtitle + +nelinearna osebna spletna beležnica \ No newline at end of file diff --git a/languages/sl-SI/SiteTitle.tid b/languages/sl-SI/SiteTitle.tid new file mode 100644 index 000000000..35cec873d --- /dev/null +++ b/languages/sl-SI/SiteTitle.tid @@ -0,0 +1,3 @@ +title: $:/SiteTitle + +Moj ~TiddlyWiki \ No newline at end of file diff --git a/languages/sl-SI/Snippets/ListByTag.tid b/languages/sl-SI/Snippets/ListByTag.tid new file mode 100644 index 000000000..cd8f0c0ad --- /dev/null +++ b/languages/sl-SI/Snippets/ListByTag.tid @@ -0,0 +1,5 @@ +title: $:/language/Snippets/ListByTag +tags: $:/tags/TextEditor/Snippet +caption: Seznam tiddlerjev po oznaki + +<<list-links "[tag[task]sort[title]]">> diff --git a/languages/sl-SI/Snippets/MacroDefinition.tid b/languages/sl-SI/Snippets/MacroDefinition.tid new file mode 100644 index 000000000..546da207e --- /dev/null +++ b/languages/sl-SI/Snippets/MacroDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/MacroDefinition +tags: $:/tags/TextEditor/Snippet +caption: Makro definicija + +\define macroName(param1:"default value",param2) +Besedilo makra +\end diff --git a/languages/sl-SI/Snippets/Table4x3.tid b/languages/sl-SI/Snippets/Table4x3.tid new file mode 100644 index 000000000..356dee2e6 --- /dev/null +++ b/languages/sl-SI/Snippets/Table4x3.tid @@ -0,0 +1,8 @@ +title: $:/language/Snippets/Table4x3 +tags: $:/tags/TextEditor/Snippet +caption: Tabela s 4 stolpci in 3 vrsticami + +|! |!Alfa |!Beta |!Gama |!Delta | +|!Ena| | | | | +|!Dva| | | | | +|!Tri| | | | | diff --git a/languages/sl-SI/Snippets/TableOfContents.tid b/languages/sl-SI/Snippets/TableOfContents.tid new file mode 100644 index 000000000..e6182e527 --- /dev/null +++ b/languages/sl-SI/Snippets/TableOfContents.tid @@ -0,0 +1,9 @@ +title: $:/language/Snippets/TableOfContents +tags: $:/tags/TextEditor/Snippet +caption: Kazalo + +<div class="tc-table-of-contents"> + +<<toc-selective-expandable 'TableOfContents'>> + +</div> \ No newline at end of file diff --git a/languages/sl-SI/ThemeTweaks.multids b/languages/sl-SI/ThemeTweaks.multids new file mode 100644 index 000000000..25d41a2e1 --- /dev/null +++ b/languages/sl-SI/ThemeTweaks.multids @@ -0,0 +1,41 @@ +title: $:/language/ThemeTweaks/ + +Metrics: Velikost +Metrics/BodyFontSize: Velikost pisave za vsebino tiddlerja +Metrics/BodyLineHeight: Višina vrstice za vsebino tiddlerja +Metrics/FontSize: Velikost pisave +Metrics/LineHeight: Višina vrstice +Metrics/SidebarBreakpoint: Prelom stranske vrstice +Metrics/SidebarBreakpoint/Hint: najmanjša širina strani, pri kateri bosta zgodba<br>(reka tiddlerjev) in stranska vrstica prikazani vzporedno +Metrics/SidebarWidth: Širina stranske vrstice +Metrics/SidebarWidth/Hint: širina stranske vrstice pri variabilno/fiksni postavitvi +Metrics/StoryLeft: Zgodba položaj levo +Metrics/StoryLeft/Hint: kako daleč je levi rob zgodbe<br>(območje tiddlerja) od levega roba strani +Metrics/StoryRight: Zgodba položaj desno +Metrics/StoryRight/Hint: kako daleč je levi rob stranske vrstice od levega roba strani +Metrics/StoryTop: Zgodba položaj zgoraj +Metrics/StoryTop/Hint: kako daleč je zgornji rob zgodbe<br>(reka tiddlerjev) od vrha strani +Metrics/StoryWidth: Širina zgodbe +Metrics/StoryWidth/Hint: celotna širina zgodbe (reke tiddlerjev) +Metrics/TiddlerWidth: Širina tiddlerja +Metrics/TiddlerWidth/Hint: v zgodbi (reki tiddlerjev) +Options: Možnosti +Options/CodeWrapping: Prelomi dolge vrstice v blokih kode +Options/SidebarLayout: Postavitev stranske vrstice +Options/SidebarLayout/Fixed-Fluid: Fiksna zgodba, variabilna stranska vrstica +Options/SidebarLayout/Fluid-Fixed: Variabilna zgodba, fiksna stranska vrstica +Options/StickyTitles: Lepljivi naslovi +Options/StickyTitles/Hint: Naslovi tiddlerja, naj se »držijo« na vrhu okna brskalnika. Opozorilo: sploh ne deluje s Chromom in povzroča težave s postavitvijo v Firefoxu +Settings: Nastavitve +Settings/BackgroundImage: slika ozadja strani +Settings/BackgroundImageAttachment: Priponka slike za ozadje strani +Settings/BackgroundImageAttachment/Fixed: Fiksen položaj v oknu +Settings/BackgroundImageAttachment/Scroll: Pomika se z vsebino +Settings/BackgroundImageSize: Velikost slike ozadja strani +Settings/BackgroundImageSize/Auto: Samodejno +Settings/BackgroundImageSize/Contain: Prilagodi +Settings/BackgroundImageSize/Cover: Prekrij +Settings/CodeFontFamily: Družina pisav kode +Settings/FontFamily: Družina pisav +ThemeTweaks: Prilagoditev teme +ThemeTweaks/Hint: Prilagodite lahko nekatere elemente standardne ''Vanilla'' teme. diff --git a/languages/sl-SI/TiddlerInfo.multids b/languages/sl-SI/TiddlerInfo.multids new file mode 100644 index 000000000..6f9a4b7eb --- /dev/null +++ b/languages/sl-SI/TiddlerInfo.multids @@ -0,0 +1,21 @@ +title: $:/language/TiddlerInfo/ + +Advanced/Caption: Napredno +Advanced/PluginInfo/Empty/Hint: noben +Advanced/PluginInfo/Heading: Podrobnosti vtičnika +Advanced/PluginInfo/Hint: Ta vtičnik vsebuje naslednje senčne tiddlerje: +Advanced/ShadowInfo/Heading: Stanje sence +Advanced/ShadowInfo/NotShadow/Hint: Tiddler <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> ni senčni tiddler +Advanced/ShadowInfo/OverriddenShadow/Hint: Prvotni senčni tiddler je bil prepisan s tem tiddlerjem. Če izbrišete ta tiddler, bo prvotni senčni tiddler ponovno aktiven. +Advanced/ShadowInfo/Shadow/Hint: Tiddler <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> je senčni tiddler +Advanced/ShadowInfo/Shadow/Source: Definiran je v vtičniku <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link> +Fields/Caption: Polja +List/Caption: Seznam +List/Empty: Ta tiddler nima seznama +Listed/Caption: Našteto +Listed/Empty: Ta tiddler ni na seznamu drugih tiddlerjev. +References/Caption: Reference +References/Empty: Noben tiddler ni povezan s tem +Tagging/Caption: Označevanje +Tagging/Empty: Noben tiddler ni označen s tem +Tools/Caption: Orodja diff --git a/languages/sl-SI/Types/application%2Fjavascript.tid b/languages/sl-SI/Types/application%2Fjavascript.tid new file mode 100644 index 000000000..cd71d1159 --- /dev/null +++ b/languages/sl-SI/Types/application%2Fjavascript.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/application/javascript +description: JavaScript koda +name: application/javascript +group: Razvijalec diff --git a/languages/sl-SI/Types/application%2Fjson.tid b/languages/sl-SI/Types/application%2Fjson.tid new file mode 100644 index 000000000..fd9a57d42 --- /dev/null +++ b/languages/sl-SI/Types/application%2Fjson.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/application/json +description: JSON podatki +name: application/json +group: Razvijalec diff --git a/languages/sl-SI/Types/application%2Fx-tiddler-dictionary.tid b/languages/sl-SI/Types/application%2Fx-tiddler-dictionary.tid new file mode 100644 index 000000000..6592c222a --- /dev/null +++ b/languages/sl-SI/Types/application%2Fx-tiddler-dictionary.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/application/x-tiddler-dictionary +description: Podatkovni slovar +name: application/x-tiddler-dictionary +group: Razvijalec diff --git a/languages/sl-SI/Types/image%2Fgif.tid b/languages/sl-SI/Types/image%2Fgif.tid new file mode 100644 index 000000000..2f94eb4f4 --- /dev/null +++ b/languages/sl-SI/Types/image%2Fgif.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/image/gif +description: GIF slika +name: image/gif +group: Slika diff --git a/languages/sl-SI/Types/image%2Fjpeg.tid b/languages/sl-SI/Types/image%2Fjpeg.tid new file mode 100644 index 000000000..6e58ad288 --- /dev/null +++ b/languages/sl-SI/Types/image%2Fjpeg.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/image/jpeg +description: JPEG slika +name: image/jpeg +group: Slika diff --git a/languages/sl-SI/Types/image%2Fpng.tid b/languages/sl-SI/Types/image%2Fpng.tid new file mode 100644 index 000000000..db5634133 --- /dev/null +++ b/languages/sl-SI/Types/image%2Fpng.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/image/png +description: PNG slika +name: image/png +group: Slika diff --git a/languages/sl-SI/Types/image%2Fsvg%2Bxml.tid b/languages/sl-SI/Types/image%2Fsvg%2Bxml.tid new file mode 100644 index 000000000..4db97ea79 --- /dev/null +++ b/languages/sl-SI/Types/image%2Fsvg%2Bxml.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/image/svg+xml +description: SVG - Strukturirana vektorska grafika +name: image/svg+xml +group: Slika diff --git a/languages/sl-SI/Types/image%2Fx-icon.tid b/languages/sl-SI/Types/image%2Fx-icon.tid new file mode 100644 index 000000000..7007c1ac3 --- /dev/null +++ b/languages/sl-SI/Types/image%2Fx-icon.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/image/x-icon +description: Datoteka s ikono oblike ICO +name: image/x-icon +group: Slika diff --git a/languages/sl-SI/Types/text%2Fcss.tid b/languages/sl-SI/Types/text%2Fcss.tid new file mode 100644 index 000000000..b10e3a2d0 --- /dev/null +++ b/languages/sl-SI/Types/text%2Fcss.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/css +description: CSS - Cascading Style Sheets +name: text/css +group: Razvijalec diff --git a/languages/sl-SI/Types/text%2Fhtml.tid b/languages/sl-SI/Types/text%2Fhtml.tid new file mode 100644 index 000000000..ec091d2d0 --- /dev/null +++ b/languages/sl-SI/Types/text%2Fhtml.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/html +description: HTML - jezik za označevanje nadbesedila +name: text/html +group: Besedilo diff --git a/languages/sl-SI/Types/text%2Fplain.tid b/languages/sl-SI/Types/text%2Fplain.tid new file mode 100644 index 000000000..e8604a28a --- /dev/null +++ b/languages/sl-SI/Types/text%2Fplain.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/plain +description: Golo besedilo +name: text/plain +group: Besedilo diff --git a/languages/sl-SI/Types/text%2Fvnd.tiddlywiki.tid b/languages/sl-SI/Types/text%2Fvnd.tiddlywiki.tid new file mode 100644 index 000000000..57e59e22e --- /dev/null +++ b/languages/sl-SI/Types/text%2Fvnd.tiddlywiki.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/vnd.tiddlywiki +description: TiddlyWiki 5 wiki besedilo +name: text/vnd.tiddlywiki +group: Besedilo diff --git a/languages/sl-SI/Types/text%2Fx-tiddlywiki.tid b/languages/sl-SI/Types/text%2Fx-tiddlywiki.tid new file mode 100644 index 000000000..3c843b840 --- /dev/null +++ b/languages/sl-SI/Types/text%2Fx-tiddlywiki.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/x-tiddlywiki +description: TiddlyWiki Classic wiki besedilo +name: text/x-tiddlywiki +group: Besedilo diff --git a/languages/sl-SI/icon.tid b/languages/sl-SI/icon.tid new file mode 100644 index 000000000..b3b8d0584 --- /dev/null +++ b/languages/sl-SI/icon.tid @@ -0,0 +1,28 @@ +title: $:/languages/sl-SI/icon +type: image/svg+xml + +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'> +<svg xmlns="http://www.w3.org/2000/svg" height="600" width="1200" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 12 6"> + <title>Flag of Slovenia + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/sl-SI/plugin.info b/languages/sl-SI/plugin.info new file mode 100644 index 000000000..c002c5abe --- /dev/null +++ b/languages/sl-SI/plugin.info @@ -0,0 +1,8 @@ +{ + "title": "$:/languages/sl-SI", + "name": "sl-SI", + "plugin-type": "language", + "description": "Solvenian (Slovenia)", + "author": "Tomaž Ficko", + "core-version": ">=5.0.0" +} \ No newline at end of file diff --git a/languages/sv-SE/GettingStarted.tid b/languages/sv-SE/GettingStarted.tid index 2a629e61c..e6a4d3667 100755 --- a/languages/sv-SE/GettingStarted.tid +++ b/languages/sv-SE/GettingStarted.tid @@ -3,7 +3,7 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ Välkommen till ~TiddlyWiki och ~TiddlyWiki-community -För att komma igång med denna tomma ~TiddlyWiki, måste du ändra följande. Kolla på http://tiddlywiki.com/#GettingStarted för detaljer +För att komma igång med denna tomma ~TiddlyWiki, måste du ändra följande. Kolla på https://tiddlywiki.com/#GettingStarted för detaljer !! Ställ in denna ~TiddlyWiki diff --git a/languages/sv-SE/Misc.multids b/languages/sv-SE/Misc.multids index c064be15b..e70910218 100755 --- a/languages/sv-SE/Misc.multids +++ b/languages/sv-SE/Misc.multids @@ -1,7 +1,7 @@ title: $:/language/ BinaryWarning/Prompt: Denna tiddler innehåller binär data -ClassicWarning/Hint: Denna tiddler är skriven i TiddlyWiki klassisk wiki-textformat, vilket inte är fullständigt kompatibelt med TiddlyWiki version 5. Läs http://tiddlywiki.com/static/Upgrading.html för mer info. +ClassicWarning/Hint: Denna tiddler är skriven i TiddlyWiki klassisk wiki-textformat, vilket inte är fullständigt kompatibelt med TiddlyWiki version 5. Läs https://tiddlywiki.com/static/Upgrading.html för mer info. ClassicWarning/Upgrade/Caption: uppgradera CloseAll/Button: stäng alla ConfirmCancelTiddler: Vill du ångra ändringar för denna tiddler "<$text text=<>/>"? @@ -20,7 +20,7 @@ Encryption/RepeatPassword: Upprepa lösenordet Encryption/PasswordNoMatch: Lösenorden matchar inte Encryption/SetPassword: Ställ in lösenord InvalidFieldName: Ogiltigt tecken i namn-fältet "<$text text=<<fieldName>>/>". Fält kan bara innehålla gemena bokstäver, siffror och tecknen understreck (`_`), bindestreck (`-`) and punkt (`.`) -MissingTiddler/Hint: Saknar tiddler "<$text text=<<currentTiddler>>/>" - klicka {{$:/core/images/edit-button}} för att skapa +MissingTiddler/Hint: Saknar tiddler "<$text text=<<currentTiddler>>/>" - klicka {{||$:/core/ui/Buttons/edit}} för att skapa OfficialPluginLibrary: Officiella ~TiddlyWiki Insticksprogramsbibliotek PluginReloadWarning: Spara {{$:/core/ui/Buttons/save-wiki}} och ladda om {{$:/core/ui/Buttons/refresh}} för att ändringarna för insticksprogrammen ska slå igenom RecentChanges/DateFormat: DD MMM YYYY diff --git a/languages/sv-SE/Modals/Download.tid b/languages/sv-SE/Modals/Download.tid index 9f7b8caed..8d16ad94b 100755 --- a/languages/sv-SE/Modals/Download.tid +++ b/languages/sv-SE/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Download changes footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/DownloadingChanges.html +help: https://tiddlywiki.com/static/DownloadingChanges.html Din webbläsare stödjer bara manuell sparning. diff --git a/languages/sv-SE/Modals/SaveInstructions.tid b/languages/sv-SE/Modals/SaveInstructions.tid index eeb269bfa..56e4a093a 100755 --- a/languages/sv-SE/Modals/SaveInstructions.tid +++ b/languages/sv-SE/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Save your work footer: <$button message="tm-close-tiddler">Close</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html Dina ändringar för denna wiki behöver sparas som en ~TiddlyWiki HTML-fil. diff --git a/languages/sv-SE/Search.multids b/languages/sv-SE/Search.multids index 52b7c9b10..afee772b3 100755 --- a/languages/sv-SE/Search.multids +++ b/languages/sv-SE/Search.multids @@ -2,7 +2,7 @@ title: $:/language/Search/ DefaultResults/Caption: Lista Filter/Caption: Filter -Filter/Hint: Sök via [[filter expression|http://tiddlywiki.com/static/Filters.html]] +Filter/Hint: Sök via [[filter expression|https://tiddlywiki.com/static/Filters.html]] Filter/Matches: //<small><<resultCount>> träffar</small>// Matches: //<small><<resultCount>> träffar</small>// Shadows/Caption: Skuggor diff --git a/languages/zh-Hans/Buttons.multids b/languages/zh-Hans/Buttons.multids index b7bc7c29a..f6c074180 100644 --- a/languages/zh-Hans/Buttons.multids +++ b/languages/zh-Hans/Buttons.multids @@ -14,6 +14,8 @@ CloseOthers/Caption: 关闭其他 CloseOthers/Hint: 关闭其他条目 ControlPanel/Caption: 控制台 ControlPanel/Hint: 开启控制台 +CopyToClipboard/Caption: 复制到剪贴板 +CopyToClipboard/Hint: 将此文本复制到剪贴板 Delete/Caption: 删除 Delete/Hint: 删除此条目 Edit/Caption: 编辑 @@ -54,6 +56,8 @@ Info/Caption: 信息 Info/Hint: 显示此条目的信息 Language/Caption: 语言 Language/Hint: 选择用户介面语言 +Manager/Caption: 条目管理器 +Manager/Hint: 开启条目管理器 More/Caption: 更多 More/Hint: 更多动作 NewHere/Caption: 添加子条目 @@ -76,6 +80,8 @@ Permalink/Caption: 引用链接 Permalink/Hint: 设置浏览器网址栏为直接链接到此条目 Permaview/Caption: 永久链接 Permaview/Hint: 设置浏览器网址栏为直接链接到当前所有已开启条目 +Print/Caption: 打印页面 +Print/Hint: 打印当前页面 Refresh/Caption: 刷新 Refresh/Hint: 执行维基的完全刷新 Save/Caption: 确定 @@ -90,6 +96,12 @@ ShowSideBar/Caption: 显示侧边栏 ShowSideBar/Hint: 显示侧边栏 TagManager/Caption: 标签管理 TagManager/Hint: 标签管理 +Timestamp/Caption: 时间戳记 +Timestamp/Hint: 选择修改是否更新时间戳记 +Timestamp/On/Caption: 时间戳记开启 +Timestamp/On/Hint: 条目被修改时，更新时间戳记 +Timestamp/Off/Caption: 时间戳记关闭 +Timestamp/Off/Hint: 条目被修改时，不更新时间戳记 Theme/Caption: 布景主题 Theme/Hint: 选择布景主题 Bold/Caption: 粗体 @@ -129,6 +141,8 @@ LineWidth/Caption: 线宽 LineWidth/Hint: 设置绘画的线条宽度 Link/Caption: 链接 Link/Hint: 创建维基文字链接 +Linkify/Caption: 维基链接 +Linkify/Hint: 套用维基链接于所选文字 ListBullet/Caption: 符号清单 ListBullet/Hint: 套用符号清单格式于包含所选文本的列 ListNumber/Caption: 数字清单 @@ -149,6 +163,8 @@ PreviewType/Caption: 预览类型 PreviewType/Hint: 选择预览类型 Quote/Caption: 引言 Quote/Hint: 套用引言文本格式于包含所选文本的列 +RotateLeft/Caption: 向左旋转 +RotateLeft/Hint: 图像向左旋转 90 度 Size/Caption: 图像大小 Size/Caption/Height: 高度︰ Size/Caption/Resize: 调整图像的大小 @@ -165,5 +181,7 @@ Subscript/Caption: 下标 Subscript/Hint: 套用下标格式于所选文本 Superscript/Caption: 上标 Superscript/Hint: 套用上标格式于所选文本 +Transcludify/Caption: 嵌入 +Transcludify/Hint: 套用嵌入于所选文字 Underline/Caption: 下划线 Underline/Hint: 套用下划线格式于所选文本 diff --git a/languages/zh-Hans/ControlPanel.multids b/languages/zh-Hans/ControlPanel.multids index a3e922a31..8a7ce35a1 100644 --- a/languages/zh-Hans/ControlPanel.multids +++ b/languages/zh-Hans/ControlPanel.multids @@ -10,8 +10,10 @@ Basics/DefaultTiddlers/BottomHint: 标题含空白时请使用 [[双中 Basics/DefaultTiddlers/Prompt: 首页： Basics/DefaultTiddlers/TopHint: 默认开启的条目： Basics/Language/Prompt: 您好！当前的语言： -Basics/NewJournal/Title/Prompt: 新日志条目的名称 Basics/NewJournal/Tags/Prompt: 新日志条目的标签 +Basics/NewJournal/Text/Prompt: 新日志条目的内容 +Basics/NewJournal/Title/Prompt: 新日志条目的名称 +Basics/NewTiddler/Title/Prompt: 新条目的名称 Basics/OverriddenShadowTiddlers/Prompt: 被覆写的默认条目数量： Basics/ShadowTiddlers/Prompt: 默认条目数量： Basics/Subtitle/Prompt: 副标题： @@ -69,21 +71,29 @@ Plugins/NoInfoFound/Hint: 无 ''"<$text text=<<currentTab>>/>"'' Plugins/NoInformation/Hint: 未提供信息 Plugins/NotInstalled/Hint: 尚未安装此插件 Plugins/OpenPluginLibrary: 开启插件程式库 +Plugins/ClosePluginLibrary: 关闭插件程式库 Plugins/Plugins/Caption: 插件 Plugins/Plugins/Hint: 插件 Plugins/Reinstall/Caption: 重新安装 Plugins/Themes/Caption: 布景主题 Plugins/Themes/Hint: 布景主题插件 Parsing/Caption: 解析 -Parsing/Hint: 在此您可以全域禁用个别的维基语法解析规则。请小心，禁用某些解析规则，会妨碍 ~TiddlyWiki 正常运作 (您可以用[[安全模式|http://tiddlywiki.com/#SafeMode]]恢复正常操作) +Parsing/Hint: 在此您可以全域禁用或启用维基解析规则。要使更改生效，请保存并重新加载您的维基。禁用某些解析规则，会妨碍 <$text text="TiddlyWiki"/> 正常运作。可使用[[安全模式|https://tiddlywiki.com/#SafeMode]]恢复正常操作。 Parsing/Block/Caption: 区块解析规则 Parsing/Inline/Caption: 内联解析规则 Parsing/Pragma/Caption: 编译指示解析规则 Saving/Caption: 保存 -Saving/Heading: 保存 +Saving/DownloadSaver/AutoSave/Description: 允许下载保存模块的自动保存 +Saving/DownloadSaver/AutoSave/Hint: 启用下载保存模块的自动保存 +Saving/DownloadSaver/Caption: 下载保存模块 +Saving/DownloadSaver/Hint: 这些设置适用于兼容 HTML5 的下载保存模块 +Saving/General/Caption: 通用 +Saving/General/Hint: 这些设置适用于所有已载入的保存模块 +Saving/Hint: 用于通过保存模块将整个 TiddlyWiki 保存为单个文件的设置 Saving/TiddlySpot/Advanced/Heading: 高级设置 Saving/TiddlySpot/BackupDir: 备份文件夹 Saving/TiddlySpot/Backups: 备份 +Saving/TiddlySpot/Caption: ~TiddlySpot 保存模块 Saving/TiddlySpot/Description: 这些设置只适用于保存到 http://tiddlyspot.com 或兼容的远程服务器时。 Saving/TiddlySpot/Filename: 上传文件名 Saving/TiddlySpot/Heading: ~TiddlySpot @@ -95,16 +105,22 @@ Saving/TiddlySpot/UserName: 用户 Settings/AutoSave/Caption: 自动保存 Settings/AutoSave/Disabled/Description: 不要自动保存变更 Settings/AutoSave/Enabled/Description: 自动保存变更 -Settings/AutoSave/Hint: 在编辑过程中自动保存变更 +Settings/AutoSave/Hint: 当使用支持的保存模块时，在编辑期间尝试自动保存变更 Settings/CamelCase/Caption: 驼峰式维基链接 Settings/CamelCase/Hint: 您可以全域禁用驼峰式短语自动链接。须保存后重新加载，方才生效。 Settings/CamelCase/Description: 启用自动驼峰式链接 Settings/Caption: 设置 +Settings/DefaultSidebarTab/Caption: 默认侧边栏页签 +Settings/DefaultSidebarTab/Hint: 指定默认显示的侧边栏页签 +Settings/DefaultMoreSidebarTab/Caption: 更多侧边栏的默认页签 +Settings/DefaultMoreSidebarTab/Hint: 指定默认显示的更多侧栏页签 Settings/EditorToolbar/Caption: 编辑器工具栏 Settings/EditorToolbar/Hint: 启用或禁用编辑器工具栏︰ Settings/EditorToolbar/Description: 显示编辑器工具栏 -Settings/DefaultSidebarTab/Caption: 默认侧边栏页签 -Settings/DefaultSidebarTab/Hint: 指定默认显示的侧边栏页签 +Settings/InfoPanelMode/Caption: 条目信息面板模式 +Settings/InfoPanelMode/Hint: 控制条目信息面板何时关闭︰ +Settings/InfoPanelMode/Popup/Description: 条目信息面板自动关闭 +Settings/InfoPanelMode/Sticky/Description: 条目信息面板保持打开状态，直到明确关闭 Settings/Hint: 这些高级设置让您定制 TiddlyWiki 的行为。 Settings/LinkToBehaviour/Caption: 条目开启行为 Settings/LinkToBehaviour/InsideRiver/Hint: 从故事河//中//导航 @@ -143,18 +159,22 @@ Settings/TitleLinks/No/Description: 不显示条目标题为链接 Settings/TitleLinks/Yes/Description: 显示条目标题为链接 StoryView/Caption: 查看模式 StoryView/Prompt: 当前的查看模式： +Stylesheets/Caption: 样式表 +Stylesheets/Expand/Caption: 全部展开 +Stylesheets/Hint: 这是当前标签为 <<tag "$:/tags/Stylesheet">> 的样式表条目呈现的 CSS +Stylesheets/Restore/Caption: 复原 Theme/Caption: 布景主题 Theme/Prompt: 当前的布景主题： TiddlerFields/Caption: 条目栏位 TiddlerFields/Hint: 这是本维基使用中的所有条目栏位（含系统条目的栏位，但默认条目的栏位除外）。 Toolbars/Caption: 工具栏 Toolbars/EditToolbar/Caption: 编辑工具栏 -Toolbars/EditToolbar/Hint: 选择将显示哪些按钮于条目的编辑模式工具栏 +Toolbars/EditToolbar/Hint: 选择将显示哪些按钮于条目的编辑模式工具栏。拖放可改变顺序。 Toolbars/Hint: 选择将显示哪些工具栏按钮 Toolbars/PageControls/Caption: 页面工具栏 -Toolbars/PageControls/Hint: 选择将显示哪些按钮于主页面的工具栏 +Toolbars/PageControls/Hint: 选择将显示哪些按钮于主页面的工具栏。拖放可改变顺序。 Toolbars/EditorToolbar/Caption: 编辑器工具栏 -Toolbars/EditorToolbar/Hint: 选择将显示哪些按钮于编辑器工具栏。请注意，某些按钮只会出现在编辑某一类型的条目时。 +Toolbars/EditorToolbar/Hint: 选择将显示哪些按钮于编辑器工具栏。请注意，某些按钮只会出现在编辑某一类型的条目时。拖放可改变顺序。 Toolbars/ViewToolbar/Caption: 查看工具栏 -Toolbars/ViewToolbar/Hint: 选择将显示哪些按钮于条目的查看模式工具栏 +Toolbars/ViewToolbar/Hint: 选择将显示哪些按钮于条目的查看模式工具栏。拖放可改变顺序。 Tools/Download/Full/Caption: 下载完整副本 diff --git a/languages/zh-Hans/Docs/ModuleTypes.multids b/languages/zh-Hans/Docs/ModuleTypes.multids index 538918878..8969e7131 100644 --- a/languages/zh-Hans/Docs/ModuleTypes.multids +++ b/languages/zh-Hans/Docs/ModuleTypes.multids @@ -1,16 +1,21 @@ title: $:/language/Docs/ModuleTypes/ +allfilteroperator: ''all'' 筛选器算子的子算子。 animation: 动画模块包含可用于 RevealWidget 的动画。 +bitmapeditoroperation: 一个位图编辑器工具栏操作。 command: 可于 Node.js 执行的指令。 config: 加入 `$tw.config` 的数据。 filteroperator: 个别筛选器算子方法。 global: 加入 `$tw` 的全域数据。 +info: 透过 [[$:/temp/info-plugin]] 伪插件，发布系统信息。 isfilteroperator: ''is'' 筛选器算子的运算符。 +library: 一般用途的 JavaScript 模块的通用模块类型。 macro: JavaScript ''宏''定义。 parser: 不同内容类型的解析器。 saver: 于浏览器保存文件的不同的保存处理方法。 startup: 启动时期的功能函数。 storyview: 查看模式用以自订 list 小部件的动画与行为。 +texteditoroperation: 一个文本编辑器工具栏操作。 tiddlerdeserializer: 转换不同内容类型至条目。 tiddlerfield: 定义个别条目栏位的行为。 tiddlermethod: 添加方法至 `$tw.Tiddler` 原型。 diff --git a/languages/zh-Hans/EditTemplate.multids b/languages/zh-Hans/EditTemplate.multids index 263c50cae..3b6f31d72 100644 --- a/languages/zh-Hans/EditTemplate.multids +++ b/languages/zh-Hans/EditTemplate.multids @@ -1,16 +1,18 @@ title: $:/language/EditTemplate/ -Body/External/Hint: 这是保存于主要的 TiddlyWiki 文件之外的外部条目。你可以编辑其标签和栏位，但不能直接编辑内容本身 +Body/External/Hint: 此条目显示保存于主要的 TiddlyWiki 文件之外的内容。你可以编辑其标签和字段，但不能直接编辑内容本身 Body/Placeholder: 输入此条目的内容 Body/Preview/Type/Output: 输出 -Field/Remove/Caption: 删除栏位 -Field/Remove/Hint: 删除栏位 +Field/Remove/Caption: 删除字段 +Field/Remove/Hint: 删除字段 +Field/Dropdown/Caption: 字段列表 +Field/Dropdown/Hint: 顯示字段列表 Fields/Add/Button: 添加 -Fields/Add/Dropdown/System: 系统栏位 -Fields/Add/Dropdown/User: 使用者栏位 -Fields/Add/Name/Placeholder: 栏位名称 -Fields/Add/Prompt: 添加栏位： -Fields/Add/Value/Placeholder: 栏位内容 +Fields/Add/Dropdown/System: 系统字段 +Fields/Add/Dropdown/User: 使用者字段 +Fields/Add/Name/Placeholder: 字段名称 +Fields/Add/Prompt: 添加字段： +Fields/Add/Value/Placeholder: 字段内容 Shadow/Warning: 这是一个默认条目。您做的任何更改将会覆盖来自 <<pluginLink>> 插件的默认版本。 Shadow/OverriddenWarning: 这是一个修改过的默认条目。删除此条目可以还原为 <<pluginLink>> 插件中的默认版本。 Tags/Add/Button: 添加 @@ -18,6 +20,8 @@ Tags/Add/Placeholder: 标签名称 Tags/Dropdown/Caption: 标签清单 Tags/Dropdown/Hint: 显示标签清单 Title/BadCharacterWarning: 请注意，避免在条目名称中使用这些字符：<<bad-chars>> +Title/Exists/Prompt: 目标条目已经存在 +Title/Relink/Prompt: 将在其他条目的 //tags// 和 //list// 字段中的 ''<$text text=<<fromTitle>>/>'' 改为 ''<$text text=<<toTitle>>/>'' Type/Dropdown/Caption: 内容类型清单 Type/Dropdown/Hint: 显示内容类型清单 Type/Delete/Caption: 删除内容类型 diff --git a/languages/zh-Hans/Fields.multids b/languages/zh-Hans/Fields.multids index d6b748f03..61044cb9e 100644 --- a/languages/zh-Hans/Fields.multids +++ b/languages/zh-Hans/Fields.multids @@ -17,8 +17,8 @@ hack-to-give-us-something-to-compare-against: 于 [[$:/core/templates/static.con icon: 条目的标题含有与条目关联的图标 library: 若设为 “yes”，表示条目应该被保存为一个 JavaScript 程序库 list: 条目的列表，指定一些条目的标题清单 -list-before:当前条目名称将被添加到条目排序清单中的设置条目名称之前，或若此栏位存在但是空的，则在清单的起始位置 -list-after: 当前条目名称将被添加到条目排序清单的设置条目名称之后 +list-before:当前条目名称将被添加到条目排序清单中的设置条目名称之前，或若此栏位存在但是空的，则被添加於清单的前端 +list-after: 当前条目名称将被添加到条目排序清单的设置条目名称之后，或若此栏位存在但是空的，則被添加於清單的尾端 modified: 条目的最近修改日期与时间 modifier: 条目的最近修改者 name: 具可读性的插件条目的名称 diff --git a/languages/zh-Hans/Filters.multids b/languages/zh-Hans/Filters.multids index b37194a57..4cee66b01 100644 --- a/languages/zh-Hans/Filters.multids +++ b/languages/zh-Hans/Filters.multids @@ -11,4 +11,5 @@ SystemTiddlers: 系统条目 ShadowTiddlers: 默认条目 OverriddenShadowTiddlers: 被覆写的默认条目 SystemTags: 系统标签 +StoryList: 故事河中的条目，不含 ~$:/AdvancedSearch TypedTiddlers: 非维基文字条目 diff --git a/languages/zh-Hans/GettingStarted.tid b/languages/zh-Hans/GettingStarted.tid index 940094b8e..20cc2329a 100644 --- a/languages/zh-Hans/GettingStarted.tid +++ b/languages/zh-Hans/GettingStarted.tid @@ -3,7 +3,7 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ 欢迎使用 ~TiddlyWiki 及参与 ~TiddlyWiki 社群 -开始将重要资讯存放于 ~TiddlyWiki 之前，确认您可以可靠地保存变更是很重要的。详细资讯请参阅 http://tiddlywiki.com/#GettingStarted +开始将重要资讯存放于 ~TiddlyWiki 之前，确认您可以可靠地保存变更是很重要的。详细资讯请参阅 https://tiddlywiki.com/#GettingStarted !! 设置此 ~TiddlyWiki diff --git a/languages/zh-Hans/Help/fetch.tid b/languages/zh-Hans/Help/fetch.tid new file mode 100644 index 000000000..39c37bb6c --- /dev/null +++ b/languages/zh-Hans/Help/fetch.tid @@ -0,0 +1,37 @@ +title: $:/language/Help/fetch +description: 通过网址从维基撷取条目 + +通过 HTTP/HTTPS 撷取一个或多个文件，并导入匹配筛选器的条目，可选的转换传入的名称。 + +``` +--fetch file <url> <import-filter> <transform-filter> +--fetch files <url-filter> <import-filter> <transform-filter> +--fetch raw-file <url> <transform-filter> +--fetch raw-files <url-filter> <transform-filter> +``` + + "file" 和 "files" 选项撷取指定的文件，并尝试导入其中的条目（与将文件拖动到浏览器视窗中的处理相同）。 "raw-file" 和 "raw-files" 变选项撷取指定的文件，并将原始文件资料存储于条目，而不套用导入逻辑。 + +使用 "file" and "raw-file" 选项为仅撷取单个文件，且第一个参数为要读取文件的网址。 + +使用 "files" 和 "raw-files" 选项为撷取多个文件，且第一个参数是一个产生要读取文件的网址清单的筛选器。例如，给定标签为 "remote-server" 的一组具有字段 "url" 的条目，筛选器 `[tag[remote-server]get[url]]` 将取回所有可用的网址。 + +对于 "file" 和 "files" 选项，the `<import-filter>` 参数指定一个筛选器，用于确定要导入哪些条目。如果未提供，则默认为 `[all[tiddlers]]`。 + +对于所有选项，`<transform-filter>` 参数指定一个可选的筛选器，用于转换导入条目的名称。例如，`[addprefix[$:/myimports/]]` 会将前缀 `$:/myimports/` 加至每个名称。 + +于 `--fetch` 之前使用 `--verbose` 命令，将在导入期间输出进度信息。 + +请注意，TiddlyWiki 不会撷取一个已经加载插件的旧版本。 + +以下示例从 https://tiddlywiki.com 取回所有非系统条目，并将其保存到一个 JSON 文件： + +``` +tiddlywiki --verbose --fetch file "https://tiddlywiki.com/" "[!is[system]]" "" --rendertiddler "$:/core/templates/exporters/JsonFile" output.json text/plain "" exportFilter "[!is[system]]" +``` + +以下范例从 https://tiddlywiki.com 取回 "favicon" 文件，并将其保存在名为 "output.ico" 的文件中。请注意，在 "--fetch" 命令中引用的中间条目 "Icon Tiddler"，因为它被用作转换筛选器来替换预设的名称，而 "--savetiddler" 命令没有引号，因为它是直接用作标题。 + +``` +tiddlywiki --verbose --fetch raw-file "https://tiddlywiki.com/favicon.ico" "[[Icon Tiddler]]" --savetiddler "Icon Tiddler" output.ico +``` diff --git a/languages/zh-Hans/Help/import.tid b/languages/zh-Hans/Help/import.tid new file mode 100644 index 000000000..a9d11bf9f --- /dev/null +++ b/languages/zh-Hans/Help/import.tid @@ -0,0 +1,24 @@ +title: $:/language/Help/import +description: 从文件导入条目 + +从 TiddlyWiki 文件 (`.html`)、`.tiddler`、`.tid`、`.json` 或其他本机文件导入条目。必须明确指定解串器，而不像 load 命令，从文件扩展名推断解串器。 + +``` +--import <filepath> <deserializer> [<title>] [<encoding>] +``` + +核心的解串器包括： + +* application/javascript +* application/json +* application/x-tiddler +* application/x-tiddler-html-div +* application/x-tiddlers +* text/html +* text/plain + +导入的条目名称，默认为文件名。 + +编码默认为 "utf8"，但用于导入二进制文件可以是 "base64"。 + +请注意，TiddlyWiki 不会导入旧版本的已加载插件。 diff --git a/languages/zh-Hans/Help/load.tid b/languages/zh-Hans/Help/load.tid index 4629a27c9..586e277ef 100644 --- a/languages/zh-Hans/Help/load.tid +++ b/languages/zh-Hans/Help/load.tid @@ -1,10 +1,11 @@ title: $:/language/Help/load description: 从文件中加载条目 -从 2.x.x TiddlyWiki (`.html`), `.tiddler`, `.tid`, `.json` 或其他文件加载条目 +从 TiddlyWiki (`.html`), `.tiddler`, `.tid`, `.json` 或其他本机文件加载条目。应用的处理程序取决于导入文件的扩展名。如果您需要明确指定解串器和编码，请改用 `import` 命令。 ``` --load <filepath> +--load <dirpath> ``` 从已加密的 TiddlyWiki 文件中加载条目，须使用 PasswordCommand 指定密码，例如： diff --git a/languages/zh-Hans/Help/render.tid b/languages/zh-Hans/Help/render.tid new file mode 100644 index 000000000..e1400bd74 --- /dev/null +++ b/languages/zh-Hans/Help/render.tid @@ -0,0 +1,33 @@ +title: $:/language/Help/render +description: 呈现个别条目到文件 + +呈现由筛选器标识的个别条目，并将结果保存到指定的文件。 + +可选择性地指定范本条目名称。在此情况下，不是直接呈现每个条目，而是使用设为正在呈现的条目名称的 "currentTiddler" 变量，来呈现范本条目。 + +也可以选择性地指定附加变量的名称和值。 + +``` +--render <tiddler-filter> [<filename-filter>] [<render-type>] [<template>] [<name>] [<value>] +``` + +* ''tiddler-filter'': 标识要呈现的条目的筛选器 +* ''filename-filter'': 可选的筛选器，转换条目名称至路径名。如果省略，默认为 `[is[tiddler]addsuffix[.html]]`，其使用未改变的条目名称为文件名 +* ''template'': 可选的范本，用于呈现每个条目 +* ''render-type'': 可选的呈现类型：`text/html` (默认值) 会传回完整的 HTML 文本，而 `text/plain` 只会传回文本内容 (即其忽略 HTML 标记与其他不可印出的数据) +* ''name'': 可选的变量名称 +* ''value'': 可选的变量值 + +默认情况下，文件名被解析为相对于发行版文件夹的 `output` 子文件夹。`--output` 命令可用于将输出指到一个不同的文件夹。 + +附注： + +* 输出目录不清除任何现有的文件 +* 文件名的路径中，任何不存在的文件夹，将自动创建。 +* 当正呈现的条目名称中带有空格，请注意同时使用命令行接口所要求的引号，与 TiddlyWiki 的双重方括号；`--render "[[Motovun Jack.jpg]]"` +* 所选的项目被设置为当前正在呈现的条目名称，以此评估文件名筛选器，允条目名称用作基础计算的文件名。例如，`[encodeuricomponent[]addprefix[static/]]` 为每个条目名称套用 URI 编码，然后增加首码 `static/` +* `--render` 命令是已弃用的 `--rendertiddler` 和 `--rendertiddlers` 的一个更灵活的替代命令。 + +例子： + +* `--render "[!is[system]]" "[encodeuricomponent[]addprefix[tiddlers/]addsuffix[.html]]"` -- 呈现所有非系统条目为 "tiddlers" 子文件夹中的文件，文件名为 URL 编码的条目名称和扩展名 HTML diff --git a/languages/zh-Hans/Help/rendertiddler.tid b/languages/zh-Hans/Help/rendertiddler.tid index 2d6883e39..3ee3b9c37 100644 --- a/languages/zh-Hans/Help/rendertiddler.tid +++ b/languages/zh-Hans/Help/rendertiddler.tid @@ -1,7 +1,13 @@ title: $:/language/Help/rendertiddler -description: 呈现个别条目为指定的内容类型 +description: 呈现个别条目为指定的内容类型 -呈现个别条目为指定的[[内容类型|ContentType]]，默认为 `text/html` 且保存为指定的文件名。还可以指定一个范本，在这种情况下，"currentTiddler" 变数设为正在呈现的条目 (第一个参数值) 与范本条目合并呈现。 +(请注意：`--rendertiddler` 命令已被弃用，而支持新的、更灵活的 `--render` 命令) + +呈现个别条目为指定的[[内容类型|ContentType]]，默认为 `text/html` 且保存为指定的文件名。 + +还可以指定一个模板，在这种情况下，"currentTiddler" 变量设为正在呈现的条目 (第一个参数值) 与模板条目合并呈现。 + +也能可选地指定附加变量的名称与其值。 ``` --rendertiddler <title> <filename> [<type>] [<template>] @@ -9,4 +15,10 @@ description: 呈现个别条目为指定的内容类型 默认情况下，文件名被解析为相对于版本文件夹的 `output` 子文件夹。 `--output` 命令可以用于将输出指定到一个不同的文件夹。 -自动创建在文件名称的路径中任何缺少的文件夹。 \ No newline at end of file +自动创建在文件名称的路径中任何缺少的文件夹。 + +例如，以下命令通过使用核心模板 `$:/core/templates/exporters/JsonFile`，将所有匹配筛选器 `[tag[done]]` 的条目保存到名为 `output.json` 的 JSON 文件。 + +``` +--rendertiddler "$:/core/templates/exporters/JsonFile" output.json text/plain "" exportFilter "[tag[done]]" +``` \ No newline at end of file diff --git a/languages/zh-Hans/Help/rendertiddlers.tid b/languages/zh-Hans/Help/rendertiddlers.tid index 94e4d9bb9..8bb3b43ad 100644 --- a/languages/zh-Hans/Help/rendertiddlers.tid +++ b/languages/zh-Hans/Help/rendertiddlers.tid @@ -1,6 +1,8 @@ title: $:/language/Help/rendertiddlers description: 呈现符合筛选条件的条目为指定的内容类型 +(请注意：`--rendertiddlers` 命令已被弃用，而支持新的、更灵活的 `--render` 命令) + 呈现符合筛选条的条目为指定的[[内容类型|ContentType]] (默认为 `text/html`) 与扩展名 (默认为 `.html`). ``` diff --git a/languages/zh-Hans/Help/save.tid b/languages/zh-Hans/Help/save.tid new file mode 100644 index 000000000..75f317bcf --- /dev/null +++ b/languages/zh-Hans/Help/save.tid @@ -0,0 +1,23 @@ +title: $:/language/Help/save +description: 将个别原始条目保存到文件 + +将筛选器标识的个别条目，以原始文本或二进位格式，保存到指定的文件。 + +``` +--save <tiddler-filter> <filename-filter> +``` + +* ''tiddler-filter'': 标识要保存的条目的筛选器 +* ''filename-filter'': 可选的筛选器，转换条目名称至路径名。如果省略，默认为 `[is[tiddler]]`，其使用未改变的条目名称为文件名 + +附注： + +* 输出文件夹不清除任何现有的文件 +* 文件名的路径中，任何不存在的文件夹，将自动创建。 +* 当正保存的条目的名称中带有空格，请注意同时使用命令行接口所要求的引号，与 TiddlyWiki 的双重方括号；`--save "[[Motovun Jack.jpg]]"` +* 所选的项目被设置为当前正在保存的条目名称，以此评估文件名筛选器，允条目名称用作基础计算的文件名。例如，`[encodeuricomponent[]addprefix[static/]]` 为每个条目名称套用 URI 编码，然后增加首码 `static/` +* `--save` 命令是已被弃用的 `--savetiddler` 和 `--savetiddlers` 的一个更灵活的替代命令。 + +例子： + +* `--save "[!is[system]is[image]]" "[encodeuricomponent[]addprefix[tiddlers/]]"` -- 保存所有非系统的图像条目为 "tiddlers" 子文件夹中的文件，文件名为 URL 编码的条目名称 \ No newline at end of file diff --git a/languages/zh-Hans/Help/savetiddler.tid b/languages/zh-Hans/Help/savetiddler.tid index c3fd22d92..b23335f3e 100644 --- a/languages/zh-Hans/Help/savetiddler.tid +++ b/languages/zh-Hans/Help/savetiddler.tid @@ -1,6 +1,8 @@ title: $:/language/Help/savetiddler description: 将条目的原始内容保存到一个文件 +(请注意：`--savetiddler` 命令已被弃用，而支持新的、更灵活的 `--save` 命令) + 保存个别条目的原始文本或二进制格式到指定的文件名。 ``` diff --git a/languages/zh-Hans/Help/savetiddlers.tid b/languages/zh-Hans/Help/savetiddlers.tid index 9b0291868..9cc5b4921 100644 --- a/languages/zh-Hans/Help/savetiddlers.tid +++ b/languages/zh-Hans/Help/savetiddlers.tid @@ -1,6 +1,8 @@ title: $:/language/Help/savetiddlers description: 将一群条目的原始内容保存到一个文件夹 +(请注意：`--savetiddlers` 命令已被弃用，而支持新的、更灵活的 `--save` 命令) + 保存一群条目的原始文字或二进制格式到指定的文件夹。 ``` diff --git a/languages/zh-Hans/Help/server.tid b/languages/zh-Hans/Help/server.tid index 8ac221f41..4c7b0210d 100644 --- a/languages/zh-Hans/Help/server.tid +++ b/languages/zh-Hans/Help/server.tid @@ -11,7 +11,7 @@ description: 提供一个 HTTP 服务器介面到 TiddlyWiki 参数说明： -* ''port'' - 服务的埠号 (默认为 "8080") +* ''port'' - 要侦听的埠号；非数值会被解译为一个系统环境变数，从其中提取埠号 (默认为 "8080") * ''roottiddler'' - 服务的基本条目 (默认为 "$:/core/save/all") * ''rendertype'' - 呈现的基本条目内容类型 (默认为 "text/plain") * ''servetype'' - 服务的基本条目内容类型(默认为 "text/html") @@ -19,6 +19,7 @@ description: 提供一个 HTTP 服务器介面到 TiddlyWiki * ''password'' - 可选的基本验证密码 * ''host'' - 可选的主机名称， (默认为 "127.0.0.1" 或名为 "localhost") * ''pathprefix'' - 可选的路径前缀 +* ''debuglevel'' - 可選的調試級別；設置為 "debug" 來查看請求的詳細信息；(默認為 "none") 若指定密码参数，浏览器将提示使用者输入用户名与密码。注意，密码系以明码方式传递，因此并不适合一般正式用途。 @@ -34,4 +35,8 @@ description: 提供一个 HTTP 服务器介面到 TiddlyWiki --server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245 ``` -同时执行多个 TiddlyWiki 服务，须分别指定不同的埠号。 +同时执行多个 TiddlyWiki 服务，须分别指定不同的埠号。使用环境变数，有助于将埠号传递给 Node.js 进程。本示例引用一个名为 "MY_PORT_NUMBER" 的环境变数: + +``` +--server MY_PORT_NUMBER $:/core/save/all text/plain text/html MyUserName passw0rd +``` \ No newline at end of file diff --git a/languages/zh-Hans/Import.multids b/languages/zh-Hans/Import.multids index 82fd66924..e9b85a8e4 100644 --- a/languages/zh-Hans/Import.multids +++ b/languages/zh-Hans/Import.multids @@ -7,6 +7,12 @@ Listing/Import/Caption: 导入 Listing/Select/Caption: 选择 Listing/Status/Caption: 状态 Listing/Title/Caption: 条目 +Listing/Preview: 预览： +Listing/Preview/Text: 文本 +Listing/Preview/TextRaw: 文本 (原始) +Listing/Preview/Fields: 字段 +Listing/Preview/Diff: 差异 +Listing/Preview/DiffFields: 差异 (字段) Upgrader/Plugins/Suppressed/Incompatible: 封锁的不兼容或过时插件 Upgrader/Plugins/Suppressed/Version: 封锁的插件 (由于传入的 <<incoming>> 较现有版本 <<existing>> 旧) Upgrader/Plugins/Upgraded: 升级插件，从 <<incoming>> 到 <<upgraded>> diff --git a/languages/zh-Hans/Misc.multids b/languages/zh-Hans/Misc.multids index bd69f0d98..84f927808 100644 --- a/languages/zh-Hans/Misc.multids +++ b/languages/zh-Hans/Misc.multids @@ -1,8 +1,8 @@ title: $:/language/ -AboveStory/ClassicPlugin/Warning: 您貌似要加载为 ~TiddlyWiki 经典版设计的插件。请注意，[[这些插件无法运行于 TiddlyWiki 5.x.x 版|http://tiddlywiki.com/#TiddlyWikiClassic]]。检测到 ~TiddlyWiki 经典版插件： +AboveStory/ClassicPlugin/Warning: 您貌似要加载为 ~TiddlyWiki 经典版设计的插件。请注意，[[这些插件无法运行于 TiddlyWiki 5.x.x 版|https://tiddlywiki.com/#TiddlyWikiClassic]]。检测到 ~TiddlyWiki 经典版插件： BinaryWarning/Prompt: 此条目包含二进制数据 -ClassicWarning/Hint: 此条目以经典版 TiddlyWiki 标记格式撰写，不完全兼容新版 TiddlyWiki 的格式，详细信息请参阅：http://tiddlywiki.com/static/Upgrading。 +ClassicWarning/Hint: 此条目以经典版 TiddlyWiki 标记格式撰写，不完全兼容新版 TiddlyWiki 的格式，详细信息请参阅：https://tiddlywiki.com/static/Upgrading。 ClassicWarning/Upgrade/Caption: 升级 CloseAll/Button: 全部关闭 ColourPicker/Recent: 最近︰ @@ -12,6 +12,7 @@ ConfirmOverwriteTiddler: 您确定要覆写条目 "<$text text=<<title>>/>"？ ConfirmEditShadowTiddler: 您即将要编辑默认条目，任何更改将会覆盖默认的系统，使未来的升级不寻常。您确定要编辑 "<$text text=<<title>>/>"? Count: 计数 DefaultNewTiddlerTitle: 新条目 +Diffs/CountMessage: <<diff-count>> 个差异 DropMessage: 拖放到此处 （或按 ESC 键取消） Encryption/Cancel: 取消 Encryption/ConfirmClearPassword: 您要清除密码吗？当保存此维基时，这将删除已套用的加密 @@ -22,6 +23,7 @@ Encryption/RepeatPassword: 重复输入密码 Encryption/PasswordNoMatch: 密码不匹配 Encryption/SetPassword: 设定密码 Error/Caption: 错误 +Error/EditConflict: 服务器上的文件已更改 Error/Filter: 筛选器错误 Error/FilterSyntax: 筛选器运算式中的语法错误 Error/IsFilterOperator: 筛选器错误︰'is' 筛选器运算符的未知操作数 @@ -34,15 +36,33 @@ Error/XMLHttpRequest: XMLHttpRequest 错误代码 InternalJavaScriptError/Title: 内部的 JavaScript 错误 InternalJavaScriptError/Hint: 喔，真是令人尴尬。建议刷新您的浏览器，重新启动 TiddlyWiki InvalidFieldName: 栏位名称 "<$text text=<<fieldName>>/>" 包含无效字符，栏位名称只能包含小写字母、数字、底线 (`_`)、 连字号 (`-`) 和小数点 (`.`) -LazyLoadingWarning: <p>正在从 ''<$text text={{!!_canonical_uri}}/>'' 加载外部条目 ...</p><p>如果此信息未消失，可能您使用的浏览器不支援此配置的外部条目。请参阅 http://tiddlywiki.com/#ExternalText</p> +LazyLoadingWarning: <p>正在从 ''<$text text={{!!_canonical_uri}}/>'' 加载外部内容 ...</p><p>如果此信息未消失，可能是条目内容类型与外部内容的类型不匹配，或是您可能正在使用的浏览器，不支援单文件式维基的外部内容。请参阅 https://tiddlywiki.com/#ExternalText</p> LoginToTiddlySpace: 登录 TiddlySpace -MissingTiddler/Hint: 佚失条目 "<$text text=<<currentTiddler>>/>" - 点击 {{$:/core/images/edit-button}} 可创建此条目 +Manager/Controls/FilterByTag/None: (无) +Manager/Controls/FilterByTag/Prompt: 依标签筛选︰ +Manager/Controls/Order/Prompt: 反向顺序 +Manager/Controls/Search/Placeholder: 搜寻 +Manager/Controls/Search/Prompt: 搜寻︰ +Manager/Controls/Show/Option/Tags: 标签 +Manager/Controls/Show/Option/Tiddlers: 条目 +Manager/Controls/Show/Prompt: 显示︰ +Manager/Controls/Sort/Prompt: 排序︰ +Manager/Item/Colour: 颜色 +Manager/Item/Fields: 栏位 +Manager/Item/Icon/None: (无) +Manager/Item/Icon: 图标 +Manager/Item/RawText: 原始文字 +Manager/Item/Tags: 标签 +Manager/Item/Tools: 工具 +Manager/Item/WikifiedText: Wikified 文字 +MissingTiddler/Hint: 佚失条目 "<$text text=<<currentTiddler>>/>" - 点击 {{||$:/core/ui/Buttons/edit}} 可创建此条目 No: 否 OfficialPluginLibrary: ~TiddlyWiki 官方插件程式库 OfficialPluginLibrary/Hint: 此为在 tiddlywiki.com 的 ~TiddlyWiki 官方插件程式库。由核心团队维护的插件、主题和语言包。 PluginReloadWarning: 请保存 {{$:/core/ui/Buttons/save-wiki}} 并刷新页面 {{$:/core/ui/Buttons/refresh}} 允许更改插件才能生效 RecentChanges/DateFormat: YYYY年0MM月0DD日 SystemTiddler/Tooltip: 此为系统条目 +SystemTiddlers/Include/Prompt: 包括系统条目 TagManager/Colour/Heading: 颜色 TagManager/Count/Heading: 计数 TagManager/Icon/Heading: 图标 diff --git a/languages/zh-Hans/Modals/Download.tid b/languages/zh-Hans/Modals/Download.tid index 584ade7a0..feecca254 100644 --- a/languages/zh-Hans/Modals/Download.tid +++ b/languages/zh-Hans/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Download changes footer: <$button message="tm-close-tiddler">关闭</$button> -help: http://tiddlywiki.com/ +help: https://tiddlywiki.com/ 您的浏览器只支援手动保存。 diff --git a/languages/zh-Hans/Modals/SaveInstructions.tid b/languages/zh-Hans/Modals/SaveInstructions.tid index f19c4d353..b6ae6fe31 100644 --- a/languages/zh-Hans/Modals/SaveInstructions.tid +++ b/languages/zh-Hans/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Save your work footer: <$button message="tm-close-tiddler">关闭</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html 您对此 wiki 的变更需被保存为 ~TiddlyWiki HTML 文件。 diff --git a/languages/zh-Hans/NewJournal.multids b/languages/zh-Hans/NewJournal.multids index 5401f74a8..fadcc911a 100644 --- a/languages/zh-Hans/NewJournal.multids +++ b/languages/zh-Hans/NewJournal.multids @@ -1,4 +1,5 @@ title: $:/config/NewJournal/ Title: YYYY年0MM月0DD日 +Text: Tags: 日志 diff --git a/languages/zh-Hans/Notifications.multids b/languages/zh-Hans/Notifications.multids index efb5599af..fcefa8040 100644 --- a/languages/zh-Hans/Notifications.multids +++ b/languages/zh-Hans/Notifications.multids @@ -2,3 +2,5 @@ title: $:/language/Notifications/ Save/Done: 已保存 wiki Save/Starting: 开始保存 wiki +CopiedToClipboard/Succeeded: 复制完成！ +CopiedToClipboard/Failed: 无法复制到剪贴板！ diff --git a/languages/zh-Hans/Search.multids b/languages/zh-Hans/Search.multids index d3e2f570e..06bf94170 100644 --- a/languages/zh-Hans/Search.multids +++ b/languages/zh-Hans/Search.multids @@ -2,12 +2,13 @@ title: $:/language/Search/ DefaultResults/Caption: 列表 Filter/Caption: 筛选 -Filter/Hint: 以[[筛选表达式|http://tiddlywiki.com/static/Filters.html]]查找 +Filter/Hint: 以[[筛选表达式|https://tiddlywiki.com/static/Filters.html]]查找 Filter/Matches: //<small><<resultCount>> 个条目符合条件</small>// Matches: //<small><<resultCount>> 个条目符合条件</small>// Matches/All: 所有匹配： Matches/Title: 条目名称匹配： Search: 查找 +Search/TooShort: 查找文本太短 Shadows/Caption: 默认 Shadows/Hint: 查找默认条目 Shadows/Matches: //<small><<resultCount>> 个条目符合条件</small>// diff --git a/languages/zh-Hans/SideBar.multids b/languages/zh-Hans/SideBar.multids index 1c758fa53..83c1ccb73 100644 --- a/languages/zh-Hans/SideBar.multids +++ b/languages/zh-Hans/SideBar.multids @@ -3,6 +3,7 @@ title: $:/language/SideBar/ All/Caption: 全部 Contents/Caption: 目录 Drafts/Caption: 草稿 +Explorer/Caption: 探索 Missing/Caption: 缺失 More/Caption: 更多 Open/Caption: 开启 diff --git a/languages/zh-Hans/ThemeTweaks.multids b/languages/zh-Hans/ThemeTweaks.multids index f0d4dded5..02df2d7ec 100644 --- a/languages/zh-Hans/ThemeTweaks.multids +++ b/languages/zh-Hans/ThemeTweaks.multids @@ -7,11 +7,12 @@ Options/SidebarLayout: 侧边栏布局 Options/SidebarLayout/Fixed-Fluid: 固定故事，浮动侧边栏 Options/SidebarLayout/Fluid-Fixed: 浮动故事，固定侧边栏 Options/StickyTitles: 置顶标题 -Options/StickyTitles/Hint: 导致条目名称"黏着"于浏览器窗口的顶部。<br>注意︰此功能无法运作于 Chrome，且于 Firefox 中会导致一些布局问题 +Options/StickyTitles/Hint: 使条目名称"黏着"于浏览器窗口的顶端 Options/CodeWrapping: 在代码区块中折行 Settings: 设置 Settings/FontFamily: 字型 Settings/CodeFontFamily: 代码字型 +Settings/EditorFontFamily: 编辑器字型 Settings/BackgroundImage: 页面背景图像 Settings/BackgroundImageAttachment: 页面背景图像附属 Settings/BackgroundImageAttachment/Scroll: 随条目卷动 diff --git a/languages/zh-Hans/config.multids b/languages/zh-Hans/config.multids new file mode 100644 index 000000000..e403185d4 --- /dev/null +++ b/languages/zh-Hans/config.multids @@ -0,0 +1,3 @@ +title: $:/config/ + +Search/MinLength: 1 diff --git a/languages/zh-Hant/Buttons.multids b/languages/zh-Hant/Buttons.multids index 04b179cd7..9f7477650 100644 --- a/languages/zh-Hant/Buttons.multids +++ b/languages/zh-Hant/Buttons.multids @@ -14,6 +14,8 @@ CloseOthers/Caption: 關閉其他 CloseOthers/Hint: 關閉其他條目 ControlPanel/Caption: 控制台 ControlPanel/Hint: 開啟控制台 +CopyToClipboard/Caption: 複製到剪貼簿 +CopyToClipboard/Hint: 將此文字複製到剪貼簿 Delete/Caption: 刪除 Delete/Hint: 刪除此條目 Edit/Caption: 編輯 @@ -54,6 +56,8 @@ Info/Caption: 資訊 Info/Hint: 顯示此條目的資訊 Language/Caption: 語言 Language/Hint: 選擇使用者介面語言 +Manager/Caption: 條目管理器 +Manager/Hint: 開啟條目管理器 More/Caption: 更多 More/Hint: 更多動作 NewHere/Caption: 新增子條目 @@ -76,6 +80,8 @@ Permalink/Caption: 引用連結 Permalink/Hint: 設定瀏覽器網址列為直接連結到此條目 Permaview/Caption: 固定連結 Permaview/Hint: 設定瀏覽器網址列為直接連結到當前所有已開啟條目 +Print/Caption: 列印頁面 +Print/Hint: 列印當前頁面 Refresh/Caption: 重新整理 Refresh/Hint: 執行維基的完全刷新 Save/Caption: 確定 @@ -90,6 +96,12 @@ ShowSideBar/Caption: 顯示側邊欄 ShowSideBar/Hint: 顯示側邊欄 TagManager/Caption: 標籤管理 TagManager/Hint: 標籤管理 +Timestamp/Caption: 時間戳記 +Timestamp/Hint: 選擇修改是否更新時間戳記 +Timestamp/On/Caption: 時間戳記開啟 +Timestamp/On/Hint: 條目被修改時，更新時間戳記 +Timestamp/Off/Caption: 時間戳記關閉 +Timestamp/Off/Hint: 條目被修改時，不更新時間戳記 Theme/Caption: 佈景主題 Theme/Hint: 選擇佈景主題 Bold/Caption: 粗體 @@ -129,6 +141,8 @@ LineWidth/Caption: 線寬 LineWidth/Hint: 設定繪畫的線條寬度 Link/Caption: 鏈接 Link/Hint: 建立維基文字鏈接 +Linkify/Caption: 維基鏈接 +Linkify/Hint: 套用維基鏈接於所選文字 ListBullet/Caption: 符號清單 ListBullet/Hint: 套用符號清單格式於包含所選文字的列 ListNumber/Caption: 數字清單 @@ -149,6 +163,8 @@ PreviewType/Caption: 預覽類型 PreviewType/Hint: 選擇預覽類型 Quote/Caption: 引言 Quote/Hint: 套用引言文字格式於包含所選文字的列 +RotateLeft/Caption: 向左旋轉 +RotateLeft/Hint: 圖像向左旋轉 90 度 Size/Caption: 圖像大小 Size/Caption/Height: 高度︰ Size/Caption/Resize: 調整圖像的大小 @@ -165,5 +181,7 @@ Subscript/Caption: 下標 Subscript/Hint: 套用下標格式於所選文字 Superscript/Caption: 上標 Superscript/Hint: 套用上標格式於所選文字 +Transcludify/Caption: 嵌入 +Transcludify/Hint: 套用嵌入於所選文字 Underline/Caption: 底線 Underline/Hint: 套用底線格式於所選文字 diff --git a/languages/zh-Hant/ControlPanel.multids b/languages/zh-Hant/ControlPanel.multids index 490637fe6..e69ad8c65 100644 --- a/languages/zh-Hant/ControlPanel.multids +++ b/languages/zh-Hant/ControlPanel.multids @@ -10,8 +10,10 @@ Basics/DefaultTiddlers/BottomHint: 標題含空白時請使用 [[雙中 Basics/DefaultTiddlers/Prompt: 首頁： Basics/DefaultTiddlers/TopHint: 預設開啟的條目： Basics/Language/Prompt: 您好！當前的語言： -Basics/NewJournal/Title/Prompt: 新日誌條目的名稱 Basics/NewJournal/Tags/Prompt: 新日誌條目的標籤 +Basics/NewJournal/Text/Prompt: 新日誌條目的內容 +Basics/NewJournal/Title/Prompt: 新日誌條目的名稱 +Basics/NewTiddler/Title/Prompt: 新條目的名稱 Basics/OverriddenShadowTiddlers/Prompt: 被覆寫的預設條目數量： Basics/ShadowTiddlers/Prompt: 預設條目數量： Basics/Subtitle/Prompt: 副標題： @@ -69,21 +71,29 @@ Plugins/NoInfoFound/Hint: 無 ''"<$text text=<<currentTab>>/>"'' Plugins/NoInformation/Hint: 未提供資訊 Plugins/NotInstalled/Hint: 尚未安裝此插件 Plugins/OpenPluginLibrary: 開啟插件程式庫 +Plugins/ClosePluginLibrary: 關閉插件程式庫 Plugins/Plugins/Caption: 插件 Plugins/Plugins/Hint: 插件 Plugins/Reinstall/Caption: 重新安裝 Plugins/Themes/Caption: 佈景主題 Plugins/Themes/Hint: 佈景主題插件 Parsing/Caption: 解析 -Parsing/Hint: 在此您可以全域停用個別的維基語法解析規則。請小心，停用某些解析規則，會妨礙 ~TiddlyWiki 正常運作 (您可以用[[安全模式|http://tiddlywiki.com/#SafeMode]]恢復正常操作) +Parsing/Hint: 在此您可以全域停用或啟用維基解析規則。要使更改生效，請儲存並重新載入您的維基。停用某些解析規則，會妨礙 <$text text="TiddlyWiki"/> 正常運作。可使用[[安全模式|https://tiddlywiki.com/#SafeMode]]恢復正常操作。 Parsing/Block/Caption: 區塊解析規則 Parsing/Inline/Caption: 行內解析規則 Parsing/Pragma/Caption: 編譯指示解析規則 Saving/Caption: 儲存 -Saving/Heading: 儲存 +Saving/DownloadSaver/AutoSave/Description: 允許下載儲存模組的自動儲存 +Saving/DownloadSaver/AutoSave/Hint: 啟用下載儲存模組的自動儲存 +Saving/DownloadSaver/Caption: 下載儲存模組 +Saving/DownloadSaver/Hint: 這些設定適用於相容 HTML5 的下載儲存模組 +Saving/General/Caption: 通用 +Saving/General/Hint: 這些設定適用於所有已載入的儲存模組 +Saving/Hint: 用於通過儲存模組將整個 TiddlyWiki 保存為單個檔案的設定 Saving/TiddlySpot/Advanced/Heading: 進階設定 Saving/TiddlySpot/BackupDir: 備份資料夾 Saving/TiddlySpot/Backups: 備份 +Saving/TiddlySpot/Caption: ~TiddlySpot 儲存模組 Saving/TiddlySpot/Description: 這些設定只適用於儲存到 http://tiddlyspot.com 或相容的遠端伺服器時。 Saving/TiddlySpot/Filename: 上傳檔名 Saving/TiddlySpot/Heading: ~TiddlySpot @@ -95,16 +105,22 @@ Saving/TiddlySpot/UserName: 帳號 Settings/AutoSave/Caption: 自動儲存 Settings/AutoSave/Disabled/Description: 不要自動儲存變更 Settings/AutoSave/Enabled/Description: 自動儲存變更 -Settings/AutoSave/Hint: 在編輯過程中自動儲存變更 +Settings/AutoSave/Hint: 當使用支援的儲存模組時，在編輯期間嘗試自動儲存變更 Settings/CamelCase/Caption: 駝峰式維基鏈接 Settings/CamelCase/Hint: 您可以全域停用駝峰式短語自動鏈接。須儲存後重新載入，方才生效。 Settings/CamelCase/Description: 啟用自動駝峰式鏈接 Settings/Caption: 設定 +Settings/DefaultSidebarTab/Caption: 預設側邊欄頁籤 +Settings/DefaultSidebarTab/Hint: 指定預設顯示的側邊欄頁籤 +Settings/DefaultMoreSidebarTab/Caption: 更多側邊欄的預設頁籤 +Settings/DefaultMoreSidebarTab/Hint: 指定預設顯示的更多側欄頁籤 Settings/EditorToolbar/Caption: 編輯器工具列 Settings/EditorToolbar/Hint: 啟用或停用編輯器工具列︰ Settings/EditorToolbar/Description: 顯示編輯器工具列 -Settings/DefaultSidebarTab/Caption: 預設側邊欄頁籤 -Settings/DefaultSidebarTab/Hint: 指定預設顯示的側邊欄頁籤 +Settings/InfoPanelMode/Caption: 條目資訊面板模式 +Settings/InfoPanelMode/Hint: 控制條目資訊面板何時關閉︰ +Settings/InfoPanelMode/Popup/Description: 條目資訊面板自動關閉 +Settings/InfoPanelMode/Sticky/Description: 條目資訊面板保持開啟狀態，直到明確關閉 Settings/Hint: 這些進階設定讓您自訂 TiddlyWiki 的行為。 Settings/LinkToBehaviour/Caption: 條目開啟行為 Settings/LinkToBehaviour/InsideRiver/Hint: 從故事河//中//導航 @@ -143,18 +159,22 @@ Settings/TitleLinks/No/Description: 不顯示條目標題為鏈接 Settings/TitleLinks/Yes/Description: 顯示條目標題為鏈接 StoryView/Caption: 檢視模式 StoryView/Prompt: 當前的檢視模式： +Stylesheets/Caption: 樣式表 +Stylesheets/Expand/Caption: 全部展開 +Stylesheets/Hint: 這是當前標籤為 <<tag "$:/tags/Stylesheet">> 的樣式表條目呈現的 CSS +Stylesheets/Restore/Caption: 復原 Theme/Caption: 佈景主題 Theme/Prompt: 當前的佈景主題： TiddlerFields/Caption: 條目欄位 TiddlerFields/Hint: 這是本維基使用中的所有條目欄位（含系統條目的欄位，但預設條目的欄位除外）。 Toolbars/Caption: 工具列 Toolbars/EditToolbar/Caption: 編輯工具列 -Toolbars/EditToolbar/Hint: 選擇將顯示哪些按鈕於條目的編輯模式工具列 +Toolbars/EditToolbar/Hint: 選擇將顯示哪些按鈕於條目的編輯模式工具列。拖放可改變順序。 Toolbars/Hint: 選擇將顯示哪些工具列按鈕 Toolbars/PageControls/Caption: 頁面工具列 -Toolbars/PageControls/Hint: 選擇將顯示哪些按鈕於主頁面的工具列 +Toolbars/PageControls/Hint: 選擇將顯示哪些按鈕於主頁面的工具列。拖放可改變順序。 Toolbars/EditorToolbar/Caption: 編輯器工具列 -Toolbars/EditorToolbar/Hint: 選擇將顯示哪些按鈕於編輯器工具列。請注意，某些按鈕只會出現在編輯某一類型的條目時。 +Toolbars/EditorToolbar/Hint: 選擇將顯示哪些按鈕於編輯器工具列。請注意，某些按鈕只會出現在編輯某一類型的條目時。拖放可改變順序。 Toolbars/ViewToolbar/Caption: 檢視工具列 -Toolbars/ViewToolbar/Hint: 選擇將顯示哪些按鈕於條目的檢視模式工具列 +Toolbars/ViewToolbar/Hint: 選擇將顯示哪些按鈕於條目的檢視模式工具列。拖放可改變順序。 Tools/Download/Full/Caption: 下載完整副本 diff --git a/languages/zh-Hant/Docs/ModuleTypes.multids b/languages/zh-Hant/Docs/ModuleTypes.multids index 461652ce6..4a4c70566 100644 --- a/languages/zh-Hant/Docs/ModuleTypes.multids +++ b/languages/zh-Hant/Docs/ModuleTypes.multids @@ -1,16 +1,21 @@ title: $:/language/Docs/ModuleTypes/ +allfilteroperator: ''all'' 篩選器運算子的子運算子。 animation: 動畫模組包含可用於 RevealWidget 的動畫。 +bitmapeditoroperation: 一個點陣圖編輯器工具列操作。 command: 可於 Node.js 執行的指令。 config: 加入 `$tw.config` 的資料。 filteroperator: 個別篩選器運算元方法。 global: 加入 `$tw` 的全域資料。 +info: 透過 [[$:/temp/info-plugin]] 偽插件，發佈系統資訊。 isfilteroperator: ''is'' 篩選器運算元的運算子。 +library: 一般用途的 JavaScript 模組的通用的模組類型。 macro: JavaScript ''巨集''定義。 parser: 不同內容類型的解析器。 saver: 於瀏覽器儲存檔案的不同的儲存處理方法。 startup: 啟動時期的功能函數。 storyview: 檢視模式用以自訂 list 小工具的動畫與行為。 +texteditoroperation: 一個文字編輯器工具列操作。 tiddlerdeserializer: 轉換不同內容類型至條目。 tiddlerfield: 定義個別條目欄位的行為。 tiddlermethod: 新增方法至 `$tw.Tiddler` 原型。 diff --git a/languages/zh-Hant/EditTemplate.multids b/languages/zh-Hant/EditTemplate.multids index 0bfaecadf..8b3163da7 100644 --- a/languages/zh-Hant/EditTemplate.multids +++ b/languages/zh-Hant/EditTemplate.multids @@ -1,10 +1,12 @@ title: $:/language/EditTemplate/ -Body/External/Hint: 這是儲存於主要的 TiddlyWiki 檔之外的外部條目。你可以編輯其標籤和欄位，但不能直接編輯內容本身 +Body/External/Hint: 此條目顯示儲存於主要的 TiddlyWiki 檔之外的內容。你可以編輯其標籤和欄位，但不能直接編輯內容本身 Body/Placeholder: 輸入此條目的內容 Body/Preview/Type/Output: 輸出 Field/Remove/Caption: 刪除欄位 Field/Remove/Hint: 刪除欄位 +Field/Dropdown/Caption: 欄位列表 +Field/Dropdown/Hint: 顯示欄位列表 Fields/Add/Button: 新增 Fields/Add/Dropdown/System: 系統欄位 Fields/Add/Dropdown/User: 使用者欄位 @@ -18,6 +20,8 @@ Tags/Add/Placeholder: 標籤名稱 Tags/Dropdown/Caption: 標籤清單 Tags/Dropdown/Hint: 顯示標籤清單 Title/BadCharacterWarning: 請注意，避免在條目名稱中使用這些字元：<<bad-chars>> +Title/Exists/Prompt: 目標條目已經存在 +Title/Relink/Prompt: 將在其他條目的 //tags// 和 //list// 欄位中的 ''<$text text=<<fromTitle>>/>'' 改為 ''<$text text=<<toTitle>>/>'' Type/Dropdown/Caption: 內容類型清單 Type/Dropdown/Hint: 顯示內容類型清單 Type/Delete/Caption: 刪除內容類型 diff --git a/languages/zh-Hant/Fields.multids b/languages/zh-Hant/Fields.multids index 3af6e8cea..e9ba24de5 100644 --- a/languages/zh-Hant/Fields.multids +++ b/languages/zh-Hant/Fields.multids @@ -17,8 +17,8 @@ hack-to-give-us-something-to-compare-against: 於 [[$:/core/templates/static.con icon: 條目的標題含有與條目關聯的圖示 library: 若設為 “yes”，表示條目應該被儲存為一個 JavaScript 程式庫 list: 條目的列表，指定一些條目的標題清單 -list-before: 當前條目名稱將被新增到條目排序清單中的設定條目名稱之前，或若此欄位存在但是空的，則在清單的起始位置 -list-after: 當前條目名稱將被新增到條目排序清單中的設定條目名稱之後 +list-before: 當前條目名稱將被新增到條目排序清單中的設定條目名稱之前，或若此欄位存在但是空的，則被新增於清單的前端 +list-after: 當前條目名稱將被新增到條目排序清單中的設定條目名稱之後，或若此欄位存在但是空的，則被新增於清單的尾端 modified: 條目的最近修改日期與時間 modifier: 條目的最近修改者 name: 具可讀性的套件條目的名稱 diff --git a/languages/zh-Hant/Filters.multids b/languages/zh-Hant/Filters.multids index 0d7c6f7ca..a0d3ccd5a 100644 --- a/languages/zh-Hant/Filters.multids +++ b/languages/zh-Hant/Filters.multids @@ -11,4 +11,5 @@ SystemTiddlers: 系統條目 ShadowTiddlers: 預設條目 OverriddenShadowTiddlers: 被覆寫的預設條目 SystemTags: 系統標籤 +StoryList: 故事河中的條目，不含 ~$:/AdvancedSearch TypedTiddlers: 非維基文字條目 \ No newline at end of file diff --git a/languages/zh-Hant/GettingStarted.tid b/languages/zh-Hant/GettingStarted.tid index abd686f12..a3b8f3a6c 100644 --- a/languages/zh-Hant/GettingStarted.tid +++ b/languages/zh-Hant/GettingStarted.tid @@ -3,7 +3,7 @@ title: GettingStarted \define lingo-base() $:/language/ControlPanel/Basics/ 歡迎使用 ~TiddlyWiki 及參與 ~TiddlyWiki 社群 -開始將重要資訊存放於 ~TiddlyWiki 之前，確認您可以可靠地儲存變更是很重要的。詳細資訊請參閱 http://tiddlywiki.com/#GettingStarted +開始將重要資訊存放於 ~TiddlyWiki 之前，確認您可以可靠地儲存變更是很重要的。詳細資訊請參閱 https://tiddlywiki.com/#GettingStarted !! 設定此 ~TiddlyWiki diff --git a/languages/zh-Hant/Help/fetch.tid b/languages/zh-Hant/Help/fetch.tid new file mode 100644 index 000000000..17be1b458 --- /dev/null +++ b/languages/zh-Hant/Help/fetch.tid @@ -0,0 +1,37 @@ +title: $:/language/Help/fetch +description: 通過網址從維基擷取條目 + +通過 HTTP/HTTPS 擷取一個或多個檔案，並導入符合篩選器的條目，可選的轉換傳入的名稱。 + +``` +--fetch file <url> <import-filter> <transform-filter> +--fetch files <url-filter> <import-filter> <transform-filter> +--fetch raw-file <url> <transform-filter> +--fetch raw-files <url-filter> <transform-filter> +``` + + "file" 和 "files" 選項擷取指定的檔案，並嘗試導入其中的條目（與將檔案拖動到瀏覽器視窗中的處理相同）。 "raw-file" 和 "raw-files" 變選項擷取指定的檔案，並將原始檔案資料存儲於條目，而不套用導入邏輯。 + +使用 "file" and "raw-file" 選項為僅擷取單個檔案，且第一個參數為要讀取檔案的網址。 + +使用 "files" 和 "raw-files" 選項為擷取多個檔案，且第一個參數是一個產生要讀取檔案的網址清單的篩選器。例如，給定標籤為 "remote-server" 的一組具有欄位 "url" 的條目，篩選器 `[tag[remote-server]get[url]]` 將取回所有可用的網址。 + +對於 "file" 和 "files" 選項，the `<import-filter>` 參數指定一個篩選器，用於確定要導入哪些條目。如果未提供，則預設為 `[all[tiddlers]]`。 + +對於所有選項，`<transform-filter>` 參數指定一個可選的篩選器，用於轉換導入條目的名稱。例如，`[addprefix[$:/myimports/]]` 會將前綴 `$:/myimports/` 加至每個名稱。 + +於 `--fetch` 之前使用 `--verbose` 命令，將在導入期間輸出進度資訊。 + +請注意，TiddlyWiki 不會擷取一個已經載入插件的舊版本。 + +以下範例從 https://tiddlywiki.com 取回所有非系統條目，並將其儲存到一個 JSON 檔案： + +``` +tiddlywiki --verbose --fetch file "https://tiddlywiki.com/" "[!is[system]]" "" --rendertiddler "$:/core/templates/exporters/JsonFile" output.json text/plain "" exportFilter "[!is[system]]" +``` + +以下範例從 https://tiddlywiki.com 取回 "favicon" 檔案，並將其儲存在名為 "output.ico" 的檔案中。請注意，在 "--fetch" 命令中引用的中間條目 "Icon Tiddler"，因為它被用作轉換篩選器來替換預設的名稱，而 "--savetiddler" 命令沒有引號，因為它是直接用作標題。 + +``` +tiddlywiki --verbose --fetch raw-file "https://tiddlywiki.com/favicon.ico" "[[Icon Tiddler]]" --savetiddler "Icon Tiddler" output.ico +``` diff --git a/languages/zh-Hant/Help/import.tid b/languages/zh-Hant/Help/import.tid new file mode 100644 index 000000000..e34388225 --- /dev/null +++ b/languages/zh-Hant/Help/import.tid @@ -0,0 +1,24 @@ +title: $:/language/Help/import +description: 從檔案導入條目 + +從 TiddlyWiki 檔案 (`.html`)、`.tiddler`、`.tid`、`.json` 或其他本機檔案導入條目。必須明確指定解串器，而不像 `load` 命令，從檔案的副檔名推斷解串器。 + +``` +--import <filepath> <deserializer> [<title>] [<encoding>] +``` + +核心的解串器包括： + +* application/javascript +* application/json +* application/x-tiddler +* application/x-tiddler-html-div +* application/x-tiddlers +* text/html +* text/plain + +導入的條目名稱，預設為檔名。 + +編碼預設為 "utf8"，但用於導入二進位檔案可以是 "base64"。 + +請注意，TiddlyWiki 不會導入舊版本的已載入插件。 diff --git a/languages/zh-Hant/Help/load.tid b/languages/zh-Hant/Help/load.tid index e3da43fcc..482aa2cb8 100644 --- a/languages/zh-Hant/Help/load.tid +++ b/languages/zh-Hant/Help/load.tid @@ -1,10 +1,11 @@ title: $:/language/Help/load description: 從檔案中載入條目 -從 2.x.x TiddlyWiki (`.html`), `.tiddler`, `.tid`, `.json` 或其他檔案載入條目 +從 TiddlyWiki (`.html`), `.tiddler`, `.tid`, `.json` 或其他本機檔案載入條目。應用的處理程序取決於導入檔案的副檔名。如果您需要明確指定解串器和編碼，請改用 `import` 命令。 ``` --load <filepath> +--load <dirpath> ``` 從已加密的 TiddlyWiki 檔案中載入條目，須使用 PasswordCommand 指定密碼，例如： diff --git a/languages/zh-Hant/Help/render.tid b/languages/zh-Hant/Help/render.tid new file mode 100644 index 000000000..7a0b352a4 --- /dev/null +++ b/languages/zh-Hant/Help/render.tid @@ -0,0 +1,33 @@ +title: $:/language/Help/render +description: 呈現個別條目到檔案 + +呈現由篩選器標識的個別條目，並將結果儲存到指定的檔案。 + +可選擇性地指定範本條目名稱。在此情況下，不是直接呈現每個條目，而是使用設為正在呈現的條目名稱的 "currentTiddler" 變數，來呈現範本條目。 + +也可以選擇性地指定附加變數的名稱和值。 + +``` +--render <tiddler-filter> [<filename-filter>] [<render-type>] [<template>] [<name>] [<value>] +``` + +* ''tiddler-filter'': 標識要呈現的條目的篩選器 +* ''filename-filter'': 可選的篩選器，轉換條目名稱至路徑名。如果省略，預設為 `[is[tiddler]addsuffix[.html]]`，其使用未改變的條目名稱為檔名 +* ''template'': 可選的範本，用於呈現每個條目 +* ''render-type'': 可選的呈現類型：`text/html` (預設值) 會傳回完整的 HTML 文字，而 `text/plain` 只會傳回文字內容 (即其忽略 HTML 標記與其他不可印出的資料) +* ''name'': 可選的變數名稱 +* ''value'': 可選的變數值 + +預設情況下，檔名被解析為相對於發行版資料夾的 `output` 子資料夾。`--output` 命令可用於將輸出指到一個不同的資料夾。 + +附註： + +* 輸出資料夾不清除任何現有的檔案 +* 檔名的路徑中，任何不存在的資料夾，將自動建立。 +* 當正呈現的條目名稱中帶有空格，請注意同時使用命令列介面所要求的引號，與 TiddlyWiki 的雙重方括號；`--render "[[Motovun Jack.jpg]]"` +* 所選的項目被設定為當前正在呈現的條目名稱，以此評估檔名篩選器，允條目名稱用作基礎計算的檔名。例如，`[encodeuricomponent[]addprefix[static/]]` 為每個條目名稱套用 URI 編碼，然後增加首碼 `static/` +* `--render` 命令是已棄用的 `--rendertiddler` 和 `--rendertiddlers` 的一個更靈活的替代命令。 + +範例： + +* `--render "[!is[system]]" "[encodeuricomponent[]addprefix[tiddlers/]addsuffix[.html]]"` -- 呈現所有非系統條目為 "tiddlers" 子資料夾中的檔案，檔名為 URL 編碼的條目名稱和副檔名 HTML diff --git a/languages/zh-Hant/Help/rendertiddler.tid b/languages/zh-Hant/Help/rendertiddler.tid index 1d1d43215..34f7fb263 100644 --- a/languages/zh-Hant/Help/rendertiddler.tid +++ b/languages/zh-Hant/Help/rendertiddler.tid @@ -1,12 +1,24 @@ title: $:/language/Help/rendertiddler description: 呈現個別條目為指定的內容類型 -呈現個別條目為指定的[[內容類型|ContentType]]，預設為 `text/html` 且儲存為指定的檔名。還可以指定一個範本，在這種情況下，"currentTiddler" 變數設為正在呈現的條目 (第一個參數值) 與範本條目合併呈現。 +(請注意：`--rendertiddler` 命令已被棄用，而支援新的、更靈活得 `--render` 命令) + +呈現個別條目為指定的[[內容類型|ContentType]]，預設為 `text/html` 且儲存為指定的檔名。 + +還能可選地指定一個範本條目的名稱，在這種情況下，"currentTiddler" 變數設為正在呈現的條目 (第一個參數值) 與範本條目合併呈現。 + +也能可選地指定附加變數的名稱與其值。 ``` ---rendertiddler <title> <filename> [<type>] [<template>] +--rendertiddler <title> <filename> [<type>] [<template>] [<name>] [<value>] ``` -預設情況下，檔名被解析為相對於版本資料夾的 `output` 子資料夾。 `--output` 命令可以用於將輸出指定到一個不同的資料夾。 +預設情況下，檔名被解析為相對於發行版資料夾的 `output` 子資料夾。 `--output` 命令可以用於將輸出指定到一個不同的資料夾。 -自動建立在檔案名稱的路徑中任何缺少的資料夾。 \ No newline at end of file +自動建立在檔案名稱的路徑中任何缺少的資料夾。 + +例如，以下命令通過使用核心範本 `$:/core/templates/exporters/JsonFile`，將所有符合篩選器 `[tag[done]]` 的條目儲存到名為 `output.json` 的 JSON 檔案。 + +``` +--rendertiddler "$:/core/templates/exporters/JsonFile" output.json text/plain "" exportFilter "[tag[done]]" +``` \ No newline at end of file diff --git a/languages/zh-Hant/Help/rendertiddlers.tid b/languages/zh-Hant/Help/rendertiddlers.tid index b23cada50..830085d02 100644 --- a/languages/zh-Hant/Help/rendertiddlers.tid +++ b/languages/zh-Hant/Help/rendertiddlers.tid @@ -1,6 +1,8 @@ title: $:/language/Help/rendertiddlers description: 呈現符合篩選條件的條目為指定的內容類型 +(請注意：`--rendertiddlers` 命令已被棄用，而支援新的、更靈活得 `--render` 命令) + 呈現符合篩選條的條目為指定的[[內容類型|ContentType]] (預設為 `text/html`) 與副檔名 (預設為 `.html`). ``` @@ -13,6 +15,6 @@ description: 呈現符合篩選條件的條目為指定的內容類型 --rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html ./static text/plain ``` -預設情況下，路徑名被解析為相對於版本資料夾的 `output` 子資料夾。 `--output` 命令可以用於將輸出指定到一個不同的資料夾。 +預設情況下，路徑名被解析為相對於發行版資料夾的 `output` 子資料夾。 `--output` 命令可以用於將輸出指定到一個不同的資料夾。 在目標資料夾中的任何檔案都會被刪除，除非指定 ''noclean'' 旗標。若缺少目標資料夾，則以遞迴方式建立。 \ No newline at end of file diff --git a/languages/zh-Hant/Help/save.tid b/languages/zh-Hant/Help/save.tid new file mode 100644 index 000000000..e4fac5669 --- /dev/null +++ b/languages/zh-Hant/Help/save.tid @@ -0,0 +1,23 @@ +title: $:/language/Help/save +description: 將個別原始條目儲存到檔案 + +將篩選器標識的個別條目，以原始文字或二進位格式，儲存到指定的檔案。 + +``` +--save <tiddler-filter> <filename-filter> +``` + +* ''tiddler-filter'': 標識要儲存的條目的篩選器 +* ''filename-filter'': 可選的篩選器，轉換條目名稱至路徑名。如果省略，預設為 `[is[tiddler]]`，其使用未改變的條目名稱為檔名 + +附註： + +* 輸出資料夾不清除任何現有的檔案 +* 檔名的路徑中，任何不存在的目錄，將自動建立。 +* 當正儲存的條目的名稱中帶有空格，請注意同時使用命令列介面所要求的引號，與 TiddlyWiki 的雙重方括號；`--save "[[Motovun Jack.jpg]]"` +* 所選的項目被設定為當前正在儲存的條目名稱，以此評估檔案名篩選器，允條目名稱用作基礎計算的檔名。例如，`[encodeuricomponent[]addprefix[static/]]` 為每個條目名稱套用 URI 編碼，然後增加首碼 `static/` +* `--save` 命令是已被棄用的 `--savetiddler` 和 `--savetiddlers` 的一個更靈活的替代命令。 + +範例： + +* `--save "[!is[system]is[image]]" "[encodeuricomponent[]addprefix[tiddlers/]]"` -- 儲存所有非系統的圖像條目為 "tiddlers" 子資料夾中的檔案，檔名為 URL 編碼的條目名稱 \ No newline at end of file diff --git a/languages/zh-Hant/Help/savetiddler.tid b/languages/zh-Hant/Help/savetiddler.tid index 982bb7b6c..8f4cfd897 100644 --- a/languages/zh-Hant/Help/savetiddler.tid +++ b/languages/zh-Hant/Help/savetiddler.tid @@ -1,12 +1,14 @@ title: $:/language/Help/savetiddler description: 將條目的原始內容儲存到一個檔案 +(請注意：`--savetiddler` 命令已被棄用，而支援新的、更靈活得 `--save` 命令) + 儲存個別條目的原始文字或二進位格式到指定的檔名。 ``` --savetiddler <title> <filename> ``` -預設情況下，檔名被解析為相對於版本資料夾的 `output` 子資料夾。 `--output` 命令可以用於將輸出指定到一個不同的資料夾。 +預設情況下，檔名被解析為相對於發行版資料夾的 `output` 子資料夾。 `--output` 命令可以用於將輸出指定到一個不同的資料夾。 自動建立在檔案名稱的路徑中任何缺少的資料夾。 \ No newline at end of file diff --git a/languages/zh-Hant/Help/savetiddlers.tid b/languages/zh-Hant/Help/savetiddlers.tid index ccc081ab7..8fbe31918 100644 --- a/languages/zh-Hant/Help/savetiddlers.tid +++ b/languages/zh-Hant/Help/savetiddlers.tid @@ -1,13 +1,15 @@ title: $:/language/Help/savetiddlers description: 將一群條目的原始內容儲存到一個資料夾 +(請注意：`--savetiddlers` 命令已被棄用，而支援新的、更靈活得 `--save` 命令) + 儲存一群條目的原始文字或二進位格式到指定的資料夾。 ``` --savetiddlers <filter> <pathname> [noclean] ``` -預設情況下，路徑名被解析為相對於版本資料夾的 `output` 子資料夾。 `--output` 命令可以用於將輸出指定到一個不同的資料夾。 +預設情況下，路徑名被解析為相對於發行版資料夾的 `output` 子資料夾。 `--output` 命令可以用於將輸出指定到一個不同的資料夾。 儲存指定的檔案之前，會先清除輸出目錄的現有檔案。可藉由指定 ''noclean'' 旗標，停用該刪除動作。 diff --git a/languages/zh-Hant/Help/server.tid b/languages/zh-Hant/Help/server.tid index 1ac2224cd..e099141fe 100644 --- a/languages/zh-Hant/Help/server.tid +++ b/languages/zh-Hant/Help/server.tid @@ -11,7 +11,7 @@ description: 提供一個 HTTP 伺服器介面到 TiddlyWiki 參數說明： -* ''port'' - 服務的埠號 (預設為 "8080") +* ''port'' - 要偵聽的埠號；非數值會被解譯為一個系統環境變數，從其中提取埠號 (預設為 "8080") * ''roottiddler'' - 服務的基本條目 (預設為 "$:/core/save/all") * ''rendertype'' - 呈現的基本條目內容類型 (預設為 "text/plain") * ''servetype'' - 服務的基本條目內容類型(預設為 "text/html") @@ -19,6 +19,7 @@ description: 提供一個 HTTP 伺服器介面到 TiddlyWiki * ''password'' - 選擇性的基本驗證密碼 * ''host'' - 選擇性的主機名稱， (預設為 "127.0.0.1" 或名為 "localhost") * ''pathprefix'' - 選擇性的路徑前綴 +* ''debuglevel'' - 可選的偵錯層級；設定為 "debug" 來檢視請求的詳細資訊；(預設為 "none") 若指定密碼參數，瀏覽器將提示使用者輸入帳號與密碼。注意，密碼係以明碼方式傳遞，因此並不適合一般正式用途。 @@ -34,4 +35,8 @@ description: 提供一個 HTTP 伺服器介面到 TiddlyWiki --server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245 ``` -同時執行多個 TiddlyWiki 伺服器，須分別指定不同的埠號。 +同時執行多個 TiddlyWiki 伺服器，須分別指定不同的埠號。使用環境變數，有助於將埠號傳遞給 Node.js 進程。本示例引用一個名為 "MY_PORT_NUMBER" 的環境變數: + +``` +--server MY_PORT_NUMBER $:/core/save/all text/plain text/html MyUserName passw0rd +``` \ No newline at end of file diff --git a/languages/zh-Hant/Import.multids b/languages/zh-Hant/Import.multids index c01ff5901..bebc18b15 100644 --- a/languages/zh-Hant/Import.multids +++ b/languages/zh-Hant/Import.multids @@ -7,6 +7,12 @@ Listing/Import/Caption: 導入 Listing/Select/Caption: 選擇 Listing/Status/Caption: 狀態 Listing/Title/Caption: 條目 +Listing/Preview: 預覽： +Listing/Preview/Text: 文字 +Listing/Preview/TextRaw: 文字 (原始) +Listing/Preview/Fields: 欄位 +Listing/Preview/Diff: 差異 +Listing/Preview/DiffFields: 差異 (欄位) Upgrader/Plugins/Suppressed/Incompatible: 封鎖的不相容或過時插件 Upgrader/Plugins/Suppressed/Version: 封鎖的插件 (由於傳入的 <<incoming>> 較現有版本 <<existing>> 舊) Upgrader/Plugins/Upgraded: 升級插件，從 <<incoming>> 到 <<upgraded>> diff --git a/languages/zh-Hant/Misc.multids b/languages/zh-Hant/Misc.multids index ab020d66a..c583a2ed1 100644 --- a/languages/zh-Hant/Misc.multids +++ b/languages/zh-Hant/Misc.multids @@ -1,8 +1,8 @@ title: $:/language/ -AboveStory/ClassicPlugin/Warning: 您似乎要載入為 ~TiddlyWiki 經典版設計的插件。請注意，[[這些插件無法運行於 TiddlyWiki 5.x.x 版|http://tiddlywiki.com/#TiddlyWikiClassic]]。偵測到 ~TiddlyWiki 經典版插件： +AboveStory/ClassicPlugin/Warning: 您似乎要載入為 ~TiddlyWiki 經典版設計的插件。請注意，[[這些插件無法運行於 TiddlyWiki 5.x.x 版|https://tiddlywiki.com/#TiddlyWikiClassic]]。偵測到 ~TiddlyWiki 經典版插件： BinaryWarning/Prompt: 此條目包含二進位資料 -ClassicWarning/Hint: 此條目以經典版 TiddlyWiki 標記格式撰寫，不完全相容新版 TiddlyWiki 的格式，詳細資訊請參閱：http://tiddlywiki.com/static/Upgrading。 +ClassicWarning/Hint: 此條目以經典版 TiddlyWiki 標記格式撰寫，不完全相容新版 TiddlyWiki 的格式，詳細資訊請參閱：https://tiddlywiki.com/static/Upgrading。 ClassicWarning/Upgrade/Caption: 升級 CloseAll/Button: 全部關閉 ColourPicker/Recent: 最近︰ @@ -12,6 +12,7 @@ ConfirmOverwriteTiddler: 您確定要覆寫條目 "<$text text=<<title>>/>"？ ConfirmEditShadowTiddler: 您即將要編輯預設條目，任何更改將會覆蓋預設的系統，使未來的升級不尋常。您確定要編輯 "<$text text=<<title>>/>"? Count: 計數 DefaultNewTiddlerTitle: 新條目 +Diffs/CountMessage: <<diff-count>> 個差異 DropMessage: 拖放到此處 （或按 ESC 鍵取消） Encryption/Cancel: 取消 Encryption/ConfirmClearPassword: 您要清除密碼嗎？當儲存此維基時，這將刪除已套用的加密 @@ -22,6 +23,7 @@ Encryption/RepeatPassword: 重複輸入密碼 Encryption/PasswordNoMatch: 密碼不匹配 Encryption/SetPassword: 設定密碼 Error/Caption: 錯誤 +Error/EditConflict: 伺服器上的檔案已更改 Error/Filter: 篩選器錯誤 Error/FilterSyntax: 篩選器運算式中的語法錯誤 Error/IsFilterOperator: 篩選器錯誤︰'is' 篩選器運算子的未知運算元 @@ -34,15 +36,33 @@ Error/XMLHttpRequest: XMLHttpRequest 錯誤代碼 InternalJavaScriptError/Title: 內部的 JavaScript 錯誤 InternalJavaScriptError/Hint: 喔，真是令人尷尬。建議刷新您的瀏覽器，重新啟動 TiddlyWiki InvalidFieldName: 欄位名稱 "<$text text=<<fieldName>>/>" 包含無效字元，欄位名稱只能包含小寫字母、數字、底線 (`_`)、 連接號 (`-`) 和小數點 (`.`) -LazyLoadingWarning: <p>正在從 ''<$text text={{!!_canonical_uri}}/>'' 載入外部條目 ...</p><p>如果此訊息未消失，可能您使用的瀏覽器不支援此配置的外部條目。請參閱 http://tiddlywiki.com/#ExternalText</p> +LazyLoadingWarning: <p>正在從 ''<$text text={{!!_canonical_uri}}/>'' 載入外部內容 ...</p><p>如果此訊息未消失，可能是條目內容類型與外部內容的類型不匹配，或是您可能正在使用的瀏覽器，不支援單檔式維基的外部內容。請參閱 https://tiddlywiki.com/#ExternalText</p> LoginToTiddlySpace: 登入 TiddlySpace -MissingTiddler/Hint: 佚失條目 "<$text text=<<currentTiddler>>/>" - 點擊 {{$:/core/images/edit-button}} 可建立此條目 +Manager/Controls/FilterByTag/None: (無) +Manager/Controls/FilterByTag/Prompt: 依標籤篩選︰ +Manager/Controls/Order/Prompt: 反向順序 +Manager/Controls/Search/Placeholder: 搜尋 +Manager/Controls/Search/Prompt: 搜尋︰ +Manager/Controls/Show/Option/Tags: 標籤 +Manager/Controls/Show/Option/Tiddlers: 條目 +Manager/Controls/Show/Prompt: 顯示︰ +Manager/Controls/Sort/Prompt: 排序︰ +Manager/Item/Colour: 顏色 +Manager/Item/Fields: 欄位 +Manager/Item/Icon/None: (無) +Manager/Item/Icon: 圖示 +Manager/Item/RawText: 原始文字 +Manager/Item/Tags: 標籤 +Manager/Item/Tools: 工具 +Manager/Item/WikifiedText: Wikified 文字 +MissingTiddler/Hint: 佚失條目 "<$text text=<<currentTiddler>>/>" - 點擊 {{||$:/core/ui/Buttons/edit}} 可建立此條目 No: 否 OfficialPluginLibrary: ~TiddlyWiki 官方插件程式庫 OfficialPluginLibrary/Hint: 此為在 tiddlywiki.com 的 ~TiddlyWiki 官方插件程式庫。由核心團隊維護的插件、主題和語言包。 PluginReloadWarning: 請儲存 {{$:/core/ui/Buttons/save-wiki}} 並刷新頁面 {{$:/core/ui/Buttons/refresh}} 允許更改插件才能生效 RecentChanges/DateFormat: YYYY年0MM月0DD日 SystemTiddler/Tooltip: 此為系統條目 +SystemTiddlers/Include/Prompt: 包括系統條目 TagManager/Colour/Heading: 顏色 TagManager/Count/Heading: 計數 TagManager/Icon/Heading: 圖示 diff --git a/languages/zh-Hant/Modals/Download.tid b/languages/zh-Hant/Modals/Download.tid index 498caccb5..219018f6f 100644 --- a/languages/zh-Hant/Modals/Download.tid +++ b/languages/zh-Hant/Modals/Download.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki subtitle: Download changes footer: <$button message="tm-close-tiddler">關閉</$button> -help: http://tiddlywiki.com/ +help: https://tiddlywiki.com/ 您的瀏覽器只支援手動儲存。 diff --git a/languages/zh-Hant/Modals/SaveInstructions.tid b/languages/zh-Hant/Modals/SaveInstructions.tid index 0c32dd7dd..15558cc64 100644 --- a/languages/zh-Hant/Modals/SaveInstructions.tid +++ b/languages/zh-Hant/Modals/SaveInstructions.tid @@ -2,7 +2,7 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki subtitle: Save your work footer: <$button message="tm-close-tiddler">關閉</$button> -help: http://tiddlywiki.com/static/SavingChanges.html +help: https://tiddlywiki.com/static/SavingChanges.html 您對此 wiki 的變更需被儲存為 ~TiddlyWiki HTML 檔案。 diff --git a/languages/zh-Hant/NewJournal.multids b/languages/zh-Hant/NewJournal.multids index 1e06c7421..18086683f 100644 --- a/languages/zh-Hant/NewJournal.multids +++ b/languages/zh-Hant/NewJournal.multids @@ -1,4 +1,5 @@ title: $:/config/NewJournal/ Title: YYYY年0MM月0DD日 +Text: Tags: 日誌 diff --git a/languages/zh-Hant/Notifications.multids b/languages/zh-Hant/Notifications.multids index 48d4b2ade..05ca05346 100644 --- a/languages/zh-Hant/Notifications.multids +++ b/languages/zh-Hant/Notifications.multids @@ -2,3 +2,5 @@ title: $:/language/Notifications/ Save/Done: 已儲存 wiki Save/Starting: 開始儲存 wiki +CopiedToClipboard/Succeeded: 複製完成！ +CopiedToClipboard/Failed: 無法複製到剪貼簿！ diff --git a/languages/zh-Hant/Search.multids b/languages/zh-Hant/Search.multids index ba33cd35e..3b3bc1c81 100644 --- a/languages/zh-Hant/Search.multids +++ b/languages/zh-Hant/Search.multids @@ -2,12 +2,13 @@ title: $:/language/Search/ DefaultResults/Caption: 列表 Filter/Caption: 篩選 -Filter/Hint: 以[[篩選表達式|http://tiddlywiki.com/static/Filters.html]]搜尋 +Filter/Hint: 以[[篩選表達式|https://tiddlywiki.com/static/Filters.html]]搜尋 Filter/Matches: //<small><<resultCount>> 個條目符合條件</small>// Matches: //<small><<resultCount>> 個條目符合條件</small>// Matches/All: 所有匹配： Matches/Title: 條目名稱匹配： Search: 搜尋 +Search/TooShort: 搜尋文字太短 Shadows/Caption: 預設 Shadows/Hint: 尋找預設條目 Shadows/Matches: //<small><<resultCount>> 個條目符合條件</small>// diff --git a/languages/zh-Hant/SideBar.multids b/languages/zh-Hant/SideBar.multids index 53af4eb09..ae916b877 100644 --- a/languages/zh-Hant/SideBar.multids +++ b/languages/zh-Hant/SideBar.multids @@ -3,6 +3,7 @@ title: $:/language/SideBar/ All/Caption: 全部 Contents/Caption: 目錄 Drafts/Caption: 草稿 +Explorer/Caption: 探索 Missing/Caption: 佚失 More/Caption: 更多 Open/Caption: 開啟 diff --git a/languages/zh-Hant/ThemeTweaks.multids b/languages/zh-Hant/ThemeTweaks.multids index a7a661e69..641d82b34 100644 --- a/languages/zh-Hant/ThemeTweaks.multids +++ b/languages/zh-Hant/ThemeTweaks.multids @@ -7,11 +7,12 @@ Options/SidebarLayout: 側邊欄佈局 Options/SidebarLayout/Fixed-Fluid: 固定故事，浮動側邊欄 Options/SidebarLayout/Fluid-Fixed: 浮動故事，固定側邊欄 Options/StickyTitles: 置頂標題 -Options/StickyTitles/Hint: 導致條目名稱"黏著"於瀏覽器視窗的頂部。<br>注意︰此功能無法運作於 Chrome，且於 Firefox 中會導致一些佈局問題 +Options/StickyTitles/Hint: 使條目名稱"黏著"於瀏覽器視窗的頂端 Options/CodeWrapping: 在代碼區塊中折行 Settings: 設定 Settings/FontFamily: 字型 Settings/CodeFontFamily: 代碼字型 +Settings/EditorFontFamily: 編輯器字型 Settings/BackgroundImage: 頁面背景圖像 Settings/BackgroundImageAttachment: 頁面背景圖像附屬 Settings/BackgroundImageAttachment/Scroll: 隨條目捲動 diff --git a/languages/zh-Hant/config.multids b/languages/zh-Hant/config.multids new file mode 100644 index 000000000..e403185d4 --- /dev/null +++ b/languages/zh-Hant/config.multids @@ -0,0 +1,3 @@ +title: $:/config/ + +Search/MinLength: 1 diff --git a/license b/license new file mode 100644 index 000000000..1aea47592 --- /dev/null +++ b/license @@ -0,0 +1,30 @@ +TiddlyWiki created by Jeremy Ruston, (jeremy [at] jermolene [dot] com) + +Copyright (c) 2004-2007, Jeremy Ruston +Copyright (c) 2007-2018, UnaMesa Association +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/licenses/cla-entity.md b/licenses/cla-entity.md index cacf862c2..cb8603085 100644 --- a/licenses/cla-entity.md +++ b/licenses/cla-entity.md @@ -5,8 +5,7 @@ Thank you for your interest in contributing to TiddlyWiki5. TiddlyWiki is owned This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please sign it and send it to Us by electronic submission, following the instructions in `contributing.md`, which is in the root directory of the project repository. This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us. -1. Definitions --------------- +## 1. Definitions "You" means any Legal Entity on behalf of whom a Contribution has been received by Us. @@ -31,8 +30,7 @@ This contributor agreement ("Agreement") documents the rights granted by contrib "Affiliates" means other Legal Entities that control, are controlled by, or under common control with that Legal Entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such Legal Entity, whether by contract or otherwise, (ii) ownership of fifty percent (50%) or more of the outstanding shares or securities which vote to elect the management or other persons who direct such Legal Entity or (iii) beneficial ownership of such entity. -2. Grant of Rights -------------------- +## 2. Grant of Rights ### 2.1 Copyright License @@ -67,8 +65,7 @@ Any rights not expressly assigned or licensed under this section are expressly r We may use 3rd party libraries to create TiddlyWiki5 plugins. These libraries may have their own licenses. 3rd party software and licenses are not subject in this CLA, while TiddlyWiki5 plugins that use these libraries are. 3rd party libraries may be included everywhere, especially in the following directories and their subdirectories: `plugins/` and `editions/`. -3. Agreement ------------- +## 3. Agreement You confirm that: @@ -80,18 +77,15 @@ You confirm that: (d) You have followed the instructions in `contributing.md`, if You do not own the Copyright in the entire work of authorship Submitted. The file can be found in the root directory of the project repository. -4. Disclaimer --------------- +## 4. Disclaimer EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US AND BY US TO YOU. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW. -5. Consequential Damage Waiver -------------------------------- +## 5. Consequential Damage Waiver TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU OR US BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED. -6. Miscellaneous ----------------- +## 6. Miscellaneous 6.1 This Agreement will be governed by and construed in accordance with the laws of the State of California and the United States excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement. @@ -110,8 +104,8 @@ The below-signed are contributors to a code repository that is part of the proje eg: Jeremy Ruston, @Jermolene for Federatial Limited, 2011/11/22 -Contributors ------------- +## Contributors Jeremy Ruston, @Jermolene for Federatial Limited, 2011/11/22 + Google Inc, 2015/12/21 diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index b739b621c..298ea6887 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -5,8 +5,7 @@ Thank you for your interest in contributing to TiddlyWiki5. TiddlyWiki is owned This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please sign it and send it to Us by electronic submission, following the instructions in `contributing.md`, which is in the root directory of the project repository. This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us. -1. Definitions ---------------- +## 1. Definitions "You" means the individual who Submits a Contribution to Us. @@ -26,8 +25,7 @@ This contributor agreement ("Agreement") documents the rights granted by contrib "Media" means any portion of a Contribution which is not software. -2. Grant of Rights ------------------- +## 2. Grant of Rights ### 2.1 Copyright License @@ -61,8 +59,7 @@ Any rights not expressly licensed under this section are expressly reserved by Y We may use 3rd party libraries to create TiddlyWiki5 plugins. These libraries may have their own licenses. 3rd party software and licenses are not subject in this CLA, while TiddlyWiki5 plugins that use these libraries are. 3rd party libraries may be included everywhere, especially in the following directories and their subdirectories: `plugins/` and `editions/`. -3. Agreement ------------- +## 3. Agreement You confirm that: @@ -74,18 +71,15 @@ You confirm that: (d) You have followed the instructions in `contributing.md`, if You do not own the Copyright in the entire work of authorship Submitted. The file can be found in the root directory of the project repository. -4. Disclaimer -------------- +## 4. Disclaimer EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW. -5. Consequential Damage Waiver ------------------------------- +## 5. Consequential Damage Waiver TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED. -6. Miscellaneous ----------------- +## 6. Miscellaneous 6.1 This Agreement will be governed by and construed in accordance with the laws of the State of California and the United States excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement. @@ -104,8 +98,7 @@ The below-signed are contributors to a code repository that is part of the proje eg: Jeremy Ruston, @Jermolene, 2011/11/22 -Contributors ------------- +## Contributors Mario Pietsch, @pmario, 2013/09/21 @@ -141,7 +134,7 @@ Bram Chen, @BramChen, 2014/02/20 Xavier Cazin, @xcazin, 2014/02/21 -Rustem Akbulatov, @nameanyone, 2014/03/04 +Rustem Akbulatov, @rubaboo, 2014/03/04 Harald Albrecht, @TheDiveO, 2014/03/12 @@ -275,6 +268,8 @@ Richard Rath @rcrath 2016/02/12 Eric Drechsel @edrex 2016/02/15 +Tomasz Pijanowski @zakrec 2016/02/21 + @FND 2016/02/27 Cengizhan Kurt, @webninjasi, 2016/03/03 @@ -286,3 +281,49 @@ Pau Deluca, @PauDeLuca, 2016/04/11 Brent Maxwell, @brentmaxwell, 2016/05/20 Thomas Herlea, @maxthomax, 2016/06/09 + +Segey Shishkin, @serj_aleks, 2016/07/28 + +Przemek Wesołek, @jest, 2016/08/05 + +Doron Tzur, @DoronTzur 2016/08/16 + +Hans Christian Haase, @hchaase, 2016/08/11 + +steve schneider, @stevesunypoly, 2016/08/26 + +Nuno Mota, @nmota, 2016/12/16 + +Sylvain Comte, @sycom, 2016/12/20 + +Saul D Beniquez, @beniquezsd 2017/01/01 + +Rizwan Ishak, @ibnishak, 2017/01/10 + +Stefano De Dionigi, @dedioste, 2017/01/19 + +Matias Goldman, @twMat, 2017/01/22 + +Andrew Webb, @tejjyid, 2017/03/06 + +Richard Decal, @crypdick, 2017/04/04 + +Adrian Morosanu, @morosanuae, 2017/06/02 + +Rob Hoelz, @hoelzro, 2017/05/08 + +Saq Imtiaz, @saqimtiaz, 2017/06/14 + +Simon Huber, @BurningTreeC, 2017/12/22 + +Brian McKee, @furicle, 2018/01/08 + +Diego Mesa, @diego898, 2018/01/11 + +Mete Balci, @metebalci, 2018/03/19 + +Sebastian Silva, @icarito, 2018/04/03 + +Luca Dorigo, @ldorigo, 2018/05/05 + +Anthony Muscio, @AnthonyMuscio, 2018/05/21 diff --git a/licenses/copyright.md b/licenses/copyright.md deleted file mode 100644 index c2d1601fd..000000000 --- a/licenses/copyright.md +++ /dev/null @@ -1,29 +0,0 @@ -TiddlyWiki created by Jeremy Ruston, (jeremy [at] jermolene [dot] com) - -Copyright © Jeremy Ruston 2004-2007 -Copyright © UnaMesa Association 2007-2016 - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or other -materials provided with the distribution. - -Neither the name of the UnaMesa Association nor the names of its contributors may be -used to endorse or promote products derived from this software without specific -prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. diff --git a/package.json b/package.json index 8a6953336..6532faaf1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tiddlywiki", "preferGlobal": "true", - "version": "5.1.13", + "version": "5.1.18-prerelease", "author": "Jeremy Ruston <jeremy@jermolene.com>", "description": "a non-linear personal web notebook", "contributors": [ diff --git a/plugins/tiddlywiki/aws/docs/commands.tid b/plugins/tiddlywiki/aws/docs/commands.tid new file mode 100644 index 000000000..5fab718c4 --- /dev/null +++ b/plugins/tiddlywiki/aws/docs/commands.tid @@ -0,0 +1,3 @@ +title: $:/plugins/tiddlywiki/aws/commands + +{{$:/language/Help/aws}} diff --git a/plugins/tiddlywiki/aws/docs/help.tid b/plugins/tiddlywiki/aws/docs/help.tid new file mode 100644 index 000000000..c6b294e07 --- /dev/null +++ b/plugins/tiddlywiki/aws/docs/help.tid @@ -0,0 +1,86 @@ +title: $:/language/Help/aws +description: Operations for working with Amazon Web Services + +! Commands + +Perform operation on Amazon Web Services + +``` +--aws <sub-command> [<parameter> ...] +``` + +! "s3-load" subcommand + +Load tiddlers from files in an S3 bucket. + +``` +--aws s3-load <region> <bucket> <filename>... +``` + +* ''region'': AWS region +* ''bucket'': name of the bucket containing the files +* ''filename'': one or more filenames of the files to load + +The content in the files is deserialized according to the content type reported by S3. + +! "s3-savetiddler" subcommand + +Save a raw tiddler to a file in an S3 bucket. + +``` +--aws s3-savetiddler <title> <region> <bucket> <filename> <zipfilename> <savetype> +``` + +* ''title'': title of the tiddler to save +* ''region'': AWS region +* ''bucket'': name of the bucket to save the saved file +* ''filename'': filename of the saved file +* ''zipfilename'': optional; the file will be packed into a ZIP file with the specified name +* ''savetype'': optional; the MIME type for the saved file (defaults to ''type'' or "text/html") + +! "s3-savetiddlers" subcommand + +Save raw tiddlers matching a filter to an S3 bucket. + +``` +--aws s3-savetiddlers <filter> <region> <bucket> <filenamefilter> <savetypefilter> +``` + +* ''filter'': filter identifying tiddlers to render +* ''region'': AWS region +* ''bucket'': name of the bucket to save the files +* ''filenamefilter'': filter for converting tiddler titles to filepaths (eg `[encodeuricomponent[]addprefix[files/]addsuffix[.html]]`) +* ''savetypefilter'': optional; a filter that is passed the title of the tiddler being saved and should yield the MIME type for the saved file (defaults to a filter that yields the value of the ''type'' field) + +! "s3-rendertiddler" subcommand + +Save the results of rendering a tiddler to a file in an S3 bucket. + +``` +--aws s3-rendertiddler <title> <region> <bucket> <filename> <type> <template> <zipfilename> <savetype> +``` + +* ''title'': title of the tiddler to render +* ''region'': AWS region +* ''bucket'': name of the bucket to save the rendered file +* ''filename'': filename of the rendered file +* ''type'': optional render type (defaults to "text/html") +* ''template'': optional template (defaults to directly rendering the tiddler without using a template) +* ''zipfilename'': optional; the file will be packed into a ZIP file with the specified name +* ''savetype'': optional; the MIME type for the saved file (defaults to ''type'' or "text/html") + +! "s3-rendertiddlers" subcommand + +Save the results of rendering tiddlers identified by a filter to files in an S3 bucket. + +``` +--aws s3-rendertiddlers <filter> <template> <region> <bucket> <filenamefilter> <type> <savetypefilter> +``` + +* ''filter'': filter identifying tiddlers to render +* ''template'': template for rendering each tiddler +* ''region'': AWS region +* ''bucket'': name of the bucket to save the rendered file +* ''filenamefilter'': filter for converting tiddler titles to filepaths (eg `[encodeuricomponent[]addprefix[files/]addsuffix[.html]]`) +* ''type'': optional render type (defaults to "text/html") +* ''savetypefilter'': optional; a filter that is passed the title of the tiddler being rendered and should yield the MIME type for the saved file (defaults to the value of the ''type'' field via `[is[tiddler]get[type]]`) diff --git a/plugins/tiddlywiki/aws/docs/lambda.tid b/plugins/tiddlywiki/aws/docs/lambda.tid new file mode 100644 index 000000000..50da2a8b0 --- /dev/null +++ b/plugins/tiddlywiki/aws/docs/lambda.tid @@ -0,0 +1,46 @@ +title: $:/plugins/tiddlywiki/aws/lambda + +! Template + +The template [[$:/plugins/tiddlywiki/aws/lambdas/main]] transcludes everything required to render a TiddlyWiki as an AWS Lambda function. + +The Lambda is build with this command: + +``` +tiddlywiki editions/aws --rendertiddler $:/plugins/tiddlywiki/aws/lambdas/main index.js text/plain +``` + +Or: + +``` +tiddlywiki editions/aws --build lambda +``` + +! Execution + +The Lambda boot code looks for an array of tiddlers to load in `event.tiddlers`, and an array of commands to execute in `event.commands`. For example: + +``` +{ + "commands": [ + "--aws","s3-rendertiddler","HelloThere","eu-west-2","my-bucket-name","rendered.html" + ], + "tiddlers": [ + { + "title": "HelloThere", + "text": "Hello from {{Platform}}." + }, + { + "title": "Platform", + "text": "TiddlyWiki" + } + ] +} + +``` + +! Return data + +If the Lambda function successfully executes it returns an object with the following fields: + +* ''lambda-result'': An array of `{bucketname,key}` pairs for each file written to S3 within the lambda function diff --git a/plugins/tiddlywiki/aws/docs/readme.tid b/plugins/tiddlywiki/aws/docs/readme.tid new file mode 100644 index 000000000..3677cbb71 --- /dev/null +++ b/plugins/tiddlywiki/aws/docs/readme.tid @@ -0,0 +1,6 @@ +title: $:/plugins/tiddlywiki/aws/readme + +This plugin provides several tools for working with Amazon Web Services: + +* Templates for saving a TiddlyWiki as a single JavaScript file in a ZIP file that can be executed as an AWS Lambda function. In this form, TiddlyWiki is a self contained single file containing both code and data, just like the standalone HTML file configuration +* Commands that can be used to interact with AWS services, under both the Node.js and Lambda configurations of TiddlyWiki diff --git a/plugins/tiddlywiki/aws/docs/setup.tid b/plugins/tiddlywiki/aws/docs/setup.tid new file mode 100644 index 000000000..7a358d289 --- /dev/null +++ b/plugins/tiddlywiki/aws/docs/setup.tid @@ -0,0 +1,51 @@ +title: $:/plugins/tiddlywiki/aws/setup + +! Introduction + +!! About Amazon Web Services + +Amazon Web Services is a collection of online APIs to services that allow cloud-based applications to be built. It is a commercial service that charges usage fees, but there is a free tier that is sufficient for most personal use. + +An ordinary Amazon account can be used to sign into the AWS console at https://aws.amazon.com/console/. Here you can see a menu of the available services and use interactive dashboards to inspect and configure resources. + +! Getting Started + +!! Setup Amazon Credentials + +The main root account has super-user privileges across all the resources owned by the account. The Identity and Access Management (IAM) service allows subsidiary user accounts to be created for specific tasks. Here we create a new user account for running TiddlyWiki code: + +# Visit the AWS console at https://aws.amazon.com/console/ +# Choose ''IAM'' from the ''Services'' dropdown menu +# Choose ''Users'' from the left hand menu +# Click the ''Create New Users'' button +# Enter ''tiddlywiki'' as the first user name +# Check the box labelled //Generate an access key for each user// +# Click the ''Create'' button +# Click the ''Download Credentials'' button to download a file called "credentials.csv" +#* The file contains three values: +#*# ''User Name'': Username for +#*# ''Password'': +#*# ''Direct Signin Link'': +# Create a text file with the following content: +#> <div><pre><code>[default] +aws_access_key_id = <your access key> +aws_secret_access_key = <your secret access key> +</code></pre></div> +# Save the file as `~/.aws/credentials` (Mac/Linux) or `?` (Windows) + +!! Download or Clone TiddlyWiki Repository + +Even if you have already installed TiddlyWiki, you should create a new installation for working with the AWS plugin. + +Visit the TiddlyWiki5 repository at https://github.com/Jermolene/TiddlyWiki5. You can either download or clone a copy: + +* Download to get up and running quickly +* Clone to make it easier to upgrade in the future + +!! Install `aws-sdk` + +Open a command terminal, switch to the directory where TiddlyWiki is installed and run the following command: + +``` +npm install aws-sdk +``` diff --git a/plugins/tiddlywiki/aws/modules/command.js b/plugins/tiddlywiki/aws/modules/command.js new file mode 100644 index 000000000..3c62e87d9 --- /dev/null +++ b/plugins/tiddlywiki/aws/modules/command.js @@ -0,0 +1,234 @@ +/*\ +title: $:/plugins/tiddlywiki/aws/command.js +type: application/javascript +module-type: command + +--aws command + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +var async, + awsUtils; + +exports.info = { + name: "aws", + synchronous: false +}; + +var Command = function(params,commander,callback) { + async = require("$:/plugins/tiddlywiki/async/async.js"); + awsUtils = require("$:/plugins/tiddlywiki/aws/utils.js"); + this.params = params; + this.commander = commander; + this.callback = callback; +}; + +Command.prototype.execute = function() { + var self = this, + wiki = this.commander.wiki, + subCommand = this.params[0], + fn = this.subCommands[subCommand]; + if(!fn) { + return this.callback("AWS: Unknown subcommand") + } + fn.bind(this)(); + return null; +}; + +Command.prototype.subCommands = {}; + +// Load tiddlers from files in an S3 bucket +Command.prototype.subCommands["s3-load"] = function() { + var self = this, + wiki = this.commander.wiki, + region = this.params[1], + bucket = this.params[2], + filepaths = this.params.slice(3); + // Check parameters + if(!region || !bucket || filepaths.length < 1) { + throw "Missing parameters"; + } + async.eachLimit( + filepaths, + 20, + function(filepath,callback) { + awsUtils.getFile(region,bucket,filepath,function(err,data) { + if(err) { + return callback(err); + } + var tiddlers = self.commander.wiki.deserializeTiddlers(data.type,data.body,{}); + $tw.utils.each(tiddlers,function(tiddler) { + self.commander.wiki.importTiddler(new $tw.Tiddler(tiddler)); + }); + callback(null); + }); + }, + function(err,results) { + self.callback(err,results); + } + ); + return null; +}; + +// Render a tiddler to an S3 bucket +Command.prototype.subCommands["s3-rendertiddler"] = function() { + var self = this, + wiki = this.commander.wiki, + title = this.params[1], + region = this.params[2], + bucket = this.params[3], + filename = this.params[4], + type = this.params[5] || "text/html", + template = this.params[6], + zipfilename = this.params[7], + saveType = this.params[8] || type, + variables = {}; + // Check parameters + if(!title || !region || !bucket || !filename) { + throw "Missing parameters"; + } + // Process the template if present + if(template) { + variables.currentTiddler = title; + title = template; + } + // Render the tiddler + var text = this.commander.wiki.renderTiddler(type,title,{variables: variables}), + type = "text/plain", + encoding = ($tw.config.contentTypeInfo[type] || {encoding: "utf8"}).encoding; + // Zip it if needed + if(zipfilename) { + var JSZip = require("$:/plugins/tiddlywiki/jszip/jszip.js"), + zip = new JSZip(); + zip.file(filename,new Buffer(text,encoding)); + text = zip.generate({type: "base64"}); + type = "application/zip"; + filename = zipfilename; + } + // Save the file + async.series([ + awsUtils.putFile.bind(null,region,bucket,filename,text,saveType) + ], + function(err,results){ + self.callback(err,results); + }); + return null; +}; + +Command.prototype.subCommands["s3-rendertiddlers"] = function() { + var self = this, + wiki = this.commander.wiki, + filter = this.params[1], + template = this.params[2], + region = this.params[3], + bucket = this.params[4], + filenameFilter = this.params[5], + type = this.params[6] || "text/html", + saveTypeFilter = this.params[7] || "[[" + type + "]]", + tiddlers = wiki.filterTiddlers(filter); + // Check parameters + if(!filter || !region || !bucket || !filenameFilter) { + throw "Missing parameters"; + } + async.eachLimit( + tiddlers, + 20, + function(title,callback) { + var parser = wiki.parseTiddler(template || title), + widgetNode = wiki.makeWidget(parser,{variables: {currentTiddler: title}}), + container = $tw.fakeDocument.createElement("div"); + widgetNode.render(container,null); + var text = type === "text/html" ? container.innerHTML : container.textContent, + filename = wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0], + saveType = wiki.filterTiddlers(saveTypeFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]; + awsUtils.putFile(region,bucket,filename,text,saveType,callback); + }, + function(err,results) { + self.callback(err,results); + } + ); + return null; +}; + +// Save a tiddler to an S3 bucket +Command.prototype.subCommands["s3-savetiddler"] = function() { + var self = this, + wiki = this.commander.wiki, + title = this.params[1], + region = this.params[2], + bucket = this.params[3], + filename = this.params[4], + zipfilename = this.params[5], + saveType = this.params[6], + tiddler = wiki.getTiddler(title), + text = tiddler.fields.text, + type = tiddler.fields.type, + encoding = ($tw.config.contentTypeInfo[type] || {encoding: "utf8"}).encoding; + // Check parameters + if(!title || !region || !bucket || !filename) { + throw "Missing parameters"; + } + // Zip it if needed + if(zipfilename) { + var JSZip = require("$:/plugins/tiddlywiki/jszip/jszip.js"), + zip = new JSZip(); + zip.file(filename,new Buffer(text,encoding)); + text = zip.generate({type: "base64"}); + type = "application/zip"; + filename = zipfilename; + } + // Save the file + async.series([ + awsUtils.putFile.bind(null,region,bucket,filename,text,saveType || type) + ], + function(err,results){ + self.callback(err,results); + }); + return null; +}; + +// Save a tiddler to an S3 bucket +Command.prototype.subCommands["s3-savetiddlers"] = function() { + var self = this, + wiki = this.commander.wiki, + filter = this.params[1], + region = this.params[2], + bucket = this.params[3], + filenameFilter = this.params[4], + saveTypeFilter = this.params[5] || "[is[tiddler]get[type]]", + tiddlers = wiki.filterTiddlers(filter); + // Check parameters + if(!filter || !region || !bucket || !filenameFilter) { + throw "Missing parameters"; + } + async.eachLimit( + tiddlers, + 20, + function(title,callback) { + var tiddler = wiki.getTiddler(title); + if(tiddler) { + var text = tiddler.fields.text || "", + type = tiddler.fields.type || "text/vnd.tiddlywiki", + filename = wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0], + saveType = wiki.filterTiddlers(saveTypeFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]; + awsUtils.putFile(region,bucket,filename,text,saveType || type,callback); + } else { + process.nextTick(callback,null); + } + }, + function(err,results) { + self.callback(err,results); + } + ); + return null; +}; + +exports.Command = Command; + +})(); + diff --git a/plugins/tiddlywiki/aws/modules/init.js b/plugins/tiddlywiki/aws/modules/init.js new file mode 100644 index 000000000..b0b7d3c71 --- /dev/null +++ b/plugins/tiddlywiki/aws/modules/init.js @@ -0,0 +1,37 @@ +/*\ +title: $:/plugins/tiddlywiki/aws/init.js +type: application/javascript +module-type: startup + +AWS initialisation + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +// Export name and synchronous status +exports.name = "aws-init"; +exports.before = ["startup"]; +exports.synchronous = true; + +exports.startup = function() { + var logger = new $tw.utils.Logger("aws"); + if($tw.node) { + try { + require("aws-sdk"); + } catch(e) { + logger.alert("The plugin 'tiddlywiki/aws' requires the aws-sdk to be installed. Run 'npm install aws-sdk' in the root of the TiddlyWiki repository"); + } + } + if(!$tw.modules.titles["$:/plugins/tiddlywiki/async/async.js"]) { + logger.alert("The plugin 'tiddlywiki/aws' requires the 'tiddlywiki/async' plugin to be installed"); + } + if(!$tw.modules.titles["$:/plugins/tiddlywiki/jszip/jszip.js"]) { + logger.alert("The plugin 'tiddlywiki/aws' requires the 'tiddlywiki/jszip' plugin to be installed"); + } +}; + +})(); diff --git a/plugins/tiddlywiki/aws/modules/utils.js b/plugins/tiddlywiki/aws/modules/utils.js new file mode 100644 index 000000000..d57546aeb --- /dev/null +++ b/plugins/tiddlywiki/aws/modules/utils.js @@ -0,0 +1,76 @@ +/*\ +title: $:/plugins/tiddlywiki/aws/utils.js +type: application/javascript +module-type: library + +AWS utility functions + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Get a file from an S3 bucket +region: +bucketName: +title: +callback: invoked with (err,{body:,type:} +*/ +function getFile(region,bucketName,title,callback) { + // console.log("Reading file from S3",bucketName,title); + var AWS = require("aws-sdk"), + s3bucket = new AWS.S3({ + region: region + }), + params = { + Bucket: bucketName, + Key: title + }; + s3bucket.getObject(params,function(err,data) { + if(err) { + return callback(err); + } + callback(null,{ + etag: data.ETag, + version: data.VersionId, + type: data.ContentType, + body: data.Body.toString() + }); + }); +} + +/* +Put a file to an S3 bucket +*/ +function putFile(region,bucketName,title,text,type,callback) { + // Log the write + if($tw["lambda-result"]) { + $tw["lambda-result"]["files-written"].push({bucket: bucketName,key: title}); + } + // console.log("Writing file to S3",bucketName,title,type); + var AWS = require("aws-sdk"), + s3bucket = new AWS.S3({ + region: region + }), + encoding = ($tw.config.contentTypeInfo[type] || {encoding: "utf8"}).encoding, + params = { + Bucket: bucketName, + Key: title, + Body: new Buffer(text,encoding), + ContentType: type || "text/plain" + }; + s3bucket.upload(params,function(err,data) { + if(err) { + return callback(err + " (writing " + title + " to " + bucketName + ", type " + type + ")"); + } + callback(null,data); + }); +} + +exports.putFile = putFile; +exports.getFile = getFile; + +})(); diff --git a/plugins/tiddlywiki/aws/plugin.info b/plugins/tiddlywiki/aws/plugin.info new file mode 100644 index 000000000..08ee1fd44 --- /dev/null +++ b/plugins/tiddlywiki/aws/plugin.info @@ -0,0 +1,7 @@ +{ + "title": "$:/plugins/tiddlywiki/aws", + "description": "Tools for working with Amazon Web Services", + "author": "JeremyRuston", + "core-version": ">=5.0.0", + "list": "readme setup commands lambda" +} diff --git a/plugins/tiddlywiki/aws/templates/lambda/handler.tid b/plugins/tiddlywiki/aws/templates/lambda/handler.tid new file mode 100644 index 000000000..d1421c901 --- /dev/null +++ b/plugins/tiddlywiki/aws/templates/lambda/handler.tid @@ -0,0 +1,30 @@ +title: $:/plugins/tiddlywiki/aws/lambda/handler +type: text/plain + +/* +TiddlyWiki for AWS +*/ + +exports.handler = function(event,context,callback) { + // Initialise the boot prefix + global.$tw = _bootprefix(); + // Initialise the returned results + $tw["lambda-result"] = { + "files-written": [] + }; + // Some default package info + $tw.packageInfo = lambdaPackageInfo; + // Load any tiddlers from the package + $tw.preloadTiddlerArray(lambdaTiddlers); + // Load any tiddlers from the event + if(event.tiddlers) { + $tw.preloadTiddlerArray(event.tiddlers); + } + // Load the commands from the event + $tw.boot.argv = (event.commands || []).slice(0); + // Boot the TW5 app + _boot($tw); + $tw.boot.boot(function() { + callback(null,$tw["lambda-result"]); + }); +} diff --git a/plugins/tiddlywiki/aws/templates/lambda/main.tid b/plugins/tiddlywiki/aws/templates/lambda/main.tid new file mode 100644 index 000000000..1a7b6f7aa --- /dev/null +++ b/plugins/tiddlywiki/aws/templates/lambda/main.tid @@ -0,0 +1,19 @@ +title: $:/plugins/tiddlywiki/aws/lambdas/main + +\rules only filteredtranscludeinline transcludeinline + +/* +{{ $:/core/copyright.txt }} +*/ + +{{$:/plugins/tiddlywiki/aws/lambda/tiddlers}} + +{{$:/plugins/tiddlywiki/aws/lambda/sjcl}} + +{{ $:/boot/bootprefix.js ||$:/core/templates/plain-text-tiddler}} + +{{ $:/boot/boot.js ||$:/core/templates/plain-text-tiddler}} + +{{$:/plugins/tiddlywiki/aws/lambda/package-info}} + +{{ $:/plugins/tiddlywiki/aws/lambda/handler ||$:/core/templates/plain-text-tiddler}} diff --git a/plugins/tiddlywiki/aws/templates/lambda/package-info.tid b/plugins/tiddlywiki/aws/templates/lambda/package-info.tid new file mode 100644 index 000000000..51baca713 --- /dev/null +++ b/plugins/tiddlywiki/aws/templates/lambda/package-info.tid @@ -0,0 +1,11 @@ +title: $:/plugins/tiddlywiki/aws/lambda/package-info + +\rules only filteredtranscludeinline transcludeinline codeinline macrocallinline +` +var lambdaPackageInfo = { + "version": "`<<version>>`", + "engines": { + "node": ">=0.8.2" + } +}; +` diff --git a/plugins/tiddlywiki/aws/templates/lambda/sjcl.tid b/plugins/tiddlywiki/aws/templates/lambda/sjcl.tid new file mode 100644 index 000000000..2f6237b77 --- /dev/null +++ b/plugins/tiddlywiki/aws/templates/lambda/sjcl.tid @@ -0,0 +1,17 @@ +title: $:/plugins/tiddlywiki/aws/lambda/sjcl + +\rules only filteredtranscludeinline transcludeinline + +(function() { + +var module; + +global.sjcl = (function() { + +{{ $:/library/sjcl.js ||$:/core/templates/plain-text-tiddler}} + +return sjcl; + +})(); + +})(); diff --git a/plugins/tiddlywiki/aws/templates/lambda/tiddlers.tid b/plugins/tiddlywiki/aws/templates/lambda/tiddlers.tid new file mode 100644 index 000000000..80e5898c9 --- /dev/null +++ b/plugins/tiddlywiki/aws/templates/lambda/tiddlers.tid @@ -0,0 +1,5 @@ +title: $:/plugins/tiddlywiki/aws/lambda/tiddlers + +` +var lambdaTiddlers = `<$text text=<<jsontiddlers "[all[tiddlers]]">>/>`; +` diff --git a/plugins/tiddlywiki/bibtex/deserializer.js b/plugins/tiddlywiki/bibtex/deserializer.js new file mode 100644 index 000000000..2259cb78d --- /dev/null +++ b/plugins/tiddlywiki/bibtex/deserializer.js @@ -0,0 +1,49 @@ +/*\ +title: $:/plugins/tiddlywiki/bibtex/deserializer.js +type: application/javascript +module-type: tiddlerdeserializer + +XLSX file deserializer + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +var bibtexParse = require("$:/plugins/tiddlywiki/bibtex/bibtexParse.js"); + +/* +Parse an XLSX file into tiddlers +*/ +exports["application/x-bibtex"] = function(text,fields) { + var data, + results = []; + // Parse the text + try { + data = bibtexParse.toJSON(text) + } catch(ex) { + data = ex.toString(); + } + if(typeof data === "string") { + return [{ + title: "BibTeX import error: " + data, + }]; + } + // Convert each entry + $tw.utils.each(data,function(entry) { + var fields = { + title: entry.citationKey, + "bibtex-entry-type": entry.entryType + }; + $tw.utils.each(entry.entryTags,function(value,name) { + fields["bibtex-" + name] = value; + }); + results.push(fields); + }); + // Return the output tiddlers + return results; +}; + +})(); diff --git a/plugins/tiddlywiki/bibtex/doc/readme.tid b/plugins/tiddlywiki/bibtex/doc/readme.tid new file mode 100644 index 000000000..619733d51 --- /dev/null +++ b/plugins/tiddlywiki/bibtex/doc/readme.tid @@ -0,0 +1,13 @@ +title: $:/plugins/tiddlywiki/bibtex/readme + +The BibTeX plugin provides a deserializer that can convert bibliographic entries in `.bib` files into individual tiddlers. + +You can use it in the browser by dragging and dropping a `.bib` file into the TiddlyWiki window. Under Node.js, use the `--load` command to load a `.bib` file. + +The conversion is as follows: + +* `title` comes from citationKey +* `bibtex-entry-type` comes from entryType +* all `entryTags` are assigned to fields with the prefix `bibtex-` + +The BibTeX plugin is based on the library [[bibtexParseJs by Henrik Muehe and Mikola Lysenko|https://github.com/ORCID/bibtexParseJs]]. diff --git a/plugins/tiddlywiki/bibtex/files/LICENSE b/plugins/tiddlywiki/bibtex/files/LICENSE new file mode 100755 index 000000000..a881203f6 --- /dev/null +++ b/plugins/tiddlywiki/bibtex/files/LICENSE @@ -0,0 +1,23 @@ + +The MIT License (MIT) +Copyright (c) 2013 ORCID, Inc. + +Copyright (c) 2010 Henrik Muehe + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/plugins/tiddlywiki/bibtex/files/README.md b/plugins/tiddlywiki/bibtex/files/README.md new file mode 100755 index 000000000..be17cc103 --- /dev/null +++ b/plugins/tiddlywiki/bibtex/files/README.md @@ -0,0 +1,47 @@ +bibtexParseJs +============= +A JavaScript library that parses BibTeX parser. Forked from +[bibtex-parser](https://github.com/mikolalysenko/bibtex-parser). + + +## Using in Browser +Include bibtexParse.js and call + +``` +bibtexParse.toJSON('@article{sample1,title={sample title}}'); +``` + +## Using in [Node.js](http://nodejs.org/) +Install ```npm install bibtex-parse-js``` + +``` +var bibtexParse = require('bibtex-parse-js'); + +var sample = bibtexParse.toJSON('@article{sample1,title={sample title}}'); + +console.log(sample); +``` + +**Returns** A parsed bibtex file as a JSON Array Object + +``` +[ { citationKey: 'SAMPLE1', + entryType: 'ARTICLE', + entryTags: { TITLE: 'sample title' } } ] +``` + +## Contributing + Contributions are welcome. Please make sure the unit test(test/runTest.js) reflects the + changes and completes successfully. + +#### Travis CI +See the latest build and results at [https://travis-ci.org/ORCID/bibtexParseJs](https://travis-ci.org/ORCID/bibtexParseJs) + +## Credits +(c) 2010 Henrik Muehe. MIT License +[visit](https://code.google.com/p/bibtex-js/) + + +CommonJS port maintained by Mikola Lysenko +[visit](https://github.com/mikolalysenko/bibtex-parser) + diff --git a/plugins/tiddlywiki/bibtex/files/bibtexParse.js b/plugins/tiddlywiki/bibtex/files/bibtexParse.js new file mode 100755 index 000000000..2e276f9ac --- /dev/null +++ b/plugins/tiddlywiki/bibtex/files/bibtexParse.js @@ -0,0 +1,342 @@ +/* start bibtexParse 0.0.22 */ + +//Original work by Henrik Muehe (c) 2010 +// +//CommonJS port by Mikola Lysenko 2013 +// +//Port to Browser lib by ORCID / RCPETERS +// +//Issues: +//no comment handling within strings +//no string concatenation +//no variable values yet +//Grammar implemented here: +//bibtex -> (string | preamble | comment | entry)*; +//string -> '@STRING' '{' key_equals_value '}'; +//preamble -> '@PREAMBLE' '{' value '}'; +//comment -> '@COMMENT' '{' value '}'; +//entry -> '@' key '{' key ',' key_value_list '}'; +//key_value_list -> key_equals_value (',' key_equals_value)*; +//key_equals_value -> key '=' value; +//value -> value_quotes | value_braces | key; +//value_quotes -> '"' .*? '"'; // not quite +//value_braces -> '{' .*? '"'; // not quite +(function(exports) { + + function BibtexParser() { + + this.months = ["jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec"]; + this.notKey = [',','{','}',' ','=']; + this.pos = 0; + this.input = ""; + this.entries = new Array(); + + this.currentEntry = ""; + + this.setInput = function(t) { + this.input = t; + }; + + this.getEntries = function() { + return this.entries; + }; + + this.isWhitespace = function(s) { + return (s == ' ' || s == '\r' || s == '\t' || s == '\n'); + }; + + this.match = function(s, canCommentOut) { + if (canCommentOut == undefined || canCommentOut == null) + canCommentOut = true; + this.skipWhitespace(canCommentOut); + if (this.input.substring(this.pos, this.pos + s.length) == s) { + this.pos += s.length; + } else { + throw "Token mismatch, expected " + s + ", found " + + this.input.substring(this.pos); + }; + this.skipWhitespace(canCommentOut); + }; + + this.tryMatch = function(s, canCommentOut) { + if (canCommentOut == undefined || canCommentOut == null) + canCommentOut = true; + this.skipWhitespace(canCommentOut); + if (this.input.substring(this.pos, this.pos + s.length) == s) { + return true; + } else { + return false; + }; + this.skipWhitespace(canCommentOut); + }; + + /* when search for a match all text can be ignored, not just white space */ + this.matchAt = function() { + while (this.input.length > this.pos && this.input[this.pos] != '@') { + this.pos++; + }; + + if (this.input[this.pos] == '@') { + return true; + }; + return false; + }; + + this.skipWhitespace = function(canCommentOut) { + while (this.isWhitespace(this.input[this.pos])) { + this.pos++; + }; + if (this.input[this.pos] == "%" && canCommentOut == true) { + while (this.input[this.pos] != "\n") { + this.pos++; + }; + this.skipWhitespace(canCommentOut); + }; + }; + + this.value_braces = function() { + var bracecount = 0; + this.match("{", false); + var start = this.pos; + var escaped = false; + while (true) { + if (!escaped) { + if (this.input[this.pos] == '}') { + if (bracecount > 0) { + bracecount--; + } else { + var end = this.pos; + this.match("}", false); + return this.input.substring(start, end); + }; + } else if (this.input[this.pos] == '{') { + bracecount++; + } else if (this.pos >= this.input.length - 1) { + throw "Unterminated value"; + }; + }; + if (this.input[this.pos] == '\\' && escaped == false) + escaped = true; + else + escaped = false; + this.pos++; + }; + }; + + this.value_comment = function() { + var str = ''; + var brcktCnt = 0; + while (!(this.tryMatch("}", false) && brcktCnt == 0)) { + str = str + this.input[this.pos]; + if (this.input[this.pos] == '{') + brcktCnt++; + if (this.input[this.pos] == '}') + brcktCnt--; + if (this.pos >= this.input.length - 1) { + throw "Unterminated value:" + this.input.substring(start); + }; + this.pos++; + }; + return str; + }; + + this.value_quotes = function() { + this.match('"', false); + var start = this.pos; + var escaped = false; + while (true) { + if (!escaped) { + if (this.input[this.pos] == '"') { + var end = this.pos; + this.match('"', false); + return this.input.substring(start, end); + } else if (this.pos >= this.input.length - 1) { + throw "Unterminated value:" + this.input.substring(start); + }; + } + if (this.input[this.pos] == '\\' && escaped == false) + escaped = true; + else + escaped = false; + this.pos++; + }; + }; + + this.single_value = function() { + var start = this.pos; + if (this.tryMatch("{")) { + return this.value_braces(); + } else if (this.tryMatch('"')) { + return this.value_quotes(); + } else { + var k = this.key(); + if (k.match("^[0-9]+$")) + return k; + else if (this.months.indexOf(k.toLowerCase()) >= 0) + return k.toLowerCase(); + else + throw "Value expected:" + this.input.substring(start) + ' for key: ' + k; + + }; + }; + + this.value = function() { + var values = []; + values.push(this.single_value()); + while (this.tryMatch("#")) { + this.match("#"); + values.push(this.single_value()); + }; + return values.join(""); + }; + + this.key = function(optional) { + var start = this.pos; + while (true) { + if (this.pos >= this.input.length) { + throw "Runaway key"; + }; + // а-яА-Я is Cyrillic + //console.log(this.input[this.pos]); + if (this.notKey.indexOf(this.input[this.pos]) >= 0) { + if (optional && this.input[this.pos] != ',') { + this.pos = start; + return null; + }; + return this.input.substring(start, this.pos); + } else { + this.pos++; + + }; + }; + }; + + this.key_equals_value = function() { + var key = this.key(); + if (this.tryMatch("=")) { + this.match("="); + var val = this.value(); + return [ key, val ]; + } else { + throw "... = value expected, equals sign missing:" + + this.input.substring(this.pos); + }; + }; + + this.key_value_list = function() { + var kv = this.key_equals_value(); + this.currentEntry['entryTags'] = {}; + this.currentEntry['entryTags'][kv[0]] = kv[1]; + while (this.tryMatch(",")) { + this.match(","); + // fixes problems with commas at the end of a list + if (this.tryMatch("}")) { + break; + } + ; + kv = this.key_equals_value(); + this.currentEntry['entryTags'][kv[0]] = kv[1]; + }; + }; + + this.entry_body = function(d) { + this.currentEntry = {}; + this.currentEntry['citationKey'] = this.key(true); + this.currentEntry['entryType'] = d.substring(1); + if (this.currentEntry['citationKey'] != null) { + this.match(","); + } + this.key_value_list(); + this.entries.push(this.currentEntry); + }; + + this.directive = function() { + this.match("@"); + return "@" + this.key(); + }; + + this.preamble = function() { + this.currentEntry = {}; + this.currentEntry['entryType'] = 'PREAMBLE'; + this.currentEntry['entry'] = this.value_comment(); + this.entries.push(this.currentEntry); + }; + + this.comment = function() { + this.currentEntry = {}; + this.currentEntry['entryType'] = 'COMMENT'; + this.currentEntry['entry'] = this.value_comment(); + this.entries.push(this.currentEntry); + }; + + this.entry = function(d) { + this.entry_body(d); + }; + + this.alernativeCitationKey = function () { + this.entries.forEach(function (entry) { + if (!entry.citationKey && entry.entryTags) { + entry.citationKey = ''; + if (entry.entryTags.author) { + entry.citationKey += entry.entryTags.author.split(',')[0] += ', '; + } + entry.citationKey += entry.entryTags.year; + } + }); + } + + this.bibtex = function() { + while (this.matchAt()) { + var d = this.directive(); + this.match("{"); + if (d == "@STRING") { + this.string(); + } else if (d == "@PREAMBLE") { + this.preamble(); + } else if (d == "@COMMENT") { + this.comment(); + } else { + this.entry(d); + } + this.match("}"); + }; + + this.alernativeCitationKey(); + }; + }; + + exports.toJSON = function(bibtex) { + var b = new BibtexParser(); + b.setInput(bibtex); + b.bibtex(); + return b.entries; + }; + + /* added during hackathon don't hate on me */ + exports.toBibtex = function(json) { + var out = ''; + for ( var i in json) { + out += "@" + json[i].entryType; + out += '{'; + if (json[i].citationKey) + out += json[i].citationKey + ', '; + if (json[i].entry) + out += json[i].entry ; + if (json[i].entryTags) { + var tags = ''; + for (var jdx in json[i].entryTags) { + if (tags.length != 0) + tags += ', '; + tags += jdx + '= {' + json[i].entryTags[jdx] + '}'; + } + out += tags; + } + out += '}\n\n'; + } + return out; + + }; + +})(typeof exports === 'undefined' ? this['bibtexParse'] = {} : exports); + +/* end bibtexParse */ diff --git a/plugins/tiddlywiki/bibtex/files/tiddlywiki.files b/plugins/tiddlywiki/bibtex/files/tiddlywiki.files new file mode 100644 index 000000000..f7a502441 --- /dev/null +++ b/plugins/tiddlywiki/bibtex/files/tiddlywiki.files @@ -0,0 +1,18 @@ +{ + "tiddlers": [ + { + "file": "bibtexParse.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/bibtex/bibtexParse.js", + "module-type": "library" + } + },{ + "file": "LICENSE", + "fields": { + "type": "text/plain", + "title": "$:/plugins/tiddlywiki/bibtex/license" + } + } + ] +} diff --git a/plugins/tiddlywiki/bibtex/plugin.info b/plugins/tiddlywiki/bibtex/plugin.info new file mode 100644 index 000000000..4b88be21e --- /dev/null +++ b/plugins/tiddlywiki/bibtex/plugin.info @@ -0,0 +1,7 @@ +{ + "title": "$:/plugins/tiddlywiki/bibtex", + "description": "BibTeX importer", + "author": "Henrik Muehe and Mikola Lysenko, adapted by Jeremy Ruston", + "plugin-type": "plugin", + "list": "readme license" +} diff --git a/plugins/tiddlywiki/bibtex/samples/first-jabref-bibtex-db.bib b/plugins/tiddlywiki/bibtex/samples/first-jabref-bibtex-db.bib new file mode 100644 index 000000000..115113ce7 --- /dev/null +++ b/plugins/tiddlywiki/bibtex/samples/first-jabref-bibtex-db.bib @@ -0,0 +1,929 @@ +% Encoding: UTF-8 + +@InProceedings{Dalgaard2001, + author = {Dalgaard, Rune}, + title = {Hypertext and the Scholarly Archive: Intertexts, Paratexts and Metatexts at Work}, + booktitle = {Proceedings of the 12th {ACM} Conference on Hypertext and Hypermedia}, + series = {{HYPERTEXT} '01}, + pages = {175--184}, + publisher = {{ACM}}, + abstract = {With the Web, hypertext has become the paradigmatic rhetorical structure of a global and distributed archive. This paper argues that the scholarly archive is going though a process of hypertextualization that is not adequately accounted for in theories on hypertext. A methodological approach based on Gerard Genettes theory of transtextuality is proposed for a study of the hypertextualized archive. This involves a rejection of the reductionist opposition of hypertext and the fixed linear text, in favor of a study of the intertexts, paratexts and metatexts that work at the interface between texts and archive. I refer to this as second-order textuality.}, + date = {2001}, + doi = {10.1145/504216.504262}, + isbn = {978-1-58113-420-9}, + keywords = {criticism, hypertext rhetoric, intertextuality, metatext, navigation, paratext, scholarly and scientific communication, textuality, theory, web}, + location = {New York, {NY}, {USA}}, + shorttitle = {Hypertext and the Scholarly Archive}, + url = {http://doi.acm.org/10.1145/504216.504262}, + urldate = {2016-10-17}, +} + +@InProceedings{Stoyanova2015, + author = {Stoyanova, Silvia and Johnston, Ben}, + title = {Remediating Giacomo Leopardi's Zibaldone: Hypertextual Semantic Networks in the Scholarly Archive}, + booktitle = {Proceedings of the Third {AIUCD} Annual Conference on Humanities and Their Methods in the Digital Ecosystem}, + series = {{AIUCD} '14}, + pages = {9:1--9:8}, + publisher = {{ACM}}, + abstract = {The project of remediating Giacomo Leopardi's Zibaldone addresses the manuscript's hypertextual dimension of cross-references between related passages and their allocation to thematic indexes, which Leopardi wrote with the intention to mediate his research notes into scholarly publications. The project objective is to actualize the author's design for harvesting the Zibaldone's intra-textual semantic networks and reconstruct its inter-textual bibliographic networks by building a digital research platform, which would enable users to comprehensively mine the text's structural complexity. The {XML} encoding in {TEI} P5 allows to process the Zibaldone in custom-selected layers of its encoded elements for the exploration of their interrelations through statistical charts, histograms, network visualizations. In its future development, the platform would expand to an interactive space, where users could add their own annotations to the text and contribute to the site's editorial apparatus. The project has been a collaboration between Princeton University and the Trier Center for Digital Humanities, and its website is currently hosted at http://zibaldone.princeton.edu.}, + date = {2015}, + doi = {10.1145/2802612.2802634}, + isbn = {978-1-4503-3295-8}, + keywords = {fragmentary genre, Giacomo Leopardi, hypertext, note-taking, scholarly digital editions, semantic networks, Zibaldone}, + location = {New York, {NY}, {USA}}, + shorttitle = {Remediating Giacomo Leopardi's Zibaldone}, + url = {http://doi.acm.org/10.1145/2802612.2802634}, + urldate = {2016-10-17}, +} + +@Article{Rowan2016, + author = {Rowan, Kyle Edward}, + title = {Not Quite a Sunset: a hypertext opera}, + date = {2016}, + shorttitle = {Not Quite a Sunset}, + url = {http://escholarship.org/uc/item/9830g5pn.pdf}, + urldate = {2016-10-17}, +} + +@Article{Janez2016, + author = {Jáñez, Álvaro and Rosales, Javier}, + title = {Novices' need for exploration: Effects of goal specificity on hypertext navigation and comprehension}, + volume = {60}, + pages = {121--130}, + date = {2016}, + journaltitle = {Computers in Human Behavior}, + shorttitle = {Novices' need for exploration}, + url = {http://www.sciencedirect.com/science/article/pii/S0747563216301169}, + urldate = {2016-10-17}, +} + +@Book{Bernstein2016, + title = {Getting Started With Hypertext Narrative}, + publisher = {Eastgate Systems, Inc}, + author = {Bernstein, Mark}, + date = {2016}, +} + +@Article{Shang2016, + author = {Shang, Hui-Fang}, + title = {Online metacognitive strategies, hypermedia annotations, and motivation on hypertext comprehension}, + volume = {19}, + number = {3}, + pages = {321--334}, + date = {2016}, + file = {[PDF] ifets.info:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/992U6NNG/Shang - 2016 - Online metacognitive strategies, hypermedia annota.pdf:application/pdf}, + journaltitle = {Educational Technology \& Society}, + url = {http://www.jstor.org/stable/pdf/jeductechsoci.19.3.321.pdf}, + urldate = {2016-10-17}, +} + +@Article{Li2016, + author = {Li, Liang-Yi and Tseng, Shu-Ting and Chen, Gwo-Dong}, + title = {Effect of hypertext highlighting on browsing, reading, and navigational performance}, + volume = {54}, + pages = {318--325}, + date = {2016}, + journaltitle = {Computers in Human Behavior}, + url = {http://www.sciencedirect.com/science/article/pii/S074756321530090X}, + urldate = {2016-10-17}, +} + +@Article{Blustein2016, + author = {Blustein, Jamie and Herder, Eelco and Rubart, Jessica and Ashman, Helen}, + title = {27 th {ACM} International Conference on Hypertext and Social Media}, + pages = {1}, + date = {2016}, + issue = {Winter}, + journaltitle = {{ACM} {SIGWEB} Newsletter}, + url = {http://dl.acm.org/citation.cfm?id=2857660}, + urldate = {2016-10-17}, +} + +@Article{Blustein2016a, + author = {Blustein, James and Graff, Ann-Barbara}, + title = {6 alt. hypertext: An Early Social Medium}, + pages = {119}, + date = {2016}, + journaltitle = {Social Media Archeology and Poetics}, + shorttitle = {6 alt. hypertext}, + url = {https://books.google.com/books?hl=en&lr=&id=dPjdDAAAQBAJ&oi=fnd&pg=PA119&dq=hypertext&ots=fEESfFDhtn&sig=ygSkDRTvC9QETpNnVxJM4Ay-L9s}, + urldate = {2016-10-17}, +} + +@Article{Shang2016a, + author = {Shang, Hui-Fang}, + title = {Exploring demographic and motivational factors associated with hypertext reading by English as a foreign language ({EFL}) students}, + volume = {35}, + number = {7}, + pages = {559--571}, + date = {2016}, + journaltitle = {Behaviour \& Information Technology}, + url = {http://www.tandfonline.com/doi/abs/10.1080/0144929X.2015.1094827}, + urldate = {2016-10-17}, +} + +@Article{Hargood2016, + author = {Hargood, Charlie and Hunt, Verity and Weal, Mark and Millard, David}, + title = {Patterns of sculptural hypertext in location based narratives}, + date = {2016}, + file = {[PDF] soton.ac.uk:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/NSARWFGB/Hargood et al. - 2016 - Patterns of sculptural hypertext in location based.pdf:application/pdf}, + url = {http://eprints.soton.ac.uk/390748/}, + urldate = {2016-10-17}, +} + +@Article{Conradty2016, + author = {Conradty, Cathérine and Bogner, Franz X.}, + title = {Hypertext or Textbook: Effects on Motivation and Gain in Knowledge}, + volume = {6}, + number = {3}, + pages = {29}, + date = {2016}, + journaltitle = {Education Sciences}, + shorttitle = {Hypertext or Textbook}, + url = {http://www.mdpi.com/2227-7102/6/3/29/htm}, + urldate = {2016-10-17}, +} + +@Thesis{Fitzpatrick2016, + author = {Fitzpatrick, Philip J.}, + title = {Applied Hypertext Theory in a Demonstration of a Non-Sequential Audio Narrative}, + date = {2016}, + type = {phdthesis}, + url = {https://suny-dspace.longsight.com/handle/1951/66527}, + urldate = {2016-10-17}, +} + +@Article{Finnemann2016, + author = {Finnemann, Niels Ole}, + title = {Hypertext configurations: Genres in networked digital media}, + date = {2016}, + file = {[DOC] ku.dk:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/DSGTA9J3/Finnemann - 2016 - Hypertext configurations Genres in networked digi.doc:application/msword}, + journaltitle = {Journal of the Association for Information Science and Technology}, + shorttitle = {Hypertext configurations}, + url = {http://onlinelibrary.wiley.com/doi/10.1002/asi.23709/full}, + urldate = {2016-10-17}, +} + +@Article{Atkinson2016, + author = {Atkinson, Paul}, + title = {Digital ethnographies}, + volume = {16}, + number = {2}, + pages = {236--241}, + date = {2016}, + journaltitle = {Qualitative Research}, + url = {http://qrj.sagepub.com/content/16/2/236.short}, + urldate = {2016-10-17}, +} + +@Article{Bakshi2016, + author = {Bakshi, Divya}, + title = {Hypertext and Feminisms: Voicing the Silence (d)}, + volume = {3}, + number = {3}, + date = {2016}, + journaltitle = {Anglisticum Journal}, + shorttitle = {Hypertext and Feminisms}, + url = {http://anglisticum.mk/index.php/Anglisticum/article/view/625}, + urldate = {2016-10-17}, +} + +@InCollection{Maier2016, + author = {Maier, Carmen Daniela}, + title = {Hypertext and Hypermedia}, + booktitle = {International Encyclopedia of Mass Media and Society}, + publisher = {: {SAGE} Publications}, + date = {2016}, + url = {http://www.forskningsdatabasen.dk/en/catalog/2261443119}, + urldate = {2016-10-17}, +} + +@Article{Suresh2016a, + author = {Suresh, Mayur}, + title = {The file as hypertext}, + pages = {97}, + date = {2016}, + journaltitle = {Law, Memory, Violence: Uncovering the Counter-Archive}, + url = {https://books.google.com/books?hl=en&lr=&id=TmmaCwAAQBAJ&oi=fnd&pg=PA97&dq=hypertext&ots=nzLjpgq0h2&sig=jzOnpGgDes0pcu_Cx0P9zYU4Kxs}, + urldate = {2016-10-17}, +} + +@Thesis{Rafiq2008, + author = {Rafiq, Omar}, + title = {Improving the Accessibility of {TiddlyWiki}}, + date = {2008}, + institution = {University of Leeds, School of Computer Studies}, + type = {phdthesis}, +} + +@Thesis{Lauw2008, + author = {Lauw, Madelaine L.}, + title = {{TiddlyGraph}: Graph Drawing Tool for {TiddlyWiki}}, + date = {2008}, + institution = {University of Leeds, School of Computer Studies}, + shorttitle = {{TiddlyGraph}}, + type = {phdthesis}, +} + +@Thesis{Rutherford2009, + author = {Rutherford, Jayne}, + title = {Graphical Input for {TiddlyWiki}}, + date = {2009}, + institution = {University of Leeds, School of Computer Studies}, + type = {phdthesis}, +} + +@Thesis{Rafiq2008a, + author = {Rafiq, Omar}, + title = {Improving the Accessibility of {TiddlyWiki}}, + date = {2008}, + institution = {University of Leeds, School of Computer Studies}, + type = {phdthesis}, +} + +@Thesis{Lauw2008a, + author = {Lauw, Madelaine L.}, + title = {{TiddlyGraph}: Graph Drawing Tool for {TiddlyWiki}}, + date = {2008}, + institution = {University of Leeds, School of Computer Studies}, + shorttitle = {{TiddlyGraph}}, + type = {phdthesis}, +} + +@Article{TRUNG, + author = {{TRUNG}, {DANG} {DINH}}, + title = {{TiddlyWiki} client and server modification for scholarly digital libraries}, + url = {http://wing.comp.nus.edu.sg/publications/theses/2008/dangDinhTrungDang_HYP.pdf}, + urldate = {2016-10-17}, +} + +@Thesis{Rutherford2009a, + author = {Rutherford, Jayne}, + title = {Graphical Input for {TiddlyWiki}}, + date = {2009}, + institution = {University of Leeds, School of Computer Studies}, + type = {phdthesis}, +} + +@Article{Bakoa, + author = {Bakó, Mária and Aszalós, László}, + title = {Learning environments in {eBook} format}, + file = {[PDF] icvl.eu:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/3X4IZ2DH/Bakó and Aszalós - Learning environments in eBook format.pdf:application/pdf}, + url = {http://www.icvl.eu/2011/disc/structura/icvl/documente/pdf/tech/ICVL_Technologies_paper08.pdf}, + urldate = {2016-10-17}, +} + +@InProceedings{Solis2009, + author = {Solís, Carlos and Ali, Nour and Babar, Muhammad Ali}, + title = {A spatial hypertext wiki for architectural knowledge management}, + booktitle = {Wikis for Software Engineering, 2009. {WIKIS}4SE'09. {ICSE} Workshop on}, + pages = {36--46}, + publisher = {{IEEE}}, + date = {2009}, + file = {[PDF] ul.ie:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/7X4QZPUT/Solís et al. - 2009 - A spatial hypertext wiki for architectural knowled.pdf:application/pdf}, + url = {http://ieeexplore.ieee.org/xpls/abs_all.jsp?arnumber=5069995}, + urldate = {2016-10-17}, +} + +@InCollection{Burry2005b, + author = {Burry, Jane and Burrow, Andrew and Amor, Robert and Burry, Mark}, + title = {Shared design space}, + booktitle = {Computer Aided Architectural Design Futures 2005}, + publisher = {Springer}, + pages = {217--226}, + date = {2005}, + file = {[PDF] architexturez.net:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/A223SNFN/Burry et al. - 2005 - Shared design space.pdf:application/pdf}, + url = {http://link.springer.com/chapter/10.1007/1-4020-3698-1_20}, + urldate = {2016-10-17}, +} + +@Article{Jipsen2006b, + author = {Jipsen, Peter}, + title = {{ASciencePad}–a {TiddlyWiki} suitable for scientific notes}, + date = {2006}, + journaltitle = {Accessed via http://math. chapman. edu/∼ jipsen/asciencepad/asciencepad. html (7 January 2007)}, +} + +@Book{Bagnoli2006b, + title = {Tiddlywiki in science education}, + publisher = {{ITHET}}, + author = {Bagnoli, Franco and Jipsen, Peter and Sterbini, Andrea}, + date = {2006}, + url = {http://www.academia.edu/download/44779373/TiddlyWiki_in_Science_Education20160415-24634-dvo6mu.pdf}, + urldate = {2016-10-17}, +} + +@InProceedings{Yang2008b, + author = {Yang, Chia-Han and Wu, Ming-Ying and Lin, Chien-Min and Yang, Don-Lin}, + title = {Implementation of Wiki-based knowledge management systems for small research groups}, + booktitle = {2008 Eighth International Conference on Intelligent Systems Design and Applications}, + volume = {2}, + pages = {346--349}, + publisher = {{IEEE}}, + date = {2008}, + file = {[PDF] mirlabs.net:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/EVE2GP2R/Yang et al. - 2008 - Implementation of Wiki-based knowledge management .pdf:application/pdf}, + url = {http://ieeexplore.ieee.org/xpls/abs_all.jsp?arnumber=4696356}, + urldate = {2016-10-17}, +} + +@Book{Ruston2004a, + title = {{TiddlyWiki}}, + author = {Ruston, Jeremy}, + date = {2004}, +} + +@Article{Gobbo2006b, + author = {Gobbo, Federico and Lanzarone, Gaetano Aurelio}, + title = {A wiki-based active learning system; how to enhance learning material in epistemology of computer science and computer ethics}, + date = {2006}, + file = {[PDF] researchgate.net:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/A5SIBRAA/Gobbo and Lanzarone - 2006 - A wiki-based active learning system\; how to enhanc.pdf:application/pdf}, + journaltitle = {Current Developments in Technology-Assisted Education}, + url = {https://www.researchgate.net/profile/Federico_Gobbo/publication/216111828_A_wiki-based_active_learning_system_how_to_enhance_learning_material_in_epistemology_of_computer_science_and_computer_ethics/links/09e4150a67b1073482000000.pdf}, + urldate = {2016-10-17}, +} + +@Article{Kopchok2008b, + author = {Kopchok, Katie}, + title = {Interlibrary loan the Wiki way: an effective and free interlibrary loan procedures and communications tool}, + volume = {18}, + number = {1}, + pages = {67--77}, + date = {2008}, + journaltitle = {Journal of Interlibrary Loan, Document Delivery \& Electronic Reserve}, + shorttitle = {Interlibrary loan the Wiki way}, + url = {http://www.tandfonline.com/doi/abs/10.1300/J474v18n01_08}, + urldate = {2016-10-17}, +} + +@InProceedings{Dang2008b, + author = {Dang, Dinh-Trung and Tan, Yee Fan and Kan, Min-Yen}, + title = {Towards a Webpage-based bibliographic manager}, + booktitle = {International Conference on Asian Digital Libraries}, + pages = {313--316}, + publisher = {Springer}, + date = {2008}, + file = {[PDF] nus.edu.sg:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/X466UZP3/Dang et al. - 2008 - Towards a Webpage-based bibliographic manager.pdf:application/pdf}, + url = {http://link.springer.com/chapter/10.1007/978-3-540-89533-6_33}, + urldate = {2016-10-17}, +} + +@InProceedings{Barker2008e, + author = {Barker, P. G.}, + title = {Using Wikis for Knowledge Management}, + booktitle = {Proceedings of the {ED}-{MEDIA} 2008 World Conference on Educational Multimedia, Hypermedia and Telecommunications}, + pages = {3604--3613}, + date = {2008}, + url = {https://www.editlib.org/p/28886/proceeding_28886.pdf}, + urldate = {2016-10-17}, +} + +@InProceedings{Marchese2009b, + author = {Marchese, Francis T.}, + title = {Asynchronous collaborative visualization on a stick}, + booktitle = {Proceedings of Vis 2009 (Atlantic City, {NJ}), Conference {DVD}}, + publisher = {{IEEE} Computer Society Washington, {DC}}, + date = {2009}, + file = {[PDF] researchgate.net:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/ZM78BHSJ/Marchese - 2009 - Asynchronous collaborative visualization on a stic.pdf:application/pdf}, + url = {https://www.researchgate.net/profile/Francis_Marchese/publication/228366401_Asynchronous_Collaborative_Visualization_on_a_Stick/links/09e4150c32bfec2345000000.pdf}, + urldate = {2016-10-17}, +} + +@Book{DeCiccio2007b, + title = {Developing a Flexible Information Repository: A Case Study Using {TiddlyWiki} for a Knowledge Management System}, + publisher = {{ProQuest}}, + author = {{DeCiccio}, Michael}, + date = {2007}, + shorttitle = {Developing a Flexible Information Repository}, +} + +@Book{Wilson2007d, + title = {{TiddlyWiki} 2.1. 3.}, + publisher = {{UNIV} {SHEFFIELD} {DEPT} {INFORMATION} {STUDIES} {UNIV} {SHEFFIELD}, {WESTERN} {BANK}, {SHEFFIELD} S10 2TN, S {YORKS}, {ENGLAND}}, + author = {Wilson, T. D.}, + volume = {12}, + number = {3}, + date = {2007}, +} + +@Thesis{Rafiq2008b, + author = {Rafiq, Omar}, + title = {Improving the Accessibility of {TiddlyWiki}}, + date = {2008}, + institution = {University of Leeds, School of Computer Studies}, + type = {phdthesis}, +} + +@Thesis{Lauw2008b, + author = {Lauw, Madelaine L.}, + title = {{TiddlyGraph}: Graph Drawing Tool for {TiddlyWiki}}, + date = {2008}, + institution = {University of Leeds, School of Computer Studies}, + shorttitle = {{TiddlyGraph}}, + type = {phdthesis}, +} + +@Article{Wilson2007e, + author = {Wilson, Tom D.}, + title = {Review of: {TiddlyWiki} 2.1. 3. Osmosoft. com, 2007}, + volume = {12}, + number = {3}, + pages = {review--no}, + date = {2007}, + journaltitle = {Information research}, + shorttitle = {Review of}, + url = {http://www.diva-portal.org/smash/record.jsf?pid=diva2:870314}, + urldate = {2016-10-17}, +} + +@Thesis{Rutherford2009b, + author = {Rutherford, Jayne}, + title = {Graphical Input for {TiddlyWiki}}, + date = {2009}, + institution = {University of Leeds, School of Computer Studies}, + type = {phdthesis}, +} + +@InProceedings{Montaner2013b, + author = {Montaner, David and Garcıa-Garcıa, Francisco}, + title = {{TiddlyWikiR}: an R package for dynamic report writing.}, + booktitle = {The R User Conference, {useR}! 2013 July 10-12 2013 University of Castilla-La Mancha, Albacete, Spain}, + volume = {10}, + pages = {126}, + date = {2013}, + shorttitle = {{TiddlyWikiR}}, + url = {https://www.researchgate.net/profile/Selcuk_Korkmaz/publication/273333674_bbRVM_an_R_package_for_Ensemble_Classification_Approaches_of_Relevance_Vector_Machines/links/54fed6cf0cf2741b69f1787b.pdf#page=126}, + urldate = {2016-10-17}, +} + +@InProceedings{Dickinson2008b, + author = {Dickinson, Anne}, + title = {Is the e-Learning Object “Create Interactive Accessible e-Learning” Accessible?}, + booktitle = {Proceedings of the 3rd International Conference on e-Learning: {ICEL}}, + pages = {133}, + publisher = {Academic Conferences Limited}, + date = {2008}, +} + +@Article{Palmer2009, + author = {Palmer, Joy}, + title = {Archives 2.0: if we build it, will they come?}, + number = {60}, + __markedentry = {[steve:]}, + date = {2009}, + journaltitle = {Ariadne}, + shorttitle = {Archives 2.0}, + url = {http://www.ariadne.ac.uk/issue60/palmer}, + urldate = {2016-10-17}, +} + +@Article{Grannum2011, + author = {Grannum, Guy and Theimer, Kate}, + title = {Harnessing User Knowledge: The National Archives Your Archives Wiki}, + pages = {116--127}, + __markedentry = {[steve:]}, + date = {2011}, + journaltitle = {A Different Kind of Web: New Connections Between Archives and Our Users}, + shorttitle = {Harnessing User Knowledge}, +} + +@Article{Frumkin2005, + author = {Frumkin, Jeremy}, + title = {The wiki and the digital library}, + volume = {21}, + number = {1}, + pages = {18--22}, + __markedentry = {[steve:]}, + date = {2005}, + journaltitle = {{OCLC} Systems \& Services: International digital library perspectives}, + url = {http://www.emeraldinsight.com/doi/full/10.1108/10650750510578109}, + urldate = {2016-10-17}, +} + +@Article{Flinn2010, + author = {Flinn, Andrew}, + title = {Independent Community Archives and Community-Generated Content ‘Writing, Saving and Sharing our Histories’}, + volume = {16}, + number = {1}, + pages = {39--51}, + __markedentry = {[steve:]}, + date = {2010}, + journaltitle = {Convergence: The International Journal of Research into New Media Technologies}, + url = {http://con.sagepub.com/content/16/1/39.short}, + urldate = {2016-10-17}, +} + +@Article{Wagner2004, + author = {Wagner, Christian}, + title = {Wiki: A technology for conversational knowledge management and group collaboration}, + volume = {13}, + number = {1}, + pages = {58}, + __markedentry = {[steve:]}, + date = {2004}, + file = {[PDF] hksyu.edu:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/C7TZN8FR/Wagner - 2004 - Wiki A technology for conversational knowledge ma.pdf:application/pdf}, + journaltitle = {The Communications of the Association for Information Systems}, + shorttitle = {Wiki}, + url = {http://aisel.aisnet.org/cgi/viewcontent.cgi?article=3238&context=cais}, + urldate = {2016-10-17}, +} + +@InProceedings{Munteanu2006, + author = {Munteanu, Cosmin and Zhang, Yuecheng and Baecker, Ron and Penn, Gerald}, + title = {Wiki-like editing of imperfect computer-generated webcast transcripts}, + booktitle = {Proc. Demo track of {ACM} Conf. on Computer Supported Cooperative Work–{CSCW}}, + pages = {83--84}, + publisher = {Citeseer}, + __markedentry = {[steve:]}, + date = {2006}, + file = {[PDF] psu.edu:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/I22V3CTX/Munteanu et al. - 2006 - Wiki-like editing of imperfect computer-generated .pdf:application/pdf}, + url = {http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.129.3559&rep=rep1&type=pdf}, + urldate = {2016-10-17}, +} + +@Article{Unit2010, + author = {Unit, Economist Intelligence}, + title = {Democracy index 2010}, + __markedentry = {[steve:]}, + date = {2010}, + url = {http://ictlogy.net/bibliography/reports/projects.php?idp=1853}, + urldate = {2016-10-17}, +} + +@Article{Cunningham2002, + author = {Cunningham, Ward and {others}}, + title = {What is wiki}, + __markedentry = {[steve:]}, + date = {2002}, + journaltitle = {{WikiWikiWeb}. http://www. wiki. org/wiki. cgi}, +} + +@Article{Regli2010, + author = {Regli, William C. and Kopena, Joseph B. and Grauer, Michael and Simpson, Timothy W. and Stone, Robert B. and Lewis, Kemper and Bohm, Matt R. and Wilkie, David and Piecyk, Martin and Osecki, Jordan}, + title = {Semantics for digital engineering archives supporting engineering design education}, + volume = {31}, + number = {1}, + pages = {37--50}, + __markedentry = {[steve:]}, + date = {2010}, + file = {[PDF] aaai.org:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/5K858ZWC/Regli et al. - 2010 - Semantics for digital engineering archives support.pdf:application/pdf}, + journaltitle = {{AI} Magazine}, + url = {http://www.aaai.org/ojs/index.php/aimagazine/article/viewArticle/2282}, + urldate = {2016-10-17}, +} + +@Article{Harris2004, + author = {Harris, Roger W.}, + title = {Information and communication technologies for poverty alleviation}, + __markedentry = {[steve:]}, + date = {2004}, + url = {http://ictlogy.net/bibliography/reports/projects.php?idp=1271}, + urldate = {2016-10-17}, +} + +@Article{Wiki1996, + author = {Wiki, {ASIS}{\textbackslash}\&T-{ESC}}, + title = {Information literacy}, + __markedentry = {[steve:]}, + date = {1996}, + url = {https://www.asis.org/Chapters/Student/esc/?tag=information-literacy}, + urldate = {2016-10-17}, +} + +@Article{Parker2007, + author = {Parker, Kevin R. and Chao, Joseph T.}, + title = {Wiki as a teaching tool}, + volume = {3}, + number = {1}, + pages = {57--72}, + __markedentry = {[steve:]}, + date = {2007}, + file = {[PDF] wikieducator.org:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/NBDH2ICS/Parker and Chao - 2007 - Wiki as a teaching tool.pdf:application/pdf}, + journaltitle = {Interdisciplinary journal of knowledge and learning objects}, + url = {http://wikieducator.org/images/5/58/Wikiasateachingtool.pdf}, + urldate = {2016-10-17}, +} + +@Article{Haddad2002, + author = {Haddad, Wadi D. and Draxler, Alexandra}, + title = {Technologies for Education: Potential, Parameters, and Prospects}, + __markedentry = {[steve:]}, + date = {2002}, + shorttitle = {Technologies for Education}, + url = {http://ictlogy.net/bibliography/reports/projects.php?idp=515}, + urldate = {2016-10-17}, +} + +@Article{Desilets2005, + author = {Désilets, Alain and Paquet, Sébastien}, + title = {Wiki as a tool for web-based collaborative story telling in primary school: A case study}, + __markedentry = {[steve:]}, + date = {2005}, + shorttitle = {Wiki as a tool for web-based collaborative story telling in primary school}, + url = {http://nparc.cisti-icist.nrc-cnrc.gc.ca/npsi/ctrl?action=rtdoc&an=8913987}, + urldate = {2016-10-17}, +} + +@Article{Giles2007, + author = {Giles, Jim}, + title = {Key biology databases go wiki}, + volume = {445}, + number = {7129}, + pages = {691--691}, + __markedentry = {[steve:]}, + date = {2007}, + journaltitle = {Nature}, + url = {http://www.nature.com/nature/journal/v445/n7129/full/445691a.html}, + urldate = {2016-10-17}, +} + +@Article{Kennedy2009, + author = {Kennedy, Gregor and Dalgarno, Barney and Bennett, Sue and Gray, Kathleen and Waycott, Jenny and Judd, Terry and Bishop, Andrea and Maton, Karl and Krause, Kerri-Lee and Chang, Rosemary}, + title = {Educating the net generation. A handbook of findings for practice and policy}, + __markedentry = {[steve:]}, + date = {2009}, + url = {http://ictlogy.net/bibliography/reports/projects.php?idp=1450}, + urldate = {2016-10-17}, +} + +@Article{Sciadas2005, + author = {Sciadas, George}, + title = {From the digital divide to digital opportunities}, + __markedentry = {[steve:]}, + date = {2005}, + url = {http://ictlogy.net/bibliography/reports/projects.php?idp=239}, + urldate = {2016-10-17}, +} + +@Book{Web2000, + title = {Wiki Web}, + author = {Web, Wiki and {DE}, {WIKIPEDI} and {JPG}, {WIKI}}, + __markedentry = {[steve:]}, + date = {2000}, +} + +@Article{Varfolomeyev2012, + author = {Varfolomeyev, Aleksey and Ivanovs, Aleksandrs}, + title = {Wiki Technologies for Semantic Publication of Old Russian Charters}, + pages = {405--407}, + __markedentry = {[steve:]}, + date = {2012}, + journaltitle = {Digital Humanities}, + url = {http://www.dh2012.uni-hamburg.de/conference/programme/abstracts/wiki-technologies-for-semantic-publication-of-old-russian-charters.1.html}, + urldate = {2016-10-17}, +} + +@InProceedings{Buffa2006, + author = {Buffa, Michel and Gandon, Fabien}, + title = {{SweetWiki}: semantic web enabled technologies in Wiki}, + booktitle = {Proceedings of the 2006 international symposium on Wikis}, + pages = {69--78}, + publisher = {{ACM}}, + __markedentry = {[steve:]}, + date = {2006}, + file = {[PDF] inria.fr:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/KFGFBGWE/Buffa and Gandon - 2006 - SweetWiki semantic web enabled technologies in Wi.pdf:application/pdf}, + shorttitle = {{SweetWiki}}, + url = {http://dl.acm.org/citation.cfm?id=1149469}, + urldate = {2016-10-17}, +} + +@InProceedings{Barker2008, + author = {Barker, Philip}, + title = {Using wikis and weblogs to enhance human performance}, + booktitle = {Proceedings of World Conference on E-Learning in Corporate, Government, Healthcare, and Higher Education}, + pages = {581--589}, + date = {2008}, + url = {https://www.editlib.org/index.cfm/files/paper_29665.pdf?fuseaction=Reader.DownloadFullText&paper_id=29665}, + urldate = {2016-10-17}, +} + +@InProceedings{Burry2005, + author = {Burry, Jane and Burrow, Andrew and Amor, Robert and Burry, Mark}, + title = {Shared design space. The contribution of augmented wiki hypertext to design collaboration.}, + booktitle = {{CAAD} Futures 2005}, + publisher = {Springer}, + date = {2005}, + url = {https://researchbank.rmit.edu.au/view/rmit:1820}, + urldate = {2016-10-17}, +} + +@InProceedings{Notari2006, + author = {Notari, Michele}, + title = {How to use a Wiki in education:'Wiki based effective constructive learning'}, + booktitle = {Proceedings of the 2006 international symposium on Wikis}, + pages = {131--132}, + publisher = {{ACM}}, + date = {2006}, + file = {[PDF] drake.edu:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/9D8KADJZ/Notari - 2006 - How to use a Wiki in education'Wiki based effecti.pdf:application/pdf}, + shorttitle = {How to use a Wiki in education}, + url = {http://dl.acm.org/citation.cfm?id=1149479}, + urldate = {2016-10-17}, +} + +@InProceedings{Burrow2004, + author = {Burrow, Andrew Lincoln}, + title = {Negotiating access within Wiki: a system to construct and maintain a taxonomy of access rules}, + booktitle = {Proceedings of the fifteenth {ACM} conference on Hypertext and hypermedia}, + pages = {77--86}, + publisher = {{ACM}}, + date = {2004}, + shorttitle = {Negotiating access within Wiki}, + url = {http://dl.acm.org/citation.cfm?id=1012831}, + urldate = {2016-10-17}, +} + +@InProceedings{Solis2010, + author = {Solis, Carlos and Ali, Nour}, + title = {Distributed requirements elicitation using a spatial hypertext wiki}, + booktitle = {2010 5th {IEEE} International Conference on Global Software Engineering}, + pages = {237--246}, + publisher = {{IEEE}}, + date = {2010}, + file = {[PDF] ul.ie:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/FR2DGIKF/Solis and Ali - 2010 - Distributed requirements elicitation using a spati.pdf:application/pdf}, + url = {http://ieeexplore.ieee.org/xpls/abs_all.jsp?arnumber=5581514}, + urldate = {2016-10-17}, +} + +@InProceedings{Solis2008, + author = {Solís, Carlos and Ali, Nour}, + title = {{ShyWiki}-a spatial hypertext wiki}, + booktitle = {Proceedings of the 4th International Symposium on Wikis}, + pages = {10}, + publisher = {{ACM}}, + date = {2008}, + file = {[PDF] psu.edu:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/ZR4GMI8R/Solís and Ali - 2008 - ShyWiki-a spatial hypertext wiki.pdf:application/pdf}, + url = {http://dl.acm.org/citation.cfm?id=1822272}, + urldate = {2016-10-17}, +} + +@Article{Sauer2005, + author = {Sauer, Igor M. and Bialek, Dominik and Efimova, Ekaterina and Schwartlander, Ruth and Pless, Gesine and Neuhaus, Peter}, + title = {“Blogs” and “wikis” are valuable software tools for communication within research groups}, + volume = {29}, + number = {1}, + pages = {82--83}, + date = {2005}, + journaltitle = {Artificial organs}, + url = {http://onlinelibrary.wiley.com/doi/10.1111/j.1525-1594.2004.29005.x/full}, + urldate = {2016-10-17}, +} + +@Article{TREnTIn2009, + author = {{TREnTIn}, Guglielmo}, + title = {Using a wiki to evaluate individual contribution to a collaborative learning project}, + volume = {25}, + number = {1}, + pages = {43--55}, + date = {2009}, + file = {[PDF] semanticscholar.org:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/IF24EBKI/TREnTIn - 2009 - Using a wiki to evaluate individual contribution t.pdf:application/pdf}, + journaltitle = {Journal of computer assisted learning}, + url = {http://onlinelibrary.wiley.com/doi/10.1111/j.1365-2729.2008.00276.x/full}, + urldate = {2016-10-17}, +} + +@Article{Skiba2005, + author = {Skiba, Diane J.}, + title = {Do your students wiki?}, + volume = {26}, + number = {2}, + pages = {120}, + date = {2005}, + journaltitle = {Nursing education perspectives}, + url = {http://search.proquest.com/openview/460686aff56fe55ba2bc3cd9a3fc27aa/1?pq-origsite=gscholar}, + urldate = {2016-10-17}, +} + +@InProceedings{Millard2006, + author = {Millard, David E. and Ross, Martin}, + title = {Web 2.0: hypertext by any other name?}, + booktitle = {Proceedings of the seventeenth conference on Hypertext and hypermedia}, + pages = {27--30}, + publisher = {{ACM}}, + date = {2006}, + file = {[PDF] soton.ac.uk:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/ZGXUB4IM/Millard and Ross - 2006 - Web 2.0 hypertext by any other name.pdf:application/pdf}, + shorttitle = {Web 2.0}, + url = {http://dl.acm.org/citation.cfm?id=1149947}, + urldate = {2016-10-17}, +} + +@InProceedings{Aronsson2002, + author = {Aronsson, Lars}, + title = {Operation of a Large Scale, General Purpose Wiki Website.}, + booktitle = {Elpub}, + date = {2002}, + file = {[PDF] architexturez.net:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/4VUK34H6/Aronsson - 2002 - Operation of a Large Scale, General Purpose Wiki W.pdf:application/pdf}, + url = {http://elpub.architexturez.net/system/files/pdf/02-03.content_0.pdf}, + urldate = {2016-10-17}, +} + +@InProceedings{Solis2010a, + author = {Solis, Carlos and Ali, Nour}, + title = {A spatial hypertext wiki for knowledge management}, + booktitle = {Collaborative Technologies and Systems ({CTS}), 2010 International Symposium on}, + pages = {225--234}, + publisher = {{IEEE}}, + date = {2010}, + file = {[PDF] ul.ie:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/6B2BWZ6F/Solis and Ali - 2010 - A spatial hypertext wiki for knowledge management.pdf:application/pdf}, + url = {http://ieeexplore.ieee.org/xpls/abs_all.jsp?arnumber=5478505}, + urldate = {2016-10-17}, +} + +@InProceedings{Morris2007, + author = {Morris, Joseph C.}, + title = {{DistriWiki}:: a distributed peer-to-peer wiki network}, + booktitle = {Proceedings of the 2007 international symposium on Wikis}, + pages = {69--74}, + publisher = {{ACM}}, + date = {2007}, + file = {[PDF] psu.edu:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/5P2FCHHM/Morris - 2007 - DistriWiki a distributed peer-to-peer wiki netwo.pdf:application/pdf}, + shorttitle = {{DistriWiki}}, + url = {http://dl.acm.org/citation.cfm?id=1296959}, + urldate = {2016-10-17}, +} + +@InProceedings{Solis2011, + author = {Solis, Carlos and Ali, Nour}, + title = {An experience using a spatial hypertext Wiki}, + booktitle = {Proceedings of the 22nd {ACM} conference on Hypertext and hypermedia}, + pages = {133--142}, + publisher = {{ACM}}, + date = {2011}, + file = {[PDF] ul.ie:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/G2FJIIVS/Solis and Ali - 2011 - An experience using a spatial hypertext Wiki.pdf:application/pdf}, + url = {http://dl.acm.org/citation.cfm?id=1995986}, + urldate = {2016-10-17}, +} + +@InProceedings{Zhang2006, + author = {Zhang, Yuejiao}, + title = {Wiki means more: hyperreading in Wikipedia}, + booktitle = {Proceedings of the seventeenth conference on Hypertext and hypermedia}, + pages = {23--26}, + publisher = {{ACM}}, + date = {2006}, + shorttitle = {Wiki means more}, + url = {http://dl.acm.org/citation.cfm?id=1149946}, + urldate = {2016-10-17}, +} + +@Article{Solis2011a, + author = {Solis, Carlos and Ali, Nour}, + title = {A Semantic Wiki Based on Spatial Hypertext.}, + volume = {17}, + number = {7}, + pages = {1043--1059}, + date = {2011}, + file = {[PDF] brighton.ac.uk:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/QATARD72/Solis and Ali - 2011 - A Semantic Wiki Based on Spatial Hypertext..pdf:application/pdf}, + journaltitle = {J. {UCS}}, + url = {http://jucs.org/jucs_17_7/a_semantic_wiki_based/jucs_17_07_1043_1059_solis.pdf}, + urldate = {2016-10-17}, +} + +@InProceedings{Schaffert2006, + author = {Schaffert, Sebastian}, + title = {{IkeWiki}: A semantic wiki for collaborative knowledge management}, + booktitle = {15th {IEEE} International Workshops on Enabling Technologies: Infrastructure for Collaborative Enterprises ({WETICE}'06)}, + pages = {388--396}, + publisher = {{IEEE}}, + date = {2006}, + file = {[PDF] psu.edu:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/AGSE8WEV/Schaffert - 2006 - IkeWiki A semantic wiki for collaborative knowled.pdf:application/pdf}, + shorttitle = {{IkeWiki}}, + url = {http://ieeexplore.ieee.org/xpls/abs_all.jsp?arnumber=4092241}, + urldate = {2016-10-17}, +} + +@InProceedings{Cunningham2006, + author = {Cunningham, Ward}, + title = {Design Principles of Wiki: How can so little do so much?}, + booktitle = {Int. Sym. Wikis}, + pages = {13--14}, + date = {2006}, + shorttitle = {Design Principles of Wiki}, + url = {https://pdfs.semanticscholar.org/2713/89a35bb3c98101d65dd70ba79c3b188615c5.pdf}, + urldate = {2016-10-17}, +} + +@Article{Nixon2006, + author = {Nixon, Lyndon {JB} and Simperl, Elena Paslaru Bontas}, + title = {Makna and {MultiMakna}: towards semantic and multimedia capability in wikis for the emerging web}, + volume = {2006}, + date = {2006}, + journaltitle = {Proc. Semantics}, + shorttitle = {Makna and {MultiMakna}}, + url = {http://www.academia.edu/download/1909725/4quz0v7pkwwyigy.pdf}, + urldate = {2016-10-17}, +} + +@Article{Truman2016, + author = {Truman, Gail}, + title = {Web Archiving Environmental Scan}, + __markedentry = {[steve:6]}, + abstract = {Version of Record}, + date = {2016}, + file = {Full Text PDF:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/PADARME2/Truman - 2016 - Web Archiving Environmental Scan.pdf:application/pdf}, + langid = {american}, + owner = {steve}, + rights = {open}, + timestamp = {2016-10-18}, + url = {https://dash.harvard.edu/handle/1/25658314}, + urldate = {2016-10-18}, +} + diff --git a/plugins/tiddlywiki/bibtex/samples/tiddlywiki.files b/plugins/tiddlywiki/bibtex/samples/tiddlywiki.files new file mode 100644 index 000000000..cff7acd09 --- /dev/null +++ b/plugins/tiddlywiki/bibtex/samples/tiddlywiki.files @@ -0,0 +1,3 @@ +{ + "tiddlers": [] +} \ No newline at end of file diff --git a/plugins/tiddlywiki/browser-sniff/readme.tid b/plugins/tiddlywiki/browser-sniff/readme.tid index 98fa1f745..9de5985b0 100644 --- a/plugins/tiddlywiki/browser-sniff/readme.tid +++ b/plugins/tiddlywiki/browser-sniff/readme.tid @@ -4,6 +4,6 @@ This plugin adds a number of `$:/info/` tiddlers containing information about th It allows you to create content that is presented in a way that is responsive to different browsers. -For example, http://tiddlywiki.com uses this plugin to present the user with the best options for getting started depending on their browser. +For example, https://tiddlywiki.com uses this plugin to present the user with the best options for getting started depending on their browser. [[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/browser-sniff]] diff --git a/plugins/tiddlywiki/codemirror-autocomplete/config/autocomplete.tid b/plugins/tiddlywiki/codemirror-autocomplete/config/autocomplete.tid new file mode 100644 index 000000000..5f76573dd --- /dev/null +++ b/plugins/tiddlywiki/codemirror-autocomplete/config/autocomplete.tid @@ -0,0 +1,7 @@ +title: $:/config/codemirror/autocomplete +extend: extraKeys +type: json + +{ + "Ctrl-Space": "autocomplete" +} \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/anyword-hint.js b/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/anyword-hint.js new file mode 100644 index 000000000..80b384a3e --- /dev/null +++ b/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/anyword-hint.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";var r=/[\w$]+/;e.registerHelper("hint","anyword",function(t,o){for(var i=o&&o.word||r,n=o&&o.range||500,f=t.getCursor(),s=t.getLine(f.line),a=f.ch,c=a;c&&i.test(s.charAt(c-1));)--c;for(var l=c!=a&&s.slice(c,a),d=o&&o.list||[],u={},p=new RegExp(i.source,"g"),g=-1;g<=1;g+=2)for(var h=f.line,m=Math.min(Math.max(h+g*n,t.firstLine()),t.lastLine())+g;h!=m;h+=g)for(var y,b=t.getLine(h);y=p.exec(b);)h==f.line&&y[0]===l||l&&0!=y[0].lastIndexOf(l,0)||Object.prototype.hasOwnProperty.call(u,y[0])||(u[y[0]]=!0,d.push(y[0]));return{list:d,from:e.Pos(f.line,c),to:e.Pos(f.line,a)}})}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/css-hint.js b/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/css-hint.js new file mode 100644 index 000000000..fadd84612 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/css-hint.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror"),require("../../mode/css/css")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../mode/css/css"],e):e(CodeMirror)}(function(e){"use strict";var r={link:1,visited:1,active:1,hover:1,focus:1,"first-letter":1,"first-line":1,"first-child":1,before:1,after:1,lang:1};e.registerHelper("hint","css",function(t){var o=t.getCursor(),s=t.getTokenAt(o),i=e.innerMode(t.getMode(),s.state);if("css"==i.mode.name){if("keyword"==s.type&&0=="!important".indexOf(s.string))return{list:["!important"],from:e.Pos(o.line,s.start),to:e.Pos(o.line,s.end)};var n=s.start,a=o.ch,d=s.string.slice(0,a-n);/[^\w$_-]/.test(d)&&(d="",n=a=o.ch);var c=e.resolveMode("text/css"),f=[],l=i.state.state;return"pseudo"==l||"variable-3"==s.type?p(r):"block"==l||"maybeprop"==l?p(c.propertyKeywords):"prop"==l||"parens"==l||"at"==l||"params"==l?(p(c.valueKeywords),p(c.colorKeywords)):"media"!=l&&"media_parens"!=l||(p(c.mediaTypes),p(c.mediaFeatures)),f.length?{list:f,from:e.Pos(o.line,n),to:e.Pos(o.line,a)}:void 0}function p(e){for(var r in e)d&&0!=r.lastIndexOf(d,0)||f.push(r)}})}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/html-hint.js b/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/html-hint.js new file mode 100644 index 000000000..e3215229a --- /dev/null +++ b/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/html-hint.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(l){"object"==typeof exports&&"object"==typeof module?l(require("../../lib/codemirror"),require("./xml-hint")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./xml-hint"],l):l(CodeMirror)}(function(l){"use strict";var t="ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh cv kw co cr hr cs da dv nl dz en eo et ee fo fj fi fr ff gl ka de el gn gu ht ha he hz hi ho hu ia id ie ga ig ik io is it iu ja jv kl kn kr ks kk km ki rw ky kv kg ko ku kj la lb lg li ln lo lt lu lv gv mk mg ms ml mt mi mr mh mn na nv nb nd ne ng nn no ii nr oc oj cu om or os pa pi fa pl ps pt qu rm rn ro ru sa sc sd se sm sg sr gd sn si sk sl so st es su sw ss sv ta te tg th ti bo tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa cy wo fy xh yi yo za zu".split(" "),e=["_blank","_self","_top","_parent"],a=["ascii","utf-8","utf-16","latin1","latin1"],n=["get","post","put","delete"],r=["application/x-www-form-urlencoded","multipart/form-data","text/plain"],o=["all","screen","print","embossed","braille","handheld","print","projection","screen","tty","tv","speech","3d-glasses","resolution [>][<][=] [X]","device-aspect-ratio: X/Y","orientation:portrait","orientation:landscape","device-height: [X]","device-width: [X]"],s={attrs:{}},u={a:{attrs:{href:null,ping:null,type:null,media:o,target:e,hreflang:t}},abbr:s,acronym:s,address:s,applet:s,area:{attrs:{alt:null,coords:null,href:null,target:null,ping:null,media:o,hreflang:t,type:null,shape:["default","rect","circle","poly"]}},article:s,aside:s,audio:{attrs:{src:null,mediagroup:null,crossorigin:["anonymous","use-credentials"],preload:["none","metadata","auto"],autoplay:["","autoplay"],loop:["","loop"],controls:["","controls"]}},b:s,base:{attrs:{href:null,target:e}},basefont:s,bdi:s,bdo:s,big:s,blockquote:{attrs:{cite:null}},body:s,br:s,button:{attrs:{form:null,formaction:null,name:null,value:null,autofocus:["","autofocus"],disabled:["","autofocus"],formenctype:r,formmethod:n,formnovalidate:["","novalidate"],formtarget:e,type:["submit","reset","button"]}},canvas:{attrs:{width:null,height:null}},caption:s,center:s,cite:s,code:s,col:{attrs:{span:null}},colgroup:{attrs:{span:null}},command:{attrs:{type:["command","checkbox","radio"],label:null,icon:null,radiogroup:null,command:null,title:null,disabled:["","disabled"],checked:["","checked"]}},data:{attrs:{value:null}},datagrid:{attrs:{disabled:["","disabled"],multiple:["","multiple"]}},datalist:{attrs:{data:null}},dd:s,del:{attrs:{cite:null,datetime:null}},details:{attrs:{open:["","open"]}},dfn:s,dir:s,div:s,dl:s,dt:s,em:s,embed:{attrs:{src:null,type:null,width:null,height:null}},eventsource:{attrs:{src:null}},fieldset:{attrs:{disabled:["","disabled"],form:null,name:null}},figcaption:s,figure:s,font:s,footer:s,form:{attrs:{action:null,name:null,"accept-charset":a,autocomplete:["on","off"],enctype:r,method:n,novalidate:["","novalidate"],target:e}},frame:s,frameset:s,h1:s,h2:s,h3:s,h4:s,h5:s,h6:s,head:{attrs:{},children:["title","base","link","style","meta","script","noscript","command"]},header:s,hgroup:s,hr:s,html:{attrs:{manifest:null},children:["head","body"]},i:s,iframe:{attrs:{src:null,srcdoc:null,name:null,width:null,height:null,sandbox:["allow-top-navigation","allow-same-origin","allow-forms","allow-scripts"],seamless:["","seamless"]}},img:{attrs:{alt:null,src:null,ismap:null,usemap:null,width:null,height:null,crossorigin:["anonymous","use-credentials"]}},input:{attrs:{alt:null,dirname:null,form:null,formaction:null,height:null,list:null,max:null,maxlength:null,min:null,name:null,pattern:null,placeholder:null,size:null,src:null,step:null,value:null,width:null,accept:["audio/*","video/*","image/*"],autocomplete:["on","off"],autofocus:["","autofocus"],checked:["","checked"],disabled:["","disabled"],formenctype:r,formmethod:n,formnovalidate:["","novalidate"],formtarget:e,multiple:["","multiple"],readonly:["","readonly"],required:["","required"],type:["hidden","text","search","tel","url","email","password","datetime","date","month","week","time","datetime-local","number","range","color","checkbox","radio","file","submit","image","reset","button"]}},ins:{attrs:{cite:null,datetime:null}},kbd:s,keygen:{attrs:{challenge:null,form:null,name:null,autofocus:["","autofocus"],disabled:["","disabled"],keytype:["RSA"]}},label:{attrs:{for:null,form:null}},legend:s,li:{attrs:{value:null}},link:{attrs:{href:null,type:null,hreflang:t,media:o,sizes:["all","16x16","16x16 32x32","16x16 32x32 64x64"]}},map:{attrs:{name:null}},mark:s,menu:{attrs:{label:null,type:["list","context","toolbar"]}},meta:{attrs:{content:null,charset:a,name:["viewport","application-name","author","description","generator","keywords"],"http-equiv":["content-language","content-type","default-style","refresh"]}},meter:{attrs:{value:null,min:null,low:null,high:null,max:null,optimum:null}},nav:s,noframes:s,noscript:s,object:{attrs:{data:null,type:null,name:null,usemap:null,form:null,width:null,height:null,typemustmatch:["","typemustmatch"]}},ol:{attrs:{reversed:["","reversed"],start:null,type:["1","a","A","i","I"]}},optgroup:{attrs:{disabled:["","disabled"],label:null}},option:{attrs:{disabled:["","disabled"],label:null,selected:["","selected"],value:null}},output:{attrs:{for:null,form:null,name:null}},p:s,param:{attrs:{name:null,value:null}},pre:s,progress:{attrs:{value:null,max:null}},q:{attrs:{cite:null}},rp:s,rt:s,ruby:s,s:s,samp:s,script:{attrs:{type:["text/javascript"],src:null,async:["","async"],defer:["","defer"],charset:a}},section:s,select:{attrs:{form:null,name:null,size:null,autofocus:["","autofocus"],disabled:["","disabled"],multiple:["","multiple"]}},small:s,source:{attrs:{src:null,type:null,media:null}},span:s,strike:s,strong:s,style:{attrs:{type:["text/css"],media:o,scoped:null}},sub:s,summary:s,sup:s,table:s,tbody:s,td:{attrs:{colspan:null,rowspan:null,headers:null}},textarea:{attrs:{dirname:null,form:null,maxlength:null,name:null,placeholder:null,rows:null,cols:null,autofocus:["","autofocus"],disabled:["","disabled"],readonly:["","readonly"],required:["","required"],wrap:["soft","hard"]}},tfoot:s,th:{attrs:{colspan:null,rowspan:null,headers:null,scope:["row","col","rowgroup","colgroup"]}},thead:s,time:{attrs:{datetime:null}},title:s,tr:s,track:{attrs:{src:null,label:null,default:null,kind:["subtitles","captions","descriptions","chapters","metadata"],srclang:t}},tt:s,u:s,ul:s,var:s,video:{attrs:{src:null,poster:null,width:null,height:null,crossorigin:["anonymous","use-credentials"],preload:["auto","metadata","none"],autoplay:["","autoplay"],mediagroup:["movie"],muted:["","muted"],controls:["","controls"]}},wbr:s},i={accesskey:["a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","0","1","2","3","4","5","6","7","8","9"],class:null,contenteditable:["true","false"],contextmenu:null,dir:["ltr","rtl","auto"],draggable:["true","false","auto"],dropzone:["copy","move","link","string:","file:"],hidden:["hidden"],id:null,inert:["inert"],itemid:null,itemprop:null,itemref:null,itemscope:["itemscope"],itemtype:null,lang:["en","es"],spellcheck:["true","false"],style:null,tabindex:["1","2","3","4","5","6","7","8","9"],title:null,translate:["yes","no"],onclick:null,rel:["stylesheet","alternate","author","bookmark","help","license","next","nofollow","noreferrer","prefetch","prev","search","tag"]};function d(l){for(var t in i)i.hasOwnProperty(t)&&(l.attrs[t]=i[t])}for(var c in d(s),u)u.hasOwnProperty(c)&&u[c]!=s&&d(u[c]);l.htmlSchema=u,l.registerHelper("hint","html",function(t,e){var a={schemaInfo:u};if(e)for(var n in e)a[n]=e[n];return l.hint.xml(t,a)})}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/javascript-hint.js b/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/javascript-hint.js new file mode 100644 index 000000000..0e8cc6a6c --- /dev/null +++ b/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/javascript-hint.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],t):t(CodeMirror)}(function(t){var e=t.Pos;function r(t,e){for(var r=0,n=t.length;r<n;++r)e(t[r])}function n(n,i,l,f){var c=n.getCursor(),p=l(n,c);if(!/\b(?:string|comment)\b/.test(p.type)){var u=t.innerMode(n.getMode(),p.state);if("json"!==u.mode.helperType){p.state=u.state,/^[\w$_]*$/.test(p.string)?p.end>c.ch&&(p.end=c.ch,p.string=p.string.slice(0,c.ch-p.start)):p={start:c.ch,end:c.ch,string:"",state:p.state,type:"."==p.string?"property":null};for(var d=p;"property"==d.type;){if("."!=(d=l(n,e(c.line,d.start))).string)return;if(d=l(n,e(c.line,d.start)),!g)var g=[];g.push(d)}return{list:function(t,e,n,i){var l=[],f=t.string,c=i&&i.globalScope||window;function p(t){0!=t.lastIndexOf(f,0)||function(t,e){if(!Array.prototype.indexOf){for(var r=t.length;r--;)if(t[r]===e)return!0;return!1}return-1!=t.indexOf(e)}(l,t)||l.push(t)}function u(t){"string"==typeof t?r(o,p):t instanceof Array?r(s,p):t instanceof Function&&r(a,p),function(t,e){if(Object.getOwnPropertyNames&&Object.getPrototypeOf)for(var r=t;r;r=Object.getPrototypeOf(r))Object.getOwnPropertyNames(r).forEach(e);else for(var n in t)e(n)}(t,p)}if(e&&e.length){var d,g=e.pop();for(g.type&&0===g.type.indexOf("variable")?(i&&i.additionalContext&&(d=i.additionalContext[g.string]),i&&!1===i.useGlobalScope||(d=d||c[g.string])):"string"==g.type?d="":"atom"==g.type?d=1:"function"==g.type&&(null==c.jQuery||"$"!=g.string&&"jQuery"!=g.string||"function"!=typeof c.jQuery?null!=c._&&"_"==g.string&&"function"==typeof c._&&(d=c._()):d=c.jQuery());null!=d&&e.length;)d=d[e.pop().string];null!=d&&u(d)}else{for(var y=t.state.localVars;y;y=y.next)p(y.name);for(var y=t.state.globalVars;y;y=y.next)p(y.name);i&&!1===i.useGlobalScope||u(c),r(n,p)}return l}(p,g,i,f),from:e(c.line,p.start),to:e(c.line,p.end)}}}}function i(t,e){var r=t.getTokenAt(e);return e.ch==r.start+1&&"."==r.string.charAt(0)?(r.end=r.start,r.string=".",r.type="property"):/^\.[\w$_]*$/.test(r.string)&&(r.type="property",r.start++,r.string=r.string.replace(/\./,"")),r}t.registerHelper("hint","javascript",function(t,e){return n(t,l,function(t,e){return t.getTokenAt(e)},e)}),t.registerHelper("hint","coffeescript",function(t,e){return n(t,f,i,e)});var o="charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight toUpperCase toLowerCase split concat match replace search".split(" "),s="length concat join splice push pop shift unshift slice reverse sort indexOf lastIndexOf every some filter forEach map reduce reduceRight ".split(" "),a="prototype apply call bind".split(" "),l="break case catch class const continue debugger default delete do else export extends false finally for function if in import instanceof new null return super switch this throw true try typeof var void while with yield".split(" "),f="and break catch class continue delete do else extends false finally for if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes".split(" ")}); diff --git a/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/show-hint.css b/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/show-hint.css new file mode 100644 index 000000000..5617ccca2 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/show-hint.css @@ -0,0 +1,36 @@ +.CodeMirror-hints { + position: absolute; + z-index: 10; + overflow: hidden; + list-style: none; + + margin: 0; + padding: 2px; + + -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2); + -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2); + box-shadow: 2px 3px 5px rgba(0,0,0,.2); + border-radius: 3px; + border: 1px solid silver; + + background: white; + font-size: 90%; + font-family: monospace; + + max-height: 20em; + overflow-y: auto; +} + +.CodeMirror-hint { + margin: 0; + padding: 0 4px; + border-radius: 2px; + white-space: pre; + color: black; + cursor: pointer; +} + +li.CodeMirror-hint-active { + background: #08f; + color: white; +} diff --git a/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/show-hint.js b/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/show-hint.js new file mode 100644 index 000000000..8c58de461 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/show-hint.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],t):t(CodeMirror)}(function(t){"use strict";var i="CodeMirror-hint",e="CodeMirror-hint-active";function n(t,i){this.cm=t,this.options=i,this.widget=null,this.debounce=0,this.tick=0,this.startPos=this.cm.getCursor("start"),this.startLen=this.cm.getLine(this.startPos.line).length-this.cm.getSelection().length;var e=this;t.on("cursorActivity",this.activityFunc=function(){e.cursorActivity()})}t.showHint=function(t,i,e){if(!i)return t.showHint(e);e&&e.async&&(i.async=!0);var n={hint:i};if(e)for(var o in e)n[o]=e[o];return t.showHint(n)},t.defineExtension("showHint",function(i){i=function(t,i,e){var n=t.options.hintOptions,o={};for(var s in a)o[s]=a[s];if(n)for(var s in n)void 0!==n[s]&&(o[s]=n[s]);if(e)for(var s in e)void 0!==e[s]&&(o[s]=e[s]);o.hint.resolve&&(o.hint=o.hint.resolve(t,i));return o}(this,this.getCursor("start"),i);var e=this.listSelections();if(!(e.length>1)){if(this.somethingSelected()){if(!i.hint.supportsSelection)return;for(var o=0;o<e.length;o++)if(e[o].head.line!=e[o].anchor.line)return}this.state.completionActive&&this.state.completionActive.close();var s=this.state.completionActive=new n(this,i);s.options.hint&&(t.signal(this,"startCompletion",this),s.update(!0))}});var o=window.requestAnimationFrame||function(t){return setTimeout(t,1e3/60)},s=window.cancelAnimationFrame||clearTimeout;function c(t){return"string"==typeof t?t:t.text}function r(t,i){for(;i&&i!=t;){if("LI"===i.nodeName.toUpperCase()&&i.parentNode==t)return i;i=i.parentNode}}function h(n,o){this.completion=n,this.data=o,this.picked=!1;var s=this,h=n.cm,l=this.hints=document.createElement("ul");l.className="CodeMirror-hints",this.selectedHint=o.selectedHint||0;for(var a=o.list,u=0;u<a.length;++u){var f=l.appendChild(document.createElement("li")),d=a[u],p=i+(u!=this.selectedHint?"":" "+e);null!=d.className&&(p=d.className+" "+p),f.className=p,d.render?d.render(f,o,d):f.appendChild(document.createTextNode(d.displayText||c(d))),f.hintId=u}var m=h.cursorCoords(n.options.alignWithWord?o.from:null),g=m.left,v=m.bottom,y=!0;l.style.left=g+"px",l.style.top=v+"px";var w=window.innerWidth||Math.max(document.body.offsetWidth,document.documentElement.offsetWidth),H=window.innerHeight||Math.max(document.body.offsetHeight,document.documentElement.offsetHeight);(n.options.container||document.body).appendChild(l);var k=l.getBoundingClientRect(),C=k.bottom-H,b=l.scrollHeight>l.clientHeight+1,x=h.getScrollInfo();if(C>0){var A=k.bottom-k.top;if(m.top-(m.bottom-k.top)-A>0)l.style.top=(v=m.top-A)+"px",y=!1;else if(A>H){l.style.height=H-5+"px",l.style.top=(v=m.bottom-k.top)+"px";var S=h.getCursor();o.from.ch!=S.ch&&(m=h.cursorCoords(S),l.style.left=(g=m.left)+"px",k=l.getBoundingClientRect())}}var T,M=k.right-w;if(M>0&&(k.right-k.left>w&&(l.style.width=w-5+"px",M-=k.right-k.left-w),l.style.left=(g=m.left-M)+"px"),b)for(var N=l.firstChild;N;N=N.nextSibling)N.style.paddingRight=h.display.nativeBarWidth+"px";(h.addKeyMap(this.keyMap=function(t,i){var e={Up:function(){i.moveFocus(-1)},Down:function(){i.moveFocus(1)},PageUp:function(){i.moveFocus(1-i.menuSize(),!0)},PageDown:function(){i.moveFocus(i.menuSize()-1,!0)},Home:function(){i.setFocus(0)},End:function(){i.setFocus(i.length-1)},Enter:i.pick,Tab:i.pick,Esc:i.close},n=t.options.customKeys,o=n?{}:e;function s(t,n){var s;s="string"!=typeof n?function(t){return n(t,i)}:e.hasOwnProperty(n)?e[n]:n,o[t]=s}if(n)for(var c in n)n.hasOwnProperty(c)&&s(c,n[c]);var r=t.options.extraKeys;if(r)for(var c in r)r.hasOwnProperty(c)&&s(c,r[c]);return o}(n,{moveFocus:function(t,i){s.changeActive(s.selectedHint+t,i)},setFocus:function(t){s.changeActive(t)},menuSize:function(){return s.screenAmount()},length:a.length,close:function(){n.close()},pick:function(){s.pick()},data:o})),n.options.closeOnUnfocus)&&(h.on("blur",this.onBlur=function(){T=setTimeout(function(){n.close()},100)}),h.on("focus",this.onFocus=function(){clearTimeout(T)}));return h.on("scroll",this.onScroll=function(){var t=h.getScrollInfo(),i=h.getWrapperElement().getBoundingClientRect(),e=v+x.top-t.top,o=e-(window.pageYOffset||(document.documentElement||document.body).scrollTop);if(y||(o+=l.offsetHeight),o<=i.top||o>=i.bottom)return n.close();l.style.top=e+"px",l.style.left=g+x.left-t.left+"px"}),t.on(l,"dblclick",function(t){var i=r(l,t.target||t.srcElement);i&&null!=i.hintId&&(s.changeActive(i.hintId),s.pick())}),t.on(l,"click",function(t){var i=r(l,t.target||t.srcElement);i&&null!=i.hintId&&(s.changeActive(i.hintId),n.options.completeOnSingleClick&&s.pick())}),t.on(l,"mousedown",function(){setTimeout(function(){h.focus()},20)}),t.signal(o,"select",a[this.selectedHint],l.childNodes[this.selectedHint]),!0}function l(t,i,e,n){if(t.async)t(i,n,e);else{var o=t(i,e);o&&o.then?o.then(n):n(o)}}n.prototype={close:function(){this.active()&&(this.cm.state.completionActive=null,this.tick=null,this.cm.off("cursorActivity",this.activityFunc),this.widget&&this.data&&t.signal(this.data,"close"),this.widget&&this.widget.close(),t.signal(this.cm,"endCompletion",this.cm))},active:function(){return this.cm.state.completionActive==this},pick:function(i,e){var n=i.list[e];n.hint?n.hint(this.cm,i,n):this.cm.replaceRange(c(n),n.from||i.from,n.to||i.to,"complete"),t.signal(i,"pick",n),this.close()},cursorActivity:function(){this.debounce&&(s(this.debounce),this.debounce=0);var t=this.cm.getCursor(),i=this.cm.getLine(t.line);if(t.line!=this.startPos.line||i.length-t.ch!=this.startLen-this.startPos.ch||t.ch<this.startPos.ch||this.cm.somethingSelected()||t.ch&&this.options.closeCharacters.test(i.charAt(t.ch-1)))this.close();else{var e=this;this.debounce=o(function(){e.update()}),this.widget&&this.widget.disable()}},update:function(t){if(null!=this.tick){var i=this,e=++this.tick;l(this.options.hint,this.cm,this.options,function(n){i.tick==e&&i.finishUpdate(n,t)})}},finishUpdate:function(i,e){this.data&&t.signal(this.data,"update");var n=this.widget&&this.widget.picked||e&&this.options.completeSingle;this.widget&&this.widget.close(),this.data=i,i&&i.list.length&&(n&&1==i.list.length?this.pick(i,0):(this.widget=new h(this,i),t.signal(i,"shown")))}},h.prototype={close:function(){if(this.completion.widget==this){this.completion.widget=null,this.hints.parentNode.removeChild(this.hints),this.completion.cm.removeKeyMap(this.keyMap);var t=this.completion.cm;this.completion.options.closeOnUnfocus&&(t.off("blur",this.onBlur),t.off("focus",this.onFocus)),t.off("scroll",this.onScroll)}},disable:function(){this.completion.cm.removeKeyMap(this.keyMap);var t=this;this.keyMap={Enter:function(){t.picked=!0}},this.completion.cm.addKeyMap(this.keyMap)},pick:function(){this.completion.pick(this.data,this.selectedHint)},changeActive:function(i,n){if(i>=this.data.list.length?i=n?this.data.list.length-1:0:i<0&&(i=n?0:this.data.list.length-1),this.selectedHint!=i){var o=this.hints.childNodes[this.selectedHint];o.className=o.className.replace(" "+e,""),(o=this.hints.childNodes[this.selectedHint=i]).className+=" "+e,o.offsetTop<this.hints.scrollTop?this.hints.scrollTop=o.offsetTop-3:o.offsetTop+o.offsetHeight>this.hints.scrollTop+this.hints.clientHeight&&(this.hints.scrollTop=o.offsetTop+o.offsetHeight-this.hints.clientHeight+3),t.signal(this.data,"select",this.data.list[this.selectedHint],o)}},screenAmount:function(){return Math.floor(this.hints.clientHeight/this.hints.firstChild.offsetHeight)||1}},t.registerHelper("hint","auto",{resolve:function(i,e){var n,o=i.getHelpers(e,"hint");if(o.length){var s=function(t,i,e){var n=function(t,i){if(!t.somethingSelected())return i;for(var e=[],n=0;n<i.length;n++)i[n].supportsSelection&&e.push(i[n]);return e}(t,o);!function o(s){if(s==n.length)return i(null);l(n[s],t,e,function(t){t&&t.list.length>0?i(t):o(s+1)})}(0)};return s.async=!0,s.supportsSelection=!0,s}return(n=i.getHelper(i.getCursor(),"hintWords"))?function(i){return t.hint.fromList(i,{words:n})}:t.hint.anyword?function(i,e){return t.hint.anyword(i,e)}:function(){}}}),t.registerHelper("hint","fromList",function(i,e){var n,o=i.getCursor(),s=i.getTokenAt(o),c=t.Pos(o.line,s.start),r=o;s.start<o.ch&&/\w/.test(s.string.charAt(o.ch-s.start-1))?n=s.string.substr(0,o.ch-s.start):(n="",c=o);for(var h=[],l=0;l<e.words.length;l++){var a=e.words[l];a.slice(0,n.length)==n&&h.push(a)}if(h.length)return{list:h,from:c,to:r}}),t.commands.autocomplete=t.showHint;var a={hint:t.hint.auto,completeSingle:!0,alignWithWord:!0,closeCharacters:/[\s()\[\]{};:>,]/,closeOnUnfocus:!0,completeOnSingleClick:!0,container:null,customKeys:null,extraKeys:null};t.defineOption("hintOptions",null)}); diff --git a/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/xml-hint.js b/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/xml-hint.js new file mode 100644 index 000000000..4b8190141 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-autocomplete/files/addon/hint/xml-hint.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],t):t(CodeMirror)}(function(t){"use strict";var e=t.Pos;t.registerHelper("hint","xml",function(r,s){var n=s&&s.schemaInfo,a=s&&s.quoteChar||'"';if(n){var i=r.getCursor(),o=r.getTokenAt(i);o.end>i.ch&&(o.end=i.ch,o.string=o.string.slice(0,i.ch-o.start));var l=t.innerMode(r.getMode(),o.state);if("xml"==l.mode.name){var f,g,c=[],h=!1,p=/\btag\b/.test(o.type)&&!/>$/.test(o.string),u=p&&/^\w/.test(o.string);if(u){var d=r.getLine(i.line).slice(Math.max(0,o.start-2),o.start),m=/<\/$/.test(d)?"close":/<$/.test(d)?"open":null;m&&(g=o.start-("close"==m?2:1))}else p&&"<"==o.string?m="open":p&&"</"==o.string&&(m="close");if(!p&&!l.state.tagName||m){u&&(f=o.string),h=m;var v=l.state.context,y=v&&n[v.tagName],x=v?y&&y.children:n["!top"];if(x&&"close"!=m)for(var O=0;O<x.length;++O)f&&0!=x[O].lastIndexOf(f,0)||c.push("<"+x[O]);else if("close"!=m)for(var b in n)!n.hasOwnProperty(b)||"!top"==b||"!attrs"==b||f&&0!=b.lastIndexOf(f,0)||c.push("<"+b);v&&(!f||"close"==m&&0==v.tagName.lastIndexOf(f,0))&&c.push("</"+v.tagName+">")}else{var w=(y=n[l.state.tagName])&&y.attrs,I=n["!attrs"];if(!w&&!I)return;if(w){if(I){var P={};for(var A in I)I.hasOwnProperty(A)&&(P[A]=I[A]);for(var A in w)w.hasOwnProperty(A)&&(P[A]=w[A]);w=P}}else w=I;if("string"==o.type||"="==o.string){var M,N=(d=r.getRange(e(i.line,Math.max(0,i.ch-60)),e(i.line,"string"==o.type?o.start:o.end))).match(/([^\s\u00a0=<>\"\']+)=$/);if(!N||!w.hasOwnProperty(N[1])||!(M=w[N[1]]))return;if("function"==typeof M&&(M=M.call(this,r)),"string"==o.type){f=o.string;var $=0;/['"]/.test(o.string.charAt(0))&&(a=o.string.charAt(0),f=o.string.slice(1),$++);var C=o.string.length;/['"]/.test(o.string.charAt(C-1))&&(a=o.string.charAt(C-1),f=o.string.substr($,C-2)),h=!0}for(O=0;O<M.length;++O)f&&0!=M[O].lastIndexOf(f,0)||c.push(a+M[O]+a)}else for(var j in"attribute"==o.type&&(f=o.string,h=!0),w)!w.hasOwnProperty(j)||f&&0!=j.lastIndexOf(f,0)||c.push(j)}return{list:c,from:h?e(i.line,null==g?o.start:g):i,to:h?e(i.line,o.end):i}}}})}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-autocomplete/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-autocomplete/files/tiddlywiki.files new file mode 100755 index 000000000..829bca8da --- /dev/null +++ b/plugins/tiddlywiki/codemirror-autocomplete/files/tiddlywiki.files @@ -0,0 +1,54 @@ +{ + "tiddlers": [ + { + "file": "addon/hint/anyword-hint.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/hint/anyword-hint.js", + "module-type": "codemirror" + } + },{ + "file": "addon/hint/css-hint.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/hint/css-hint.js", + "module-type": "codemirror" + } + },{ + "file": "addon/hint/html-hint.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/hint/html-hint.js", + "module-type": "codemirror" + } + },{ + "file": "addon/hint/javascript-hint.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/hint/javascript-hint.js", + "module-type": "codemirror" + } + },{ + "file": "addon/hint/show-hint.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/hint/show-hint.js", + "module-type": "codemirror" + } + },{ + "file": "addon/hint/show-hint.css", + "fields": { + "type": "text/css", + "title": "$:/plugins/tiddlywiki/codemirror/addon/hint/show-hint.css", + "tags": "[[$:/tags/Stylesheet]]" + } + },{ + "file": "addon/hint/xml-hint.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/hint/xml-hint.js", + "module-type": "codemirror" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-autocomplete/plugin.info b/plugins/tiddlywiki/codemirror-autocomplete/plugin.info new file mode 100755 index 000000000..aae66a787 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-autocomplete/plugin.info @@ -0,0 +1,6 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-autocomplete", + "description": "CodeMirror AddOn: Autocompletion", + "author": "JeremyRuston", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-autocomplete/readme.tid b/plugins/tiddlywiki/codemirror-autocomplete/readme.tid new file mode 100755 index 000000000..d5d1549e2 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-autocomplete/readme.tid @@ -0,0 +1,8 @@ +title: $:/plugins/tiddlywiki/codemirror-autocomplete/readme + +This plugin enhances the [[CodeMirror|http://codemirror.net]] text editor with Autocompletion functionality. It needs the latest [[CodeMirror plugin|$:/plugins/tiddlywiki/codemirror]] to be installed + +It adds Autocompletion for ''html'', ''javascript'' and ''xml'' and also for ''already present words'' within a text-editor instance + +The ''Keyboard Shortcut'' for autocompletion is `Ctrl+Space` + diff --git a/plugins/tiddlywiki/codemirror-closebrackets/config/autoCloseBrackets.tid b/plugins/tiddlywiki/codemirror-closebrackets/config/autoCloseBrackets.tid new file mode 100644 index 000000000..c898b206d --- /dev/null +++ b/plugins/tiddlywiki/codemirror-closebrackets/config/autoCloseBrackets.tid @@ -0,0 +1,4 @@ +title: $:/config/codemirror/autoCloseBrackets +type: bool + +true \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-closebrackets/config/matchBrackets.tid b/plugins/tiddlywiki/codemirror-closebrackets/config/matchBrackets.tid new file mode 100644 index 000000000..85e990e3d --- /dev/null +++ b/plugins/tiddlywiki/codemirror-closebrackets/config/matchBrackets.tid @@ -0,0 +1,4 @@ +title: $:/config/codemirror/matchBrackets +type: bool + +true diff --git a/plugins/tiddlywiki/codemirror-closebrackets/files/addon/edit/closebrackets.js b/plugins/tiddlywiki/codemirror-closebrackets/files/addon/edit/closebrackets.js new file mode 100644 index 000000000..330fc8d7a --- /dev/null +++ b/plugins/tiddlywiki/codemirror-closebrackets/files/addon/edit/closebrackets.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){var t={pairs:"()[]{}''\"\"",triples:"",explode:"[]{}"},r=e.Pos;function n(e,r){return"pairs"==r&&"string"==typeof e?e:"object"==typeof e&&null!=e[r]?e[r]:t[r]}e.defineOption("autoCloseBrackets",!1,function(t,r,o){o&&o!=e.Init&&(t.removeKeyMap(i),t.state.closeBrackets=null),r&&(a(n(r,"pairs")),t.state.closeBrackets=r,t.addKeyMap(i))});var i={Backspace:function(t){var i=s(t);if(!i||t.getOption("disableInput"))return e.Pass;for(var a=n(i,"pairs"),o=t.listSelections(),c=0;c<o.length;c++){if(!o[c].empty())return e.Pass;var f=l(t,o[c].head);if(!f||a.indexOf(f)%2!=0)return e.Pass}for(var c=o.length-1;c>=0;c--){var h=o[c].head;t.replaceRange("",r(h.line,h.ch-1),r(h.line,h.ch+1),"+delete")}},Enter:function(t){var r=s(t),i=r&&n(r,"explode");if(!i||t.getOption("disableInput"))return e.Pass;for(var a=t.listSelections(),o=0;o<a.length;o++){if(!a[o].empty())return e.Pass;var c=l(t,a[o].head);if(!c||i.indexOf(c)%2!=0)return e.Pass}t.operation(function(){var e=t.lineSeparator()||"\n";t.replaceSelection(e+e,null),t.execCommand("goCharLeft"),a=t.listSelections();for(var r=0;r<a.length;r++){var n=a[r].head.line;t.indentLine(n,null,!0),t.indentLine(n+1,null,!0)}})}};function a(e){for(var t=0;t<e.length;t++){var r=e.charAt(t),n="'"+r+"'";i[n]||(i[n]=o(r))}}function o(t){return function(i){return function(t,i){var a=s(t);if(!a||t.getOption("disableInput"))return e.Pass;var o=n(a,"pairs"),l=o.indexOf(i);if(-1==l)return e.Pass;for(var c,f=n(a,"triples"),h=o.charAt(l+1)==i,d=t.listSelections(),u=l%2==0,g=0;g<d.length;g++){var p,v=d[g],m=v.head,b=t.getRange(m,r(m.line,m.ch+1));if(u&&!v.empty())p="surround";else if(!h&&u||b!=i)if(h&&m.ch>1&&f.indexOf(i)>=0&&t.getRange(r(m.line,m.ch-2),m)==i+i){if(m.ch>2&&/\bstring/.test(t.getTokenTypeAt(r(m.line,m.ch-2))))return e.Pass;p="addFour"}else if(h){var C=0==m.ch?" ":t.getRange(r(m.line,m.ch-1),m);if(e.isWordChar(b)||C==i||e.isWordChar(C))return e.Pass;p="both"}else{if(!u||!(t.getLine(m.line).length==m.ch||(x=b,P=o,void 0,k=P.lastIndexOf(x),k>-1&&k%2==1)||/\s/.test(b)))return e.Pass;p="both"}else p=!h||(S=m,void 0,O=(y=t).getTokenAt(r(S.line,S.ch+1)),!/\bstring/.test(O.type)||O.start!=S.ch||0!=S.ch&&/\bstring/.test(y.getTokenTypeAt(S)))?f.indexOf(i)>=0&&t.getRange(m,r(m.line,m.ch+3))==i+i+i?"skipThree":"skip":"both";if(c){if(c!=p)return e.Pass}else c=p}var x,P,k;var y,S,O;var R=l%2?o.charAt(l-1):i,A=l%2?i:o.charAt(l+1);t.operation(function(){if("skip"==c)t.execCommand("goCharRight");else if("skipThree"==c)for(var n=0;n<3;n++)t.execCommand("goCharRight");else if("surround"==c){for(var i=t.getSelections(),n=0;n<i.length;n++)i[n]=R+i[n]+A;t.replaceSelections(i,"around"),i=t.listSelections().slice();for(var n=0;n<i.length;n++)i[n]=(a=i[n],void 0,o=e.cmpPos(a.anchor,a.head)>0,{anchor:new r(a.anchor.line,a.anchor.ch+(o?-1:1)),head:new r(a.head.line,a.head.ch+(o?1:-1))});t.setSelections(i)}else"both"==c?(t.replaceSelection(R+A,null),t.triggerElectric(R+A),t.execCommand("goCharLeft")):"addFour"==c&&(t.replaceSelection(R+R+R+R,"before"),t.execCommand("goCharRight"));var a,o})}(i,t)}}function s(e){var t=e.state.closeBrackets;return!t||t.override?t:e.getModeAt(e.getCursor()).closeBrackets||t}function l(e,t){var n=e.getRange(r(t.line,t.ch-1),r(t.line,t.ch+1));return 2==n.length?n:null}a(t.pairs+"`")}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-closebrackets/files/addon/edit/matchbrackets.js b/plugins/tiddlywiki/codemirror-closebrackets/files/addon/edit/matchbrackets.js new file mode 100755 index 000000000..8852ea42f --- /dev/null +++ b/plugins/tiddlywiki/codemirror-closebrackets/files/addon/edit/matchbrackets.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],t):t(CodeMirror)}(function(t){var e=/MSIE \d/.test(navigator.userAgent)&&(null==document.documentMode||document.documentMode<8),n=t.Pos,r={"(":")>",")":"(<","[":"]>","]":"[<","{":"}>","}":"{<"};function i(t,e,i){var c=t.getLineHandle(e.line),o=e.ch-1,l=i&&i.afterCursor;null==l&&(l=/(^| )cm-fat-cursor($| )/.test(t.getWrapperElement().className));var h=!l&&o>=0&&r[c.text.charAt(o)]||r[c.text.charAt(++o)];if(!h)return null;var s=">"==h.charAt(1)?1:-1;if(i&&i.strict&&s>0!=(o==e.ch))return null;var u=t.getTokenTypeAt(n(e.line,o+1)),f=a(t,n(e.line,o+(s>0?1:0)),s,u||null,i);return null==f?null:{from:n(e.line,o),to:f&&f.pos,match:f&&f.ch==h.charAt(0),forward:s>0}}function a(t,e,i,a,c){for(var o=c&&c.maxScanLineLength||1e4,l=c&&c.maxScanLines||1e3,h=[],s=c&&c.bracketRegex?c.bracketRegex:/[(){}[\]]/,u=i>0?Math.min(e.line+l,t.lastLine()+1):Math.max(t.firstLine()-1,e.line-l),f=e.line;f!=u;f+=i){var m=t.getLine(f);if(m){var g=i>0?0:m.length-1,d=i>0?m.length:-1;if(!(m.length>o))for(f==e.line&&(g=e.ch-(i<0?1:0));g!=d;g+=i){var k=m.charAt(g);if(s.test(k)&&(void 0===a||t.getTokenTypeAt(n(f,g+1))==a))if(">"==r[k].charAt(1)==i>0)h.push(k);else{if(!h.length)return{pos:n(f,g),ch:k};h.pop()}}}}return f-i!=(i>0?t.lastLine():t.firstLine())&&null}function c(t,r,a){for(var c=t.state.matchBrackets.maxHighlightLineLength||1e3,o=[],l=t.listSelections(),h=0;h<l.length;h++){var s=l[h].empty()&&i(t,l[h].head,a);if(s&&t.getLine(s.from.line).length<=c){var u=s.match?"CodeMirror-matchingbracket":"CodeMirror-nonmatchingbracket";o.push(t.markText(s.from,n(s.from.line,s.from.ch+1),{className:u})),s.to&&t.getLine(s.to.line).length<=c&&o.push(t.markText(s.to,n(s.to.line,s.to.ch+1),{className:u}))}}if(o.length){e&&t.state.focused&&t.focus();var f=function(){t.operation(function(){for(var t=0;t<o.length;t++)o[t].clear()})};if(!r)return f;setTimeout(f,800)}}function o(t){t.operation(function(){t.state.matchBrackets.currentlyHighlighted&&(t.state.matchBrackets.currentlyHighlighted(),t.state.matchBrackets.currentlyHighlighted=null),t.state.matchBrackets.currentlyHighlighted=c(t,!1,t.state.matchBrackets)})}t.defineOption("matchBrackets",!1,function(e,n,r){r&&r!=t.Init&&(e.off("cursorActivity",o),e.state.matchBrackets&&e.state.matchBrackets.currentlyHighlighted&&(e.state.matchBrackets.currentlyHighlighted(),e.state.matchBrackets.currentlyHighlighted=null)),n&&(e.state.matchBrackets="object"==typeof n?n:{},e.on("cursorActivity",o))}),t.defineExtension("matchBrackets",function(){c(this,!0)}),t.defineExtension("findMatchingBracket",function(t,e,n){return(n||"boolean"==typeof e)&&(n?(n.strict=e,e=n):e=e?{strict:!0}:null),i(this,t,e)}),t.defineExtension("scanForBracket",function(t,e,n,r){return a(this,t,e,n,r)})}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-closebrackets/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-closebrackets/files/tiddlywiki.files new file mode 100755 index 000000000..f98d4800d --- /dev/null +++ b/plugins/tiddlywiki/codemirror-closebrackets/files/tiddlywiki.files @@ -0,0 +1,19 @@ +{ + "tiddlers": [ + { + "file": "addon/edit/closebrackets.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/edit/closebrackets.js", + "module-type": "codemirror" + } + },{ + "file": "addon/edit/matchbrackets.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/edit/matchbrackets.js", + "module-type": "codemirror" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-closebrackets/plugin.info b/plugins/tiddlywiki/codemirror-closebrackets/plugin.info new file mode 100755 index 000000000..c308d1045 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-closebrackets/plugin.info @@ -0,0 +1,6 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-closebrackets", + "description": "CodeMirror AddOn: Close Brackets", + "author": "JeremyRuston", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-closebrackets/readme.tid b/plugins/tiddlywiki/codemirror-closebrackets/readme.tid new file mode 100755 index 000000000..0602868b8 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-closebrackets/readme.tid @@ -0,0 +1,7 @@ +title: $:/plugins/tiddlywiki/codemirror-closebrackets/readme + +This plugin adds the ability to automatically insert the closing brackets when you type an opening bracket. +Also enables highlighting of matching brackets. + +It needs the latest [[CodeMirror plugin|$:/plugins/tiddlywiki/codemirror]] to be installed + diff --git a/plugins/tiddlywiki/codemirror-closetag/config-language.multids b/plugins/tiddlywiki/codemirror-closetag/config-language.multids new file mode 100644 index 000000000..df8dd52eb --- /dev/null +++ b/plugins/tiddlywiki/codemirror-closetag/config-language.multids @@ -0,0 +1,4 @@ +title: $:/language/codemirror/ + +autoCloseTags/hint: Auto-close tags +autoCloseTags/info: Whether or not to automatically close tags diff --git a/plugins/tiddlywiki/codemirror-closetag/config/autoCloseTags.tid b/plugins/tiddlywiki/codemirror-closetag/config/autoCloseTags.tid new file mode 100644 index 000000000..5720055d7 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-closetag/config/autoCloseTags.tid @@ -0,0 +1,4 @@ +title: $:/config/codemirror/autoCloseTags +type: bool + +true diff --git a/plugins/tiddlywiki/codemirror-closetag/files/addon/edit/closetag.js b/plugins/tiddlywiki/codemirror-closetag/files/addon/edit/closetag.js new file mode 100644 index 000000000..a3c34dcbf --- /dev/null +++ b/plugins/tiddlywiki/codemirror-closetag/files/addon/edit/closetag.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror"),require("../fold/xml-fold")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../fold/xml-fold"],e):e(CodeMirror)}(function(e){e.defineOption("autoCloseTags",!1,function(i,s,l){if(l!=e.Init&&l&&i.removeKeyMap("autoCloseTags"),s){var d={name:"autoCloseTags"};("object"!=typeof s||s.whenClosing)&&(d["'/'"]=function(t){return(n=t).getOption("disableInput")?e.Pass:o(n,!0);var n}),("object"!=typeof s||s.whenOpening)&&(d["'>'"]=function(o){return function(o){if(o.getOption("disableInput"))return e.Pass;for(var i=o.listSelections(),s=[],l=o.getOption("autoCloseTags"),d=0;d<i.length;d++){if(!i[d].empty())return e.Pass;var c=i[d].head,f=o.getTokenAt(c),g=e.innerMode(o.getMode(),f.state),u=g.state;if("xml"!=g.mode.name||!u.tagName)return e.Pass;var m="html"==g.mode.configuration,h="object"==typeof l&&l.dontCloseTags||m&&t,p="object"==typeof l&&l.indentTags||m&&n,v=u.tagName;f.end>c.ch&&(v=v.slice(0,v.length-f.end+c.ch));var b=v.toLowerCase();if(!v||"string"==f.type&&(f.end!=c.ch||!/[\"\']/.test(f.string.charAt(f.string.length-1))||1==f.string.length)||"tag"==f.type&&"closeTag"==u.type||f.string.indexOf("/")==f.string.length-1||h&&a(h,b)>-1||r(o,v,c,u,!0))return e.Pass;var y=p&&a(p,b)>-1;s[d]={indent:y,text:">"+(y?"\n\n":"")+"</"+v+">",newPos:y?e.Pos(c.line+1,0):e.Pos(c.line,c.ch+1)}}for(var x="object"==typeof l&&l.dontIndentOnAutoClose,d=i.length-1;d>=0;d--){var P=s[d];o.replaceRange(P.text,i[d].head,i[d].anchor,"+insert");var T=o.listSelections().slice(0);T[d]={head:P.newPos,anchor:P.newPos},o.setSelections(T),!x&&P.indent&&(o.indentLine(P.newPos.line,null,!0),o.indentLine(P.newPos.line+1,null,!0))}}(o)}),i.addKeyMap(d)}});var t=["area","base","br","col","command","embed","hr","img","input","keygen","link","meta","param","source","track","wbr"],n=["applet","blockquote","body","button","div","dl","fieldset","form","frameset","h1","h2","h3","h4","h5","h6","head","html","iframe","layer","legend","object","ol","p","select","table","ul"];function o(t,n){for(var o=t.listSelections(),a=[],i=n?"/":"</",s=t.getOption("autoCloseTags"),l="object"==typeof s&&s.dontIndentOnSlash,d=0;d<o.length;d++){if(!o[d].empty())return e.Pass;var c,f=o[d].head,g=t.getTokenAt(f),u=e.innerMode(t.getMode(),g.state),m=u.state;if(n&&("string"==g.type||"<"!=g.string.charAt(0)||g.start!=f.ch-1))return e.Pass;if("xml"!=u.mode.name)if("htmlmixed"==t.getMode().name&&"javascript"==u.mode.name)c=i+"script";else{if("htmlmixed"!=t.getMode().name||"css"!=u.mode.name)return e.Pass;c=i+"style"}else{if(!m.context||!m.context.tagName||r(t,m.context.tagName,f,m))return e.Pass;c=i+m.context.tagName}">"!=t.getLine(f.line).charAt(g.end)&&(c+=">"),a[d]=c}if(t.replaceSelections(a),o=t.listSelections(),!l)for(d=0;d<o.length;d++)(d==o.length-1||o[d].head.line<o[d+1].head.line)&&t.indentLine(o[d].head.line)}function a(e,t){if(e.indexOf)return e.indexOf(t);for(var n=0,o=e.length;n<o;++n)if(e[n]==t)return n;return-1}function r(t,n,o,a,r){if(!e.scanForClosingTag)return!1;var i=Math.min(t.lastLine()+1,o.line+500),s=e.scanForClosingTag(t,o,null,i);if(!s||s.tag!=n)return!1;for(var l=a.context,d=r?1:0;l&&l.tagName==n;l=l.prev)++d;o=s.to;for(var c=1;c<d;c++){var f=e.scanForClosingTag(t,o,null,i);if(!f||f.tag!=n)return!1;o=f.to}return!0}e.commands.closeTag=function(e){return o(e)}}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-closetag/files/addon/fold/xml-fold.js b/plugins/tiddlywiki/codemirror-closetag/files/addon/fold/xml-fold.js new file mode 100644 index 000000000..f082e5dd4 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-closetag/files/addon/fold/xml-fold.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";var n=e.Pos;function t(e,n){return e.line-n.line||e.ch-n.ch}var i="A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD",r=new RegExp("<(/?)(["+i+"][A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD-:.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*)","g");function u(e,n,t,i){this.line=n,this.ch=t,this.cm=e,this.text=e.getLine(n),this.min=i?Math.max(i.from,e.firstLine()):e.firstLine(),this.max=i?Math.min(i.to-1,e.lastLine()):e.lastLine()}function f(e,t){var i=e.cm.getTokenTypeAt(n(e.line,t));return i&&/\btag\b/.test(i)}function o(e){if(!(e.line>=e.max))return e.ch=0,e.text=e.cm.getLine(++e.line),!0}function l(e){if(!(e.line<=e.min))return e.text=e.cm.getLine(--e.line),e.ch=e.text.length,!0}function c(e){for(;;){var n=e.text.indexOf(">",e.ch);if(-1==n){if(o(e))continue;return}if(f(e,n+1)){var t=e.text.lastIndexOf("/",n),i=t>-1&&!/\S/.test(e.text.slice(t+1,n));return e.ch=n+1,i?"selfClose":"regular"}e.ch=n+1}}function a(e){for(;;){var n=e.ch?e.text.lastIndexOf("<",e.ch-1):-1;if(-1==n){if(l(e))continue;return}if(f(e,n+1)){r.lastIndex=n,e.ch=n;var t=r.exec(e.text);if(t&&t.index==n)return t}else e.ch=n}}function s(e){for(;;){r.lastIndex=e.ch;var n=r.exec(e.text);if(!n){if(o(e))continue;return}if(f(e,n.index+1))return e.ch=n.index+n[0].length,n;e.ch=n.index+1}}function h(e){for(;;){var n=e.ch?e.text.lastIndexOf(">",e.ch-1):-1;if(-1==n){if(l(e))continue;return}if(f(e,n+1)){var t=e.text.lastIndexOf("/",n),i=t>-1&&!/\S/.test(e.text.slice(t+1,n));return e.ch=n+1,i?"selfClose":"regular"}e.ch=n}}function F(e,t){for(var i=[];;){var r,u=s(e),f=e.line,o=e.ch-(u?u[0].length:0);if(!u||!(r=c(e)))return;if("selfClose"!=r)if(u[1]){for(var l=i.length-1;l>=0;--l)if(i[l]==u[2]){i.length=l;break}if(l<0&&(!t||t==u[2]))return{tag:u[2],from:n(f,o),to:n(e.line,e.ch)}}else i.push(u[2])}}function x(e,t){for(var i=[];;){var r=h(e);if(!r)return;if("selfClose"!=r){var u=e.line,f=e.ch,o=a(e);if(!o)return;if(o[1])i.push(o[2]);else{for(var l=i.length-1;l>=0;--l)if(i[l]==o[2]){i.length=l;break}if(l<0&&(!t||t==o[2]))return{tag:o[2],from:n(e.line,e.ch),to:n(u,f)}}}else a(e)}}e.registerHelper("fold","xml",function(e,i){for(var r=new u(e,i.line,0);;){var f=s(r);if(!f||r.line!=i.line)return;var o=c(r);if(!o)return;if(!f[1]&&"selfClose"!=o){var l=n(r.line,r.ch),a=F(r,f[2]);return a&&t(a.from,l)>0?{from:l,to:a.from}:null}}}),e.findMatchingTag=function(e,i,r){var f=new u(e,i.line,i.ch,r);if(-1!=f.text.indexOf(">")||-1!=f.text.indexOf("<")){var o=c(f),l=o&&n(f.line,f.ch),s=o&&a(f);if(o&&s&&!(t(f,i)>0)){var h={from:n(f.line,f.ch),to:l,tag:s[2]};return"selfClose"==o?{open:h,close:null,at:"open"}:s[1]?{open:x(f,s[2]),close:h,at:"close"}:{open:h,close:F(f=new u(e,l.line,l.ch,r),s[2]),at:"open"}}}},e.findEnclosingTag=function(e,n,t,i){for(var r=new u(e,n.line,n.ch,t);;){var f=x(r,i);if(!f)break;var o=F(new u(e,n.line,n.ch,t),f.tag);if(o)return{open:f,close:o}}},e.scanForClosingTag=function(e,n,t,i){return F(new u(e,n.line,n.ch,i?{from:0,to:i}:null),t)}}); diff --git a/plugins/tiddlywiki/codemirror-closetag/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-closetag/files/tiddlywiki.files new file mode 100755 index 000000000..7f077e1f9 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-closetag/files/tiddlywiki.files @@ -0,0 +1,19 @@ +{ + "tiddlers": [ + { + "file": "addon/fold/xml-fold.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/fold/xml-fold.js", + "module-type": "codemirror" + } + },{ + "file": "addon/edit/closetag.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/edit/closetag.js", + "module-type": "codemirror" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-closetag/plugin.info b/plugins/tiddlywiki/codemirror-closetag/plugin.info new file mode 100755 index 000000000..81d404892 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-closetag/plugin.info @@ -0,0 +1,6 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-closetag", + "description": "CodeMirror AddOn: Auto-Close Tags", + "author": "JeremyRuston", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-closetag/readme.tid b/plugins/tiddlywiki/codemirror-closetag/readme.tid new file mode 100755 index 000000000..86be5bef1 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-closetag/readme.tid @@ -0,0 +1,5 @@ +title: $:/plugins/tiddlywiki/codemirror-closetag/readme + +This plugin adds the ability to ''automatically close Tags''. It needs the latest [[CodeMirror plugin|$:/plugins/tiddlywiki/codemirror]] to be installed + + diff --git a/plugins/tiddlywiki/codemirror-closetag/settings/autoCloseTags.tid b/plugins/tiddlywiki/codemirror-closetag/settings/autoCloseTags.tid new file mode 100644 index 000000000..a3247c6ff --- /dev/null +++ b/plugins/tiddlywiki/codemirror-closetag/settings/autoCloseTags.tid @@ -0,0 +1,9 @@ +title: $:/core/ui/ControlPanel/Settings/codemirror/autoCloseTags +tags: $:/tags/ControlPanel/Settings/CodeMirror +caption: {{$:/language/codemirror/autoCloseTags/hint}} + +\define lingo-base() $:/language/codemirror/autoCloseTags/ +<<lingo hint>> + +<$checkbox tiddler="$:/config/codemirror/autoCloseTags" field="text" checked="true" unchecked="false" default="true"> <$link to="$:/config/codemirror/autoCloseTags"><<lingo info>></$link> </$checkbox> + diff --git a/plugins/tiddlywiki/codemirror-fullscreen-editing/config/fullscreen-editing.tid b/plugins/tiddlywiki/codemirror-fullscreen-editing/config/fullscreen-editing.tid new file mode 100644 index 000000000..2e4e5c2da --- /dev/null +++ b/plugins/tiddlywiki/codemirror-fullscreen-editing/config/fullscreen-editing.tid @@ -0,0 +1,7 @@ +title: $:/config/codemirror/fullscreen +extend: extraKeys +type: json + +{ + "F11": "togglefullscreen" +} \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-fullscreen-editing/files/addon/fullscreen/fullscreen.css b/plugins/tiddlywiki/codemirror-fullscreen-editing/files/addon/fullscreen/fullscreen.css new file mode 100644 index 000000000..437acd89b --- /dev/null +++ b/plugins/tiddlywiki/codemirror-fullscreen-editing/files/addon/fullscreen/fullscreen.css @@ -0,0 +1,6 @@ +.CodeMirror-fullscreen { + position: fixed; + top: 0; left: 0; right: 0; bottom: 0; + height: auto; + z-index: 9; +} diff --git a/plugins/tiddlywiki/codemirror-fullscreen-editing/files/addon/fullscreen/fullscreen.js b/plugins/tiddlywiki/codemirror-fullscreen-editing/files/addon/fullscreen/fullscreen.js new file mode 100644 index 000000000..a70760d4c --- /dev/null +++ b/plugins/tiddlywiki/codemirror-fullscreen-editing/files/addon/fullscreen/fullscreen.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";e.defineOption("fullScreen",!1,function(t,l,o){var r,n;(o==e.Init&&(o=!1),!o!=!l)&&(l?(n=(r=t).getWrapperElement(),r.state.fullScreenRestore={scrollTop:window.pageYOffset,scrollLeft:window.pageXOffset,width:n.style.width,height:n.style.height},n.style.width="",n.style.height="auto",n.className+=" CodeMirror-fullscreen",document.documentElement.style.overflow="hidden",r.refresh()):function(e){var t=e.getWrapperElement();t.className=t.className.replace(/\s*CodeMirror-fullscreen\b/,""),document.documentElement.style.overflow="";var l=e.state.fullScreenRestore;t.style.width=l.width,t.style.height=l.height,window.scrollTo(l.scrollLeft,l.scrollTop),e.refresh()}(t))}),e.toggleFullscreen=function(e){e.setOption("fullScreen",!e.getOption("fullScreen"))},e.commands.togglefullscreen=e.toggleFullscreen}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-fullscreen-editing/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-fullscreen-editing/files/tiddlywiki.files new file mode 100755 index 000000000..b0835e8c9 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-fullscreen-editing/files/tiddlywiki.files @@ -0,0 +1,19 @@ +{ + "tiddlers": [ + { + "file": "addon/fullscreen/fullscreen.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/fullscreen/fullscreen.js", + "module-type": "codemirror" + } + },{ + "file": "addon/fullscreen/fullscreen.css", + "fields": { + "type": "text/css", + "title": "$:/plugins/tiddlywiki/codemirror/addon/fullscreen/fullscreen.css", + "tags": "[[$:/tags/Stylesheet]]" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-fullscreen-editing/plugin.info b/plugins/tiddlywiki/codemirror-fullscreen-editing/plugin.info new file mode 100755 index 000000000..e95e5cc29 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-fullscreen-editing/plugin.info @@ -0,0 +1,6 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-fullscreen", + "description": "CodeMirror AddOn: Fullscreen Editing", + "author": "JeremyRuston", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-fullscreen-editing/readme.tid b/plugins/tiddlywiki/codemirror-fullscreen-editing/readme.tid new file mode 100755 index 000000000..8611b3aea --- /dev/null +++ b/plugins/tiddlywiki/codemirror-fullscreen-editing/readme.tid @@ -0,0 +1,6 @@ +title: $:/plugins/tiddlywiki/codemirror-fullscreen/readme + +This plugin adds a ''Fullscreen editing Mode'' to the [[CodeMirror|http://codemirror.net]] text editor. It needs the latest [[CodeMirror plugin|$:/plugins/tiddlywiki/codemirror]] to be installed + +Pressing ''F11'' with the focus within the editor-textarea will make the editor go fullscreen, pressing ''F11'' again leaves fullscreen-mode + diff --git a/plugins/tiddlywiki/codemirror-keymap-emacs/config/keyMap.tid b/plugins/tiddlywiki/codemirror-keymap-emacs/config/keyMap.tid new file mode 100644 index 000000000..70187148f --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-emacs/config/keyMap.tid @@ -0,0 +1,4 @@ +title: $:/plugins/tiddlywiki/codemirror/keymaps/emacs +module-type: codemirror-keymap + +emacs diff --git a/plugins/tiddlywiki/codemirror-keymap-emacs/files/keymap/emacs.js b/plugins/tiddlywiki/codemirror-keymap-emacs/files/keymap/emacs.js new file mode 100755 index 000000000..d37e0032f --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-emacs/files/keymap/emacs.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../lib/codemirror")):"function"==typeof define&&define.amd?define(["../lib/codemirror"],t):t(CodeMirror)}(function(t){"use strict";var e=t.Pos;function n(t,e){return t.line==e.line&&t.ch==e.ch}var r=[];function o(t){r.push(t),r.length>50&&r.shift()}function i(t){return r[r.length-(t?Math.min(t,1):1)]||""}var l=null;function a(t,e,i,a,c){null==c&&(c=t.getRange(e,i)),"grow"==a&&l&&l.cm==t&&n(e,l.pos)&&t.isClean(l.gen)?function(t){if(!r.length)return o(t);r[r.length-1]+=t}(c):!1!==a&&o(c),t.replaceRange("",e,i,"+delete"),l="grow"==a?{cm:t,pos:e,gen:t.changeGeneration()}:null}function c(t,e,n){return t.findPosH(e,n,"char",!0)}function u(t,e,n){return t.findPosH(e,n,"word",!0)}function f(t,e,n){return t.findPosV(e,n,"line",t.doc.sel.goalColumn)}function s(t,e,n){return t.findPosV(e,n,"page",t.doc.sel.goalColumn)}function g(t,n,r){for(var o=n.line,i=t.getLine(o),l=/\S/.test(r<0?i.slice(0,n.ch):i.slice(n.ch)),a=t.firstLine(),c=t.lastLine();;){if((o+=r)<a||o>c)return t.clipPos(e(o-r,r<0?0:null));if(i=t.getLine(o),/\S/.test(i))l=!0;else if(l)return e(o,0)}}function C(t,n,r){for(var o=n.line,i=n.ch,l=t.getLine(n.line),a=!1;;){var c=l.charAt(i+(r<0?-1:0));if(c){if(a&&/[!?.]/.test(c))return e(o,i+(r>0?1:0));a||(a=/\w/.test(c)),i+=r}else{if(o==(r<0?t.firstLine():t.lastLine()))return e(o,i);if(l=t.getLine(o+r),!/\S/.test(l))return e(o,i);o+=r,i=r<0?l.length:0}}}function d(t,r,o){var i;if(t.findMatchingBracket&&(i=t.findMatchingBracket(r,{strict:!0}))&&i.match&&(i.forward?1:-1)==o)return o>0?e(i.to.line,i.to.ch+1):i.to;for(var l=!0;;l=!1){var a=t.getTokenAt(r),c=e(r.line,o<0?a.start:a.end);if(!(l&&o>0&&a.end==r.ch)&&/\w/.test(a.string))return c;var u=t.findPosH(c,o,"char");if(n(c,u))return r;r=u}}function p(t,e){var n=t.state.emacsPrefix;return n?(L(t),"-"==n?-1:Number(n)):e?null:1}function h(t){var e="string"==typeof t?function(e){e.execCommand(t)}:t;return function(t){var n=p(t);e(t);for(var r=1;r<n;++r)e(t)}}function v(t,e,r,o){var i=p(t);i<0&&(o=-o,i=-i);for(var l=0;l<i;++l){var a=r(t,e,o);if(n(a,e))break;e=a}return e}function m(t,e){var n=function(n){n.extendSelection(v(n,n.getCursor(),t,e))};return n.motion=!0,n}function A(t,e,n,r){for(var o,i=t.listSelections(),l=i.length;l--;)a(t,o=i[l].head,v(t,o,e,n),r)}function S(t,e){if(t.somethingSelected()){for(var n,r=t.listSelections(),o=r.length;o--;)a(t,(n=r[o]).anchor,n.head,e);return!0}}function P(t,e){t.state.emacsPrefix?"-"!=e&&(t.state.emacsPrefix+=e):(t.state.emacsPrefix=e,t.on("keyHandled",x),t.on("inputRead",R))}var w={"Alt-G":!0,"Ctrl-X":!0,"Ctrl-Q":!0,"Ctrl-U":!0};function x(t,e){t.state.emacsPrefixMap||w.hasOwnProperty(e)||L(t)}function L(t){t.state.emacsPrefix=null,t.off("keyHandled",x),t.off("inputRead",R)}function R(t,e){var n=p(t);if(n>1&&"+input"==e.origin){for(var r=e.text.join("\n"),o="",i=1;i<n;++i)o+=r;t.replaceSelection(o)}}function y(t,e){("string"!=typeof e||!/^\d$/.test(e)&&"Ctrl-U"!=e)&&(t.removeKeyMap(D),t.state.emacsPrefixMap=!1,t.off("keyHandled",y),t.off("inputRead",y))}function k(t){t.setCursor(t.getCursor()),t.setExtending(!t.getExtending()),t.on("change",function(){t.setExtending(!1)})}function b(t){t.setExtending(!1),t.setCursor(t.getCursor())}function U(t,e){var n=t.getCursor(),r=t.findPosH(n,1,"word");t.replaceRange(e(t.getRange(n,r)),n,r),t.setCursor(r)}t.emacs={kill:a,killRegion:S,repeated:h};var X=t.keyMap.emacs=t.normalizeKeyMap({"Ctrl-W":function(t){a(t,t.getCursor("start"),t.getCursor("end"),!0)},"Ctrl-K":h(function(t){var n=t.getCursor(),r=t.clipPos(e(n.line)),o=t.getRange(n,r);/\S/.test(o)||(o+="\n",r=e(n.line+1,0)),a(t,n,r,"grow",o)}),"Alt-W":function(t){o(t.getSelection()),b(t)},"Ctrl-Y":function(t){var e=t.getCursor();t.replaceRange(i(p(t)),e,e,"paste"),t.setSelection(e,t.getCursor())},"Alt-Y":function(t){t.replaceSelection((r.length>1&&r.pop(),i()),"around","paste")},"Ctrl-Space":k,"Ctrl-Shift-2":k,"Ctrl-F":m(c,1),"Ctrl-B":m(c,-1),Right:m(c,1),Left:m(c,-1),"Ctrl-D":function(t){A(t,c,1,!1)},Delete:function(t){S(t,!1)||A(t,c,1,!1)},"Ctrl-H":function(t){A(t,c,-1,!1)},Backspace:function(t){S(t,!1)||A(t,c,-1,!1)},"Alt-F":m(u,1),"Alt-B":m(u,-1),"Alt-D":function(t){A(t,u,1,"grow")},"Alt-Backspace":function(t){A(t,u,-1,"grow")},"Ctrl-N":m(f,1),"Ctrl-P":m(f,-1),Down:m(f,1),Up:m(f,-1),"Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd",End:"goLineEnd",Home:"goLineStart","Alt-V":m(s,-1),"Ctrl-V":m(s,1),PageUp:m(s,-1),PageDown:m(s,1),"Ctrl-Up":m(g,-1),"Ctrl-Down":m(g,1),"Alt-A":m(C,-1),"Alt-E":m(C,1),"Alt-K":function(t){A(t,C,1,"grow")},"Ctrl-Alt-K":function(t){A(t,d,1,"grow")},"Ctrl-Alt-Backspace":function(t){A(t,d,-1,"grow")},"Ctrl-Alt-F":m(d,1),"Ctrl-Alt-B":m(d,-1),"Shift-Ctrl-Alt-2":function(t){var e=t.getCursor();t.setSelection(v(t,e,d,1),e)},"Ctrl-Alt-T":function(t){var e=d(t,t.getCursor(),-1),n=d(t,e,1),r=d(t,n,1),o=d(t,r,-1);t.replaceRange(t.getRange(o,r)+t.getRange(n,o)+t.getRange(e,n),e,r)},"Ctrl-Alt-U":h(function(t){for(var n=t.getCursor(),r=n.line,o=n.ch,i=[];r>=t.firstLine();){for(var l=t.getLine(r),a=null==o?l.length:o;a>0;)if(")"==(o=l.charAt(--a)))i.push("(");else if("]"==o)i.push("[");else if("}"==o)i.push("{");else if(/[\(\{\[]/.test(o)&&(!i.length||i.pop()!=o))return t.extendSelection(e(r,a));--r,o=null}}),"Alt-Space":function(t){for(var n=t.getCursor(),r=n.ch,o=n.ch,i=t.getLine(n.line);r&&/\s/.test(i.charAt(r-1));)--r;for(;o<i.length&&/\s/.test(i.charAt(o));)++o;t.replaceRange(" ",e(n.line,r),e(n.line,o))},"Ctrl-O":h(function(t){t.replaceSelection("\n","start")}),"Ctrl-T":h(function(t){t.execCommand("transposeChars")}),"Alt-C":h(function(t){U(t,function(t){var e=t.search(/\w/);return-1==e?t:t.slice(0,e)+t.charAt(e).toUpperCase()+t.slice(e+1).toLowerCase()})}),"Alt-U":h(function(t){U(t,function(t){return t.toUpperCase()})}),"Alt-L":h(function(t){U(t,function(t){return t.toLowerCase()})}),"Alt-;":"toggleComment","Ctrl-/":h("undo"),"Shift-Ctrl--":h("undo"),"Ctrl-Z":h("undo"),"Cmd-Z":h("undo"),"Shift-Alt-,":"goDocStart","Shift-Alt-.":"goDocEnd","Ctrl-S":"findPersistentNext","Ctrl-R":"findPersistentPrev","Ctrl-G":function(t){t.execCommand("clearSearch"),b(t)},"Shift-Alt-5":"replace","Alt-/":"autocomplete",Enter:"newlineAndIndent","Ctrl-J":h(function(t){t.replaceSelection("\n","end")}),Tab:"indentAuto","Alt-G G":function(t){var e,n,r,o=p(t,!0);if(null!=o&&o>0)return t.setCursor(o-1);n="Goto line",r=function(e){var n;e&&!isNaN(n=Number(e))&&n==(0|n)&&n>0&&t.setCursor(n-1)},(e=t).openDialog?e.openDialog(n+': <input type="text" style="width: 10em"/>',r,{bottom:!0}):r(prompt(n,""))},"Ctrl-X Tab":function(t){t.indentSelection(p(t,!0)||t.getOption("indentUnit"))},"Ctrl-X Ctrl-X":function(t){t.setSelection(t.getCursor("head"),t.getCursor("anchor"))},"Ctrl-X Ctrl-S":"save","Ctrl-X Ctrl-W":"save","Ctrl-X S":"saveAll","Ctrl-X F":"open","Ctrl-X U":h("undo"),"Ctrl-X K":"close","Ctrl-X Delete":function(t){a(t,t.getCursor(),C(t,t.getCursor(),1),"grow")},"Ctrl-X H":"selectAll","Ctrl-Q Tab":h("insertTab"),"Ctrl-U":function(t){t.state.emacsPrefixMap=!0,t.addKeyMap(D),t.on("keyHandled",y),t.on("inputRead",y)}}),D={"Ctrl-G":L};function E(t){D[t]=function(e){P(e,t)},X["Ctrl-"+t]=function(e){P(e,t)},w["Ctrl-"+t]=!0}for(var H=0;H<10;++H)E(String(H));E("-")}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-keymap-emacs/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-keymap-emacs/files/tiddlywiki.files new file mode 100755 index 000000000..b54049eba --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-emacs/files/tiddlywiki.files @@ -0,0 +1,12 @@ +{ + "tiddlers": [ + { + "file": "keymap/emacs.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/keymap/emacs.js", + "module-type": "codemirror" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-keymap-emacs/plugin.info b/plugins/tiddlywiki/codemirror-keymap-emacs/plugin.info new file mode 100755 index 000000000..7844a4932 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-emacs/plugin.info @@ -0,0 +1,6 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-keymap-emacs", + "description": "CodeMirror Keymap: Emacs", + "author": "JeremyRuston", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-keymap-emacs/readme.tid b/plugins/tiddlywiki/codemirror-keymap-emacs/readme.tid new file mode 100644 index 000000000..7553ac1a5 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-emacs/readme.tid @@ -0,0 +1,5 @@ +title: $:/plugins/tiddlywiki/codemirror-keymap-emacs/readme + +This plugin adds a ''Keymap'' with some of the most important ''Emacs'' keyboard shortcuts + +For more information about available ''keyboard shortcuts'' see the [ext[CodeMirror emacs demo|https://codemirror.net/demo/emacs.html]] diff --git a/plugins/tiddlywiki/codemirror-keymap-sublime-text/config/extraKeysTW.tid b/plugins/tiddlywiki/codemirror-keymap-sublime-text/config/extraKeysTW.tid new file mode 100644 index 000000000..23aba1bde --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-sublime-text/config/extraKeysTW.tid @@ -0,0 +1,24 @@ +title: $:/config/codemirror/extraKeysTW +extend: extraKeys +type: json + +{ + "Ctrl-M": "", + "Alt-M": "goToBracket", + "Ctrl-Enter": "", + "Shift-Enter": "insertLineAfter", + "Esc": "", + "Ctrl-Esc": "singleSelectionTop", + "Ctrl-L": "", + "Shift-Ctrl-L": "", + "Alt-L": "selectLine", + "Shift-Alt-L": "splitSelectionByLine", + "Ctrl-T": "", + "Alt-T": "transposeChars", + "Ctrl-K Ctrl-U": "", + "Ctrl-K Ctrl-L": "", + "Ctrl-K Ctrl-W": "", + "Ctrl-K Alt-U": "upcaseAtCursor", + "Ctrl-K Alt-L": "downcaseAtCursor", + "Ctrl-K Alt-D": "deleteToSublimeMark" +} diff --git a/plugins/tiddlywiki/codemirror-keymap-sublime-text/config/keyMap.tid b/plugins/tiddlywiki/codemirror-keymap-sublime-text/config/keyMap.tid new file mode 100644 index 000000000..a65e1ef35 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-sublime-text/config/keyMap.tid @@ -0,0 +1,4 @@ +title: $:/plugins/tiddlywiki/codemirror/keymaps/sublime +module-type: codemirror-keymap + +sublime diff --git a/plugins/tiddlywiki/codemirror-keymap-sublime-text/files/keymap/sublime.js b/plugins/tiddlywiki/codemirror-keymap-sublime-text/files/keymap/sublime.js new file mode 100755 index 000000000..fca70db15 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-sublime-text/files/keymap/sublime.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../lib/codemirror"),require("../addon/search/searchcursor"),require("../addon/edit/matchbrackets")):"function"==typeof define&&define.amd?define(["../lib/codemirror","../addon/search/searchcursor","../addon/edit/matchbrackets"],e):e(CodeMirror)}(function(e){"use strict";var t=e.commands,n=e.Pos;function r(t,r){t.extendSelectionsBy(function(o){return t.display.shift||t.doc.extend||o.empty()?function(t,r,o){if(o<0&&0==r.ch)return t.clipPos(n(r.line-1));var i=t.getLine(r.line);if(o>0&&r.ch>=i.length)return t.clipPos(n(r.line+1,0));for(var l,a="start",s=r.ch,c=o<0?0:i.length,f=0;s!=c;s+=o,f++){var u=i.charAt(o<0?s-1:s),d="_"!=u&&e.isWordChar(u)?"w":"o";if("w"==d&&u.toUpperCase()==u&&(d="W"),"start"==a)"o"!=d&&(a="in",l=d);else if("in"==a&&l!=d){if("w"==l&&"W"==d&&o<0&&s--,"W"==l&&"w"==d&&o>0){l="w";continue}break}}return n(r.line,s)}(t.doc,o.head,r):r<0?o.from():o.to()})}function o(t,r){if(t.isReadOnly())return e.Pass;t.operation(function(){for(var e=t.listSelections().length,o=[],i=-1,l=0;l<e;l++){var a=t.listSelections()[l].head;if(!(a.line<=i)){var s=n(a.line+(r?0:1),0);t.replaceRange("\n",s,null,"+insertLine"),t.indentLine(s.line,null,!0),o.push({head:s,anchor:s}),i=a.line+1}}t.setSelections(o)}),t.execCommand("indentAuto")}function i(t,r){for(var o=r.ch,i=o,l=t.getLine(r.line);o&&e.isWordChar(l.charAt(o-1));)--o;for(;i<l.length&&e.isWordChar(l.charAt(i));)++i;return{from:n(r.line,o),to:n(r.line,i),word:l.slice(o,i)}}function l(e,t){for(var n=e.listSelections(),r=[],o=0;o<n.length;o++){var i=n[o],l=e.findPosV(i.anchor,t,"line",i.anchor.goalColumn),a=e.findPosV(i.head,t,"line",i.head.goalColumn);l.goalColumn=null!=i.anchor.goalColumn?i.anchor.goalColumn:e.cursorCoords(i.anchor,"div").left,a.goalColumn=null!=i.head.goalColumn?i.head.goalColumn:e.cursorCoords(i.head,"div").left;var s={anchor:l,head:a};r.push(i),r.push(s)}e.setSelections(r)}t.goSubwordLeft=function(e){r(e,-1)},t.goSubwordRight=function(e){r(e,1)},t.scrollLineUp=function(e){var t=e.getScrollInfo();if(!e.somethingSelected()){var n=e.lineAtHeight(t.top+t.clientHeight,"local");e.getCursor().line>=n&&e.execCommand("goLineUp")}e.scrollTo(null,t.top-e.defaultTextHeight())},t.scrollLineDown=function(e){var t=e.getScrollInfo();if(!e.somethingSelected()){var n=e.lineAtHeight(t.top,"local")+1;e.getCursor().line<=n&&e.execCommand("goLineDown")}e.scrollTo(null,t.top+e.defaultTextHeight())},t.splitSelectionByLine=function(e){for(var t=e.listSelections(),r=[],o=0;o<t.length;o++)for(var i=t[o].from(),l=t[o].to(),a=i.line;a<=l.line;++a)l.line>i.line&&a==l.line&&0==l.ch||r.push({anchor:a==i.line?i:n(a,0),head:a==l.line?l:n(a)});e.setSelections(r,0)},t.singleSelectionTop=function(e){var t=e.listSelections()[0];e.setSelection(t.anchor,t.head,{scroll:!1})},t.selectLine=function(e){for(var t=e.listSelections(),r=[],o=0;o<t.length;o++){var i=t[o];r.push({anchor:n(i.from().line,0),head:n(i.to().line+1,0)})}e.setSelections(r)},t.insertLineAfter=function(e){return o(e,!1)},t.insertLineBefore=function(e){return o(e,!0)},t.selectNextOccurrence=function(t){var r=t.getCursor("from"),o=t.getCursor("to"),l=t.state.sublimeFindFullWord==t.doc.sel;if(0==e.cmpPos(r,o)){var a=i(t,r);if(!a.word)return;t.setSelection(a.from,a.to),l=!0}else{var s=t.getRange(r,o),c=l?new RegExp("\\b"+s+"\\b"):s,f=t.getSearchCursor(c,o),u=f.findNext();if(u||(u=(f=t.getSearchCursor(c,n(t.firstLine(),0))).findNext()),!u||function(e,t,n){for(var r=0;r<e.length;r++)if(e[r].from()==t&&e[r].to()==n)return!0;return!1}(t.listSelections(),f.from(),f.to()))return e.Pass;t.addSelection(f.from(),f.to())}l&&(t.state.sublimeFindFullWord=t.doc.sel)},t.addCursorToPrevLine=function(e){l(e,-1)},t.addCursorToNextLine=function(e){l(e,1)};var a="(){}[]";function s(t){for(var r=t.listSelections(),o=[],i=0;i<r.length;i++){var l=r[i],s=l.head,c=t.scanForBracket(s,-1);if(!c)return!1;for(;;){var f=t.scanForBracket(s,1);if(!f)return!1;if(f.ch==a.charAt(a.indexOf(c.ch)+1)){var u=n(c.pos.line,c.pos.ch+1);if(0!=e.cmpPos(u,l.from())||0!=e.cmpPos(f.pos,l.to())){o.push({anchor:u,head:f.pos});break}if(!(c=t.scanForBracket(c.pos,-1)))return!1}s=n(f.pos.line,f.pos.ch+1)}}return t.setSelections(o),!0}function c(t,r){if(t.isReadOnly())return e.Pass;for(var o,i=t.listSelections(),l=[],a=0;a<i.length;a++){var s=i[a];if(!s.empty()){for(var c=s.from().line,f=s.to().line;a<i.length-1&&i[a+1].from().line==f;)f=i[++a].to().line;i[a].to().ch||f--,l.push(c,f)}}l.length?o=!0:l.push(t.firstLine(),t.lastLine()),t.operation(function(){for(var e=[],i=0;i<l.length;i+=2){var a=l[i],s=l[i+1],c=n(a,0),f=n(s),u=t.getRange(c,f,!1);r?u.sort():u.sort(function(e,t){var n=e.toUpperCase(),r=t.toUpperCase();return n!=r&&(e=n,t=r),e<t?-1:e==t?0:1}),t.replaceRange(u,c,f),o&&e.push({anchor:c,head:n(s+1,0)})}o&&t.setSelections(e,0)})}function f(t,n){t.operation(function(){for(var r=t.listSelections(),o=[],l=[],a=0;a<r.length;a++){(c=r[a]).empty()?(o.push(a),l.push("")):l.push(n(t.getRange(c.from(),c.to())))}t.replaceSelections(l,"around","case");var s;for(a=o.length-1;a>=0;a--){var c=r[o[a]];if(!(s&&e.cmpPos(c.head,s)>0)){var f=i(t,c.head);s=f.from,t.replaceRange(n(f.word),f.from,f.to)}}})}function u(t){var n=t.getCursor("from"),r=t.getCursor("to");if(0==e.cmpPos(n,r)){var o=i(t,n);if(!o.word)return;n=o.from,r=o.to}return{from:n,to:r,query:t.getRange(n,r),word:o}}function d(e,t){var r=u(e);if(r){var o=r.query,i=e.getSearchCursor(o,t?r.to:r.from);(t?i.findNext():i.findPrevious())?e.setSelection(i.from(),i.to()):(i=e.getSearchCursor(o,t?n(e.firstLine(),0):e.clipPos(n(e.lastLine()))),(t?i.findNext():i.findPrevious())?e.setSelection(i.from(),i.to()):r.word&&e.setSelection(r.from,r.to))}}t.selectScope=function(e){s(e)||e.execCommand("selectAll")},t.selectBetweenBrackets=function(t){if(!s(t))return e.Pass},t.goToBracket=function(t){t.extendSelectionsBy(function(r){var o=t.scanForBracket(r.head,1);if(o&&0!=e.cmpPos(o.pos,r.head))return o.pos;var i=t.scanForBracket(r.head,-1);return i&&n(i.pos.line,i.pos.ch+1)||r.head})},t.swapLineUp=function(t){if(t.isReadOnly())return e.Pass;for(var r=t.listSelections(),o=[],i=t.firstLine()-1,l=[],a=0;a<r.length;a++){var s=r[a],c=s.from().line-1,f=s.to().line;l.push({anchor:n(s.anchor.line-1,s.anchor.ch),head:n(s.head.line-1,s.head.ch)}),0!=s.to().ch||s.empty()||--f,c>i?o.push(c,f):o.length&&(o[o.length-1]=f),i=f}t.operation(function(){for(var e=0;e<o.length;e+=2){var r=o[e],i=o[e+1],a=t.getLine(r);t.replaceRange("",n(r,0),n(r+1,0),"+swapLine"),i>t.lastLine()?t.replaceRange("\n"+a,n(t.lastLine()),null,"+swapLine"):t.replaceRange(a+"\n",n(i,0),null,"+swapLine")}t.setSelections(l),t.scrollIntoView()})},t.swapLineDown=function(t){if(t.isReadOnly())return e.Pass;for(var r=t.listSelections(),o=[],i=t.lastLine()+1,l=r.length-1;l>=0;l--){var a=r[l],s=a.to().line+1,c=a.from().line;0!=a.to().ch||a.empty()||s--,s<i?o.push(s,c):o.length&&(o[o.length-1]=c),i=c}t.operation(function(){for(var e=o.length-2;e>=0;e-=2){var r=o[e],i=o[e+1],l=t.getLine(r);r==t.lastLine()?t.replaceRange("",n(r-1),n(r),"+swapLine"):t.replaceRange("",n(r,0),n(r+1,0),"+swapLine"),t.replaceRange(l+"\n",n(i,0),null,"+swapLine")}t.scrollIntoView()})},t.toggleCommentIndented=function(e){e.toggleComment({indent:!0})},t.joinLines=function(e){for(var t=e.listSelections(),r=[],o=0;o<t.length;o++){for(var i=t[o],l=i.from(),a=l.line,s=i.to().line;o<t.length-1&&t[o+1].from().line==s;)s=t[++o].to().line;r.push({start:a,end:s,anchor:!i.empty()&&l})}e.operation(function(){for(var t=0,o=[],i=0;i<r.length;i++){for(var l,a=r[i],s=a.anchor&&n(a.anchor.line-t,a.anchor.ch),c=a.start;c<=a.end;c++){var f=c-t;c==a.end&&(l=n(f,e.getLine(f).length+1)),f<e.lastLine()&&(e.replaceRange(" ",n(f),n(f+1,/^\s*/.exec(e.getLine(f+1))[0].length)),++t)}o.push({anchor:s||l,head:l})}e.setSelections(o,0)})},t.duplicateLine=function(e){e.operation(function(){for(var t=e.listSelections().length,r=0;r<t;r++){var o=e.listSelections()[r];o.empty()?e.replaceRange(e.getLine(o.head.line)+"\n",n(o.head.line,0)):e.replaceRange(e.getRange(o.from(),o.to()),o.from())}e.scrollIntoView()})},t.sortLines=function(e){c(e,!0)},t.sortLinesInsensitive=function(e){c(e,!1)},t.nextBookmark=function(e){var t=e.state.sublimeBookmarks;if(t)for(;t.length;){var n=t.shift(),r=n.find();if(r)return t.push(n),e.setSelection(r.from,r.to)}},t.prevBookmark=function(e){var t=e.state.sublimeBookmarks;if(t)for(;t.length;){t.unshift(t.pop());var n=t[t.length-1].find();if(n)return e.setSelection(n.from,n.to);t.pop()}},t.toggleBookmark=function(e){for(var t=e.listSelections(),n=e.state.sublimeBookmarks||(e.state.sublimeBookmarks=[]),r=0;r<t.length;r++){for(var o=t[r].from(),i=t[r].to(),l=t[r].empty()?e.findMarksAt(o):e.findMarks(o,i),a=0;a<l.length;a++)if(l[a].sublimeBookmark){l[a].clear();for(var s=0;s<n.length;s++)n[s]==l[a]&&n.splice(s--,1);break}a==l.length&&n.push(e.markText(o,i,{sublimeBookmark:!0,clearWhenEmpty:!1}))}},t.clearBookmarks=function(e){var t=e.state.sublimeBookmarks;if(t)for(var n=0;n<t.length;n++)t[n].clear();t.length=0},t.selectBookmarks=function(e){var t=e.state.sublimeBookmarks,n=[];if(t)for(var r=0;r<t.length;r++){var o=t[r].find();o?n.push({anchor:o.from,head:o.to}):t.splice(r--,0)}n.length&&e.setSelections(n,0)},t.smartBackspace=function(t){if(t.somethingSelected())return e.Pass;t.operation(function(){for(var r=t.listSelections(),o=t.getOption("indentUnit"),i=r.length-1;i>=0;i--){var l=r[i].head,a=t.getRange({line:l.line,ch:0},l),s=e.countColumn(a,null,t.getOption("tabSize")),c=t.findPosH(l,-1,"char",!1);if(a&&!/\S/.test(a)&&s%o==0){var f=new n(l.line,e.findColumn(a,s-o,o));f.ch!=l.ch&&(c=f)}t.replaceRange("",c,l,"+delete")}})},t.delLineRight=function(e){e.operation(function(){for(var t=e.listSelections(),r=t.length-1;r>=0;r--)e.replaceRange("",t[r].anchor,n(t[r].to().line),"+delete");e.scrollIntoView()})},t.upcaseAtCursor=function(e){f(e,function(e){return e.toUpperCase()})},t.downcaseAtCursor=function(e){f(e,function(e){return e.toLowerCase()})},t.setSublimeMark=function(e){e.state.sublimeMark&&e.state.sublimeMark.clear(),e.state.sublimeMark=e.setBookmark(e.getCursor())},t.selectToSublimeMark=function(e){var t=e.state.sublimeMark&&e.state.sublimeMark.find();t&&e.setSelection(e.getCursor(),t)},t.deleteToSublimeMark=function(t){var n=t.state.sublimeMark&&t.state.sublimeMark.find();if(n){var r=t.getCursor(),o=n;if(e.cmpPos(r,o)>0){var i=o;o=r,r=i}t.state.sublimeKilled=t.getRange(r,o),t.replaceRange("",r,o)}},t.swapWithSublimeMark=function(e){var t=e.state.sublimeMark&&e.state.sublimeMark.find();t&&(e.state.sublimeMark.clear(),e.state.sublimeMark=e.setBookmark(e.getCursor()),e.setCursor(t))},t.sublimeYank=function(e){null!=e.state.sublimeKilled&&e.replaceSelection(e.state.sublimeKilled,null,"paste")},t.showInCenter=function(e){var t=e.cursorCoords(null,"local");e.scrollTo(null,(t.top+t.bottom)/2-e.getScrollInfo().clientHeight/2)},t.findUnder=function(e){d(e,!0)},t.findUnderPrevious=function(e){d(e,!1)},t.findAllUnder=function(e){var t=u(e);if(t){for(var n=e.getSearchCursor(t.query),r=[],o=-1;n.findNext();)r.push({anchor:n.from(),head:n.to()}),n.from().line<=t.from.line&&n.from().ch<=t.from.ch&&o++;e.setSelections(r,o)}};var m=e.keyMap;m.macSublime={"Cmd-Left":"goLineStartSmart","Shift-Tab":"indentLess","Shift-Ctrl-K":"deleteLine","Alt-Q":"wrapLines","Ctrl-Left":"goSubwordLeft","Ctrl-Right":"goSubwordRight","Ctrl-Alt-Up":"scrollLineUp","Ctrl-Alt-Down":"scrollLineDown","Cmd-L":"selectLine","Shift-Cmd-L":"splitSelectionByLine",Esc:"singleSelectionTop","Cmd-Enter":"insertLineAfter","Shift-Cmd-Enter":"insertLineBefore","Cmd-D":"selectNextOccurrence","Shift-Cmd-Space":"selectScope","Shift-Cmd-M":"selectBetweenBrackets","Cmd-M":"goToBracket","Cmd-Ctrl-Up":"swapLineUp","Cmd-Ctrl-Down":"swapLineDown","Cmd-/":"toggleCommentIndented","Cmd-J":"joinLines","Shift-Cmd-D":"duplicateLine",F9:"sortLines","Cmd-F9":"sortLinesInsensitive",F2:"nextBookmark","Shift-F2":"prevBookmark","Cmd-F2":"toggleBookmark","Shift-Cmd-F2":"clearBookmarks","Alt-F2":"selectBookmarks",Backspace:"smartBackspace","Cmd-K Cmd-K":"delLineRight","Cmd-K Cmd-U":"upcaseAtCursor","Cmd-K Cmd-L":"downcaseAtCursor","Cmd-K Cmd-Space":"setSublimeMark","Cmd-K Cmd-A":"selectToSublimeMark","Cmd-K Cmd-W":"deleteToSublimeMark","Cmd-K Cmd-X":"swapWithSublimeMark","Cmd-K Cmd-Y":"sublimeYank","Cmd-K Cmd-C":"showInCenter","Cmd-K Cmd-G":"clearBookmarks","Cmd-K Cmd-Backspace":"delLineLeft","Cmd-K Cmd-0":"unfoldAll","Cmd-K Cmd-J":"unfoldAll","Ctrl-Shift-Up":"addCursorToPrevLine","Ctrl-Shift-Down":"addCursorToNextLine","Cmd-F3":"findUnder","Shift-Cmd-F3":"findUnderPrevious","Alt-F3":"findAllUnder","Shift-Cmd-[":"fold","Shift-Cmd-]":"unfold","Cmd-I":"findIncremental","Shift-Cmd-I":"findIncrementalReverse","Cmd-H":"replace",F3:"findNext","Shift-F3":"findPrev",fallthrough:"macDefault"},e.normalizeKeyMap(m.macSublime),m.pcSublime={"Shift-Tab":"indentLess","Shift-Ctrl-K":"deleteLine","Alt-Q":"wrapLines","Ctrl-T":"transposeChars","Alt-Left":"goSubwordLeft","Alt-Right":"goSubwordRight","Ctrl-Up":"scrollLineUp","Ctrl-Down":"scrollLineDown","Ctrl-L":"selectLine","Shift-Ctrl-L":"splitSelectionByLine",Esc:"singleSelectionTop","Ctrl-Enter":"insertLineAfter","Shift-Ctrl-Enter":"insertLineBefore","Ctrl-D":"selectNextOccurrence","Shift-Ctrl-Space":"selectScope","Shift-Ctrl-M":"selectBetweenBrackets","Ctrl-M":"goToBracket","Shift-Ctrl-Up":"swapLineUp","Shift-Ctrl-Down":"swapLineDown","Ctrl-/":"toggleCommentIndented","Ctrl-J":"joinLines","Shift-Ctrl-D":"duplicateLine",F9:"sortLines","Ctrl-F9":"sortLinesInsensitive",F2:"nextBookmark","Shift-F2":"prevBookmark","Ctrl-F2":"toggleBookmark","Shift-Ctrl-F2":"clearBookmarks","Alt-F2":"selectBookmarks",Backspace:"smartBackspace","Ctrl-K Ctrl-K":"delLineRight","Ctrl-K Ctrl-U":"upcaseAtCursor","Ctrl-K Ctrl-L":"downcaseAtCursor","Ctrl-K Ctrl-Space":"setSublimeMark","Ctrl-K Ctrl-A":"selectToSublimeMark","Ctrl-K Ctrl-W":"deleteToSublimeMark","Ctrl-K Ctrl-X":"swapWithSublimeMark","Ctrl-K Ctrl-Y":"sublimeYank","Ctrl-K Ctrl-C":"showInCenter","Ctrl-K Ctrl-G":"clearBookmarks","Ctrl-K Ctrl-Backspace":"delLineLeft","Ctrl-K Ctrl-0":"unfoldAll","Ctrl-K Ctrl-J":"unfoldAll","Ctrl-Alt-Up":"addCursorToPrevLine","Ctrl-Alt-Down":"addCursorToNextLine","Ctrl-F3":"findUnder","Shift-Ctrl-F3":"findUnderPrevious","Alt-F3":"findAllUnder","Shift-Ctrl-[":"fold","Shift-Ctrl-]":"unfold","Ctrl-I":"findIncremental","Shift-Ctrl-I":"findIncrementalReverse","Ctrl-H":"replace",F3:"findNext","Shift-F3":"findPrev",fallthrough:"pcDefault"},e.normalizeKeyMap(m.pcSublime);var h=m.default==m.macDefault;m.sublime=h?m.macSublime:m.pcSublime}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-keymap-sublime-text/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-keymap-sublime-text/files/tiddlywiki.files new file mode 100755 index 000000000..236899789 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-sublime-text/files/tiddlywiki.files @@ -0,0 +1,12 @@ +{ + "tiddlers": [ + { + "file": "keymap/sublime.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/keymap/sublime.js", + "module-type": "codemirror" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-keymap-sublime-text/plugin.info b/plugins/tiddlywiki/codemirror-keymap-sublime-text/plugin.info new file mode 100755 index 000000000..5be49fd36 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-sublime-text/plugin.info @@ -0,0 +1,6 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-keymap-sublime-text", + "description": "CodeMirror Keymap: Sublime Text", + "author": "JeremyRuston", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-keymap-sublime-text/readme.tid b/plugins/tiddlywiki/codemirror-keymap-sublime-text/readme.tid new file mode 100644 index 000000000..394a9f89b --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-sublime-text/readme.tid @@ -0,0 +1,58 @@ +title: $:/plugins/tiddlywiki/codemirror-keymap-sublime-text/readme + +This plugin adds a ''Keymap'' with the most important ''Sublime Text'' keyboard shortcuts + +Shortcuts that interfere with ~TiddlyWiki shortcuts differ from the original sublime shortcuts to preserve functionality + + +|Shortcut |Function |h +|Shift-Tab |indentLess | +|Shift-Ctrl-K |deleteLine | +|Alt-Q |wrapLines | +|Alt-T |transposeChars | +|Alt-Left |goSubwordLeft | +|Alt-Right |goSubwordRight | +|Ctrl-Up |scrollLineUp | +|Ctrl-Down |scrollLineDown | +|Alt-L |selectLine | +|Shift-Alt-L |splitSelectionByLine | +|Ctrl-Esc |singleSelectionTop | +|Shift-Enter |insertLineAfter | +|Shift-Ctrl-Enter |insertLineBefore | +|Ctrl-D |selectNextOccurrence | +|Shift-Ctrl-Space |selectScope | +|Shift-Ctrl-M |selectBetweenBrackets | +|Alt-M |goToBracket | +|Shift-Ctrl-Up |swapLineUp | +|Shift-Ctrl-Down |swapLineDown | +|Ctrl-/ |toggleCommentIndented | +|Ctrl-J |joinLines | +|Shift-Ctrl-D |duplicateLine | +|F9 |sortLines | +|Ctrl-F9 |sortLinesInsensitive | +|F2 |nextBookmark | +|Shift-F2 |prevBookmark | +|Ctrl-F2 |toggleBookmark | +|Shift-Ctrl-F2 |clearBookmarks | +|Alt-F2 |selectBookmarks | +|Backspace |smartBackspace | +|Ctrl-K Ctrl-K |delLineRight | +|Ctrl-K Alt-U |upcaseAtCursor | +|Ctrl-K Alt-L |downcaseAtCursor | +|Ctrl-K Ctrl-Space |setSublimeMark | +|Ctrl-K Ctrl-A |selectToSublimeMark | +|Ctrl-K Alt-D |deleteToSublimeMark | +|Ctrl-K Ctrl-X |swapWithSublimeMark | +|Ctrl-K Ctrl-Y |sublimeYank | +|Ctrl-K Ctrl-C |showInCenter | +|Ctrl-K Ctrl-G |clearBookmarks | +|Ctrl-K Ctrl-Backspace |delLineLeft | +|Ctrl-K Ctrl-0 |unfoldAll | +|Ctrl-K Ctrl-J |unfoldAll | +|Ctrl-Alt-Up |addCursorToPrevLine | +|Ctrl-Alt-Down |addCursorToNextLine | +|Ctrl-F3 |findUnder | +|Shift-Ctrl-F3 |findUnderPrevious | +|Shift-Ctrl-[ |fold | +|Shift-Ctrl-] |unfold | +|Ctrl-H |replace | diff --git a/plugins/tiddlywiki/codemirror-keymap-vim/config/keyMap.tid b/plugins/tiddlywiki/codemirror-keymap-vim/config/keyMap.tid new file mode 100644 index 000000000..4f545009a --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-vim/config/keyMap.tid @@ -0,0 +1,4 @@ +title: $:/plugins/tiddlywiki/codemirror/keymaps/vim +module-type: codemirror-keymap + +vim diff --git a/plugins/tiddlywiki/codemirror-keymap-vim/files/keymap/vim.js b/plugins/tiddlywiki/codemirror-keymap-vim/files/keymap/vim.js new file mode 100755 index 000000000..ad7d48791 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-vim/files/keymap/vim.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../lib/codemirror"),require("../addon/search/searchcursor"),require("../addon/dialog/dialog"),require("../addon/edit/matchbrackets.js")):"function"==typeof define&&define.amd?define(["../lib/codemirror","../addon/search/searchcursor","../addon/dialog/dialog","../addon/edit/matchbrackets"],e):e(CodeMirror)}(function(e){"use strict";var t=[{keys:"<Left>",type:"keyToKey",toKeys:"h"},{keys:"<Right>",type:"keyToKey",toKeys:"l"},{keys:"<Up>",type:"keyToKey",toKeys:"k"},{keys:"<Down>",type:"keyToKey",toKeys:"j"},{keys:"<Space>",type:"keyToKey",toKeys:"l"},{keys:"<BS>",type:"keyToKey",toKeys:"h",context:"normal"},{keys:"<C-Space>",type:"keyToKey",toKeys:"W"},{keys:"<C-BS>",type:"keyToKey",toKeys:"B",context:"normal"},{keys:"<S-Space>",type:"keyToKey",toKeys:"w"},{keys:"<S-BS>",type:"keyToKey",toKeys:"b",context:"normal"},{keys:"<C-n>",type:"keyToKey",toKeys:"j"},{keys:"<C-p>",type:"keyToKey",toKeys:"k"},{keys:"<C-[>",type:"keyToKey",toKeys:"<Esc>"},{keys:"<C-c>",type:"keyToKey",toKeys:"<Esc>"},{keys:"<C-[>",type:"keyToKey",toKeys:"<Esc>",context:"insert"},{keys:"<C-c>",type:"keyToKey",toKeys:"<Esc>",context:"insert"},{keys:"s",type:"keyToKey",toKeys:"cl",context:"normal"},{keys:"s",type:"keyToKey",toKeys:"c",context:"visual"},{keys:"S",type:"keyToKey",toKeys:"cc",context:"normal"},{keys:"S",type:"keyToKey",toKeys:"VdO",context:"visual"},{keys:"<Home>",type:"keyToKey",toKeys:"0"},{keys:"<End>",type:"keyToKey",toKeys:"$"},{keys:"<PageUp>",type:"keyToKey",toKeys:"<C-b>"},{keys:"<PageDown>",type:"keyToKey",toKeys:"<C-f>"},{keys:"<CR>",type:"keyToKey",toKeys:"j^",context:"normal"},{keys:"<Ins>",type:"action",action:"toggleOverwrite",context:"insert"},{keys:"H",type:"motion",motion:"moveToTopLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"M",type:"motion",motion:"moveToMiddleLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"L",type:"motion",motion:"moveToBottomLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"h",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!1}},{keys:"l",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!0}},{keys:"j",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,linewise:!0}},{keys:"k",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,linewise:!0}},{keys:"gj",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!0}},{keys:"gk",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!1}},{keys:"w",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1}},{keys:"W",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1,bigWord:!0}},{keys:"e",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,inclusive:!0}},{keys:"E",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"b",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1}},{keys:"B",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1,bigWord:!0}},{keys:"ge",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,inclusive:!0}},{keys:"gE",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"{",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!1,toJumplist:!0}},{keys:"}",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!0,toJumplist:!0}},{keys:"(",type:"motion",motion:"moveBySentence",motionArgs:{forward:!1}},{keys:")",type:"motion",motion:"moveBySentence",motionArgs:{forward:!0}},{keys:"<C-f>",type:"motion",motion:"moveByPage",motionArgs:{forward:!0}},{keys:"<C-b>",type:"motion",motion:"moveByPage",motionArgs:{forward:!1}},{keys:"<C-d>",type:"motion",motion:"moveByScroll",motionArgs:{forward:!0,explicitRepeat:!0}},{keys:"<C-u>",type:"motion",motion:"moveByScroll",motionArgs:{forward:!1,explicitRepeat:!0}},{keys:"gg",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!1,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"G",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!0,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"0",type:"motion",motion:"moveToStartOfLine"},{keys:"^",type:"motion",motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"+",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0}},{keys:"-",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,toFirstChar:!0}},{keys:"_",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0,repeatOffset:-1}},{keys:"$",type:"motion",motion:"moveToEol",motionArgs:{inclusive:!0}},{keys:"%",type:"motion",motion:"moveToMatchedSymbol",motionArgs:{inclusive:!0,toJumplist:!0}},{keys:"f<character>",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"F<character>",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!1}},{keys:"t<character>",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"T<character>",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!1}},{keys:";",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!0}},{keys:",",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!1}},{keys:"'<character>",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0,linewise:!0}},{keys:"`<character>",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0}},{keys:"]`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0}},{keys:"[`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1}},{keys:"]'",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0,linewise:!0}},{keys:"['",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1,linewise:!0}},{keys:"]p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0,matchIndent:!0}},{keys:"[p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0,matchIndent:!0}},{keys:"]<character>",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!0,toJumplist:!0}},{keys:"[<character>",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!1,toJumplist:!0}},{keys:"|",type:"motion",motion:"moveToColumn"},{keys:"o",type:"motion",motion:"moveToOtherHighlightedEnd",context:"visual"},{keys:"O",type:"motion",motion:"moveToOtherHighlightedEnd",motionArgs:{sameLine:!0},context:"visual"},{keys:"d",type:"operator",operator:"delete"},{keys:"y",type:"operator",operator:"yank"},{keys:"c",type:"operator",operator:"change"},{keys:">",type:"operator",operator:"indent",operatorArgs:{indentRight:!0}},{keys:"<",type:"operator",operator:"indent",operatorArgs:{indentRight:!1}},{keys:"g~",type:"operator",operator:"changeCase"},{keys:"gu",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},isEdit:!0},{keys:"gU",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},isEdit:!0},{keys:"n",type:"motion",motion:"findNext",motionArgs:{forward:!0,toJumplist:!0}},{keys:"N",type:"motion",motion:"findNext",motionArgs:{forward:!1,toJumplist:!0}},{keys:"x",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!0},operatorMotionArgs:{visualLine:!1}},{keys:"X",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!1},operatorMotionArgs:{visualLine:!0}},{keys:"D",type:"operatorMotion",operator:"delete",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"D",type:"operator",operator:"delete",operatorArgs:{linewise:!0},context:"visual"},{keys:"Y",type:"operatorMotion",operator:"yank",motion:"expandToLine",motionArgs:{linewise:!0},context:"normal"},{keys:"Y",type:"operator",operator:"yank",operatorArgs:{linewise:!0},context:"visual"},{keys:"C",type:"operatorMotion",operator:"change",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"C",type:"operator",operator:"change",operatorArgs:{linewise:!0},context:"visual"},{keys:"~",type:"operatorMotion",operator:"changeCase",motion:"moveByCharacters",motionArgs:{forward:!0},operatorArgs:{shouldMoveCursor:!0},context:"normal"},{keys:"~",type:"operator",operator:"changeCase",context:"visual"},{keys:"<C-w>",type:"operatorMotion",operator:"delete",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1},context:"insert"},{keys:"<C-i>",type:"action",action:"jumpListWalk",actionArgs:{forward:!0}},{keys:"<C-o>",type:"action",action:"jumpListWalk",actionArgs:{forward:!1}},{keys:"<C-e>",type:"action",action:"scroll",actionArgs:{forward:!0,linewise:!0}},{keys:"<C-y>",type:"action",action:"scroll",actionArgs:{forward:!1,linewise:!0}},{keys:"a",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"charAfter"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"eol"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"endOfSelectedArea"},context:"visual"},{keys:"i",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"inplace"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"firstNonBlank"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"startOfSelectedArea"},context:"visual"},{keys:"o",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!0},context:"normal"},{keys:"O",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!1},context:"normal"},{keys:"v",type:"action",action:"toggleVisualMode"},{keys:"V",type:"action",action:"toggleVisualMode",actionArgs:{linewise:!0}},{keys:"<C-v>",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:"<C-q>",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:"gv",type:"action",action:"reselectLastSelection"},{keys:"J",type:"action",action:"joinLines",isEdit:!0},{keys:"p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0}},{keys:"P",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0}},{keys:"r<character>",type:"action",action:"replace",isEdit:!0},{keys:"@<character>",type:"action",action:"replayMacro"},{keys:"q<character>",type:"action",action:"enterMacroRecordMode"},{keys:"R",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{replace:!0}},{keys:"u",type:"action",action:"undo",context:"normal"},{keys:"u",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},context:"visual",isEdit:!0},{keys:"U",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},context:"visual",isEdit:!0},{keys:"<C-r>",type:"action",action:"redo"},{keys:"m<character>",type:"action",action:"setMark"},{keys:'"<character>',type:"action",action:"setRegister"},{keys:"zz",type:"action",action:"scrollToCursor",actionArgs:{position:"center"}},{keys:"z.",type:"action",action:"scrollToCursor",actionArgs:{position:"center"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"zt",type:"action",action:"scrollToCursor",actionArgs:{position:"top"}},{keys:"z<CR>",type:"action",action:"scrollToCursor",actionArgs:{position:"top"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"z-",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"}},{keys:"zb",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:".",type:"action",action:"repeatLastEdit"},{keys:"<C-a>",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!0,backtrack:!1}},{keys:"<C-x>",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!1,backtrack:!1}},{keys:"<C-t>",type:"action",action:"indent",actionArgs:{indentRight:!0},context:"insert"},{keys:"<C-d>",type:"action",action:"indent",actionArgs:{indentRight:!1},context:"insert"},{keys:"a<character>",type:"motion",motion:"textObjectManipulation"},{keys:"i<character>",type:"motion",motion:"textObjectManipulation",motionArgs:{textObjectInner:!0}},{keys:"/",type:"search",searchArgs:{forward:!0,querySrc:"prompt",toJumplist:!0}},{keys:"?",type:"search",searchArgs:{forward:!1,querySrc:"prompt",toJumplist:!0}},{keys:"*",type:"search",searchArgs:{forward:!0,querySrc:"wordUnderCursor",wholeWordOnly:!0,toJumplist:!0}},{keys:"#",type:"search",searchArgs:{forward:!1,querySrc:"wordUnderCursor",wholeWordOnly:!0,toJumplist:!0}},{keys:"g*",type:"search",searchArgs:{forward:!0,querySrc:"wordUnderCursor",toJumplist:!0}},{keys:"g#",type:"search",searchArgs:{forward:!1,querySrc:"wordUnderCursor",toJumplist:!0}},{keys:":",type:"ex"}],r=[{name:"colorscheme",shortName:"colo"},{name:"map"},{name:"imap",shortName:"im"},{name:"nmap",shortName:"nm"},{name:"vmap",shortName:"vm"},{name:"unmap"},{name:"write",shortName:"w"},{name:"undo",shortName:"u"},{name:"redo",shortName:"red"},{name:"set",shortName:"se"},{name:"set",shortName:"se"},{name:"setlocal",shortName:"setl"},{name:"setglobal",shortName:"setg"},{name:"sort",shortName:"sor"},{name:"substitute",shortName:"s",possiblyAsync:!0},{name:"nohlsearch",shortName:"noh"},{name:"yank",shortName:"y"},{name:"delmarks",shortName:"delm"},{name:"registers",shortName:"reg",excludeFromCommandHistory:!0},{name:"global",shortName:"g"}],n=e.Pos;e.Vim=function(){function o(t,r){var n;this==e.keyMap.vim&&(e.rmClass(t.getWrapperElement(),"cm-fat-cursor"),"contenteditable"==t.getOption("inputStyle")&&null!=document.body.style.caretColor&&(function(e){var t=e.state.fatCursorMarks;if(t)for(var r=0;r<t.length;r++)t[r].clear();e.state.fatCursorMarks=null,e.off("cursorActivity",s)}(t),t.getInputField().style.caretColor="")),r&&r.attach==i||((n=t).setOption("disableInput",!1),n.off("cursorActivity",qe),e.off(n.getInputField(),"paste",h(n)),n.state.vim=null)}function i(t,r){var n,o;this==e.keyMap.vim&&(e.addClass(t.getWrapperElement(),"cm-fat-cursor"),"contenteditable"==t.getOption("inputStyle")&&null!=document.body.style.caretColor&&((n=t).state.fatCursorMarks=a(n),n.on("cursorActivity",s),t.getInputField().style.caretColor="transparent")),r&&r.attach==i||((o=t).setOption("disableInput",!0),o.setOption("showCursorWhenSelecting",!1),e.signal(o,"vim-mode-change",{mode:"normal"}),o.on("cursorActivity",qe),P(o),e.on(o.getInputField(),"paste",h(o)))}function a(e){for(var t=e.listSelections(),r=[],o=0;o<t.length;o++){var i=t[o];if(i.empty())if(i.anchor.ch<e.getLine(i.anchor.line).length)r.push(e.markText(i.anchor,n(i.anchor.line,i.anchor.ch+1),{className:"cm-fat-cursor-mark"}));else{var a=document.createElement("span");a.textContent=" ",a.className="cm-fat-cursor-mark",r.push(e.setBookmark(i.anchor,{widget:a}))}}return r}function s(e){var t=e.state.fatCursorMarks;if(t)for(var r=0;r<t.length;r++)t[r].clear();e.state.fatCursorMarks=a(e)}function l(t,r){if(r){if(this[t])return this[t];var n=function(e){if("'"==e.charAt(0))return e.charAt(1);var t=e.split(/-(?!$)/),r=t[t.length-1];if(1==t.length&&1==t[0].length)return!1;if(2==t.length&&"Shift"==t[0]&&1==r.length)return!1;for(var n=!1,o=0;o<t.length;o++){var i=t[o];i in c?t[o]=c[i]:n=!0,i in u&&(t[o]=u[i])}return!!n&&(x(r)&&(t[t.length-1]=r.toLowerCase()),"<"+t.join("-")+">")}(t);if(!n)return!1;var o=e.Vim.findKey(r,n);return"function"==typeof o&&e.signal(r,"vim-keypress",n),o}}e.defineOption("vimMode",!1,function(t,r,n){r&&"vim"!=t.getOption("keyMap")?t.setOption("keyMap","vim"):!r&&n!=e.Init&&/^vim/.test(t.getOption("keyMap"))&&t.setOption("keyMap","default")});var c={Shift:"S",Ctrl:"C",Alt:"A",Cmd:"D",Mod:"A"},u={Enter:"CR",Backspace:"BS",Delete:"Del",Insert:"Ins"};function h(e){var t=e.state.vim;return t.onPasteFn||(t.onPasteFn=function(){t.insertMode||(e.setCursor(G(e.getCursor(),0,1)),Q.enterInsertMode(e,{},t))}),t.onPasteFn}var p=/[\d]/,f=[e.isWordChar,function(t){return t&&!e.isWordChar(t)&&!/\s/.test(t)}],d=[function(e){return/\S/.test(e)}];function m(e,t){for(var r=[],n=e;n<e+t;n++)r.push(String.fromCharCode(n));return r}var g=m(65,26),v=m(97,26),y=m(48,10),k=[].concat(g,v,y,["<",">"]),C=[].concat(g,v,y,["-",'"',".",":","/"]);function w(e,t){return t>=e.firstLine()&&t<=e.lastLine()}function M(e){return/^[a-z]$/.test(e)}function x(e){return/^[A-Z]$/.test(e)}function S(e){return/^\s*$/.test(e)}function A(e){return-1!=".?!".indexOf(e)}function b(e,t){for(var r=0;r<t.length;r++)if(t[r]==e)return!0;return!1}var L={};function T(e,t,r,n,o){if(void 0===t&&!o)throw Error("defaultValue is required unless callback is provided");if(r||(r="string"),L[e]={type:r,defaultValue:t,callback:o},n)for(var i=0;i<n.length;i++)L[n[i]]=L[e];t&&R(e,t)}function R(e,t,r,n){var o=L[e],i=(n=n||{}).scope;if(!o)return new Error("Unknown option: "+e);if("boolean"==o.type){if(t&&!0!==t)return new Error("Invalid argument: "+e+"="+t);!1!==t&&(t=!0)}o.callback?("local"!==i&&o.callback(t,void 0),"global"!==i&&r&&o.callback(t,r)):("local"!==i&&(o.value="boolean"==o.type?!!t:t),"global"!==i&&r&&(r.state.vim.options[e]={value:t}))}function E(e,t,r){var n=L[e],o=(r=r||{}).scope;if(!n)return new Error("Unknown option: "+e);if(n.callback){var i=t&&n.callback(void 0,t);return"global"!==o&&void 0!==i?i:"local"!==o?n.callback():void 0}return((i="global"!==o&&t&&t.state.vim.options[e])||"local"!==o&&n||{}).value}T("filetype",void 0,"string",["ft"],function(e,t){if(void 0!==t){if(void 0===e)return"null"==(r=t.getOption("mode"))?"":r;var r=""==e?"null":e;t.setOption("mode",r)}});var O,B,I=function(){var e=100,t=-1,r=0,n=0,o=new Array(e);return{cachedCursor:void 0,add:function(i,a,s){var l=o[t%e];function c(r){var n=++t%e,a=o[n];a&&a.clear(),o[n]=i.setBookmark(r)}if(l){var u=l.find();u&&!te(u,a)&&c(a)}else c(a);c(s),r=t,(n=t-e+1)<0&&(n=0)},move:function(i,a){(t+=a)>r?t=r:t<n&&(t=n);var s=o[(e+t)%e];if(s&&!s.find()){var l,c=a>0?1:-1,u=i.getCursor();do{if((s=o[(e+(t+=c))%e])&&(l=s.find())&&!te(u,l))break}while(t<r&&t>n)}return s}}},K=function(e){return e?{changes:e.changes,expectCursorActivityForChange:e.expectCursorActivityForChange}:{changes:[],expectCursorActivityForChange:!1}};function N(){this.latestRegister=void 0,this.isPlaying=!1,this.isRecording=!1,this.replaySearchQueries=[],this.onRecordingDone=void 0,this.lastInsertModeChanges=K()}function P(e){return e.state.vim||(e.state.vim={inputState:new _,lastEditInputState:void 0,lastEditActionCommand:void 0,lastHPos:-1,lastHSPos:-1,lastMotion:null,marks:{},fakeCursor:null,insertMode:!1,insertModeRepeat:void 0,visualMode:!1,visualLine:!1,visualBlock:!1,lastSelection:null,lastPastedText:null,sel:{},options:{}}),e.state.vim}function j(){for(var e in O={searchQuery:null,searchIsReversed:!1,lastSubstituteReplacePart:void 0,jumpList:I(),macroModeState:new N,lastCharacterSearch:{increment:0,forward:!0,selectedCharacter:""},registerController:new V({}),searchHistoryController:new D,exCommandHistoryController:new D},L){var t=L[e];t.value=t.defaultValue}}N.prototype={exitMacroRecordMode:function(){var e=O.macroModeState;e.onRecordingDone&&e.onRecordingDone(),e.onRecordingDone=void 0,e.isRecording=!1},enterMacroRecordMode:function(e,t){var r=O.registerController.getRegister(t);r&&(r.clear(),this.latestRegister=t,e.openDialog&&(this.onRecordingDone=e.openDialog("(recording)["+t+"]",null,{bottom:!0})),this.isRecording=!0)}};var H={buildKeyMap:function(){},getRegisterController:function(){return O.registerController},resetVimGlobalState_:j,getVimGlobalState_:function(){return O},maybeInitVimState_:P,suppressErrorLogging:!1,InsertModeKey:ze,map:function(e,t,r){Ve.map(e,t,r)},unmap:function(e,t){Ve.unmap(e,t)},setOption:R,getOption:E,defineOption:T,defineEx:function(e,t,r){if(t){if(0!==e.indexOf(t))throw new Error('(Vim.defineEx) "'+t+'" is not a prefix of "'+e+'", command not registered')}else t=e;We[e]=r,Ve.commandMap_[t]={name:e,shortName:t,type:"api"}},handleKey:function(e,t,r){var n=this.findKey(e,t,r);if("function"==typeof n)return n()},findKey:function(r,n,o){var i,a=P(r);function s(){var e=O.macroModeState;if(e.isRecording){if("q"==n)return e.exitMacroRecordMode(),F(r),!0;"mapping"!=o&&function(e,t){if(!e.isPlaying){var r=e.latestRegister,n=O.registerController.getRegister(r);n&&n.pushText(t)}}(e,n)}}function l(){if("<Esc>"==n)return F(r),a.visualMode?fe(r):a.insertMode&&De(r),!0}return!1===(i=a.insertMode?function(){if(l())return!0;for(var e=a.inputState.keyBuffer=a.inputState.keyBuffer+n,o=1==n.length,i=U.matchCommand(e,t,a.inputState,"insert");e.length>1&&"full"!=i.type;){e=a.inputState.keyBuffer=e.slice(1);var s=U.matchCommand(e,t,a.inputState,"insert");"none"!=s.type&&(i=s)}if("none"==i.type)return F(r),!1;if("partial"==i.type)return B&&window.clearTimeout(B),B=window.setTimeout(function(){a.insertMode&&a.inputState.keyBuffer&&F(r)},E("insertModeEscKeysTimeout")),!o;if(B&&window.clearTimeout(B),o){for(var c=r.listSelections(),u=0;u<c.length;u++){var h=c[u].head;r.replaceRange("",G(h,0,-(e.length-1)),h,"+input")}O.macroModeState.lastInsertModeChanges.changes.pop()}return F(r),i.command}():function(){if(s()||l())return!0;var e=a.inputState.keyBuffer=a.inputState.keyBuffer+n;if(/^[1-9]\d*$/.test(e))return!0;if(!(o=/^(\d*)(.*)$/.exec(e)))return F(r),!1;var o,i=a.visualMode?"visual":"normal",c=U.matchCommand(o[2]||o[1],t,a.inputState,i);return"none"==c.type?(F(r),!1):"partial"==c.type||(a.inputState.keyBuffer="",(o=/^(\d*)(.*)$/.exec(e))[1]&&"0"!=o[1]&&a.inputState.pushRepeatDigit(o[1]),c.command)}())?a.insertMode||1!==n.length?void 0:function(){return!0}:!0===i?function(){return!0}:function(){return r.operation(function(){r.curOp.isVimOp=!0;try{"keyToKey"==i.type?function(t){for(var o;t;)o=/<\w+-.+?>|<\w+>|./.exec(t),n=o[0],t=t.substring(o.index+n.length),e.Vim.handleKey(r,n,"mapping")}(i.toKeys):U.processCommand(r,a,i)}catch(t){throw r.state.vim=void 0,P(r),e.Vim.suppressErrorLogging||console.log(t),t}return!0})}},handleEx:function(e,t){Ve.processCommand(e,t)},defineMotion:function(e,t){J[e]=t},defineAction:function(e,t){Q[e]=t},defineOperator:function(e,t){q[e]=t},mapCommand:function(e,t,r,n,o){var i={keys:e,type:t};for(var a in i[t]=r,i[t+"Args"]=n,o)i[a]=o[a];Ue(i)},_mapCommand:Ue,defineRegister:function(e,t){var r=O.registerController.registers;if(!e||1!=e.length)throw Error("Register name must be 1 character");if(r[e])throw Error("Register already defined "+e);r[e]=t,C.push(e)},exitVisualMode:fe,exitInsertMode:De};function _(){this.prefixRepeat=[],this.motionRepeat=[],this.operator=null,this.operatorArgs=null,this.motion=null,this.motionArgs=null,this.keyBuffer=[],this.registerName=null}function F(t,r){t.state.vim.inputState=new _,e.signal(t,"vim-command-done",r)}function W(e,t,r){this.clear(),this.keyBuffer=[e||""],this.insertModeChanges=[],this.searchQueries=[],this.linewise=!!t,this.blockwise=!!r}function V(e){this.registers=e,this.unnamedRegister=e['"']=new W,e["."]=new W,e[":"]=new W,e["/"]=new W}function D(){this.historyBuffer=[],this.iterator=0,this.initialPrefix=null}_.prototype.pushRepeatDigit=function(e){this.operator?this.motionRepeat=this.motionRepeat.concat(e):this.prefixRepeat=this.prefixRepeat.concat(e)},_.prototype.getRepeat=function(){var e=0;return(this.prefixRepeat.length>0||this.motionRepeat.length>0)&&(e=1,this.prefixRepeat.length>0&&(e*=parseInt(this.prefixRepeat.join(""),10)),this.motionRepeat.length>0&&(e*=parseInt(this.motionRepeat.join(""),10))),e},W.prototype={setText:function(e,t,r){this.keyBuffer=[e||""],this.linewise=!!t,this.blockwise=!!r},pushText:function(e,t){t&&(this.linewise||this.keyBuffer.push("\n"),this.linewise=!0),this.keyBuffer.push(e)},pushInsertModeChanges:function(e){this.insertModeChanges.push(K(e))},pushSearchQuery:function(e){this.searchQueries.push(e)},clear:function(){this.keyBuffer=[],this.insertModeChanges=[],this.searchQueries=[],this.linewise=!1},toString:function(){return this.keyBuffer.join("")}},V.prototype={pushText:function(e,t,r,n,o){n&&"\n"!==r.charAt(r.length-1)&&(r+="\n");var i=this.isValidRegister(e)?this.getRegister(e):null;if(i)x(e)?i.pushText(r,n):i.setText(r,n,o),this.unnamedRegister.setText(i.toString(),n);else{switch(t){case"yank":this.registers[0]=new W(r,n,o);break;case"delete":case"change":-1==r.indexOf("\n")?this.registers["-"]=new W(r,n):(this.shiftNumericRegisters_(),this.registers[1]=new W(r,n))}this.unnamedRegister.setText(r,n,o)}},getRegister:function(e){return this.isValidRegister(e)?(e=e.toLowerCase(),this.registers[e]||(this.registers[e]=new W),this.registers[e]):this.unnamedRegister},isValidRegister:function(e){return e&&b(e,C)},shiftNumericRegisters_:function(){for(var e=9;e>=2;e--)this.registers[e]=this.getRegister(""+(e-1))}},D.prototype={nextMatch:function(e,t){var r=this.historyBuffer,n=t?-1:1;null===this.initialPrefix&&(this.initialPrefix=e);for(var o=this.iterator+n;t?o>=0:o<r.length;o+=n)for(var i=r[o],a=0;a<=i.length;a++)if(this.initialPrefix==i.substring(0,a))return this.iterator=o,i;return o>=r.length?(this.iterator=r.length,this.initialPrefix):o<0?e:void 0},pushInput:function(e){var t=this.historyBuffer.indexOf(e);t>-1&&this.historyBuffer.splice(t,1),e.length&&this.historyBuffer.push(e)},reset:function(){this.initialPrefix=null,this.iterator=this.historyBuffer.length}};var U={matchCommand:function(e,t,r,n){var o,i=function(e,t,r,n){for(var o,i=[],a=[],s=0;s<t.length;s++){var l=t[s];"insert"==r&&"insert"!=l.context||l.context&&l.context!=r||n.operator&&"action"==l.type||!(o=X(e,l.keys))||("partial"==o&&i.push(l),"full"==o&&a.push(l))}return{partial:i.length&&i,full:a.length&&a}}(e,t,n,r);if(!i.full&&!i.partial)return{type:"none"};if(!i.full&&i.partial)return{type:"partial"};for(var a=0;a<i.full.length;a++){var s=i.full[a];o||(o=s)}if("<character>"==o.keys.slice(-11)){var l=function(e){var t=/^.*(<[^>]+>)$/.exec(e),r=t?t[1]:e.slice(-1);if(r.length>1)switch(r){case"<CR>":r="\n";break;case"<Space>":r=" ";break;default:r=""}return r}(e);if(!l)return{type:"none"};r.selectedCharacter=l}return{type:"full",command:o}},processCommand:function(e,t,r){switch(t.inputState.repeatOverride=r.repeatOverride,r.type){case"motion":this.processMotion(e,t,r);break;case"operator":this.processOperator(e,t,r);break;case"operatorMotion":this.processOperatorMotion(e,t,r);break;case"action":this.processAction(e,t,r);break;case"search":this.processSearch(e,t,r);break;case"ex":case"keyToEx":this.processEx(e,t,r)}},processMotion:function(e,t,r){t.inputState.motion=r.motion,t.inputState.motionArgs=Z(r.motionArgs),this.evalInput(e,t)},processOperator:function(e,t,r){var n=t.inputState;if(n.operator){if(n.operator==r.operator)return n.motion="expandToLine",n.motionArgs={linewise:!0},void this.evalInput(e,t);F(e)}n.operator=r.operator,n.operatorArgs=Z(r.operatorArgs),t.visualMode&&this.evalInput(e,t)},processOperatorMotion:function(e,t,r){var n=t.visualMode,o=Z(r.operatorMotionArgs);o&&n&&o.visualLine&&(t.visualLine=!0),this.processOperator(e,t,r),n||this.processMotion(e,t,r)},processAction:function(e,t,r){var n=t.inputState,o=n.getRepeat(),i=!!o,a=Z(r.actionArgs)||{};n.selectedCharacter&&(a.selectedCharacter=n.selectedCharacter),r.operator&&this.processOperator(e,t,r),r.motion&&this.processMotion(e,t,r),(r.motion||r.operator)&&this.evalInput(e,t),a.repeat=o||1,a.repeatIsExplicit=i,a.registerName=n.registerName,F(e),t.lastMotion=null,r.isEdit&&this.recordLastEdit(t,n,r),Q[r.action](e,a,t)},processSearch:function(t,r,n){if(t.getSearchCursor){var o=n.searchArgs.forward,i=n.searchArgs.wholeWordOnly;Ae(t).setReversed(!o);var a=o?"/":"?",s=Ae(t).getQuery(),l=t.getScrollInfo();switch(n.searchArgs.querySrc){case"prompt":var c=O.macroModeState;c.isPlaying?f(p=c.replaySearchQueries.shift(),!0,!1):Ie(t,{onClose:function(e){t.scrollTo(l.left,l.top),f(e,!0,!0);var r=O.macroModeState;r.isRecording&&function(e,t){if(!e.isPlaying){var r=e.latestRegister,n=O.registerController.getRegister(r);n&&n.pushSearchQuery&&n.pushSearchQuery(t)}}(r,e)},prefix:a,desc:Be,onKeyUp:function(r,n,i){var a,s,c,u=e.keyName(r);"Up"==u||"Down"==u?(a="Up"==u,s=r.target?r.target.selectionEnd:0,i(n=O.searchHistoryController.nextMatch(n,a)||""),s&&r.target&&(r.target.selectionEnd=r.target.selectionStart=Math.min(s,r.target.value.length))):"Left"!=u&&"Right"!=u&&"Ctrl"!=u&&"Alt"!=u&&"Shift"!=u&&O.searchHistoryController.reset();try{c=Ke(t,n,!0,!0)}catch(r){}c?t.scrollIntoView(Pe(t,!o,c),30):(je(t),t.scrollTo(l.left,l.top))},onKeyDown:function(r,n,o){var i=e.keyName(r);"Esc"==i||"Ctrl-C"==i||"Ctrl-["==i||"Backspace"==i&&""==n?(O.searchHistoryController.pushInput(n),O.searchHistoryController.reset(),Ke(t,s),je(t),t.scrollTo(l.left,l.top),e.e_stop(r),F(t),o(),t.focus()):"Up"==i||"Down"==i?e.e_stop(r):"Ctrl-U"==i&&(e.e_stop(r),o(""))}});break;case"wordUnderCursor":var u=me(t,!1,0,!1,!0),h=!0;if(u||(u=me(t,!1,0,!1,!1),h=!1),!u)return;var p=t.getLine(u.start.line).substring(u.start.ch,u.end.ch);p=h&&i?"\\b"+p+"\\b":p.replace(/([.?*+$\[\]\/\\(){}|\-])/g,"\\$1"),O.jumpList.cachedCursor=t.getCursor(),t.setCursor(u.start),f(p,!0,!1)}}function f(e,o,i){O.searchHistoryController.pushInput(e),O.searchHistoryController.reset();try{Ke(t,e,o,i)}catch(r){return Oe(t,"Invalid regex: "+e),void F(t)}U.processMotion(t,r,{type:"motion",motion:"findNext",motionArgs:{forward:!0,toJumplist:n.searchArgs.toJumplist}})}},processEx:function(t,r,n){function o(e){O.exCommandHistoryController.pushInput(e),O.exCommandHistoryController.reset(),Ve.processCommand(t,e)}function i(r,n,o){var i,a,s=e.keyName(r);("Esc"==s||"Ctrl-C"==s||"Ctrl-["==s||"Backspace"==s&&""==n)&&(O.exCommandHistoryController.pushInput(n),O.exCommandHistoryController.reset(),e.e_stop(r),F(t),o(),t.focus()),"Up"==s||"Down"==s?(e.e_stop(r),i="Up"==s,a=r.target?r.target.selectionEnd:0,o(n=O.exCommandHistoryController.nextMatch(n,i)||""),a&&r.target&&(r.target.selectionEnd=r.target.selectionStart=Math.min(a,r.target.value.length))):"Ctrl-U"==s?(e.e_stop(r),o("")):"Left"!=s&&"Right"!=s&&"Ctrl"!=s&&"Alt"!=s&&"Shift"!=s&&O.exCommandHistoryController.reset()}"keyToEx"==n.type?Ve.processCommand(t,n.exArgs.input):r.visualMode?Ie(t,{onClose:o,prefix:":",value:"'<,'>",onKeyDown:i,selectValueOnOpen:!1}):Ie(t,{onClose:o,prefix:":",onKeyDown:i})},evalInput:function(e,t){var r,o,i,a,s=t.inputState,l=s.motion,c=s.motionArgs||{},u=s.operator,h=s.operatorArgs||{},p=s.registerName,f=t.sel,d=ee(t.visualMode?z(e,f.head):e.getCursor("head")),m=ee(t.visualMode?z(e,f.anchor):e.getCursor("anchor")),g=ee(d),v=ee(m);if(u&&this.recordLastEdit(t,s),(i=void 0!==s.repeatOverride?s.repeatOverride:s.getRepeat())>0&&c.explicitRepeat?c.repeatIsExplicit=!0:(c.noRepeat||!c.explicitRepeat&&0===i)&&(i=1,c.repeatIsExplicit=!1),s.selectedCharacter&&(c.selectedCharacter=h.selectedCharacter=s.selectedCharacter),c.repeat=i,F(e),l){var y=J[l](e,d,c,t);if(t.lastMotion=J[l],!y)return;if(c.toJumplist){var k=O.jumpList,C=k.cachedCursor;C?(ge(e,C,y),delete k.cachedCursor):ge(e,d,y)}y instanceof Array?(o=y[0],r=y[1]):r=y,r||(r=ee(d)),t.visualMode?(t.visualBlock&&r.ch===1/0||(r=z(e,r,t.visualBlock)),o&&(o=z(e,o,!0)),o=o||v,f.anchor=o,f.head=r,he(e),Me(e,t,"<",re(o,r)?o:r),Me(e,t,">",re(o,r)?r:o)):u||(r=z(e,r),e.setCursor(r.line,r.ch))}if(u){if(h.lastSel){o=v;var w=h.lastSel,M=Math.abs(w.head.line-w.anchor.line),x=Math.abs(w.head.ch-w.anchor.ch);r=w.visualLine?n(v.line+M,v.ch):w.visualBlock?n(v.line+M,v.ch+x):w.head.line==w.anchor.line?n(v.line,v.ch+x):n(v.line+M,v.ch),t.visualMode=!0,t.visualLine=w.visualLine,t.visualBlock=w.visualBlock,f=t.sel={anchor:o,head:r},he(e)}else t.visualMode&&(h.lastSel={anchor:ee(f.anchor),head:ee(f.head),visualBlock:t.visualBlock,visualLine:t.visualLine});var A,b,L,T,R;if(t.visualMode){if(A=ne(f.head,f.anchor),b=oe(f.head,f.anchor),L=t.visualLine||h.linewise,R=pe(e,{anchor:A,head:b},T=t.visualBlock?"block":L?"line":"char"),L){var E=R.ranges;if("block"==T)for(var B=0;B<E.length;B++)E[B].head.ch=ae(e,E[B].head.line);else"line"==T&&(E[0].head=n(E[0].head.line+1,0))}}else{if(A=ee(o||v),re(b=ee(r||g),A)){var I=A;A=b,b=I}(L=c.linewise||h.linewise)?(a=b,A.ch=0,a.ch=0,a.line++):c.forward&&function(e,t,r){var n=e.getRange(t,r);if(/\n\s*$/.test(n)){var o=n.split("\n");o.pop();for(var i=o.pop();o.length>0&&i&&S(i);i=o.pop())r.line--,r.ch=0;i?(r.line--,r.ch=ae(e,r.line)):r.ch=0}}(e,A,b),R=pe(e,{anchor:A,head:b},T="char",!c.inclusive||L)}e.setSelections(R.ranges,R.primary),t.lastMotion=null,h.repeat=i,h.registerName=p,h.linewise=L;var K=q[u](e,h,R.ranges,v,r);t.visualMode&&fe(e,null!=K),K&&e.setCursor(K)}},recordLastEdit:function(e,t,r){var n=O.macroModeState;n.isPlaying||(e.lastEditInputState=t,e.lastEditActionCommand=r,n.lastInsertModeChanges.changes=[],n.lastInsertModeChanges.expectCursorActivityForChange=!1)}},J={moveToTopLine:function(e,t,r){var o=He(e).top+r.repeat-1;return n(o,de(e.getLine(o)))},moveToMiddleLine:function(e){var t=He(e),r=Math.floor(.5*(t.top+t.bottom));return n(r,de(e.getLine(r)))},moveToBottomLine:function(e,t,r){var o=He(e).bottom-r.repeat+1;return n(o,de(e.getLine(o)))},expandToLine:function(e,t,r){return n(t.line+r.repeat-1,1/0)},findNext:function(e,t,r){var n=Ae(e),o=n.getQuery();if(o){var i=!r.forward;return i=n.isReversed()?!i:i,Ne(e,o),Pe(e,i,o,r.repeat)}},goToMark:function(e,t,r,n){var o=_e(e,n,r.selectedCharacter);return o?r.linewise?{line:o.line,ch:de(e.getLine(o.line))}:o:null},moveToOtherHighlightedEnd:function(e,t,r,o){if(o.visualBlock&&r.sameLine){var i=o.sel;return[z(e,n(i.anchor.line,i.head.ch)),z(e,n(i.head.line,i.anchor.ch))]}return[o.sel.head,o.sel.anchor]},jumpToMark:function(e,t,r,o){for(var i=t,a=0;a<r.repeat;a++){var s=i;for(var l in o.marks)if(M(l)){var c=o.marks[l].find();if(!((r.forward?re(c,s):re(s,c))||r.linewise&&c.line==s.line)){var u=te(s,i),h=r.forward?ie(s,c,i):ie(i,c,s);(u||h)&&(i=c)}}}return r.linewise&&(i=n(i.line,de(e.getLine(i.line)))),i},moveByCharacters:function(e,t,r){var o=t,i=r.repeat,a=r.forward?o.ch+i:o.ch-i;return n(o.line,a)},moveByLines:function(e,t,r,o){var i=t,a=i.ch;switch(o.lastMotion){case this.moveByLines:case this.moveByDisplayLines:case this.moveByScroll:case this.moveToColumn:case this.moveToEol:a=o.lastHPos;break;default:o.lastHPos=a}var s=r.repeat+(r.repeatOffset||0),l=r.forward?i.line+s:i.line-s,c=e.firstLine(),u=e.lastLine();return l<c&&i.line==c?this.moveToStartOfLine(e,t,r,o):l>u&&i.line==u?this.moveToEol(e,t,r,o):(r.toFirstChar&&(a=de(e.getLine(l)),o.lastHPos=a),o.lastHSPos=e.charCoords(n(l,a),"div").left,n(l,a))},moveByDisplayLines:function(e,t,r,o){var i=t;switch(o.lastMotion){case this.moveByDisplayLines:case this.moveByScroll:case this.moveByLines:case this.moveToColumn:case this.moveToEol:break;default:o.lastHSPos=e.charCoords(i,"div").left}var a=r.repeat;if((l=e.findPosV(i,r.forward?a:-a,"line",o.lastHSPos)).hitSide)if(r.forward)var s={top:e.charCoords(l,"div").top+8,left:o.lastHSPos},l=e.coordsChar(s,"div");else{var c=e.charCoords(n(e.firstLine(),0),"div");c.left=o.lastHSPos,l=e.coordsChar(c,"div")}return o.lastHPos=l.ch,l},moveByPage:function(e,t,r){var n=t,o=r.repeat;return e.findPosV(n,r.forward?o:-o,"page")},moveByParagraph:function(e,t,r){var n=r.forward?1:-1;return xe(e,t,r.repeat,n)},moveBySentence:function(e,t,r){var o=r.forward?1:-1;return function(e,t,r,o){function i(e,t){if(t.pos+t.dir<0||t.pos+t.dir>=t.line.length){if(t.ln+=t.dir,!w(e,t.ln))return t.line=null,t.ln=null,void(t.pos=null);t.line=e.getLine(t.ln),t.pos=t.dir>0?0:t.line.length-1}else t.pos+=t.dir}function a(e,t,r,n){var o=e.getLine(t),a=""===o,s={line:o,ln:t,pos:r,dir:n},l={ln:s.ln,pos:s.pos},c=""===s.line;for(i(e,s);null!==s.line;){if(l.ln=s.ln,l.pos=s.pos,""===s.line&&!c)return{ln:s.ln,pos:s.pos};if(a&&""!==s.line&&!S(s.line[s.pos]))return{ln:s.ln,pos:s.pos};!A(s.line[s.pos])||a||s.pos!==s.line.length-1&&!S(s.line[s.pos+1])||(a=!0),i(e,s)}var o=e.getLine(l.ln);l.pos=0;for(var u=o.length-1;u>=0;--u)if(!S(o[u])){l.pos=u;break}return l}function s(e,t,r,n){var o=e.getLine(t),a={line:o,ln:t,pos:r,dir:n},s={ln:a.ln,pos:null},l=""===a.line;for(i(e,a);null!==a.line;){if(""===a.line&&!l)return null!==s.pos?s:{ln:a.ln,pos:a.pos};if(A(a.line[a.pos])&&null!==s.pos&&(a.ln!==s.ln||a.pos+1!==s.pos))return s;""===a.line||S(a.line[a.pos])||(l=!1,s={ln:a.ln,pos:a.pos}),i(e,a)}var o=e.getLine(s.ln);s.pos=0;for(var c=0;c<o.length;++c)if(!S(o[c])){s.pos=c;break}return s}for(var l={ln:t.line,pos:t.ch};r>0;)l=o<0?s(e,l.ln,l.pos,o):a(e,l.ln,l.pos,o),r--;return n(l.ln,l.pos)}(e,t,r.repeat,o)},moveByScroll:function(e,t,r,n){var o=e.getScrollInfo(),i=null,a=r.repeat;a||(a=o.clientHeight/(2*e.defaultTextHeight()));var s=e.charCoords(t,"local");if(r.repeat=a,!(i=J.moveByDisplayLines(e,t,r,n)))return null;var l=e.charCoords(i,"local");return e.scrollTo(null,o.top+l.top-s.top),i},moveByWords:function(e,t,r){return function(e,t,r,o,i,a){var s=ee(t),l=[];(o&&!i||!o&&i)&&r++;for(var c=!(o&&i),u=0;u<r;u++){var h=Ce(e,t,o,a,c);if(!h){var p=ae(e,e.lastLine());l.push(o?{line:e.lastLine(),from:p,to:p}:{line:0,from:0,to:0});break}l.push(h),t=n(h.line,o?h.to-1:h.from)}var f=l.length!=r,d=l[0],m=l.pop();return o&&!i?(f||d.from==s.ch&&d.line==s.line||(m=l.pop()),n(m.line,m.from)):o&&i?n(m.line,m.to-1):!o&&i?(f||d.to==s.ch&&d.line==s.line||(m=l.pop()),n(m.line,m.to)):n(m.line,m.from)}(e,t,r.repeat,!!r.forward,!!r.wordEnd,!!r.bigWord)},moveTillCharacter:function(e,t,r){var n=we(e,r.repeat,r.forward,r.selectedCharacter),o=r.forward?-1:1;return ve(o,r),n?(n.ch+=o,n):null},moveToCharacter:function(e,t,r){var n=r.repeat;return ve(0,r),we(e,n,r.forward,r.selectedCharacter)||t},moveToSymbol:function(e,t,r){return function(e,t,r,o){var i=ee(e.getCursor()),a=r?1:-1,s=r?e.lineCount():-1,l=i.ch,c=i.line,u=e.getLine(c),h={lineText:u,nextCh:u.charAt(l),lastCh:null,index:l,symb:o,reverseSymb:(r?{")":"(","}":"{"}:{"(":")","{":"}"})[o],forward:r,depth:0,curMoveThrough:!1},p=ye[o];if(!p)return i;var f=ke[p].init,d=ke[p].isComplete;for(f&&f(h);c!==s&&t;){if(h.index+=a,h.nextCh=h.lineText.charAt(h.index),!h.nextCh){if(c+=a,h.lineText=e.getLine(c)||"",a>0)h.index=0;else{var m=h.lineText.length;h.index=m>0?m-1:0}h.nextCh=h.lineText.charAt(h.index)}d(h)&&(i.line=c,i.ch=h.index,t--)}return h.nextCh||h.curMoveThrough?n(c,h.index):i}(e,r.repeat,r.forward,r.selectedCharacter)||t},moveToColumn:function(e,t,r,o){var i,a,s,l=r.repeat;return o.lastHPos=l-1,o.lastHSPos=e.charCoords(t,"div").left,a=l,s=(i=e).getCursor().line,z(i,n(s,a-1))},moveToEol:function(e,t,r,o){var i=t;o.lastHPos=1/0;var a=n(i.line+r.repeat-1,1/0),s=e.clipPos(a);return s.ch--,o.lastHSPos=e.charCoords(s,"div").left,a},moveToFirstNonWhiteSpaceCharacter:function(e,t){var r=t;return n(r.line,de(e.getLine(r.line)))},moveToMatchedSymbol:function(e,t){for(var r,o=t,i=o.line,a=o.ch,s=e.getLine(i);a<s.length;a++)if((r=s.charAt(a))&&-1!="()[]{}".indexOf(r)){var l=e.getTokenTypeAt(n(i,a+1));if("string"!==l&&"comment"!==l)break}return a<s.length?e.findMatchingBracket(n(i,a)).to:o},moveToStartOfLine:function(e,t){return n(t.line,0)},moveToLineOrEdgeOfDocument:function(e,t,r){var o=r.forward?e.lastLine():e.firstLine();return r.repeatIsExplicit&&(o=r.repeat-e.getOption("firstLineNumber")),n(o,de(e.getLine(o)))},textObjectManipulation:function(e,t,r,o){var i=r.selectedCharacter;"b"==i?i="(":"B"==i&&(i="{");var a,s,l,c,u,h,p,f,d=!r.textObjectInner;if({"(":")",")":"(","{":"}","}":"{","[":"]","]":"["}[i])a=function(e,t,r,o){var i,a,s=t,l={"(":/[()]/,")":/[()]/,"[":/[[\]]/,"]":/[[\]]/,"{":/[{}]/,"}":/[{}]/}[r],c={"(":"(",")":"(","[":"[","]":"[","{":"{","}":"{"}[r],u=e.getLine(s.line).charAt(s.ch)===c?1:0;if(i=e.scanForBracket(n(s.line,s.ch+u),-1,void 0,{bracketRegex:l}),a=e.scanForBracket(n(s.line,s.ch+u),1,void 0,{bracketRegex:l}),!i||!a)return{start:s,end:s};if(i=i.pos,a=a.pos,i.line==a.line&&i.ch>a.ch||i.line>a.line){var h=i;i=a,a=h}return o?a.ch+=1:i.ch+=1,{start:i,end:a}}(e,t,i,d);else if({"'":!0,'"':!0}[i])a=function(e,t,r,o){var i,a,s,l,c=ee(t),u=e.getLine(c.line).split(""),h=u.indexOf(r);if(c.ch<h?c.ch=h:h<c.ch&&u[c.ch]==r&&(a=c.ch,--c.ch),u[c.ch]!=r||a)for(s=c.ch;s>-1&&!i;s--)u[s]==r&&(i=s+1);else i=c.ch+1;if(i&&!a)for(s=i,l=u.length;s<l&&!a;s++)u[s]==r&&(a=s);return i&&a?(o&&(--i,++a),{start:n(c.line,i),end:n(c.line,a)}):{start:c,end:c}}(e,t,i,d);else if("W"===i)a=me(e,d,0,!0);else if("w"===i)a=me(e,d,0,!1);else{if("p"!==i)return null;if(a=xe(e,t,r.repeat,0,d),r.linewise=!0,o.visualMode)o.visualLine||(o.visualLine=!0);else{var m=o.inputState.operatorArgs;m&&(m.linewise=!0),a.end.line--}}return e.state.vim.visualMode?(s=e,l=a.start,c=a.end,h=s.state.vim.sel,p=h.head,f=h.anchor,re(c,l)&&(u=c,c=l,l=u),re(p,f)?(p=ne(l,p),f=oe(f,c)):(f=ne(l,f),-1==(p=G(p=oe(p,c),0,-1)).ch&&p.line!=s.firstLine()&&(p=n(p.line-1,ae(s,p.line-1)))),[f,p]):[a.start,a.end]},repeatLastCharacterSearch:function(e,t,r){var n=O.lastCharacterSearch,o=r.repeat,i=r.forward===n.forward,a=(n.increment?1:0)*(i?-1:1);e.moveH(-a,"char"),r.inclusive=!!i;var s=we(e,o,i,n.selectedCharacter);return s?(s.ch+=a,s):(e.moveH(a,"char"),t)}};function $(e,t){for(var r=[],n=0;n<t;n++)r.push(e);return r}var q={change:function(t,r,o){var i,a,s=t.state.vim;if(O.macroModeState.lastInsertModeChanges.inVisualBlock=s.visualBlock,s.visualMode){a=t.getSelection();var l=$("",o.length);t.replaceSelections(l),i=ne(o[0].head,o[0].anchor)}else{var c=o[0].anchor,u=o[0].head;a=t.getRange(c,u);var h=s.lastEditInputState||{};if("moveByWords"==h.motion&&!S(a)){var p=/\s+$/.exec(a);p&&h.motionArgs&&h.motionArgs.forward&&(u=G(u,0,-p[0].length),a=a.slice(0,-p[0].length))}var f=new n(c.line-1,Number.MAX_VALUE),d=t.firstLine()==t.lastLine();u.line>t.lastLine()&&r.linewise&&!d?t.replaceRange("",f,u):t.replaceRange("",c,u),r.linewise&&(d||(t.setCursor(f),e.commands.newlineAndIndent(t)),c.ch=Number.MAX_VALUE),i=c}O.registerController.pushText(r.registerName,"change",a,r.linewise,o.length>1),Q.enterInsertMode(t,{head:i},t.state.vim)},delete:function(e,t,r){var o,i,a=e.state.vim;if(a.visualBlock){i=e.getSelection();var s=$("",r.length);e.replaceSelections(s),o=r[0].anchor}else{var l=r[0].anchor,c=r[0].head;t.linewise&&c.line!=e.firstLine()&&l.line==e.lastLine()&&l.line==c.line-1&&(l.line==e.firstLine()?l.ch=0:l=n(l.line-1,ae(e,l.line-1))),i=e.getRange(l,c),e.replaceRange("",l,c),o=l,t.linewise&&(o=J.moveToFirstNonWhiteSpaceCharacter(e,l))}return O.registerController.pushText(t.registerName,"delete",i,t.linewise,a.visualBlock),z(e,o,a.insertMode)},indent:function(e,t,r){var n=e.state.vim,o=r[0].anchor.line,i=n.visualBlock?r[r.length-1].anchor.line:r[0].head.line,a=n.visualMode?t.repeat:1;t.linewise&&i--;for(var s=o;s<=i;s++)for(var l=0;l<a;l++)e.indentLine(s,t.indentRight);return J.moveToFirstNonWhiteSpaceCharacter(e,r[0].anchor)},changeCase:function(e,t,r,n,o){for(var i=e.getSelections(),a=[],s=t.toLower,l=0;l<i.length;l++){var c=i[l],u="";if(!0===s)u=c.toLowerCase();else if(!1===s)u=c.toUpperCase();else for(var h=0;h<c.length;h++){var p=c.charAt(h);u+=x(p)?p.toLowerCase():p.toUpperCase()}a.push(u)}return e.replaceSelections(a),t.shouldMoveCursor?o:!e.state.vim.visualMode&&t.linewise&&r[0].anchor.line+1==r[0].head.line?J.moveToFirstNonWhiteSpaceCharacter(e,n):t.linewise?n:ne(r[0].anchor,r[0].head)},yank:function(e,t,r,n){var o=e.state.vim,i=e.getSelection(),a=o.visualMode?ne(o.sel.anchor,o.sel.head,r[0].head,r[0].anchor):n;return O.registerController.pushText(t.registerName,"yank",i,t.linewise,o.visualBlock),a}};var Q={jumpListWalk:function(e,t,r){if(!r.visualMode){var n=t.repeat,o=t.forward,i=O.jumpList.move(e,o?n:-n),a=i?i.find():void 0;a=a||e.getCursor(),e.setCursor(a)}},scroll:function(e,t,r){if(!r.visualMode){var n=t.repeat||1,o=e.defaultTextHeight(),i=e.getScrollInfo().top,a=o*n,s=t.forward?i+a:i-a,l=ee(e.getCursor()),c=e.charCoords(l,"local");if(t.forward)s>c.top?(l.line+=(s-c.top)/o,l.line=Math.ceil(l.line),e.setCursor(l),c=e.charCoords(l,"local"),e.scrollTo(null,c.top)):e.scrollTo(null,s);else{var u=s+e.getScrollInfo().clientHeight;u<c.bottom?(l.line-=(c.bottom-u)/o,l.line=Math.floor(l.line),e.setCursor(l),c=e.charCoords(l,"local"),e.scrollTo(null,c.bottom-e.getScrollInfo().clientHeight)):e.scrollTo(null,s)}}},scrollToCursor:function(e,t){var r=e.getCursor().line,o=e.charCoords(n(r,0),"local"),i=e.getScrollInfo().clientHeight,a=o.top,s=o.bottom-a;switch(t.position){case"center":a=a-i/2+s;break;case"bottom":a=a-i+s}e.scrollTo(null,a)},replayMacro:function(e,t,r){var n=t.selectedCharacter,o=t.repeat,i=O.macroModeState;for("@"==n&&(n=i.latestRegister);o--;)Je(e,r,i,n)},enterMacroRecordMode:function(e,t){var r=O.macroModeState,n=t.selectedCharacter;O.registerController.isValidRegister(n)&&r.enterMacroRecordMode(e,n)},toggleOverwrite:function(t){t.state.overwrite?(t.toggleOverwrite(!1),t.setOption("keyMap","vim-insert"),e.signal(t,"vim-mode-change",{mode:"insert"})):(t.toggleOverwrite(!0),t.setOption("keyMap","vim-replace"),e.signal(t,"vim-mode-change",{mode:"replace"}))},enterInsertMode:function(t,r,o){if(!t.getOption("readOnly")){o.insertMode=!0,o.insertModeRepeat=r&&r.repeat||1;var i=r?r.insertAt:null,a=o.sel,s=r.head||t.getCursor("head"),l=t.listSelections().length;if("eol"==i)s=n(s.line,ae(t,s.line));else if("charAfter"==i)s=G(s,0,1);else if("firstNonBlank"==i)s=J.moveToFirstNonWhiteSpaceCharacter(t,s);else if("startOfSelectedArea"==i)o.visualBlock?(s=n(Math.min(a.head.line,a.anchor.line),Math.min(a.head.ch,a.anchor.ch)),l=Math.abs(a.head.line-a.anchor.line)+1):s=a.head.line<a.anchor.line?a.head:n(a.anchor.line,0);else if("endOfSelectedArea"==i)o.visualBlock?(s=n(Math.min(a.head.line,a.anchor.line),Math.max(a.head.ch+1,a.anchor.ch)),l=Math.abs(a.head.line-a.anchor.line)+1):s=a.head.line>=a.anchor.line?G(a.head,0,1):n(a.anchor.line,0);else if("inplace"==i&&o.visualMode)return;t.setOption("disableInput",!1),r&&r.replace?(t.toggleOverwrite(!0),t.setOption("keyMap","vim-replace"),e.signal(t,"vim-mode-change",{mode:"replace"})):(t.toggleOverwrite(!1),t.setOption("keyMap","vim-insert"),e.signal(t,"vim-mode-change",{mode:"insert"})),O.macroModeState.isPlaying||(t.on("change",$e),e.on(t.getInputField(),"keydown",Ze)),o.visualMode&&fe(t),ce(t,s,l)}},toggleVisualMode:function(t,r,o){var i,a=r.repeat,s=t.getCursor();o.visualMode?o.visualLine^r.linewise||o.visualBlock^r.blockwise?(o.visualLine=!!r.linewise,o.visualBlock=!!r.blockwise,e.signal(t,"vim-mode-change",{mode:"visual",subMode:o.visualLine?"linewise":o.visualBlock?"blockwise":""}),he(t)):fe(t):(o.visualMode=!0,o.visualLine=!!r.linewise,o.visualBlock=!!r.blockwise,i=z(t,n(s.line,s.ch+a-1),!0),o.sel={anchor:s,head:i},e.signal(t,"vim-mode-change",{mode:"visual",subMode:o.visualLine?"linewise":o.visualBlock?"blockwise":""}),he(t),Me(t,o,"<",ne(s,i)),Me(t,o,">",oe(s,i)))},reselectLastSelection:function(t,r,n){var o=n.lastSelection;if(n.visualMode&&ue(t,n),o){var i=o.anchorMark.find(),a=o.headMark.find();if(!i||!a)return;n.sel={anchor:i,head:a},n.visualMode=!0,n.visualLine=o.visualLine,n.visualBlock=o.visualBlock,he(t),Me(t,n,"<",ne(i,a)),Me(t,n,">",oe(i,a)),e.signal(t,"vim-mode-change",{mode:"visual",subMode:n.visualLine?"linewise":n.visualBlock?"blockwise":""})}},joinLines:function(e,t,r){var o,i;if(r.visualMode){if(o=e.getCursor("anchor"),re(i=e.getCursor("head"),o)){var a=i;i=o,o=a}i.ch=ae(e,i.line)-1}else{var s=Math.max(t.repeat,2);o=e.getCursor(),i=z(e,n(o.line+s-1,1/0))}for(var l=0,c=o.line;c<i.line;c++){l=ae(e,o.line),a=n(o.line+1,ae(e,o.line+1));var u=e.getRange(o,a);u=u.replace(/\n\s*/g," "),e.replaceRange(u,o,a)}var h=n(o.line,l);r.visualMode&&fe(e,!1),e.setCursor(h)},newLineAndEnterInsertMode:function(t,r,o){o.insertMode=!0;var i=ee(t.getCursor());i.line!==t.firstLine()||r.after?(i.line=r.after?i.line:i.line-1,i.ch=ae(t,i.line),t.setCursor(i),(e.commands.newlineAndIndentContinueComment||e.commands.newlineAndIndent)(t)):(t.replaceRange("\n",n(t.firstLine(),0)),t.setCursor(t.firstLine(),0)),this.enterInsertMode(t,{repeat:r.repeat},o)},paste:function(e,t,r){var o,i,a,s,l,c=ee(e.getCursor()),u=O.registerController.getRegister(t.registerName);if(y=u.toString()){if(t.matchIndent){var h=e.getOption("tabSize"),p=function(e){var t=e.split("\t").length-1,r=e.split(" ").length-1;return t*h+1*r},f=e.getLine(e.getCursor().line),d=p(f.match(/^\s*/)[0]),m=y.replace(/\n$/,""),g=y!==m,v=p(y.match(/^\s*/)[0]),y=m.replace(/^\s*/gm,function(t){var r=d+(p(t)-v);if(r<0)return"";if(e.getOption("indentWithTabs")){var n=Math.floor(r/h);return Array(n+1).join("\t")}return Array(r+1).join(" ")});y+=g?"\n":""}t.repeat>1&&(y=Array(t.repeat+1).join(y));var k,C,w,M,x,S,A,b,L,T,R=u.linewise,E=u.blockwise;if(R)r.visualMode?y=r.visualLine?y.slice(0,-1):"\n"+y.slice(0,y.length-1)+"\n":t.after?(y="\n"+y.slice(0,y.length-1),c.ch=ae(e,c.line)):c.ch=0;else{if(E){y=y.split("\n");for(var B=0;B<y.length;B++)y[B]=""==y[B]?" ":y[B]}c.ch+=t.after?1:0}if(r.visualMode){var I;r.lastPastedText=y;var K=(w=e,x=(M=r).lastSelection,M.visualMode?(S=w.listSelections(),A=S[0],b=S[S.length-1],L=re(A.anchor,A.head)?A.anchor:A.head,T=re(b.anchor,b.head)?b.head:b.anchor,[L,T]):function(){var e=w.getCursor(),t=w.getCursor(),r=x.visualBlock;if(r){var o=r.width,i=r.height;t=n(e.line+i,e.ch+o);for(var a=[],s=e.line;s<t.line;s++){var l=n(s,e.ch),c=n(s,t.ch),u={anchor:l,head:c};a.push(u)}w.setSelections(a)}else{var h=x.anchorMark.find(),p=x.headMark.find(),f=p.line-h.line,d=p.ch-h.ch;t={line:t.line+f,ch:f?t.ch:d+t.ch},x.visualLine&&(e=n(e.line,0),t=n(t.line,ae(w,t.line))),w.setSelection(e,t)}return[e,t]}()),N=K[0],P=K[1],j=e.getSelection(),H=e.listSelections(),_=new Array(H.length).join("1").split("1");r.lastSelection&&(I=r.lastSelection.headMark.find()),O.registerController.unnamedRegister.setText(j),E?(e.replaceSelections(_),P=n(N.line+y.length-1,N.ch),e.setCursor(N),le(e,P),e.replaceSelections(y),k=N):r.visualBlock?(e.replaceSelections(_),e.setCursor(N),e.replaceRange(y,N,N),k=N):(e.replaceRange(y,N,P),k=e.posFromIndex(e.indexFromPos(N)+y.length-1)),I&&(r.lastSelection.headMark=e.setBookmark(I)),R&&(k.ch=0)}else if(E){for(e.setCursor(c),B=0;B<y.length;B++){var F=c.line+B;F>e.lastLine()&&e.replaceRange("\n",n(F,0)),ae(e,F)<c.ch&&(o=e,i=F,a=c.ch,void 0,void 0,s=ae(o,i),l=new Array(a-s+1).join(" "),o.setCursor(n(i,s)),o.replaceRange(l,o.getCursor()))}e.setCursor(c),le(e,n(c.line+y.length-1,c.ch)),e.replaceSelections(y),k=c}else e.replaceRange(y,c),R&&t.after?k=n(c.line+1,de(e.getLine(c.line+1))):R&&!t.after?k=n(c.line,de(e.getLine(c.line))):!R&&t.after?(C=e.indexFromPos(c),k=e.posFromIndex(C+y.length-1)):(C=e.indexFromPos(c),k=e.posFromIndex(C+y.length));r.visualMode&&fe(e,!1),e.setCursor(k)}},undo:function(t,r){t.operation(function(){Y(t,e.commands.undo,r.repeat)(),t.setCursor(t.getCursor("anchor"))})},redo:function(t,r){Y(t,e.commands.redo,r.repeat)()},setRegister:function(e,t,r){r.inputState.registerName=t.selectedCharacter},setMark:function(e,t,r){Me(e,r,t.selectedCharacter,e.getCursor())},replace:function(t,r,o){var i,a,s=r.selectedCharacter,l=t.getCursor(),c=t.listSelections();if(o.visualMode)l=t.getCursor("start"),a=t.getCursor("end");else{var u=t.getLine(l.line);(i=l.ch+r.repeat)>u.length&&(i=u.length),a=n(l.line,i)}if("\n"==s)o.visualMode||t.replaceRange("",l,a),(e.commands.newlineAndIndentContinueComment||e.commands.newlineAndIndent)(t);else{var h=t.getRange(l,a);if(h=h.replace(/[^\n]/g,s),o.visualBlock){var p=new Array(t.getOption("tabSize")+1).join(" ");h=(h=t.getSelection()).replace(/\t/g,p).replace(/[^\n]/g,s).split("\n"),t.replaceSelections(h)}else t.replaceRange(h,l,a);o.visualMode?(l=re(c[0].anchor,c[0].head)?c[0].anchor:c[0].head,t.setCursor(l),fe(t,!1)):t.setCursor(G(a,0,-1))}},incrementNumberToken:function(e,t){for(var r,o,i,a,s=e.getCursor(),l=e.getLine(s.line),c=/(-?)(?:(0x)([\da-f]+)|(0b|0|)(\d+))/gi;null!==(r=c.exec(l))&&(i=(o=r.index)+r[0].length,!(s.ch<i)););if((t.backtrack||!(i<=s.ch))&&r){var u=r[2]||r[4],h=r[3]||r[5],p=t.increase?1:-1,f={"0b":2,0:8,"":10,"0x":16}[u.toLowerCase()];a=(parseInt(r[1]+h,f)+p*t.repeat).toString(f);var d=u?new Array(h.length-a.length+1+r[1].length).join("0"):"";a="-"===a.charAt(0)?"-"+u+d+a.substr(1):u+d+a;var m=n(s.line,o),g=n(s.line,i);e.replaceRange(a,m,g),e.setCursor(n(s.line,o+a.length-1))}},repeatLastEdit:function(e,t,r){if(r.lastEditInputState){var n=t.repeat;n&&t.repeatIsExplicit?r.lastEditInputState.repeatOverride=n:n=r.lastEditInputState.repeatOverride||n,Ge(e,r,n,!1)}},indent:function(e,t){e.indentLine(e.getCursor().line,t.indentRight)},exitInsertMode:De};function z(e,t,r){var o=Math.min(Math.max(e.firstLine(),t.line),e.lastLine()),i=ae(e,o)-1;i=r?i+1:i;var a=Math.min(Math.max(0,t.ch),i);return n(o,a)}function Z(e){var t={};for(var r in e)e.hasOwnProperty(r)&&(t[r]=e[r]);return t}function G(e,t,r){return"object"==typeof t&&(r=t.ch,t=t.line),n(e.line+t,e.ch+r)}function X(e,t){if("<character>"==t.slice(-11)){var r=t.length-11,n=e.slice(0,r),o=t.slice(0,r);return n==o&&e.length>r?"full":0==o.indexOf(n)&&"partial"}return e==t?"full":0==t.indexOf(e)&&"partial"}function Y(e,t,r){return function(){for(var n=0;n<r;n++)t(e)}}function ee(e){return n(e.line,e.ch)}function te(e,t){return e.ch==t.ch&&e.line==t.line}function re(e,t){return e.line<t.line||e.line==t.line&&e.ch<t.ch}function ne(e,t){return arguments.length>2&&(t=ne.apply(void 0,Array.prototype.slice.call(arguments,1))),re(e,t)?e:t}function oe(e,t){return arguments.length>2&&(t=oe.apply(void 0,Array.prototype.slice.call(arguments,1))),re(e,t)?t:e}function ie(e,t,r){var n=re(e,t),o=re(t,r);return n&&o}function ae(e,t){return e.getLine(t).length}function se(e){return e.trim?e.trim():e.replace(/^\s+|\s+$/g,"")}function le(e,t){var r=[],o=e.listSelections(),i=ee(e.clipPos(t)),a=!te(t,i),s=function(e,t,r){for(var n=0;n<e.length;n++){var o="head"!=r&&te(e[n].anchor,t),i="anchor"!=r&&te(e[n].head,t);if(o||i)return n}return-1}(o,e.getCursor("head")),l=te(o[s].head,o[s].anchor),c=o.length-1,u=c-s>s?c:0,h=o[u].anchor,p=Math.min(h.line,i.line),f=Math.max(h.line,i.line),d=h.ch,m=i.ch,g=o[u].head.ch-d,v=m-d;g>0&&v<=0?(d++,a||m--):g<0&&v>=0?(d--,l||m++):g<0&&-1==v&&(d--,m++);for(var y=p;y<=f;y++){var k={anchor:new n(y,d),head:new n(y,m)};r.push(k)}return e.setSelections(r),t.ch=m,h.ch=d,h}function ce(e,t,r){for(var n=[],o=0;o<r;o++){var i=G(t,o,0);n.push({anchor:i,head:i})}e.setSelections(n,0)}function ue(e,t){var r=t.sel.anchor,n=t.sel.head;t.lastPastedText&&(n=e.posFromIndex(e.indexFromPos(r)+t.lastPastedText.length),t.lastPastedText=null),t.lastSelection={anchorMark:e.setBookmark(r),headMark:e.setBookmark(n),anchor:ee(r),head:ee(n),visualMode:t.visualMode,visualLine:t.visualLine,visualBlock:t.visualBlock}}function he(e,t,r){var n=e.state.vim,o=pe(e,t=t||n.sel,r=r||n.visualLine?"line":n.visualBlock?"block":"char");e.setSelections(o.ranges,o.primary),Qe(e)}function pe(e,t,r,o){var i=ee(t.head),a=ee(t.anchor);if("char"==r){var s=o||re(t.head,t.anchor)?0:1,l=re(t.head,t.anchor)?1:0;return i=G(t.head,0,s),{ranges:[{anchor:a=G(t.anchor,0,l),head:i}],primary:0}}if("line"==r){if(re(t.head,t.anchor))i.ch=0,a.ch=ae(e,a.line);else{a.ch=0;var c=e.lastLine();i.line>c&&(i.line=c),i.ch=ae(e,i.line)}return{ranges:[{anchor:a,head:i}],primary:0}}if("block"==r){for(var u=Math.min(a.line,i.line),h=Math.min(a.ch,i.ch),p=Math.max(a.line,i.line),f=Math.max(a.ch,i.ch)+1,d=p-u+1,m=i.line==u?0:d-1,g=[],v=0;v<d;v++)g.push({anchor:n(u+v,h),head:n(u+v,f)});return{ranges:g,primary:m}}}function fe(t,r){var n=t.state.vim;!1!==r&&t.setCursor(z(t,n.sel.head)),ue(t,n),n.visualMode=!1,n.visualLine=!1,n.visualBlock=!1,e.signal(t,"vim-mode-change",{mode:"normal"}),n.fakeCursor&&n.fakeCursor.clear()}function de(e){if(!e)return 0;var t=e.search(/\S/);return-1==t?e.length:t}function me(e,t,r,o,i){for(var a,s,l=(s=(a=e).getCursor("head"),1==a.getSelection().length&&(s=ne(s,a.getCursor("anchor"))),s),c=e.getLine(l.line),u=l.ch,h=i?f[0]:d[0];!h(c.charAt(u));)if(++u>=c.length)return null;o?h=d[0]:(h=f[0])(c.charAt(u))||(h=f[1]);for(var p=u,m=u;h(c.charAt(p))&&p<c.length;)p++;for(;h(c.charAt(m))&&m>=0;)m--;if(m++,t){for(var g=p;/\s/.test(c.charAt(p))&&p<c.length;)p++;if(g==p){for(var v=m;/\s/.test(c.charAt(m-1))&&m>0;)m--;m||(m=v)}}return{start:n(l.line,m),end:n(l.line,p)}}function ge(e,t,r){te(t,r)||O.jumpList.add(e,t,r)}function ve(e,t){O.lastCharacterSearch.increment=e,O.lastCharacterSearch.forward=t.forward,O.lastCharacterSearch.selectedCharacter=t.selectedCharacter}var ye={"(":"bracket",")":"bracket","{":"bracket","}":"bracket","[":"section","]":"section","*":"comment","/":"comment",m:"method",M:"method","#":"preprocess"},ke={bracket:{isComplete:function(e){if(e.nextCh===e.symb){if(e.depth++,e.depth>=1)return!0}else e.nextCh===e.reverseSymb&&e.depth--;return!1}},section:{init:function(e){e.curMoveThrough=!0,e.symb=(e.forward?"]":"[")===e.symb?"{":"}"},isComplete:function(e){return 0===e.index&&e.nextCh===e.symb}},comment:{isComplete:function(e){var t="*"===e.lastCh&&"/"===e.nextCh;return e.lastCh=e.nextCh,t}},method:{init:function(e){e.symb="m"===e.symb?"{":"}",e.reverseSymb="{"===e.symb?"}":"{"},isComplete:function(e){return e.nextCh===e.symb}},preprocess:{init:function(e){e.index=0},isComplete:function(e){if("#"===e.nextCh){var t=e.lineText.match(/#(\w+)/)[1];if("endif"===t){if(e.forward&&0===e.depth)return!0;e.depth++}else if("if"===t){if(!e.forward&&0===e.depth)return!0;e.depth--}if("else"===t&&0===e.depth)return!0}return!1}}};function Ce(e,t,r,n,o){var i=t.line,a=t.ch,s=e.getLine(i),l=r?1:-1,c=n?d:f;if(o&&""==s){if(i+=l,s=e.getLine(i),!w(e,i))return null;a=r?0:s.length}for(;;){if(o&&""==s)return{from:0,to:0,line:i};for(var u=l>0?s.length:-1,h=u,p=u;a!=u;){for(var m=!1,g=0;g<c.length&&!m;++g)if(c[g](s.charAt(a))){for(h=a;a!=u&&c[g](s.charAt(a));)a+=l;if(m=h!=(p=a),h==t.ch&&i==t.line&&p==h+l)continue;return{from:Math.min(h,p+1),to:Math.max(h,p),line:i}}m||(a+=l)}if(!w(e,i+=l))return null;s=e.getLine(i),a=l>0?0:s.length}}function we(e,t,r,o){for(var i,a=e.getCursor(),s=a.ch,l=0;l<t;l++){if(-1==(c=s,u=e.getLine(a.line),h=o,p=!0,f=void 0,r?-1==(f=u.indexOf(h,c+1))||p||(f-=1):-1==(f=u.lastIndexOf(h,c-1))||p||(f+=1),i=f))return null;s=i}var c,u,h,p,f;return n(e.getCursor().line,i)}function Me(e,t,r,n){b(r,k)&&(t.marks[r]&&t.marks[r].clear(),t.marks[r]=e.setBookmark(n))}function xe(e,t,r,o,i){var a,s=t.line,l=e.firstLine(),c=e.lastLine(),u=s;function h(t){return!e.getLine(t)}function p(e,t,r){return r?h(e)!=h(e+t):!h(e)&&h(e+t)}if(o){for(;l<=u&&u<=c&&r>0;)p(u,o)&&r--,u+=o;return new n(u,0)}var f=e.state.vim;if(f.visualLine&&p(s,1,!0)){var d=f.sel.anchor;p(d.line,-1,!0)&&(i&&d.line==s||(s+=1))}var m=h(s);for(u=s;u<=c&&r;u++)p(u,1,!0)&&(i&&h(u)==m||r--);for(a=new n(u,0),u>c&&!m?m=!0:i=!1,u=s;u>l&&(i&&h(u)!=m&&u!=s||!p(u,-1,!0));u--);return{start:new n(u,0),end:a}}function Se(){}function Ae(e){var t=e.state.vim;return t.searchState_||(t.searchState_=new Se)}function be(e,t){var r=Le(e,t)||[];if(!r.length)return[];var n=[];if(0===r[0]){for(var o=0;o<r.length;o++)"number"==typeof r[o]&&n.push(e.substring(r[o]+1,r[o+1]));return n}}function Le(e,t){t||(t="/");for(var r=!1,n=[],o=0;o<e.length;o++){var i=e.charAt(o);r||i!=t||n.push(o),r=!r&&"\\"==i}return n}T("pcre",!0,"boolean"),Se.prototype={getQuery:function(){return O.query},setQuery:function(e){O.query=e},getOverlay:function(){return this.searchOverlay},setOverlay:function(e){this.searchOverlay=e},isReversed:function(){return O.isReversed},setReversed:function(e){O.isReversed=e},getScrollbarAnnotate:function(){return this.annotate},setScrollbarAnnotate:function(e){this.annotate=e}};var Te={"\\n":"\n","\\r":"\r","\\t":"\t"};var Re={"\\/":"/","\\\\":"\\","\\n":"\n","\\r":"\r","\\t":"\t"};function Ee(e,t,r){if(O.registerController.getRegister("/").setText(e),e instanceof RegExp)return e;var n,o,i=Le(e,"/");return i.length?(n=e.substring(0,i[0]),o=-1!=e.substring(i[0]).indexOf("i")):n=e,n?(E("pcre")||(n=function(e){for(var t=!1,r=[],n=-1;n<e.length;n++){var o=e.charAt(n)||"",i=e.charAt(n+1)||"",a=i&&-1!="|(){".indexOf(i);t?("\\"===o&&a||r.push(o),t=!1):"\\"===o?(t=!0,i&&-1!="}".indexOf(i)&&(a=!0),a&&"\\"!==i||r.push(o)):(r.push(o),a&&"\\"!==i&&r.push("\\"))}return r.join("")}(n)),r&&(t=/^[^A-Z]*$/.test(n)),new RegExp(n,t||o?"i":void 0)):null}function Oe(e,t){e.openNotification?e.openNotification('<span style="color: red">'+t+"</span>",{bottom:!0,duration:5e3}):alert(t)}var Be="(Javascript regexp)";function Ie(e,t){var r,n,o,i,a,s,l,c,u=(t.prefix||"")+" "+(t.desc||""),h=(r=t.prefix,n=t.desc,o='<span style="font-family: monospace; white-space: pre">'+(r||"")+'<input type="text"></span>',n&&(o+=' <span style="color: #888">'+n+"</span>"),o);i=e,a=h,s=u,l=t.onClose,c=t,i.openDialog?i.openDialog(a,l,{bottom:!0,value:c.value,onKeyDown:c.onKeyDown,onKeyUp:c.onKeyUp,selectValueOnOpen:!1}):l(prompt(s,""))}function Ke(e,t,r,n){if(t){var o=Ae(e),i=Ee(t,!!r,!!n);if(i)return Ne(e,i),function(e,t){if(e instanceof RegExp&&t instanceof RegExp){for(var r=["global","multiline","ignoreCase","source"],n=0;n<r.length;n++){var o=r[n];if(e[o]!==t[o])return!1}return!0}return!1}(i,o.getQuery())?i:(o.setQuery(i),i)}}function Ne(e,t){var r=Ae(e),n=r.getOverlay();n&&t==n.query||(n&&e.removeOverlay(n),n=function(e){if("^"==e.source.charAt(0))var t=!0;return{token:function(r){if(!t||r.sol()){var n=r.match(e,!1);if(n)return 0==n[0].length?(r.next(),"searching"):r.sol()||(r.backUp(1),e.exec(r.next()+n[0]))?(r.match(e),"searching"):(r.next(),null);for(;!r.eol()&&(r.next(),!r.match(e,!1)););}else r.skipToEnd()},query:e}}(t),e.addOverlay(n),e.showMatchesOnScrollbar&&(r.getScrollbarAnnotate()&&r.getScrollbarAnnotate().clear(),r.setScrollbarAnnotate(e.showMatchesOnScrollbar(t))),r.setOverlay(n))}function Pe(e,t,r,o){return void 0===o&&(o=1),e.operation(function(){for(var i=e.getCursor(),a=e.getSearchCursor(r,i),s=0;s<o;s++){var l=a.find(t);if(0==s&&l&&te(a.from(),i)&&(l=a.find(t)),!l&&!(a=e.getSearchCursor(r,t?n(e.lastLine()):n(e.firstLine(),0))).find(t))return}return a.from()})}function je(e){var t=Ae(e);e.removeOverlay(Ae(e).getOverlay()),t.setOverlay(null),t.getScrollbarAnnotate()&&(t.getScrollbarAnnotate().clear(),t.setScrollbarAnnotate(null))}function He(e){var t=e.getScrollInfo(),r=e.coordsChar({left:0,top:6+t.top},"local"),n=t.clientHeight-10+t.top,o=e.coordsChar({left:0,top:n},"local");return{top:r.line,bottom:o.line}}function _e(e,t,r){if("'"==r){var n=e.doc.history.done,o=n[n.length-2];return o&&o.ranges&&o.ranges[0].head}if("."==r){if(0==e.doc.history.lastModTime)return;var i=e.doc.history.done.filter(function(e){if(void 0!==e.changes)return e});return i.reverse(),i[0].changes[0].to}var a=t.marks[r];return a&&a.find()}var Fe=function(){this.buildCommandMap_()};Fe.prototype={processCommand:function(e,t,r){var n=this;e.operation(function(){e.curOp.isVimOp=!0,n._processCommand(e,t,r)})},_processCommand:function(t,r,n){var o=t.state.vim,i=O.registerController.getRegister(":"),a=i.toString();o.visualMode&&fe(t);var s=new e.StringStream(r);i.setText(r);var l,c,u=n||{};u.input=r;try{this.parseInput_(t,s,u)}catch(e){throw Oe(t,e),e}if(u.commandName){if(l=this.matchCommand_(u.commandName)){if(c=l.name,l.excludeFromCommandHistory&&i.setText(a),this.parseCommandArgs_(s,u,l),"exToKey"==l.type){for(var h=0;h<l.toKeys.length;h++)e.Vim.handleKey(t,l.toKeys[h],"mapping");return}if("exToEx"==l.type)return void this.processCommand(t,l.toInput)}}else void 0!==u.line&&(c="move");if(c)try{We[c](t,u),l&&l.possiblyAsync||!u.callback||u.callback()}catch(e){throw Oe(t,e),e}else Oe(t,'Not an editor command ":'+r+'"')},parseInput_:function(e,t,r){t.eatWhile(":"),t.eat("%")?(r.line=e.firstLine(),r.lineEnd=e.lastLine()):(r.line=this.parseLineSpec_(e,t),void 0!==r.line&&t.eat(",")&&(r.lineEnd=this.parseLineSpec_(e,t)));var n=t.match(/^(\w+)/);return r.commandName=n?n[1]:t.match(/.*/)[0],r},parseLineSpec_:function(e,t){var r=t.match(/^(\d+)/);if(r)return parseInt(r[1],10)-1;switch(t.next()){case".":return this.parseLineSpecOffset_(t,e.getCursor().line);case"$":return this.parseLineSpecOffset_(t,e.lastLine());case"'":var n=t.next(),o=_e(e,e.state.vim,n);if(!o)throw new Error("Mark not set");return this.parseLineSpecOffset_(t,o.line);case"-":case"+":return t.backUp(1),this.parseLineSpecOffset_(t,e.getCursor().line);default:return void t.backUp(1)}},parseLineSpecOffset_:function(e,t){var r=e.match(/^([+-])?(\d+)/);if(r){var n=parseInt(r[2],10);"-"==r[1]?t-=n:t+=n}return t},parseCommandArgs_:function(e,t,r){if(!e.eol()){t.argString=e.match(/.*/)[0];var n=r.argDelimiter||/\s+/,o=se(t.argString).split(n);o.length&&o[0]&&(t.args=o)}},matchCommand_:function(e){for(var t=e.length;t>0;t--){var r=e.substring(0,t);if(this.commandMap_[r]){var n=this.commandMap_[r];if(0===n.name.indexOf(e))return n}}return null},buildCommandMap_:function(){this.commandMap_={};for(var e=0;e<r.length;e++){var t=r[e],n=t.shortName||t.name;this.commandMap_[n]=t}},map:function(e,r,n){if(":"!=e&&":"==e.charAt(0)){if(n)throw Error("Mode not supported for ex mappings");var o=e.substring(1);":"!=r&&":"==r.charAt(0)?this.commandMap_[o]={name:o,type:"exToEx",toInput:r.substring(1),user:!0}:this.commandMap_[o]={name:o,type:"exToKey",toKeys:r,user:!0}}else if(":"!=r&&":"==r.charAt(0)){var i={keys:e,type:"keyToEx",exArgs:{input:r.substring(1)}};n&&(i.context=n),t.unshift(i)}else i={keys:e,type:"keyToKey",toKeys:r},n&&(i.context=n),t.unshift(i)},unmap:function(e,r){if(":"!=e&&":"==e.charAt(0)){if(r)throw Error("Mode not supported for ex mappings");var n=e.substring(1);if(this.commandMap_[n]&&this.commandMap_[n].user)return void delete this.commandMap_[n]}else for(var o=e,i=0;i<t.length;i++)if(o==t[i].keys&&t[i].context===r)return void t.splice(i,1);throw Error("No such mapping.")}};var We={colorscheme:function(e,t){!t.args||t.args.length<1?Oe(e,e.getOption("theme")):e.setOption("theme",t.args[0])},map:function(e,t,r){var n=t.args;!n||n.length<2?e&&Oe(e,"Invalid mapping: "+t.input):Ve.map(n[0],n[1],r)},imap:function(e,t){this.map(e,t,"insert")},nmap:function(e,t){this.map(e,t,"normal")},vmap:function(e,t){this.map(e,t,"visual")},unmap:function(e,t,r){var n=t.args;!n||n.length<1?e&&Oe(e,"No such mapping: "+t.input):Ve.unmap(n[0],r)},move:function(e,t){U.processCommand(e,e.state.vim,{type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!1,explicitRepeat:!0,linewise:!0},repeatOverride:t.line+1})},set:function(e,t){var r=t.args,n=t.setCfg||{};if(!r||r.length<1)e&&Oe(e,"Invalid mapping: "+t.input);else{var o=r[0].split("="),i=o[0],a=o[1],s=!1;if("?"==i.charAt(i.length-1)){if(a)throw Error("Trailing characters: "+t.argString);i=i.substring(0,i.length-1),s=!0}void 0===a&&"no"==i.substring(0,2)&&(i=i.substring(2),a=!1);var l=L[i]&&"boolean"==L[i].type;if(l&&null==a&&(a=!0),!l&&void 0===a||s){var c=E(i,e,n);c instanceof Error?Oe(e,c.message):Oe(e,!0===c||!1===c?" "+(c?"":"no")+i:" "+i+"="+c)}else{var u=R(i,a,e,n);u instanceof Error&&Oe(e,u.message)}}},setlocal:function(e,t){t.setCfg={scope:"local"},this.set(e,t)},setglobal:function(e,t){t.setCfg={scope:"global"},this.set(e,t)},registers:function(e,t){var r=t.args,n=O.registerController.registers,o="----------Registers----------<br><br>";if(r){r=r.join("");for(var i=0;i<r.length;i++)a=r.charAt(i),O.registerController.isValidRegister(a)&&(o+='"'+a+" "+(n[a]||new W).toString()+"<br>")}else for(var a in n){var s=n[a].toString();s.length&&(o+='"'+a+" "+s+"<br>")}Oe(e,o)},sort:function(t,r){var o,i,a,s,l,c=function(){if(r.argString){var t=new e.StringStream(r.argString);if(t.eat("!")&&(o=!0),t.eol())return;if(!t.eatSpace())return"Invalid arguments";var n=t.match(/([dinuox]+)?\s*(\/.+\/)?\s*/);if(!n&&!t.eol())return"Invalid arguments";if(n[1]){i=-1!=n[1].indexOf("i"),a=-1!=n[1].indexOf("u");var c=-1!=n[1].indexOf("d")||-1!=n[1].indexOf("n")&&1,u=-1!=n[1].indexOf("x")&&1,h=-1!=n[1].indexOf("o")&&1;if(c+u+h>1)return"Invalid arguments";s=(c?"decimal":u&&"hex")||h&&"octal"}n[2]&&(l=new RegExp(n[2].substr(1,n[2].length-2),i?"i":""))}}();if(c)Oe(t,c+": "+r.argString);else{var u=r.line||t.firstLine(),h=r.lineEnd||r.line||t.lastLine();if(u!=h){var p=n(u,0),f=n(h,ae(t,h)),d=t.getRange(p,f).split("\n"),m=l||("decimal"==s?/(-?)([\d]+)/:"hex"==s?/(-?)(?:0x)?([0-9a-f]+)/i:"octal"==s?/([0-7]+)/:null),g="decimal"==s?10:"hex"==s?16:"octal"==s?8:null,v=[],y=[];if(s||l)for(var k=0;k<d.length;k++){var C=l?d[k].match(l):null;C&&""!=C[0]?v.push(C):!l&&m.exec(d[k])?v.push(d[k]):y.push(d[k])}else y=d;if(v.sort(l?function(e,t){var r;return o&&(r=e,e=t,t=r),i&&(e[0]=e[0].toLowerCase(),t[0]=t[0].toLowerCase()),e[0]<t[0]?-1:1}:x),l)for(k=0;k<v.length;k++)v[k]=v[k].input;else s||y.sort(x);if(d=o?v.concat(y):y.concat(v),a){var w,M=d;for(d=[],k=0;k<M.length;k++)M[k]!=w&&d.push(M[k]),w=M[k]}t.replaceRange(d.join("\n"),p,f)}}function x(e,t){var r;o&&(r=e,e=t,t=r),i&&(e=e.toLowerCase(),t=t.toLowerCase());var n=s&&m.exec(e),a=s&&m.exec(t);return n?(n=parseInt((n[1]+n[2]).toLowerCase(),g))-(a=parseInt((a[1]+a[2]).toLowerCase(),g)):e<t?-1:1}},global:function(e,t){var r=t.argString;if(r){var n,o=void 0!==t.line?t.line:e.firstLine(),i=t.lineEnd||t.line||e.lastLine(),a=be(r,"/"),s=r;if(a.length&&(s=a[0],n=a.slice(1,a.length).join("/")),s)try{Ke(e,s,!0,!0)}catch(t){return void Oe(e,"Invalid regex: "+s)}for(var l=Ae(e).getQuery(),c=[],u="",h=o;h<=i;h++)l.test(e.getLine(h))&&(c.push(h+1),u+=e.getLine(h)+"<br>");if(n){var p=0,f=function(){if(p<c.length){var t=c[p]+n;Ve.processCommand(e,t,{callback:f})}p++};f()}else Oe(e,u)}else Oe(e,"Regular Expression missing from global")},substitute:function(t,r){if(!t.getSearchCursor)throw new Error("Search feature not available. Requires searchcursor.js or any other getSearchCursor implementation.");var o,i,a,s,l=r.argString,c=l?be(l,l[0]):[],u="",h=!1,f=!1;if(c.length)o=c[0],u=c[1],o&&"$"===o[o.length-1]&&(o=o.slice(0,o.length-1)+"\\n",u=u?u+"\n":"\n"),void 0!==u&&(u=E("pcre")?function(t){for(var r=new e.StringStream(t),n=[];!r.eol();){for(;r.peek()&&"\\"!=r.peek();)n.push(r.next());var o=!1;for(var i in Re)if(r.match(i,!0)){o=!0,n.push(Re[i]);break}o||n.push(r.next())}return n.join("")}(u):function(e){for(var t,r=!1,n=[],o=-1;o<e.length;o++){var i=e.charAt(o)||"",a=e.charAt(o+1)||"";Te[i+a]?(n.push(Te[i+a]),o++):r?(n.push(i),r=!1):"\\"===i?(r=!0,t=a,p.test(t)||"$"===a?n.push("$"):"/"!==a&&"\\"!==a&&n.push("\\")):("$"===i&&n.push("$"),n.push(i),"/"===a&&n.push("\\"))}return n.join("")}(u),O.lastSubstituteReplacePart=u),i=c[2]?c[2].split(" "):[];else if(l&&l.length)return void Oe(t,"Substitutions should be of the form :s/pattern/replace/");if(i&&(a=i[0],s=parseInt(i[1]),a&&(-1!=a.indexOf("c")&&(h=!0,a.replace("c","")),-1!=a.indexOf("g")&&(f=!0,a.replace("g","")),o=o.replace(/\//g,"\\/")+"/"+a)),o)try{Ke(t,o,!0,!0)}catch(e){return void Oe(t,"Invalid regex: "+o)}if(void 0!==(u=u||O.lastSubstituteReplacePart)){var d=Ae(t).getQuery(),m=void 0!==r.line?r.line:t.getCursor().line,g=r.lineEnd||m;m==t.firstLine()&&g==t.lastLine()&&(g=1/0),s&&(g=(m=g)+s-1);var v=z(t,n(m,0)),y=t.getSearchCursor(d,v);!function(t,r,n,o,i,a,s,l,c){t.state.vim.exMode=!0;var u=!1,h=a.from();function p(){t.operation(function(){for(;!u;)f(),d();m()})}function f(){var e=t.getRange(a.from(),a.to()),r=e.replace(s,l);a.replace(r)}function d(){for(;a.findNext()&&(e=a.from(),r=o,s=i,"number"!=typeof e&&(e=e.line),r instanceof Array?b(e,r):s?e>=r&&e<=s:e==r);)if(n||!h||a.from().line!=h.line)return t.scrollIntoView(a.from(),30),t.setSelection(a.from(),a.to()),h=a.from(),void(u=!1);var e,r,s;u=!0}function m(e){if(e&&e(),t.focus(),h){t.setCursor(h);var r=t.state.vim;r.exMode=!1,r.lastHPos=r.lastHSPos=h.ch}c&&c()}if(d(),!u)return r?void Ie(t,{prefix:"replace with <strong>"+l+"</strong> (y/n/a/q/l)",onKeyDown:function(r,n,o){switch(e.e_stop(r),e.keyName(r)){case"Y":f(),d();break;case"N":d();break;case"A":var i=c;c=void 0,t.operation(p),c=i;break;case"L":f();case"Q":case"Esc":case"Ctrl-C":case"Ctrl-[":m(o)}return u&&m(o),!0}}):(p(),void(c&&c()));Oe(t,"No matches for "+s.source)}(t,h,f,m,g,y,d,u,r.callback)}else Oe(t,"No previous substitute regular expression")},redo:e.commands.redo,undo:e.commands.undo,write:function(t){e.commands.save?e.commands.save(t):t.save&&t.save()},nohlsearch:function(e){je(e)},yank:function(e){var t=ee(e.getCursor()).line,r=e.getLine(t);O.registerController.pushText("0","yank",r,!0,!0)},delmarks:function(t,r){if(r.argString&&se(r.argString))for(var n=t.state.vim,o=new e.StringStream(se(r.argString));!o.eol();){o.eatSpace();var i=o.pos;if(!o.match(/[a-zA-Z]/,!1))return void Oe(t,"Invalid argument: "+r.argString.substring(i));var a=o.next();if(o.match("-",!0)){if(!o.match(/[a-zA-Z]/,!1))return void Oe(t,"Invalid argument: "+r.argString.substring(i));var s=a,l=o.next();if(!(M(s)&&M(l)||x(s)&&x(l)))return void Oe(t,"Invalid argument: "+s+"-");var c=s.charCodeAt(0),u=l.charCodeAt(0);if(c>=u)return void Oe(t,"Invalid argument: "+r.argString.substring(i));for(var h=0;h<=u-c;h++){var p=String.fromCharCode(c+h);delete n.marks[p]}}else delete n.marks[a]}else Oe(t,"Argument required")}},Ve=new Fe;function De(t){var r=t.state.vim,n=O.macroModeState,o=O.registerController.getRegister("."),i=n.isPlaying,a=n.lastInsertModeChanges,s=[];if(!i){for(var l=a.inVisualBlock&&r.lastSelection?r.lastSelection.visualBlock.height:1,c=a.changes,u=(s=[],0);u<c.length;)s.push(c[u]),c[u]instanceof ze?u++:u+=l;a.changes=s,t.off("change",$e),e.off(t.getInputField(),"keydown",Ze)}!i&&r.insertModeRepeat>1&&(Ge(t,r,r.insertModeRepeat-1,!0),r.lastEditInputState.repeatOverride=r.insertModeRepeat),delete r.insertModeRepeat,r.insertMode=!1,t.setCursor(t.getCursor().line,t.getCursor().ch-1),t.setOption("keyMap","vim"),t.setOption("disableInput",!0),t.toggleOverwrite(!1),o.setText(a.changes.join("")),e.signal(t,"vim-mode-change",{mode:"normal"}),n.isRecording&&function(e){if(!e.isPlaying){var t=e.latestRegister,r=O.registerController.getRegister(t);r&&r.pushInsertModeChanges&&r.pushInsertModeChanges(e.lastInsertModeChanges)}}(n)}function Ue(e){t.unshift(e)}function Je(t,r,n,o){var i=O.registerController.getRegister(o);if(":"==o)return i.keyBuffer[0]&&Ve.processCommand(t,i.keyBuffer[0]),void(n.isPlaying=!1);var a=i.keyBuffer,s=0;n.isPlaying=!0,n.replaySearchQueries=i.searchQueries.slice(0);for(var l=0;l<a.length;l++)for(var c,u,h=a[l];h;)if(u=(c=/<\w+-.+?>|<\w+>|./.exec(h))[0],h=h.substring(c.index+u.length),e.Vim.handleKey(t,u,"macro"),r.insertMode){var p=i.insertModeChanges[s++].changes;O.macroModeState.lastInsertModeChanges.changes=p,Xe(t,p,1),De(t)}n.isPlaying=!1}function $e(e,t){var r=O.macroModeState,n=r.lastInsertModeChanges;if(!r.isPlaying)for(;t;){if(n.expectCursorActivityForChange=!0,"+input"==t.origin||"paste"==t.origin||void 0===t.origin){var o=t.text.join("\n");n.maybeReset&&(n.changes=[],n.maybeReset=!1),e.state.overwrite&&!/\n/.test(o)?n.changes.push([o]):n.changes.push(o)}t=t.next}}function qe(t){var r=t.state.vim;if(r.insertMode){var n=O.macroModeState;if(n.isPlaying)return;var o=n.lastInsertModeChanges;o.expectCursorActivityForChange?o.expectCursorActivityForChange=!1:o.maybeReset=!0}else t.curOp.isVimOp||function(t,r){var n=t.getCursor("anchor"),o=t.getCursor("head");if(r.visualMode&&!t.somethingSelected()?fe(t,!1):r.visualMode||r.insertMode||!t.somethingSelected()||(r.visualMode=!0,r.visualLine=!1,e.signal(t,"vim-mode-change",{mode:"visual"})),r.visualMode){var i=re(o,n)?0:-1,a=re(o,n)?-1:0;o=G(o,0,i),n=G(n,0,a),r.sel={anchor:n,head:o},Me(t,r,"<",ne(o,n)),Me(t,r,">",oe(o,n))}else r.insertMode||(r.lastHPos=t.getCursor().ch)}(t,r);r.visualMode&&Qe(t)}function Qe(e){var t=e.state.vim,r=z(e,ee(t.sel.head)),n=G(r,0,1);t.fakeCursor&&t.fakeCursor.clear(),t.fakeCursor=e.markText(r,n,{className:"cm-animate-fat-cursor"})}function ze(e){this.keyName=e}function Ze(t){var r=O.macroModeState.lastInsertModeChanges,n=e.keyName(t);n&&(-1==n.indexOf("Delete")&&-1==n.indexOf("Backspace")||e.lookupKey(n,"vim-insert",function(){return r.maybeReset&&(r.changes=[],r.maybeReset=!1),r.changes.push(new ze(n)),!0}))}function Ge(e,t,r,n){var o=O.macroModeState;o.isPlaying=!0;var i=!!t.lastEditActionCommand,a=t.inputState;function s(){i?U.processAction(e,t,t.lastEditActionCommand):U.evalInput(e,t)}function l(r){if(o.lastInsertModeChanges.changes.length>0){r=t.lastEditActionCommand?r:1;var n=o.lastInsertModeChanges;Xe(e,n.changes,r)}}if(t.inputState=t.lastEditInputState,i&&t.lastEditActionCommand.interlaceInsertRepeat)for(var c=0;c<r;c++)s(),l(1);else n||s(),l(r);t.inputState=a,t.insertMode&&!n&&De(e),o.isPlaying=!1}function Xe(t,r,n){function o(r){return"string"==typeof r?e.commands[r](t):r(t),!0}var i,a,s=t.getCursor("head"),l=O.macroModeState.lastInsertModeChanges.inVisualBlock;if(l){var c=t.state.vim.lastSelection,u=(i=c.anchor,{line:(a=c.head).line-i.line,ch:a.line-i.line});ce(t,s,u.line+1),n=t.listSelections().length,t.setCursor(s)}for(var h=0;h<n;h++){l&&t.setCursor(G(s,h,0));for(var p=0;p<r.length;p++){var f=r[p];if(f instanceof ze)e.lookupKey(f.keyName,"vim-insert",o);else if("string"==typeof f){var d=t.getCursor();t.replaceRange(f,d,d)}else{var m=t.getCursor(),g=G(m,0,f[0].length);t.replaceRange(f[0],m,g)}}}l&&t.setCursor(G(s,0,1))}return e.keyMap.vim={attach:i,detach:o,call:l},T("insertModeEscKeysTimeout",200,"number"),e.keyMap["vim-insert"]={fallthrough:["default"],attach:i,detach:o,call:l},e.keyMap["vim-replace"]={Backspace:"goCharLeft",fallthrough:["vim-insert"],attach:i,detach:o,call:l},j(),H}()}); diff --git a/plugins/tiddlywiki/codemirror-keymap-vim/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-keymap-vim/files/tiddlywiki.files new file mode 100755 index 000000000..890d988d4 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-vim/files/tiddlywiki.files @@ -0,0 +1,12 @@ +{ + "tiddlers": [ + { + "file": "keymap/vim.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/keymap/vim.js", + "module-type": "codemirror" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-keymap-vim/plugin.info b/plugins/tiddlywiki/codemirror-keymap-vim/plugin.info new file mode 100755 index 000000000..17770299c --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-vim/plugin.info @@ -0,0 +1,6 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-keymap-vim", + "description": "CodeMirror Keymap: Vim", + "author": "JeremyRuston", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-keymap-vim/readme.tid b/plugins/tiddlywiki/codemirror-keymap-vim/readme.tid new file mode 100644 index 000000000..fc08e6b0a --- /dev/null +++ b/plugins/tiddlywiki/codemirror-keymap-vim/readme.tid @@ -0,0 +1,5 @@ +title: $:/plugins/tiddlywiki/codemirror-keymap-vim/readme + +This plugin adds a ''Keymap'' with some of the most important ''Vim'' keyboard shortcuts + +For information about available ''keyboard shortcuts'' see the [ext[CodeMirror vim demo|https://codemirror.net/demo/vim.html]] diff --git a/plugins/tiddlywiki/codemirror-mode-css/files/mode/css/css.js b/plugins/tiddlywiki/codemirror-mode-css/files/mode/css/css.js new file mode 100755 index 000000000..574b23b5a --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-css/files/mode/css/css.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";function t(e){for(var t={},r=0;r<e.length;++r)t[e[r].toLowerCase()]=!0;return t}e.defineMode("css",function(t,r){var o=r.inline;r.propertyKeywords||(r=e.resolveMode("text/css"));var i,a,n=t.indentUnit,l=r.tokenHooks,s=r.documentTypes||{},c=r.mediaTypes||{},d=r.mediaFeatures||{},p=r.mediaValueKeywords||{},u=r.propertyKeywords||{},m=r.nonStandardPropertyKeywords||{},h=r.fontProperties||{},g=r.counterDescriptors||{},b=r.colorKeywords||{},f=r.valueKeywords||{},y=r.allowNested,w=r.lineComment,k=!0===r.supportsAtComponent;function v(e,t){return i=t,e}function x(e){return function(t,r){for(var o,i=!1;null!=(o=t.next());){if(o==e&&!i){")"==e&&t.backUp(1);break}i=!i&&"\\"==o}return(o==e||!i&&")"!=e)&&(r.tokenize=null),v("string","string")}}function z(e,t){return e.next(),e.match(/\s*[\"\')]/,!1)?t.tokenize=null:t.tokenize=x(")"),v(null,"(")}function j(e,t,r){this.type=e,this.indent=t,this.prev=r}function q(e,t,r,o){return e.context=new j(r,t.indentation()+(!1===o?0:n),e.context),r}function P(e){return e.context.prev&&(e.context=e.context.prev),e.context.type}function K(e,t,r){return T[r.context.type](e,t,r)}function C(e,t,r,o){for(var i=o||1;i>0;i--)r.context=r.context.prev;return K(e,t,r)}function B(e){var t=e.current().toLowerCase();a=f.hasOwnProperty(t)?"atom":b.hasOwnProperty(t)?"keyword":"variable"}var T={top:function(e,t,r){if("{"==e)return q(r,t,"block");if("}"==e&&r.context.prev)return P(r);if(k&&/@component/i.test(e))return q(r,t,"atComponentBlock");if(/^@(-moz-)?document$/i.test(e))return q(r,t,"documentTypes");if(/^@(media|supports|(-moz-)?document|import)$/i.test(e))return q(r,t,"atBlock");if(/^@(font-face|counter-style)/i.test(e))return r.stateArg=e,"restricted_atBlock_before";if(/^@(-(moz|ms|o|webkit)-)?keyframes$/i.test(e))return"keyframes";if(e&&"@"==e.charAt(0))return q(r,t,"at");if("hash"==e)a="builtin";else if("word"==e)a="tag";else{if("variable-definition"==e)return"maybeprop";if("interpolation"==e)return q(r,t,"interpolation");if(":"==e)return"pseudo";if(y&&"("==e)return q(r,t,"parens")}return r.context.type},block:function(e,t,r){if("word"==e){var o=t.current().toLowerCase();return u.hasOwnProperty(o)?(a="property","maybeprop"):m.hasOwnProperty(o)?(a="string-2","maybeprop"):y?(a=t.match(/^\s*:(?:\s|$)/,!1)?"property":"tag","block"):(a+=" error","maybeprop")}return"meta"==e?"block":y||"hash"!=e&&"qualifier"!=e?T.top(e,t,r):(a="error","block")},maybeprop:function(e,t,r){return":"==e?q(r,t,"prop"):K(e,t,r)},prop:function(e,t,r){if(";"==e)return P(r);if("{"==e&&y)return q(r,t,"propBlock");if("}"==e||"{"==e)return C(e,t,r);if("("==e)return q(r,t,"parens");if("hash"!=e||/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(t.current())){if("word"==e)B(t);else if("interpolation"==e)return q(r,t,"interpolation")}else a+=" error";return"prop"},propBlock:function(e,t,r){return"}"==e?P(r):"word"==e?(a="property","maybeprop"):r.context.type},parens:function(e,t,r){return"{"==e||"}"==e?C(e,t,r):")"==e?P(r):"("==e?q(r,t,"parens"):"interpolation"==e?q(r,t,"interpolation"):("word"==e&&B(t),"parens")},pseudo:function(e,t,r){return"meta"==e?"pseudo":"word"==e?(a="variable-3",r.context.type):K(e,t,r)},documentTypes:function(e,t,r){return"word"==e&&s.hasOwnProperty(t.current())?(a="tag",r.context.type):T.atBlock(e,t,r)},atBlock:function(e,t,r){if("("==e)return q(r,t,"atBlock_parens");if("}"==e||";"==e)return C(e,t,r);if("{"==e)return P(r)&&q(r,t,y?"block":"top");if("interpolation"==e)return q(r,t,"interpolation");if("word"==e){var o=t.current().toLowerCase();a="only"==o||"not"==o||"and"==o||"or"==o?"keyword":c.hasOwnProperty(o)?"attribute":d.hasOwnProperty(o)?"property":p.hasOwnProperty(o)?"keyword":u.hasOwnProperty(o)?"property":m.hasOwnProperty(o)?"string-2":f.hasOwnProperty(o)?"atom":b.hasOwnProperty(o)?"keyword":"error"}return r.context.type},atComponentBlock:function(e,t,r){return"}"==e?C(e,t,r):"{"==e?P(r)&&q(r,t,y?"block":"top",!1):("word"==e&&(a="error"),r.context.type)},atBlock_parens:function(e,t,r){return")"==e?P(r):"{"==e||"}"==e?C(e,t,r,2):T.atBlock(e,t,r)},restricted_atBlock_before:function(e,t,r){return"{"==e?q(r,t,"restricted_atBlock"):"word"==e&&"@counter-style"==r.stateArg?(a="variable","restricted_atBlock_before"):K(e,t,r)},restricted_atBlock:function(e,t,r){return"}"==e?(r.stateArg=null,P(r)):"word"==e?(a="@font-face"==r.stateArg&&!h.hasOwnProperty(t.current().toLowerCase())||"@counter-style"==r.stateArg&&!g.hasOwnProperty(t.current().toLowerCase())?"error":"property","maybeprop"):"restricted_atBlock"},keyframes:function(e,t,r){return"word"==e?(a="variable","keyframes"):"{"==e?q(r,t,"top"):K(e,t,r)},at:function(e,t,r){return";"==e?P(r):"{"==e||"}"==e?C(e,t,r):("word"==e?a="tag":"hash"==e&&(a="builtin"),"at")},interpolation:function(e,t,r){return"}"==e?P(r):"{"==e||";"==e?C(e,t,r):("word"==e?a="variable":"variable"!=e&&"("!=e&&")"!=e&&(a="error"),"interpolation")}};return{startState:function(e){return{tokenize:null,state:o?"block":"top",stateArg:null,context:new j(o?"block":"top",e||0,null)}},token:function(e,t){if(!t.tokenize&&e.eatSpace())return null;var r=(t.tokenize||function(e,t){var r=e.next();if(l[r]){var o=l[r](e,t);if(!1!==o)return o}return"@"==r?(e.eatWhile(/[\w\\\-]/),v("def",e.current())):"="==r||("~"==r||"|"==r)&&e.eat("=")?v(null,"compare"):'"'==r||"'"==r?(t.tokenize=x(r),t.tokenize(e,t)):"#"==r?(e.eatWhile(/[\w\\\-]/),v("atom","hash")):"!"==r?(e.match(/^\s*\w*/),v("keyword","important")):/\d/.test(r)||"."==r&&e.eat(/\d/)?(e.eatWhile(/[\w.%]/),v("number","unit")):"-"!==r?/[,+>*\/]/.test(r)?v(null,"select-op"):"."==r&&e.match(/^-?[_a-z][_a-z0-9-]*/i)?v("qualifier","qualifier"):/[:;{}\[\]\(\)]/.test(r)?v(null,r):("u"==r||"U"==r)&&e.match(/rl(-prefix)?\(/i)||("d"==r||"D"==r)&&e.match("omain(",!0,!0)||("r"==r||"R"==r)&&e.match("egexp(",!0,!0)?(e.backUp(1),t.tokenize=z,v("property","word")):/[\w\\\-]/.test(r)?(e.eatWhile(/[\w\\\-]/),v("property","word")):v(null,null):/[\d.]/.test(e.peek())?(e.eatWhile(/[\w.%]/),v("number","unit")):e.match(/^-[\w\\\-]+/)?(e.eatWhile(/[\w\\\-]/),e.match(/^\s*:/,!1)?v("variable-2","variable-definition"):v("variable-2","variable")):e.match(/^\w+-/)?v("meta","meta"):void 0})(e,t);return r&&"object"==typeof r&&(i=r[1],r=r[0]),a=r,"comment"!=i&&(t.state=T[t.state](i,e,t)),a},indent:function(e,t){var r=e.context,o=t&&t.charAt(0),i=r.indent;return"prop"!=r.type||"}"!=o&&")"!=o||(r=r.prev),r.prev&&("}"!=o||"block"!=r.type&&"top"!=r.type&&"interpolation"!=r.type&&"restricted_atBlock"!=r.type?(")"!=o||"parens"!=r.type&&"atBlock_parens"!=r.type)&&("{"!=o||"at"!=r.type&&"atBlock"!=r.type)||(i=Math.max(0,r.indent-n)):i=(r=r.prev).indent),i},electricChars:"}",blockCommentStart:"/*",blockCommentEnd:"*/",blockCommentContinue:" * ",lineComment:w,fold:"brace"}});var r=["domain","regexp","url","url-prefix"],o=t(r),i=["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"],a=t(i),n=["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid","orientation","device-pixel-ratio","min-device-pixel-ratio","max-device-pixel-ratio","pointer","any-pointer","hover","any-hover"],l=t(n),s=["landscape","portrait","none","coarse","fine","on-demand","hover","interlace","progressive"],c=t(s),d=["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-gap","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-gap","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","justify-items","justify-self","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","place-content","place-items","place-self","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","user-select","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode"],p=t(d),u=["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"],m=t(u),h=t(["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"]),g=t(["additive-symbols","fallback","negative","pad","prefix","range","speak-as","suffix","symbols","system"]),b=["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"],f=t(b),y=["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","auto-flow","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","color","color-burn","color-dodge","column","column-reverse","compact","condensed","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","darken","dashed","decimal","decimal-leading-zero","default","default-button","dense","destination-atop","destination-in","destination-out","destination-over","devanagari","difference","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","exclusion","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","flex-end","flex-start","footnotes","forwards","from","geometricPrecision","georgian","graytext","grid","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hard-light","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","hue","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-grid","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","lighten","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","luminosity","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","multiply","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","opacity","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row","row-resize","row-reverse","rtl","run-in","running","s-resize","sans-serif","saturation","scale","scale3d","scaleX","scaleY","scaleZ","screen","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","self-start","self-end","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","soft-light","solid","somali","source-atop","source-in","source-out","source-over","space","space-around","space-between","space-evenly","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","system-ui","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","transform","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","unset","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","wrap","wrap-reverse","x-large","x-small","xor","xx-large","xx-small"],w=t(y),k=r.concat(i).concat(n).concat(s).concat(d).concat(u).concat(b).concat(y);function v(e,t){for(var r,o=!1;null!=(r=e.next());){if(o&&"/"==r){t.tokenize=null;break}o="*"==r}return["comment","comment"]}e.registerHelper("hintWords","css",k),e.defineMIME("text/css",{documentTypes:o,mediaTypes:a,mediaFeatures:l,mediaValueKeywords:c,propertyKeywords:p,nonStandardPropertyKeywords:m,fontProperties:h,counterDescriptors:g,colorKeywords:f,valueKeywords:w,tokenHooks:{"/":function(e,t){return!!e.eat("*")&&(t.tokenize=v,v(e,t))}},name:"css"}),e.defineMIME("text/x-scss",{mediaTypes:a,mediaFeatures:l,mediaValueKeywords:c,propertyKeywords:p,nonStandardPropertyKeywords:m,colorKeywords:f,valueKeywords:w,fontProperties:h,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(e,t){return e.eat("/")?(e.skipToEnd(),["comment","comment"]):e.eat("*")?(t.tokenize=v,v(e,t)):["operator","operator"]},":":function(e){return!!e.match(/\s*\{/,!1)&&[null,null]},$:function(e){return e.match(/^[\w-]+/),e.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"]},"#":function(e){return!!e.eat("{")&&[null,"interpolation"]}},name:"css",helperType:"scss"}),e.defineMIME("text/x-less",{mediaTypes:a,mediaFeatures:l,mediaValueKeywords:c,propertyKeywords:p,nonStandardPropertyKeywords:m,colorKeywords:f,valueKeywords:w,fontProperties:h,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(e,t){return e.eat("/")?(e.skipToEnd(),["comment","comment"]):e.eat("*")?(t.tokenize=v,v(e,t)):["operator","operator"]},"@":function(e){return e.eat("{")?[null,"interpolation"]:!e.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/i,!1)&&(e.eatWhile(/[\w\\\-]/),e.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"])},"&":function(){return["atom","atom"]}},name:"css",helperType:"less"}),e.defineMIME("text/x-gss",{documentTypes:o,mediaTypes:a,mediaFeatures:l,propertyKeywords:p,nonStandardPropertyKeywords:m,fontProperties:h,counterDescriptors:g,colorKeywords:f,valueKeywords:w,supportsAtComponent:!0,tokenHooks:{"/":function(e,t){return!!e.eat("*")&&(t.tokenize=v,v(e,t))}},name:"css",helperType:"gss"})}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-mode-css/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-mode-css/files/tiddlywiki.files new file mode 100755 index 000000000..e3522f770 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-css/files/tiddlywiki.files @@ -0,0 +1,12 @@ +{ + "tiddlers": [ +{ + "file": "mode/css/css.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/mode/css/css.js", + "module-type": "codemirror" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-mode-css/plugin.info b/plugins/tiddlywiki/codemirror-mode-css/plugin.info new file mode 100755 index 000000000..115afed8c --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-css/plugin.info @@ -0,0 +1,6 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-mode-css", + "description": "CodeMirror Mode: CSS Highlighting", + "author": "JeremyRuston", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-mode-css/readme.tid b/plugins/tiddlywiki/codemirror-mode-css/readme.tid new file mode 100755 index 000000000..4fd51fd6d --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-css/readme.tid @@ -0,0 +1,5 @@ +title: $:/plugins/tiddlywiki/codemirror-mode-css/readme + +This plugin adds Syntax Highlighting for CSS tiddlers (text/css) to the [[CodeMirror|http://codemirror.net]] text editor. It needs the latest [[CodeMirror plugin|$:/plugins/tiddlywiki/codemirror]] to be installed + + diff --git a/plugins/tiddlywiki/codemirror-mode-htmlembedded/files/addon/mode/multiplex.js b/plugins/tiddlywiki/codemirror-mode-htmlembedded/files/addon/mode/multiplex.js new file mode 100755 index 000000000..24cd9fc5d --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-htmlembedded/files/addon/mode/multiplex.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";e.multiplexingMode=function(n){var i=Array.prototype.slice.call(arguments,1);function t(e,n,i,t){if("string"==typeof n){var r=e.indexOf(n,i);return t&&r>-1?r+n.length:r}var o=n.exec(i?e.slice(i):e);return o?o.index+i+(t?o[0].length:0):-1}return{startState:function(){return{outer:e.startState(n),innerActive:null,inner:null}},copyState:function(i){return{outer:e.copyState(n,i.outer),innerActive:i.innerActive,inner:i.innerActive&&e.copyState(i.innerActive.mode,i.inner)}},token:function(r,o){if(o.innerActive){var c=o.innerActive;a=r.string;if(!c.close&&r.sol())return o.innerActive=o.inner=null,this.token(r,o);if((v=c.close?t(a,c.close,r.pos,c.parseDelimiters):-1)==r.pos&&!c.parseDelimiters)return r.match(c.close),o.innerActive=o.inner=null,c.delimStyle&&c.delimStyle+" "+c.delimStyle+"-close";v>-1&&(r.string=a.slice(0,v));var l=c.mode.token(r,o.inner);return v>-1&&(r.string=a),v==r.pos&&c.parseDelimiters&&(o.innerActive=o.inner=null),c.innerStyle&&(l=l?l+" "+c.innerStyle:c.innerStyle),l}for(var s=1/0,a=r.string,u=0;u<i.length;++u){var v,d=i[u];if((v=t(a,d.open,r.pos))==r.pos){d.parseDelimiters||r.match(d.open),o.innerActive=d;var f=0;if(n.indent){var m=n.indent(o.outer,"");m!==e.Pass&&(f=m)}return o.inner=e.startState(d.mode,f),d.delimStyle&&d.delimStyle+" "+d.delimStyle+"-open"}-1!=v&&v<s&&(s=v)}s!=1/0&&(r.string=a.slice(0,s));var p=n.token(r,o.outer);return s!=1/0&&(r.string=a),p},indent:function(i,t){var r=i.innerActive?i.innerActive.mode:n;return r.indent?r.indent(i.innerActive?i.inner:i.outer,t):e.Pass},blankLine:function(t){var r=t.innerActive?t.innerActive.mode:n;if(r.blankLine&&r.blankLine(t.innerActive?t.inner:t.outer),t.innerActive)"\n"===t.innerActive.close&&(t.innerActive=t.inner=null);else for(var o=0;o<i.length;++o){var c=i[o];"\n"===c.open&&(t.innerActive=c,t.inner=e.startState(c.mode,r.indent?r.indent(t.outer,""):0))}},electricChars:n.electricChars,innerMode:function(e){return e.inner?{state:e.inner,mode:e.innerActive.mode}:{state:e.outer,mode:n}}}}}); diff --git a/plugins/tiddlywiki/codemirror-mode-htmlembedded/files/mode/htmlembedded/htmlembedded.js b/plugins/tiddlywiki/codemirror-mode-htmlembedded/files/mode/htmlembedded/htmlembedded.js new file mode 100755 index 000000000..459c77fc1 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-htmlembedded/files/mode/htmlembedded/htmlembedded.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror"),require("../htmlmixed/htmlmixed"),require("../../addon/mode/multiplex")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../htmlmixed/htmlmixed","../../addon/mode/multiplex"],e):e(CodeMirror)}(function(e){"use strict";e.defineMode("htmlembedded",function(i,t){var d=t.closeComment||"--%>";return e.multiplexingMode(e.getMode(i,"htmlmixed"),{open:t.openComment||"<%--",close:d,delimStyle:"comment",mode:{token:function(e){return e.skipTo(d)||e.skipToEnd(),"comment"}}},{open:t.open||t.scriptStartRegex||"<%",close:t.close||t.scriptEndRegex||"%>",mode:e.getMode(i,t.scriptingModeSpec)})},"htmlmixed"),e.defineMIME("application/x-ejs",{name:"htmlembedded",scriptingModeSpec:"javascript"}),e.defineMIME("application/x-aspx",{name:"htmlembedded",scriptingModeSpec:"text/x-csharp"}),e.defineMIME("application/x-jsp",{name:"htmlembedded",scriptingModeSpec:"text/x-java"}),e.defineMIME("application/x-erb",{name:"htmlembedded",scriptingModeSpec:"ruby"})}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-mode-htmlembedded/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-mode-htmlembedded/files/tiddlywiki.files new file mode 100755 index 000000000..8086d2248 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-htmlembedded/files/tiddlywiki.files @@ -0,0 +1,19 @@ +{ + "tiddlers": [ + { + "file": "addon/mode/multiplex.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/mode/multiplex.js", + "module-type": "codemirror" + } + },{ + "file": "mode/htmlembedded/htmlembedded.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/mode/htmlembedded/htmlembedded.js", + "module-type": "codemirror" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-mode-htmlembedded/plugin.info b/plugins/tiddlywiki/codemirror-mode-htmlembedded/plugin.info new file mode 100755 index 000000000..a7eef49c6 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-htmlembedded/plugin.info @@ -0,0 +1,6 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-mode-htmlembedded", + "description": "CodeMirror Mode: Embedded-HTML Highlighting", + "author": "JeremyRuston", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-mode-htmlembedded/readme.tid b/plugins/tiddlywiki/codemirror-mode-htmlembedded/readme.tid new file mode 100755 index 000000000..f7868e16c --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-htmlembedded/readme.tid @@ -0,0 +1,4 @@ +title: $:/plugins/tiddlywiki/codemirror-mode-htmlembedded/readme + +This plugin adds Syntax Highlighting for Embedded-HTML tiddlers (application/x-aspx, application/x-ejs, application/x-jsp and application/x-erb) to the [[CodeMirror|http://codemirror.net]] text editor. It needs the latest [[CodeMirror plugin|$:/plugins/tiddlywiki/codemirror]] to be installed + diff --git a/plugins/tiddlywiki/codemirror-mode-htmlmixed/files/mode/htmlmixed/htmlmixed.js b/plugins/tiddlywiki/codemirror-mode-htmlmixed/files/mode/htmlmixed/htmlmixed.js new file mode 100755 index 000000000..5fb1173b0 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-htmlmixed/files/mode/htmlmixed/htmlmixed.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror"),require("../xml/xml"),require("../javascript/javascript"),require("../css/css")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../xml/xml","../javascript/javascript","../css/css"],t):t(CodeMirror)}(function(t){"use strict";var e={script:[["lang",/(javascript|babel)/i,"javascript"],["type",/^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i,"javascript"],["type",/./,"text/plain"],[null,null,"javascript"]],style:[["lang",/^css$/i,"css"],["type",/^(text\/)?(x-)?(stylesheet|css)$/i,"css"],["type",/./,"text/plain"],[null,null,"css"]]};var a={};function n(t,e){var n,l=t.match(a[n=e]||(a[n]=new RegExp("\\s+"+n+"\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*")));return l?/^\s*(.*?)\s*$/.exec(l[2])[1]:""}function l(t,e){return new RegExp((e?"^":"")+"</s*"+t+"s*>","i")}function r(t,e){for(var a in t)for(var n=e[a]||(e[a]=[]),l=t[a],r=l.length-1;r>=0;r--)n.unshift(l[r])}t.defineMode("htmlmixed",function(a,o){var c=t.getMode(a,{name:"xml",htmlMode:!0,multilineTagIndentFactor:o.multilineTagIndentFactor,multilineTagIndentPastTag:o.multilineTagIndentPastTag}),i={},s=o&&o.tags,u=o&&o.scriptTypes;if(r(e,i),s&&r(s,i),u)for(var m=u.length-1;m>=0;m--)i.script.unshift(["type",u[m].matches,u[m].mode]);function d(e,r){var o,s=c.token(e,r.htmlState),u=/\btag\b/.test(s);if(u&&!/[<>\s\/]/.test(e.current())&&(o=r.htmlState.tagName&&r.htmlState.tagName.toLowerCase())&&i.hasOwnProperty(o))r.inTag=o+" ";else if(r.inTag&&u&&/>$/.test(e.current())){var m=/^([\S]+) (.*)/.exec(r.inTag);r.inTag=null;var p=">"==e.current()&&function(t,e){for(var a=0;a<t.length;a++){var l=t[a];if(!l[0]||l[1].test(n(e,l[0])))return l[2]}}(i[m[1]],m[2]),f=t.getMode(a,p),g=l(m[1],!0),h=l(m[1],!1);r.token=function(t,e){return t.match(g,!1)?(e.token=d,e.localState=e.localMode=null,null):(a=t,n=h,l=e.localMode.token(t,e.localState),r=a.current(),(o=r.search(n))>-1?a.backUp(r.length-o):r.match(/<\/?$/)&&(a.backUp(r.length),a.match(n,!1)||a.match(r)),l);var a,n,l,r,o},r.localMode=f,r.localState=t.startState(f,c.indent(r.htmlState,""))}else r.inTag&&(r.inTag+=e.current(),e.eol()&&(r.inTag+=" "));return s}return{startState:function(){return{token:d,inTag:null,localMode:null,localState:null,htmlState:t.startState(c)}},copyState:function(e){var a;return e.localState&&(a=t.copyState(e.localMode,e.localState)),{token:e.token,inTag:e.inTag,localMode:e.localMode,localState:a,htmlState:t.copyState(c,e.htmlState)}},token:function(t,e){return e.token(t,e)},indent:function(e,a,n){return!e.localMode||/^\s*<\//.test(a)?c.indent(e.htmlState,a):e.localMode.indent?e.localMode.indent(e.localState,a,n):t.Pass},innerMode:function(t){return{state:t.localState||t.htmlState,mode:t.localMode||c}}}},"xml","javascript","css"),t.defineMIME("text/html","htmlmixed")}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-mode-htmlmixed/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-mode-htmlmixed/files/tiddlywiki.files new file mode 100755 index 000000000..1f6c36595 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-htmlmixed/files/tiddlywiki.files @@ -0,0 +1,12 @@ +{ + "tiddlers": [ +{ + "file": "mode/htmlmixed/htmlmixed.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/mode/htmlmixed/htmlmixed.js", + "module-type": "codemirror" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-mode-htmlmixed/plugin.info b/plugins/tiddlywiki/codemirror-mode-htmlmixed/plugin.info new file mode 100755 index 000000000..99d12fde9 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-htmlmixed/plugin.info @@ -0,0 +1,6 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-mode-htmlmixed", + "description": "CodeMirror Mode: HTML Highlighting", + "author": "JeremyRuston", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-mode-htmlmixed/readme.tid b/plugins/tiddlywiki/codemirror-mode-htmlmixed/readme.tid new file mode 100755 index 000000000..21dc12a96 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-htmlmixed/readme.tid @@ -0,0 +1,4 @@ +title: $:/plugins/tiddlywiki/codemirror-mode-htmlmixed/readme + +This plugin adds Syntax Highlighting for HTML tiddlers (text/html) to the [[CodeMirror|http://codemirror.net]] text editor. It needs the latest [[CodeMirror plugin|$:/plugins/tiddlywiki/codemirror]] to be installed + diff --git a/plugins/tiddlywiki/codemirror-mode-javascript/files/mode/javascript/javascript.js b/plugins/tiddlywiki/codemirror-mode-javascript/files/mode/javascript/javascript.js new file mode 100755 index 000000000..f5a3db4a5 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-javascript/files/mode/javascript/javascript.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";e.defineMode("javascript",function(t,r){var n,a,i=t.indentUnit,o=r.statementIndent,c=r.jsonld,u=r.json||c,s=r.typescript,f=r.wordCharacters||/[\w$\xa1-\uffff]/,l=function(){function e(e){return{type:e,style:"keyword"}}var t=e("keyword a"),r=e("keyword b"),n=e("keyword c"),a=e("keyword d"),i=e("operator"),o={type:"atom",style:"atom"};return{if:e("if"),while:t,with:t,else:r,do:r,try:r,finally:r,return:a,break:a,continue:a,new:e("new"),delete:n,void:n,throw:n,debugger:e("debugger"),var:e("var"),const:e("var"),let:e("var"),function:e("function"),catch:e("catch"),for:e("for"),switch:e("switch"),case:e("case"),default:e("default"),in:i,typeof:i,instanceof:i,true:o,false:o,null:o,undefined:o,NaN:o,Infinity:o,this:e("this"),class:e("class"),super:e("atom"),yield:n,export:e("export"),import:e("import"),extends:n,await:n}}(),d=/[+\-*&%=<>!?|~^@]/,p=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/;function m(e,t,r){return n=e,a=r,t}function k(e,t){var r,n=e.next();if('"'==n||"'"==n)return t.tokenize=(r=n,function(e,t){var n,a=!1;if(c&&"@"==e.peek()&&e.match(p))return t.tokenize=k,m("jsonld-keyword","meta");for(;null!=(n=e.next())&&(n!=r||a);)a=!a&&"\\"==n;return a||(t.tokenize=k),m("string","string")}),t.tokenize(e,t);if("."==n&&e.match(/^\d+(?:[eE][+\-]?\d+)?/))return m("number","number");if("."==n&&e.match(".."))return m("spread","meta");if(/[\[\]{}\(\),;\:\.]/.test(n))return m(n);if("="==n&&e.eat(">"))return m("=>","operator");if("0"==n&&e.eat(/x/i))return e.eatWhile(/[\da-f]/i),m("number","number");if("0"==n&&e.eat(/o/i))return e.eatWhile(/[0-7]/i),m("number","number");if("0"==n&&e.eat(/b/i))return e.eatWhile(/[01]/i),m("number","number");if(/\d/.test(n))return e.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/),m("number","number");if("/"==n)return e.eat("*")?(t.tokenize=v,v(e,t)):e.eat("/")?(e.skipToEnd(),m("comment","comment")):He(e,t,1)?(function(e){for(var t,r=!1,n=!1;null!=(t=e.next());){if(!r){if("/"==t&&!n)return;"["==t?n=!0:n&&"]"==t&&(n=!1)}r=!r&&"\\"==t}}(e),e.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/),m("regexp","string-2")):(e.eat("="),m("operator","operator",e.current()));if("`"==n)return t.tokenize=y,y(e,t);if("#"==n)return e.skipToEnd(),m("error","error");if(d.test(n))return">"==n&&t.lexical&&">"==t.lexical.type||(e.eat("=")?"!"!=n&&"="!=n||e.eat("="):/[<>*+\-]/.test(n)&&(e.eat(n),">"==n&&e.eat(n))),m("operator","operator",e.current());if(f.test(n)){e.eatWhile(f);var a=e.current();if("."!=t.lastType){if(l.propertyIsEnumerable(a)){var i=l[a];return m(i.type,i.style,a)}if("async"==a&&e.match(/^(\s|\/\*.*?\*\/)*[\[\(\w]/,!1))return m("async","keyword",a)}return m("variable","variable",a)}}function v(e,t){for(var r,n=!1;r=e.next();){if("/"==r&&n){t.tokenize=k;break}n="*"==r}return m("comment","comment")}function y(e,t){for(var r,n=!1;null!=(r=e.next());){if(!n&&("`"==r||"$"==r&&e.eat("{"))){t.tokenize=k;break}n=!n&&"\\"==r}return m("quasi","string-2",e.current())}var b="([{}])";function w(e,t){t.fatArrowAt&&(t.fatArrowAt=null);var r=e.string.indexOf("=>",e.start);if(!(r<0)){if(s){var n=/:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(e.string.slice(e.start,r));n&&(r=n.index)}for(var a=0,i=!1,o=r-1;o>=0;--o){var c=e.string.charAt(o),u=b.indexOf(c);if(u>=0&&u<3){if(!a){++o;break}if(0==--a){"("==c&&(i=!0);break}}else if(u>=3&&u<6)++a;else if(f.test(c))i=!0;else{if(/["'\/]/.test(c))return;if(i&&!a){++o;break}}}i&&!a&&(t.fatArrowAt=o)}}var x={atom:!0,number:!0,variable:!0,string:!0,regexp:!0,this:!0,"jsonld-keyword":!0};function h(e,t,r,n,a,i){this.indented=e,this.column=t,this.type=r,this.prev=a,this.info=i,null!=n&&(this.align=n)}function g(e,t){for(var r=e.localVars;r;r=r.next)if(r.name==t)return!0;for(var n=e.context;n;n=n.prev)for(r=n.vars;r;r=r.next)if(r.name==t)return!0}var j={state:null,column:null,marked:null,cc:null};function M(){for(var e=arguments.length-1;e>=0;e--)j.cc.push(arguments[e])}function V(){return M.apply(null,arguments),!0}function A(e){function t(t){for(var r=t;r;r=r.next)if(r.name==e)return!0;return!1}var n=j.state;if(j.marked="def",n.context){if(t(n.localVars))return;n.localVars={name:e,next:n.localVars}}else{if(t(n.globalVars))return;r.globalVars&&(n.globalVars={name:e,next:n.globalVars})}}function E(e){return"public"==e||"private"==e||"protected"==e||"abstract"==e||"readonly"==e}var z={name:"this",next:{name:"arguments"}};function I(){j.state.context={prev:j.state.context,vars:j.state.localVars},j.state.localVars=z}function T(){j.state.localVars=j.state.context.vars,j.state.context=j.state.context.prev}function $(e,t){var r=function(){var r=j.state,n=r.indented;if("stat"==r.lexical.type)n=r.lexical.indented;else for(var a=r.lexical;a&&")"==a.type&&a.align;a=a.prev)n=a.indented;r.lexical=new h(n,j.stream.column(),e,null,r.lexical,t)};return r.lex=!0,r}function C(){var e=j.state;e.lexical.prev&&(")"==e.lexical.type&&(e.indented=e.lexical.indented),e.lexical=e.lexical.prev)}function q(e){return function t(r){return r==e?V():";"==e?M():V(t)}}function O(e,t){return"var"==e?V($("vardef",t.length),pe,q(";"),C):"keyword a"==e?V($("form"),W,O,C):"keyword b"==e?V($("form"),O,C):"keyword d"==e?j.stream.match(/^\s*$/,!1)?V():V($("stat"),U,q(";"),C):"debugger"==e?V(q(";")):"{"==e?V($("}"),te,C):";"==e?V():"if"==e?("else"==j.state.lexical.info&&j.state.cc[j.state.cc.length-1]==C&&j.state.cc.pop()(),V($("form"),W,O,C,be)):"function"==e?V(Me):"for"==e?V($("form"),we,O,C):"class"==e||s&&"interface"==t?(j.marked="keyword",V($("form"),Ee,C)):"variable"==e?s&&"declare"==t?(j.marked="keyword",V(O)):s&&("module"==t||"enum"==t||"type"==t)&&j.stream.match(/^\s*\w/,!1)?(j.marked="keyword","enum"==t?V(Ue):"type"==t?V(ie,q("operator"),ie,q(";")):V($("form"),me,q("{"),$("}"),te,C,C)):s&&"namespace"==t?(j.marked="keyword",V($("form"),P,te,C)):s&&"abstract"==t?(j.marked="keyword",V(O)):V($("stat"),Q):"switch"==e?V($("form"),W,q("{"),$("}","switch"),te,C,C):"case"==e?V(P,q(":")):"default"==e?V(q(":")):"catch"==e?V($("form"),I,q("("),Ve,q(")"),O,C,T):"export"==e?V($("stat"),$e,C):"import"==e?V($("stat"),qe,C):"async"==e?V(O):"@"==t?V(P,O):M($("stat"),P,q(";"),C)}function P(e,t){return N(e,t,!1)}function S(e,t){return N(e,t,!0)}function W(e){return"("!=e?M():V($(")"),P,q(")"),C)}function N(e,t,r){if(j.state.fatArrowAt==j.stream.start){var n=r?J:G;if("("==e)return V(I,$(")"),_(Ve,")"),C,q("=>"),n,T);if("variable"==e)return M(I,me,q("=>"),n,T)}var a,i=r?H:B;return x.hasOwnProperty(e)?V(i):"function"==e?V(Me,i):"class"==e||s&&"interface"==t?(j.marked="keyword",V($("form"),Ae,C)):"keyword c"==e||"async"==e?V(r?S:P):"("==e?V($(")"),U,q(")"),C,i):"operator"==e||"spread"==e?V(r?S:P):"["==e?V($("]"),Ne,C,i):"{"==e?ee(X,"}",null,i):"quasi"==e?M(D,i):"new"==e?V((a=r,function(e){return"."==e?V(a?L:K):"variable"==e&&s?V(fe,a?H:B):M(a?S:P)})):"import"==e?V(P):V()}function U(e){return e.match(/[;\}\)\],]/)?M():M(P)}function B(e,t){return","==e?V(P):H(e,t,!1)}function H(e,t,r){var n=0==r?B:H,a=0==r?P:S;return"=>"==e?V(I,r?J:G,T):"operator"==e?/\+\+|--/.test(t)||s&&"!"==t?V(n):s&&"<"==t&&j.stream.match(/^([^>]|<.*?>)*>\s*\(/,!1)?V($(">"),_(ie,">"),C,n):"?"==t?V(P,q(":"),a):V(a):"quasi"==e?M(D,n):";"!=e?"("==e?ee(S,")","call",n):"."==e?V(R,n):"["==e?V($("]"),U,q("]"),C,n):s&&"as"==t?(j.marked="keyword",V(ie,n)):"regexp"==e?(j.state.lastType=j.marked="operator",j.stream.backUp(j.stream.pos-j.stream.start-1),V(a)):void 0:void 0}function D(e,t){return"quasi"!=e?M():"${"!=t.slice(t.length-2)?V(D):V(P,F)}function F(e){if("}"==e)return j.marked="string-2",j.state.tokenize=y,V(D)}function G(e){return w(j.stream,j.state),M("{"==e?O:P)}function J(e){return w(j.stream,j.state),M("{"==e?O:S)}function K(e,t){if("target"==t)return j.marked="keyword",V(B)}function L(e,t){if("target"==t)return j.marked="keyword",V(H)}function Q(e){return":"==e?V(C,O):M(B,q(";"),C)}function R(e){if("variable"==e)return j.marked="property",V()}function X(e,t){if("async"==e)return j.marked="property",V(X);if("variable"==e||"keyword"==j.style){return j.marked="property","get"==t||"set"==t?V(Y):(s&&j.state.fatArrowAt==j.stream.start&&(r=j.stream.match(/^\s*:\s*/,!1))&&(j.state.fatArrowAt=j.stream.pos+r[0].length),V(Z));var r}else{if("number"==e||"string"==e)return j.marked=c?"property":j.style+" property",V(Z);if("jsonld-keyword"==e)return V(Z);if(s&&E(t))return j.marked="keyword",V(X);if("["==e)return V(P,re,q("]"),Z);if("spread"==e)return V(S,Z);if("*"==t)return j.marked="keyword",V(X);if(":"==e)return M(Z)}}function Y(e){return"variable"!=e?M(Z):(j.marked="property",V(Me))}function Z(e){return":"==e?V(S):"("==e?M(Me):void 0}function _(e,t,r){function n(a,i){if(r?r.indexOf(a)>-1:","==a){var o=j.state.lexical;return"call"==o.info&&(o.pos=(o.pos||0)+1),V(function(r,n){return r==t||n==t?M():M(e)},n)}return a==t||i==t?V():V(q(t))}return function(r,a){return r==t||a==t?V():M(e,n)}}function ee(e,t,r){for(var n=3;n<arguments.length;n++)j.cc.push(arguments[n]);return V($(t,r),_(e,t),C)}function te(e){return"}"==e?V():M(O,te)}function re(e,t){if(s){if(":"==e)return V(ie);if("?"==t)return V(re)}}function ne(e){if(s&&":"==e)return j.stream.match(/^\s*\w+\s+is\b/,!1)?V(P,ae,ie):V(ie)}function ae(e,t){if("is"==t)return j.marked="keyword",V()}function ie(e,t){return"keyof"==t||"typeof"==t?(j.marked="keyword",V("keyof"==t?ie:S)):"variable"==e||"void"==t?(j.marked="type",V(se)):"string"==e||"number"==e||"atom"==e?V(se):"["==e?V($("]"),_(ie,"]",","),C,se):"{"==e?V($("}"),_(ce,"}",",;"),C,se):"("==e?V(_(ue,")"),oe):"<"==e?V(_(ie,">"),ie):void 0}function oe(e){if("=>"==e)return V(ie)}function ce(e,t){return"variable"==e||"keyword"==j.style?(j.marked="property",V(ce)):"?"==t?V(ce):":"==e?V(ie):"["==e?V(P,re,q("]"),ce):void 0}function ue(e,t){return"variable"==e&&j.stream.match(/^\s*[?:]/,!1)||"?"==t?V(ue):":"==e?V(ie):M(ie)}function se(e,t){return"<"==t?V($(">"),_(ie,">"),C,se):"|"==t||"."==e||"&"==t?V(ie):"["==e?V(q("]"),se):"extends"==t||"implements"==t?(j.marked="keyword",V(ie)):void 0}function fe(e,t){if("<"==t)return V($(">"),_(ie,">"),C,se)}function le(){return M(ie,de)}function de(e,t){if("="==t)return V(ie)}function pe(e,t){return"enum"==t?(j.marked="keyword",V(Ue)):M(me,re,ve,ye)}function me(e,t){return s&&E(t)?(j.marked="keyword",V(me)):"variable"==e?(A(t),V()):"spread"==e?V(me):"["==e?ee(me,"]"):"{"==e?ee(ke,"}"):void 0}function ke(e,t){return"variable"!=e||j.stream.match(/^\s*:/,!1)?("variable"==e&&(j.marked="property"),"spread"==e?V(me):"}"==e?M():V(q(":"),me,ve)):(A(t),V(ve))}function ve(e,t){if("="==t)return V(S)}function ye(e){if(","==e)return V(pe)}function be(e,t){if("keyword b"==e&&"else"==t)return V($("form","else"),O,C)}function we(e,t){return"await"==t?V(we):"("==e?V($(")"),xe,q(")"),C):void 0}function xe(e){return"var"==e?V(pe,q(";"),ge):";"==e?V(ge):"variable"==e?V(he):M(P,q(";"),ge)}function he(e,t){return"in"==t||"of"==t?(j.marked="keyword",V(P)):V(B,ge)}function ge(e,t){return";"==e?V(je):"in"==t||"of"==t?(j.marked="keyword",V(P)):M(P,q(";"),je)}function je(e){")"!=e&&V(P)}function Me(e,t){return"*"==t?(j.marked="keyword",V(Me)):"variable"==e?(A(t),V(Me)):"("==e?V(I,$(")"),_(Ve,")"),C,ne,O,T):s&&"<"==t?V($(">"),_(le,">"),C,Me):void 0}function Ve(e,t){return"@"==t&&V(P,Ve),"spread"==e?V(Ve):s&&E(t)?(j.marked="keyword",V(Ve)):M(me,re,ve)}function Ae(e,t){return"variable"==e?Ee(e,t):ze(e,t)}function Ee(e,t){if("variable"==e)return A(t),V(ze)}function ze(e,t){return"<"==t?V($(">"),_(le,">"),C,ze):"extends"==t||"implements"==t||s&&","==e?("implements"==t&&(j.marked="keyword"),V(s?ie:P,ze)):"{"==e?V($("}"),Ie,C):void 0}function Ie(e,t){return"async"==e||"variable"==e&&("static"==t||"get"==t||"set"==t||s&&E(t))&&j.stream.match(/^\s+[\w$\xa1-\uffff]/,!1)?(j.marked="keyword",V(Ie)):"variable"==e||"keyword"==j.style?(j.marked="property",V(s?Te:Me,Ie)):"["==e?V(P,re,q("]"),s?Te:Me,Ie):"*"==t?(j.marked="keyword",V(Ie)):";"==e?V(Ie):"}"==e?V():"@"==t?V(P,Ie):void 0}function Te(e,t){return"?"==t?V(Te):":"==e?V(ie,ve):"="==t?V(S):M(Me)}function $e(e,t){return"*"==t?(j.marked="keyword",V(We,q(";"))):"default"==t?(j.marked="keyword",V(P,q(";"))):"{"==e?V(_(Ce,"}"),We,q(";")):M(O)}function Ce(e,t){return"as"==t?(j.marked="keyword",V(q("variable"))):"variable"==e?M(S,Ce):void 0}function qe(e){return"string"==e?V():"("==e?M(P):M(Oe,Pe,We)}function Oe(e,t){return"{"==e?ee(Oe,"}"):("variable"==e&&A(t),"*"==t&&(j.marked="keyword"),V(Se))}function Pe(e){if(","==e)return V(Oe,Pe)}function Se(e,t){if("as"==t)return j.marked="keyword",V(Oe)}function We(e,t){if("from"==t)return j.marked="keyword",V(P)}function Ne(e){return"]"==e?V():M(_(S,"]"))}function Ue(){return M($("form"),me,q("{"),$("}"),_(Be,"}"),C,C)}function Be(){return M(me,ve)}function He(e,t,r){return t.tokenize==k&&/^(?:operator|sof|keyword [bcd]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(t.lastType)||"quasi"==t.lastType&&/\{\s*$/.test(e.string.slice(0,e.pos-(r||0)))}return C.lex=!0,{startState:function(e){var t={tokenize:k,lastType:"sof",cc:[],lexical:new h((e||0)-i,0,"block",!1),localVars:r.localVars,context:r.localVars&&{vars:r.localVars},indented:e||0};return r.globalVars&&"object"==typeof r.globalVars&&(t.globalVars=r.globalVars),t},token:function(e,t){if(e.sol()&&(t.lexical.hasOwnProperty("align")||(t.lexical.align=!1),t.indented=e.indentation(),w(e,t)),t.tokenize!=v&&e.eatSpace())return null;var r=t.tokenize(e,t);return"comment"==n?r:(t.lastType="operator"!=n||"++"!=a&&"--"!=a?n:"incdec",function(e,t,r,n,a){var i=e.cc;for(j.state=e,j.stream=a,j.marked=null,j.cc=i,j.style=t,e.lexical.hasOwnProperty("align")||(e.lexical.align=!0);;)if((i.length?i.pop():u?P:O)(r,n)){for(;i.length&&i[i.length-1].lex;)i.pop()();return j.marked?j.marked:"variable"==r&&g(e,n)?"variable-2":t}}(t,r,n,a,e))},indent:function(t,n){if(t.tokenize==v)return e.Pass;if(t.tokenize!=k)return 0;var a,c=n&&n.charAt(0),u=t.lexical;if(!/^\s*else\b/.test(n))for(var s=t.cc.length-1;s>=0;--s){var f=t.cc[s];if(f==C)u=u.prev;else if(f!=be)break}for(;("stat"==u.type||"form"==u.type)&&("}"==c||(a=t.cc[t.cc.length-1])&&(a==B||a==H)&&!/^[,\.=+\-*:?[\(]/.test(n));)u=u.prev;o&&")"==u.type&&"stat"==u.prev.type&&(u=u.prev);var l,p,m=u.type,y=c==m;return"vardef"==m?u.indented+("operator"==t.lastType||","==t.lastType?u.info+1:0):"form"==m&&"{"==c?u.indented:"form"==m?u.indented+i:"stat"==m?u.indented+(p=n,"operator"==(l=t).lastType||","==l.lastType||d.test(p.charAt(0))||/[,.]/.test(p.charAt(0))?o||i:0):"switch"!=u.info||y||0==r.doubleIndentSwitch?u.align?u.column+(y?0:1):u.indented+(y?0:i):u.indented+(/^(?:case|default)\b/.test(n)?i:2*i)},electricInput:/^\s*(?:case .*?:|default:|\{|\})$/,blockCommentStart:u?null:"/*",blockCommentEnd:u?null:"*/",blockCommentContinue:u?null:" * ",lineComment:u?null:"//",fold:"brace",closeBrackets:"()[]{}''\"\"``",helperType:u?"json":"javascript",jsonldMode:c,jsonMode:u,expressionAllowed:He,skipExpression:function(e){var t=e.cc[e.cc.length-1];t!=P&&t!=S||e.cc.pop()}}}),e.registerHelper("wordChars","javascript",/[\w$]/),e.defineMIME("text/javascript","javascript"),e.defineMIME("text/ecmascript","javascript"),e.defineMIME("application/javascript","javascript"),e.defineMIME("application/x-javascript","javascript"),e.defineMIME("application/ecmascript","javascript"),e.defineMIME("application/json",{name:"javascript",json:!0}),e.defineMIME("application/x-json",{name:"javascript",json:!0}),e.defineMIME("application/ld+json",{name:"javascript",jsonld:!0}),e.defineMIME("text/typescript",{name:"javascript",typescript:!0}),e.defineMIME("application/typescript",{name:"javascript",typescript:!0})}); diff --git a/plugins/tiddlywiki/codemirror-mode-javascript/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-mode-javascript/files/tiddlywiki.files new file mode 100755 index 000000000..7ca41b6ca --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-javascript/files/tiddlywiki.files @@ -0,0 +1,12 @@ +{ + "tiddlers": [ +{ + "file": "mode/javascript/javascript.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/mode/javascript/javascript.js", + "module-type": "codemirror" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-mode-javascript/plugin.info b/plugins/tiddlywiki/codemirror-mode-javascript/plugin.info new file mode 100755 index 000000000..6bbc03273 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-javascript/plugin.info @@ -0,0 +1,6 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-mode-javascript", + "description": "CodeMirror Mode: Javascript Highlighting", + "author": "JeremyRuston", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-mode-javascript/readme.tid b/plugins/tiddlywiki/codemirror-mode-javascript/readme.tid new file mode 100755 index 000000000..d381014c2 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-javascript/readme.tid @@ -0,0 +1,4 @@ +title: $:/plugins/tiddlywiki/codemirror-mode-javascript/readme + +This plugin adds Syntax Highlighting for Javascript tiddlers (application/javascript) to the [[CodeMirror|http://codemirror.net]] text editor. It needs the latest [[CodeMirror plugin|$:/plugins/tiddlywiki/codemirror]] to be installed + diff --git a/plugins/tiddlywiki/codemirror-mode-markdown/files/mode/markdown/markdown.js b/plugins/tiddlywiki/codemirror-mode-markdown/files/mode/markdown/markdown.js new file mode 100755 index 000000000..93d1b593f --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-markdown/files/mode/markdown/markdown.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror"),require("../xml/xml"),require("../tw-meta")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../xml/xml","../meta"],t):t(CodeMirror)}(function(t){"use strict";t.defineMode("markdown",function(e,i){var n=t.getMode(e,"text/html"),r="null"==n.name;void 0===i.highlightFormatting&&(i.highlightFormatting=!1),void 0===i.maxBlockquoteDepth&&(i.maxBlockquoteDepth=0),void 0===i.taskLists&&(i.taskLists=!1),void 0===i.strikethrough&&(i.strikethrough=!1),void 0===i.emoji&&(i.emoji=!1),void 0===i.fencedCodeBlockHighlighting&&(i.fencedCodeBlockHighlighting=!0),void 0===i.xml&&(i.xml=!0),void 0===i.tokenTypeOverrides&&(i.tokenTypeOverrides={});var a={header:"header",code:"comment",quote:"quote",list1:"variable-2",list2:"variable-3",list3:"keyword",hr:"hr",image:"image",imageAltText:"image-alt-text",imageMarker:"image-marker",formatting:"formatting",linkInline:"link",linkEmail:"link",linkText:"link",linkHref:"string",em:"em",strong:"strong",strikethrough:"strikethrough",emoji:"builtin"};for(var l in a)a.hasOwnProperty(l)&&i.tokenTypeOverrides[l]&&(a[l]=i.tokenTypeOverrides[l]);var o=/^([*\-_])(?:\s*\1){2,}\s*$/,h=/^(?:[*\-+]|^[0-9]+([.)]))\s+/,g=/^\[(x| )\](?=\s)/i,s=i.allowAtxHeaderWithoutSpace?/^(#+)/:/^(#+)(?: |$)/,m=/^ *(?:\={1,}|-{1,})\s*$/,u=/^[^#!\[\]*_\\<>` "'(~:]+/,f=/^(~~~+|```+)[ \t]*([\w+#-]*)[^\n`]*$/,c=/^\s*\[[^\]]+?\]:.*$/,d=/[!\"#$%&\'()*+,\-\.\/:;<=>?@\[\\\]^_`{|}~—]/;function k(t,e,i){return e.f=e.inline=i,i(t,e)}function p(t,e,i){return e.f=e.block=i,i(t,e)}function x(t){return t.linkTitle=!1,t.linkHref=!1,t.linkText=!1,t.em=!1,t.strong=!1,t.strikethrough=!1,t.quote=0,t.indentedCode=!1,t.f==S&&(t.f=M,t.block=v),t.trailingSpace=0,t.trailingSpaceNewLine=!1,t.prevLine=t.thisLine,t.thisLine={stream:null},null}function v(n,r){var l,u=n.column()===r.indentation,d=!(l=r.prevLine.stream)||!/\S/.test(l.string),p=r.indentedCode,x=r.prevLine.hr,v=!1!==r.list,S=(r.listStack[r.listStack.length-1]||0)+3;r.indentedCode=!1;var q=r.indentation;if(null===r.indentationDiff&&(r.indentationDiff=r.indentation,v)){for(r.em=!1,r.strong=!1,r.code=!1,r.strikethrough=!1,r.list=null;q<r.listStack[r.listStack.length-1];)r.listStack.pop(),r.listStack.length?r.indentation=r.listStack[r.listStack.length-1]:r.list=!1;!1!==r.list&&(r.indentationDiff=q-r.listStack[r.listStack.length-1])}var M=!(d||x||r.prevLine.header||v&&p||r.prevLine.fencedCodeEnd),F=(!1===r.list||x||d)&&r.indentation<=S&&n.match(o),b=null;if(r.indentationDiff>=4&&(p||r.prevLine.fencedCodeEnd||r.prevLine.header||d))return n.skipToEnd(),r.indentedCode=!0,a.code;if(n.eatSpace())return null;if(u&&r.indentation<=S&&(b=n.match(s))&&b[1].length<=6)return r.quote=0,r.header=b[1].length,r.thisLine.header=!0,i.highlightFormatting&&(r.formatting="header"),r.f=r.inline,T(r);if(r.indentation<=S&&n.eat(">"))return r.quote=u?1:r.quote+1,i.highlightFormatting&&(r.formatting="quote"),n.eatSpace(),T(r);if(!F&&!r.setext&&u&&r.indentation<=S&&(b=n.match(h))){var E=b[1]?"ol":"ul";return r.indentation=q+n.current().length,r.list=!0,r.quote=0,r.listStack.push(r.indentation),i.taskLists&&n.match(g,!1)&&(r.taskList=!0),r.f=r.inline,i.highlightFormatting&&(r.formatting=["list","list-"+E]),T(r)}return u&&r.indentation<=S&&(b=n.match(f,!0))?(r.quote=0,r.fencedEndRE=new RegExp(b[1]+"+ *$"),r.localMode=i.fencedCodeBlockHighlighting&&function(i){if(t.findModeByName){var n=t.findModeByName(i);n&&(i=n.mime||n.mimes[0])}var r=t.getMode(e,i);return"null"==r.name?null:r}(b[2]),r.localMode&&(r.localState=t.startState(r.localMode)),r.f=r.block=L,i.highlightFormatting&&(r.formatting="code-block"),r.code=-1,T(r)):r.setext||!(M&&v||r.quote||!1!==r.list||r.code||F||c.test(n.string))&&(b=n.lookAhead(1))&&(b=b.match(m))?(r.setext?(r.header=r.setext,r.setext=0,n.skipToEnd(),i.highlightFormatting&&(r.formatting="header")):(r.header="="==b[0].charAt(0)?1:2,r.setext=r.header),r.thisLine.header=!0,r.f=r.inline,T(r)):F?(n.skipToEnd(),r.hr=!0,r.thisLine.hr=!0,a.hr):"["===n.peek()?k(n,r,w):k(n,r,r.inline)}function S(e,i){var a=n.token(e,i.htmlState);if(!r){var l=t.innerMode(n,i.htmlState);("xml"==l.mode.name&&null===l.state.tagStart&&!l.state.context&&l.state.tokenize.isInText||i.md_inside&&e.current().indexOf(">")>-1)&&(i.f=M,i.block=v,i.htmlState=null)}return a}function L(t,e){var n,r=e.listStack[e.listStack.length-1]||0,l=e.indentation<r,o=r+3;return e.fencedEndRE&&e.indentation<=o&&(l||t.match(e.fencedEndRE))?(i.highlightFormatting&&(e.formatting="code-block"),l||(n=T(e)),e.localMode=e.localState=null,e.block=v,e.f=M,e.fencedEndRE=null,e.code=0,e.thisLine.fencedCodeEnd=!0,l?p(t,e,e.block):n):e.localMode?e.localMode.token(t,e.localState):(t.skipToEnd(),a.code)}function T(t){var e=[];if(t.formatting){e.push(a.formatting),"string"==typeof t.formatting&&(t.formatting=[t.formatting]);for(var n=0;n<t.formatting.length;n++)e.push(a.formatting+"-"+t.formatting[n]),"header"===t.formatting[n]&&e.push(a.formatting+"-"+t.formatting[n]+"-"+t.header),"quote"===t.formatting[n]&&(!i.maxBlockquoteDepth||i.maxBlockquoteDepth>=t.quote?e.push(a.formatting+"-"+t.formatting[n]+"-"+t.quote):e.push("error"))}if(t.taskOpen)return e.push("meta"),e.length?e.join(" "):null;if(t.taskClosed)return e.push("property"),e.length?e.join(" "):null;if(t.linkHref?e.push(a.linkHref,"url"):(t.strong&&e.push(a.strong),t.em&&e.push(a.em),t.strikethrough&&e.push(a.strikethrough),t.emoji&&e.push(a.emoji),t.linkText&&e.push(a.linkText),t.code&&e.push(a.code),t.image&&e.push(a.image),t.imageAltText&&e.push(a.imageAltText,"link"),t.imageMarker&&e.push(a.imageMarker)),t.header&&e.push(a.header,a.header+"-"+t.header),t.quote&&(e.push(a.quote),!i.maxBlockquoteDepth||i.maxBlockquoteDepth>=t.quote?e.push(a.quote+"-"+t.quote):e.push(a.quote+"-"+i.maxBlockquoteDepth)),!1!==t.list){var r=(t.listStack.length-1)%3;r?1===r?e.push(a.list2):e.push(a.list3):e.push(a.list1)}return t.trailingSpaceNewLine?e.push("trailing-space-new-line"):t.trailingSpace&&e.push("trailing-space-"+(t.trailingSpace%2?"a":"b")),e.length?e.join(" "):null}function q(t,e){if(t.match(u,!0))return T(e)}function M(e,r){var l=r.text(e,r);if(void 0!==l)return l;if(r.list)return r.list=null,T(r);if(r.taskList)return" "===e.match(g,!0)[1]?r.taskOpen=!0:r.taskClosed=!0,i.highlightFormatting&&(r.formatting="task"),r.taskList=!1,T(r);if(r.taskOpen=!1,r.taskClosed=!1,r.header&&e.match(/^#+$/,!0))return i.highlightFormatting&&(r.formatting="header"),T(r);var o=e.next();if(r.linkTitle){r.linkTitle=!1;var h=o;"("===o&&(h=")");var s="^\\s*(?:[^"+(h=(h+"").replace(/([.?*+^\[\]\\(){}|-])/g,"\\$1"))+"\\\\]+|\\\\\\\\|\\\\.)"+h;if(e.match(new RegExp(s),!0))return a.linkHref}if("`"===o){var m=r.formatting;i.highlightFormatting&&(r.formatting="code"),e.eatWhile("`");var u=e.current().length;if(0!=r.code||r.quote&&1!=u){if(u==r.code){var f=T(r);return r.code=0,f}return r.formatting=m,T(r)}return r.code=u,T(r)}if(r.code)return T(r);if("\\"===o&&(e.next(),i.highlightFormatting)){var c=T(r),k=a.formatting+"-escape";return c?c+" "+k:k}if("!"===o&&e.match(/\[[^\]]*\] ?(?:\(|\[)/,!1))return r.imageMarker=!0,r.image=!0,i.highlightFormatting&&(r.formatting="image"),T(r);if("["===o&&r.imageMarker&&e.match(/[^\]]*\](\(.*?\)| ?\[.*?\])/,!1))return r.imageMarker=!1,r.imageAltText=!0,i.highlightFormatting&&(r.formatting="image"),T(r);if("]"===o&&r.imageAltText){i.highlightFormatting&&(r.formatting="image");var c=T(r);return r.imageAltText=!1,r.image=!1,r.inline=r.f=b,c}if("["===o&&!r.image)return r.linkText=!0,i.highlightFormatting&&(r.formatting="link"),T(r);if("]"===o&&r.linkText){i.highlightFormatting&&(r.formatting="link");var c=T(r);return r.linkText=!1,r.inline=r.f=e.match(/\(.*?\)| ?\[.*?\]/,!1)?b:M,c}if("<"===o&&e.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/,!1))return r.f=r.inline=F,i.highlightFormatting&&(r.formatting="link"),(c=T(r))?c+=" ":c="",c+a.linkInline;if("<"===o&&e.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/,!1))return r.f=r.inline=F,i.highlightFormatting&&(r.formatting="link"),(c=T(r))?c+=" ":c="",c+a.linkEmail;if(i.xml&&"<"===o&&e.match(/^(!--|[a-z][a-z0-9-]*(?:\s+[a-z_:.\-]+(?:\s*=\s*[^>]+)?)*\s*>)/i,!1)){var x=e.string.indexOf(">",e.pos);if(-1!=x){var v=e.string.substring(e.start,x);/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(v)&&(r.md_inside=!0)}return e.backUp(1),r.htmlState=t.startState(n),p(e,r,S)}if(i.xml&&"<"===o&&e.match(/^\/\w*?>/))return r.md_inside=!1,"tag";if("*"===o||"_"===o){for(var L=1,q=1==e.pos?" ":e.string.charAt(e.pos-2);L<3&&e.eat(o);)L++;var E=e.peek()||" ",w=!/\s/.test(E)&&(!d.test(E)||/\s/.test(q)||d.test(q)),j=!/\s/.test(q)&&(!d.test(q)||/\s/.test(E)||d.test(E)),y=null,C=null;if(L%2&&(r.em||!w||"*"!==o&&j&&!d.test(q)?r.em!=o||!j||"*"!==o&&w&&!d.test(E)||(y=!1):y=!0),L>1&&(r.strong||!w||"*"!==o&&j&&!d.test(q)?r.strong!=o||!j||"*"!==o&&w&&!d.test(E)||(C=!1):C=!0),null!=C||null!=y){i.highlightFormatting&&(r.formatting=null==y?"strong":null==C?"em":"strong em"),!0===y&&(r.em=o),!0===C&&(r.strong=o);f=T(r);return!1===y&&(r.em=!1),!1===C&&(r.strong=!1),f}}else if(" "===o&&(e.eat("*")||e.eat("_"))){if(" "===e.peek())return T(r);e.backUp(1)}if(i.strikethrough)if("~"===o&&e.eatWhile(o)){if(r.strikethrough){i.highlightFormatting&&(r.formatting="strikethrough");f=T(r);return r.strikethrough=!1,f}if(e.match(/^[^\s]/,!1))return r.strikethrough=!0,i.highlightFormatting&&(r.formatting="strikethrough"),T(r)}else if(" "===o&&e.match(/^~~/,!0)){if(" "===e.peek())return T(r);e.backUp(2)}if(i.emoji&&":"===o&&e.match(/^[a-z_\d+-]+:/)){r.emoji=!0,i.highlightFormatting&&(r.formatting="emoji");var H=T(r);return r.emoji=!1,H}return" "===o&&(e.match(/ +$/,!1)?r.trailingSpace++:r.trailingSpace&&(r.trailingSpaceNewLine=!0)),T(r)}function F(t,e){if(">"===t.next()){e.f=e.inline=M,i.highlightFormatting&&(e.formatting="link");var n=T(e);return n?n+=" ":n="",n+a.linkInline}return t.match(/^[^>]+/,!0),a.linkInline}function b(t,e){if(t.eatSpace())return null;var n,r=t.next();return"("===r||"["===r?(e.f=e.inline=(n="("===r?")":"]",function(t,e){var r=t.next();if(r===n){e.f=e.inline=M,i.highlightFormatting&&(e.formatting="link-string");var a=T(e);return e.linkHref=!1,a}return t.match(E[n]),e.linkHref=!0,T(e)}),i.highlightFormatting&&(e.formatting="link-string"),e.linkHref=!0,T(e)):"error"}var E={")":/^(?:[^\\\(\)]|\\.|\((?:[^\\\(\)]|\\.)*\))*?(?=\))/,"]":/^(?:[^\\\[\]]|\\.|\[(?:[^\\\[\]]|\\.)*\])*?(?=\])/};function w(t,e){return t.match(/^([^\]\\]|\\.)*\]:/,!1)?(e.f=j,t.next(),i.highlightFormatting&&(e.formatting="link"),e.linkText=!0,T(e)):k(t,e,M)}function j(t,e){if(t.match(/^\]:/,!0)){e.f=e.inline=y,i.highlightFormatting&&(e.formatting="link");var n=T(e);return e.linkText=!1,n}return t.match(/^([^\]\\]|\\.)+/,!0),a.linkText}function y(t,e){return t.eatSpace()?null:(t.match(/^[^\s]+/,!0),void 0===t.peek()?e.linkTitle=!0:t.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/,!0),e.f=e.inline=M,a.linkHref+" url")}var C={startState:function(){return{f:v,prevLine:{stream:null},thisLine:{stream:null},block:v,htmlState:null,indentation:0,inline:M,text:q,formatting:!1,linkText:!1,linkHref:!1,linkTitle:!1,code:0,em:!1,strong:!1,header:0,setext:0,hr:!1,taskList:!1,list:!1,listStack:[],quote:0,trailingSpace:0,trailingSpaceNewLine:!1,strikethrough:!1,emoji:!1,fencedEndRE:null}},copyState:function(e){return{f:e.f,prevLine:e.prevLine,thisLine:e.thisLine,block:e.block,htmlState:e.htmlState&&t.copyState(n,e.htmlState),indentation:e.indentation,localMode:e.localMode,localState:e.localMode?t.copyState(e.localMode,e.localState):null,inline:e.inline,text:e.text,formatting:!1,linkText:e.linkText,linkTitle:e.linkTitle,linkHref:e.linkHref,code:e.code,em:e.em,strong:e.strong,strikethrough:e.strikethrough,emoji:e.emoji,header:e.header,setext:e.setext,hr:e.hr,taskList:e.taskList,list:e.list,listStack:e.listStack.slice(0),quote:e.quote,indentedCode:e.indentedCode,trailingSpace:e.trailingSpace,trailingSpaceNewLine:e.trailingSpaceNewLine,md_inside:e.md_inside,fencedEndRE:e.fencedEndRE}},token:function(t,e){if(e.formatting=!1,t!=e.thisLine.stream){if(e.header=0,e.hr=!1,t.match(/^\s*$/,!0))return x(e),null;if(e.prevLine=e.thisLine,e.thisLine={stream:t},e.taskList=!1,e.trailingSpace=0,e.trailingSpaceNewLine=!1,!e.localState&&(e.f=e.block,e.f!=S)){var i=t.match(/^\s*/,!0)[0].replace(/\t/g," ").length;if(e.indentation=i,e.indentationDiff=null,i>0)return null}}return e.f(t,e)},innerMode:function(t){return t.block==S?{state:t.htmlState,mode:n}:t.localState?{state:t.localState,mode:t.localMode}:{state:t,mode:C}},indent:function(e,i,r){return e.block==S&&n.indent?n.indent(e.htmlState,i,r):e.localState&&e.localMode.indent?e.localMode.indent(e.localState,i,r):t.Pass},blankLine:x,getType:T,closeBrackets:"()[]{}''\"\"``",fold:"markdown"};return C},"xml"),t.defineMIME("text/markdown","markdown"),t.defineMIME("text/x-markdown","markdown")}); diff --git a/plugins/tiddlywiki/codemirror-mode-markdown/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-mode-markdown/files/tiddlywiki.files new file mode 100755 index 000000000..ab2c87de0 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-markdown/files/tiddlywiki.files @@ -0,0 +1,12 @@ +{ + "tiddlers": [ +{ + "file": "mode/markdown/markdown.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/mode/markdown/markdown.js", + "module-type": "codemirror" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-mode-markdown/plugin.info b/plugins/tiddlywiki/codemirror-mode-markdown/plugin.info new file mode 100755 index 000000000..a9c8f1fd1 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-markdown/plugin.info @@ -0,0 +1,6 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-mode-markdown", + "description": "CodeMirror Mode: Markdown Highlighting", + "author": "JeremyRuston", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-mode-markdown/readme.tid b/plugins/tiddlywiki/codemirror-mode-markdown/readme.tid new file mode 100755 index 000000000..7ab96a54a --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-markdown/readme.tid @@ -0,0 +1,4 @@ +title: $:/plugins/tiddlywiki/codemirror-mode-markdown/readme + +This plugin adds Syntax Highlighting for Markdown tiddlers (text/x-markdown) to the [[CodeMirror|http://codemirror.net]] text editor. It needs the latest [[CodeMirror plugin|$:/plugins/tiddlywiki/codemirror]] to be installed + diff --git a/plugins/tiddlywiki/codemirror/files/mode/tiddlywiki/tiddlywiki.css b/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/files/mode/tiddlywiki/tiddlywiki.css similarity index 100% rename from plugins/tiddlywiki/codemirror/files/mode/tiddlywiki/tiddlywiki.css rename to plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/files/mode/tiddlywiki/tiddlywiki.css diff --git a/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/files/mode/tiddlywiki/tiddlywiki.js b/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/files/mode/tiddlywiki/tiddlywiki.js new file mode 100755 index 000000000..9012bde9a --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/files/mode/tiddlywiki/tiddlywiki.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";e.defineMode("tiddlywiki",function(){var e={},t={allTags:!0,closeAll:!0,list:!0,newJournal:!0,newTiddler:!0,permaview:!0,saveChanges:!0,search:!0,slider:!0,tabs:!0,tag:!0,tagging:!0,tags:!0,tiddler:!0,timeline:!0,today:!0,version:!0,option:!0,with:!0,filter:!0},r=/[\w_\-]/i,n=/^\-\-\-\-+$/,i=/^\/\*\*\*$/,o=/^\*\*\*\/$/,u=/^<<<$/,a=/^\/\/\{\{\{$/,f=/^\/\/\}\}\}$/,c=/^<!--\{\{\{-->$/,m=/^<!--\}\}\}-->$/,l=/^\{\{\{$/,k=/^\}\}\}$/,d=/.*?\}\}\}/;function h(e,t,r){return t.tokenize=r,r(e,t)}function s(t,k){var d=t.sol(),s=t.peek();if(k.block=!1,d&&/[<\/\*{}\-]/.test(s)){if(t.match(l))return k.block=!0,h(t,k,$);if(t.match(u))return"quote";if(t.match(i)||t.match(o))return"comment";if(t.match(a)||t.match(f)||t.match(c)||t.match(m))return"comment";if(t.match(n))return"hr"}if(t.next(),d&&/[\/\*!#;:>|]/.test(s)){if("!"==s)return t.skipToEnd(),"header";if("*"==s)return t.eatWhile("*"),"comment";if("#"==s)return t.eatWhile("#"),"comment";if(";"==s)return t.eatWhile(";"),"comment";if(":"==s)return t.eatWhile(":"),"comment";if(">"==s)return t.eatWhile(">"),"quote";if("|"==s)return"header"}if("{"==s&&t.match(/\{\{/))return h(t,k,$);if(/[hf]/i.test(s)&&/[ti]/i.test(t.peek())&&t.match(/\b(ttps?|tp|ile):\/\/[\-A-Z0-9+&@#\/%?=~_|$!:,.;]*[A-Z0-9+&@#\/%=~_|$]/i))return"link";if('"'==s)return"string";if("~"==s)return"brace";if(/[\[\]]/.test(s)&&t.match(s))return"brace";if("@"==s)return t.eatWhile(r),"link";if(/\d/.test(s))return t.eatWhile(/\d/),"number";if("/"==s){if(t.eat("%"))return h(t,k,b);if(t.eat("/"))return h(t,k,v)}if("_"==s&&t.eat("_"))return h(t,k,w);if("-"==s&&t.eat("-")){if(" "!=t.peek())return h(t,k,x);if(" "==t.peek())return"brace"}return"'"==s&&t.eat("'")?h(t,k,p):"<"==s&&t.eat("<")?h(t,k,z):(t.eatWhile(/[\w\$_]/),e.propertyIsEnumerable(t.current())?"keyword":null)}function b(e,t){for(var r,n=!1;r=e.next();){if("/"==r&&n){t.tokenize=s;break}n="%"==r}return"comment"}function p(e,t){for(var r,n=!1;r=e.next();){if("'"==r&&n){t.tokenize=s;break}n="'"==r}return"strong"}function $(e,t){var r=t.block;return r&&e.current()?"comment":!r&&e.match(d)?(t.tokenize=s,"comment"):r&&e.sol()&&e.match(k)?(t.tokenize=s,"comment"):(e.next(),"comment")}function v(e,t){for(var r,n=!1;r=e.next();){if("/"==r&&n){t.tokenize=s;break}n="/"==r}return"em"}function w(e,t){for(var r,n=!1;r=e.next();){if("_"==r&&n){t.tokenize=s;break}n="_"==r}return"underlined"}function x(e,t){for(var r,n=!1;r=e.next();){if("-"==r&&n){t.tokenize=s;break}n="-"==r}return"strikethrough"}function z(e,r){if("<<"==e.current())return"macro";var n=e.next();return n?">"==n&&">"==e.peek()?(e.next(),r.tokenize=s,"macro"):(e.eatWhile(/[\w\$_]/),t.propertyIsEnumerable(e.current())?"keyword":null):(r.tokenize=s,null)}return{startState:function(){return{tokenize:s}},token:function(e,t){return e.eatSpace()?null:t.tokenize(e,t)}}}),e.defineMIME("text/x-tiddlywiki","tiddlywiki")}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/files/tiddlywiki.files new file mode 100755 index 000000000..423cca80e --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/files/tiddlywiki.files @@ -0,0 +1,19 @@ +{ + "tiddlers": [ + { + "file": "mode/tiddlywiki/tiddlywiki.css", + "fields": { + "type": "text/css", + "title": "$:/plugins/tiddlywiki/codemirror/mode/tiddlywiki/tiddlywiki.css", + "tags": "[[$:/tags/Stylesheet]]" + } + },{ + "file": "mode/tiddlywiki/tiddlywiki.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/mode/tiddlywiki/tiddlywiki.js", + "module-type": "codemirror" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/plugin.info b/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/plugin.info new file mode 100755 index 000000000..e58c0bab0 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/plugin.info @@ -0,0 +1,6 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki", + "description": "CodeMirror Mode: Tiddlywiki Classic Highlighting", + "author": "JeremyRuston", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/readme.tid b/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/readme.tid new file mode 100755 index 000000000..a5730b1d6 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/readme.tid @@ -0,0 +1,4 @@ +title: $:/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/readme + +This plugin adds Syntax Highlighting for ~TiddlyWiki Classic tiddlers (text/x-tiddlywiki) to the [[CodeMirror|http://codemirror.net]] text editor. It needs the latest [[CodeMirror plugin|$:/plugins/tiddlywiki/codemirror]] to be installed + diff --git a/plugins/tiddlywiki/codemirror-mode-xml/files/mode/xml/xml.js b/plugins/tiddlywiki/codemirror-mode-xml/files/mode/xml/xml.js new file mode 100755 index 000000000..8e6c28829 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-xml/files/mode/xml/xml.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],t):t(CodeMirror)}(function(t){"use strict";var e={autoSelfClosers:{area:!0,base:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,menuitem:!0},implicitlyClosed:{dd:!0,li:!0,optgroup:!0,option:!0,p:!0,rp:!0,rt:!0,tbody:!0,td:!0,tfoot:!0,th:!0,tr:!0},contextGrabbers:{dd:{dd:!0,dt:!0},dt:{dd:!0,dt:!0},li:{li:!0},option:{option:!0,optgroup:!0},optgroup:{optgroup:!0},p:{address:!0,article:!0,aside:!0,blockquote:!0,dir:!0,div:!0,dl:!0,fieldset:!0,footer:!0,form:!0,h1:!0,h2:!0,h3:!0,h4:!0,h5:!0,h6:!0,header:!0,hgroup:!0,hr:!0,menu:!0,nav:!0,ol:!0,p:!0,pre:!0,section:!0,table:!0,ul:!0},rp:{rp:!0,rt:!0},rt:{rp:!0,rt:!0},tbody:{tbody:!0,tfoot:!0},td:{td:!0,th:!0},tfoot:{tbody:!0},th:{td:!0,th:!0},thead:{tbody:!0,tfoot:!0},tr:{tr:!0}},doNotIndent:{pre:!0},allowUnquoted:!0,allowMissing:!0,caseFold:!0},n={autoSelfClosers:{},implicitlyClosed:{},contextGrabbers:{},doNotIndent:{},allowUnquoted:!1,allowMissing:!1,allowMissingTagName:!1,caseFold:!1};t.defineMode("xml",function(r,o){var a,i,l=r.indentUnit,u={},d=o.htmlMode?e:n;for(var c in d)u[c]=d[c];for(var c in o)u[c]=o[c];function s(t,e){function n(n){return e.tokenize=n,n(t,e)}var r=t.next();return"<"==r?t.eat("!")?t.eat("[")?t.match("CDATA[")?n(m("atom","]]>")):null:t.match("--")?n(m("comment","--\x3e")):t.match("DOCTYPE",!0,!0)?(t.eatWhile(/[\w\._\-]/),n(function t(e){return function(n,r){for(var o;null!=(o=n.next());){if("<"==o)return r.tokenize=t(e+1),r.tokenize(n,r);if(">"==o){if(1==e){r.tokenize=s;break}return r.tokenize=t(e-1),r.tokenize(n,r)}}return"meta"}}(1))):null:t.eat("?")?(t.eatWhile(/[\w\._\-]/),e.tokenize=m("meta","?>"),"meta"):(a=t.eat("/")?"closeTag":"openTag",e.tokenize=f,"tag bracket"):"&"==r?(t.eat("#")?t.eat("x")?t.eatWhile(/[a-fA-F\d]/)&&t.eat(";"):t.eatWhile(/[\d]/)&&t.eat(";"):t.eatWhile(/[\w\.\-:]/)&&t.eat(";"))?"atom":"error":(t.eatWhile(/[^&<]/),null)}function f(t,e){var n,r,o=t.next();if(">"==o||"/"==o&&t.eat(">"))return e.tokenize=s,a=">"==o?"endTag":"selfcloseTag","tag bracket";if("="==o)return a="equals",null;if("<"==o){e.tokenize=s,e.state=h,e.tagName=e.tagStart=null;var i=e.tokenize(t,e);return i?i+" tag error":"tag error"}return/[\'\"]/.test(o)?(e.tokenize=(n=o,(r=function(t,e){for(;!t.eol();)if(t.next()==n){e.tokenize=f;break}return"string"}).isInAttribute=!0,r),e.stringStartCol=t.column(),e.tokenize(t,e)):(t.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/),"word")}function m(t,e){return function(n,r){for(;!n.eol();){if(n.match(e)){r.tokenize=s;break}n.next()}return t}}function g(t){t.context&&(t.context=t.context.prev)}function p(t,e){for(var n;;){if(!t.context)return;if(n=t.context.tagName,!u.contextGrabbers.hasOwnProperty(n)||!u.contextGrabbers[n].hasOwnProperty(e))return;g(t)}}function h(t,e,n){return"openTag"==t?(n.tagStart=e.column(),x):"closeTag"==t?b:h}function x(t,e,n){return"word"==t?(n.tagName=e.current(),i="tag",v):u.allowMissingTagName&&"endTag"==t?(i="tag bracket",v(t,e,n)):(i="error",x)}function b(t,e,n){if("word"==t){var r=e.current();return n.context&&n.context.tagName!=r&&u.implicitlyClosed.hasOwnProperty(n.context.tagName)&&g(n),n.context&&n.context.tagName==r||!1===u.matchClosing?(i="tag",k):(i="tag error",w)}return u.allowMissingTagName&&"endTag"==t?(i="tag bracket",k(t,e,n)):(i="error",w)}function k(t,e,n){return"endTag"!=t?(i="error",k):(g(n),h)}function w(t,e,n){return i="error",k(t,0,n)}function v(t,e,n){if("word"==t)return i="attribute",T;if("endTag"==t||"selfcloseTag"==t){var r=n.tagName,o=n.tagStart;return n.tagName=n.tagStart=null,"selfcloseTag"==t||u.autoSelfClosers.hasOwnProperty(r)?p(n,r):(p(n,r),n.context=new function(t,e,n){this.prev=t.context,this.tagName=e,this.indent=t.indented,this.startOfLine=n,(u.doNotIndent.hasOwnProperty(e)||t.context&&t.context.noIndent)&&(this.noIndent=!0)}(n,r,o==n.indented)),h}return i="error",v}function T(t,e,n){return"equals"==t?y:(u.allowMissing||(i="error"),v(t,0,n))}function y(t,e,n){return"string"==t?N:"word"==t&&u.allowUnquoted?(i="string",v):(i="error",v(t,0,n))}function N(t,e,n){return"string"==t?N:v(t,0,n)}return s.isInText=!0,{startState:function(t){var e={tokenize:s,state:h,indented:t||0,tagName:null,tagStart:null,context:null};return null!=t&&(e.baseIndent=t),e},token:function(t,e){if(!e.tagName&&t.sol()&&(e.indented=t.indentation()),t.eatSpace())return null;a=null;var n=e.tokenize(t,e);return(n||a)&&"comment"!=n&&(i=null,e.state=e.state(a||n,t,e),i&&(n="error"==i?n+" error":i)),n},indent:function(e,n,r){var o=e.context;if(e.tokenize.isInAttribute)return e.tagStart==e.indented?e.stringStartCol+1:e.indented+l;if(o&&o.noIndent)return t.Pass;if(e.tokenize!=f&&e.tokenize!=s)return r?r.match(/^(\s*)/)[0].length:0;if(e.tagName)return!1!==u.multilineTagIndentPastTag?e.tagStart+e.tagName.length+2:e.tagStart+l*(u.multilineTagIndentFactor||1);if(u.alignCDATA&&/<!\[CDATA\[/.test(n))return 0;var a=n&&/^<(\/)?([\w_:\.-]*)/.exec(n);if(a&&a[1])for(;o;){if(o.tagName==a[2]){o=o.prev;break}if(!u.implicitlyClosed.hasOwnProperty(o.tagName))break;o=o.prev}else if(a)for(;o;){var i=u.contextGrabbers[o.tagName];if(!i||!i.hasOwnProperty(a[2]))break;o=o.prev}for(;o&&o.prev&&!o.startOfLine;)o=o.prev;return o?o.indent+l:e.baseIndent||0},electricInput:/<\/[\s\w:]+>$/,blockCommentStart:"\x3c!--",blockCommentEnd:"--\x3e",configuration:u.htmlMode?"html":"xml",helperType:u.htmlMode?"html":"xml",skipAttribute:function(t){t.state==y&&(t.state=v)}}}),t.defineMIME("text/xml","xml"),t.defineMIME("application/xml","xml"),t.mimeModes.hasOwnProperty("text/html")||t.defineMIME("text/html",{name:"xml",htmlMode:!0})}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-mode-xml/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-mode-xml/files/tiddlywiki.files new file mode 100755 index 000000000..1884e010e --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-xml/files/tiddlywiki.files @@ -0,0 +1,12 @@ +{ + "tiddlers": [ + { + "file": "mode/xml/xml.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/mode/xml/xml.js", + "module-type": "codemirror" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-mode-xml/plugin.info b/plugins/tiddlywiki/codemirror-mode-xml/plugin.info new file mode 100755 index 000000000..29ff6c7bc --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-xml/plugin.info @@ -0,0 +1,6 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-mode-xml", + "description": "CodeMirror Mode: XML Highlighting", + "author": "JeremyRuston", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-mode-xml/readme.tid b/plugins/tiddlywiki/codemirror-mode-xml/readme.tid new file mode 100755 index 000000000..70fa6f996 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-mode-xml/readme.tid @@ -0,0 +1,4 @@ +title: $:/plugins/tiddlywiki/codemirror-mode-xml/readme + +This plugin is a requirement for other Syntax-highlighting plugins and adds Highlighting for XML tiddlers (application/xml) to the [[CodeMirror|http://codemirror.net]] text editor. It needs the latest [[CodeMirror plugin|$:/plugins/tiddlywiki/codemirror]] to be installed + diff --git a/plugins/tiddlywiki/codemirror-search-replace/files/addon/search/jump-to-line.js b/plugins/tiddlywiki/codemirror-search-replace/files/addon/search/jump-to-line.js new file mode 100644 index 000000000..5c0e2d945 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-search-replace/files/addon/search/jump-to-line.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror"),require("../dialog/dialog")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../dialog/dialog"],e):e(CodeMirror)}(function(e){"use strict";function o(e,o){var r=Number(o);return/^[-+]/.test(o)?e.getCursor().line+r:r-1}e.commands.jumpToLine=function(e){var r,i,t,s,n,l=e.getCursor();r=e,i='Jump to line: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use line:column or scroll% syntax)</span>',t="Jump to line:",s=l.line+1+":"+l.ch,n=function(r){var i;if(r)if(i=/^\s*([\+\-]?\d+)\s*\:\s*(\d+)\s*$/.exec(r))e.setCursor(o(e,i[1]),Number(i[2]));else if(i=/^\s*([\+\-]?\d+(\.\d+)?)\%\s*/.exec(r)){var t=Math.round(e.lineCount()*Number(i[1])/100);/^[-+]/.test(i[1])&&(t=l.line+t+1),e.setCursor(t-1,l.ch)}else(i=/^\s*\:?\s*([\+\-]?\d+)\s*/.exec(r))&&e.setCursor(o(e,i[1]),l.ch)},r.openDialog?r.openDialog(i,n,{value:s,selectValueOnOpen:!0}):n(prompt(t,s))},e.keyMap.default["Alt-G"]="jumpToLine"}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-search-replace/files/addon/search/search.js b/plugins/tiddlywiki/codemirror-search-replace/files/addon/search/search.js new file mode 100644 index 000000000..f61ca05e5 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-search-replace/files/addon/search/search.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror"),require("./searchcursor"),require("../dialog/dialog")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./searchcursor","../dialog/dialog"],e):e(CodeMirror)}(function(e){"use strict";function o(e){return e.state.search||(e.state.search=new function(){this.posFrom=this.posTo=this.lastQuery=this.query=null,this.overlay=null})}function n(e){return"string"==typeof e&&e==e.toLowerCase()}function r(e,o,r){return e.getSearchCursor(o,r,{caseFold:n(o),multiline:!0})}function t(e,o,n,r,t){e.openDialog?e.openDialog(o,t,{value:r,selectValueOnOpen:!0}):t(prompt(n,r))}function i(e){return e.replace(/\\(.)/g,function(e,o){return"n"==o?"\n":"r"==o?"\r":o})}function a(e){var o=e.match(/^\/(.*)\/([a-z]*)$/);if(o)try{e=new RegExp(o[1],-1==o[2].indexOf("i")?"":"i")}catch(e){}else e=i(e);return("string"==typeof e?""==e:e.test(""))&&(e=/x^/),e}var s='<span class="CodeMirror-search-label">Search:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';function c(e,o,r){var t,i;o.queryText=r,o.query=a(r),e.removeOverlay(o.overlay,n(o.query)),o.overlay=(t=o.query,i=n(o.query),"string"==typeof t?t=new RegExp(t.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&"),i?"gi":"g"):t.global||(t=new RegExp(t.source,t.ignoreCase?"gi":"g")),{token:function(e){t.lastIndex=e.pos;var o=t.exec(e.string);if(o&&o.index==e.pos)return e.pos+=o[0].length||1,"searching";o?e.pos=o.index:e.skipToEnd()}}),e.addOverlay(o.overlay),e.showMatchesOnScrollbar&&(o.annotate&&(o.annotate.clear(),o.annotate=null),o.annotate=e.showMatchesOnScrollbar(o.query,n(o.query)))}function l(n,r,i,a){var l=o(n);if(l.query)return u(n,r);var p,d,y,m,g,h=n.getSelection()||l.lastQuery;if(h instanceof RegExp&&"x^"==h.source&&(h=null),i&&n.openDialog){var v=null,x=function(o,r){e.e_stop(r),o&&(o!=l.queryText&&(c(n,l,o),l.posFrom=l.posTo=n.getCursor()),v&&(v.style.opacity=1),u(n,r.shiftKey,function(e,o){var r;o.line<3&&document.querySelector&&(r=n.display.wrapper.querySelector(".CodeMirror-dialog"))&&r.getBoundingClientRect().bottom-4>n.cursorCoords(o,"window").top&&((v=r).style.opacity=.4)}))};d=s,y=h,m=x,g=function(r,t){var i=e.keyName(r),a=n.getOption("extraKeys"),s=a&&a[i]||e.keyMap[n.getOption("keyMap")][i];"findNext"==s||"findPrev"==s||"findPersistentNext"==s||"findPersistentPrev"==s?(e.e_stop(r),c(n,o(n),t),n.execCommand(s)):"find"!=s&&"findPersistent"!=s||(e.e_stop(r),x(t,r))},(p=n).openDialog(d,m,{value:y,selectValueOnOpen:!0,closeOnEnter:!1,onClose:function(){f(p)},onKeyDown:g}),a&&h&&(c(n,l,h),u(n,r))}else t(n,s,"Search for:",h,function(e){e&&!l.query&&n.operation(function(){c(n,l,e),l.posFrom=l.posTo=n.getCursor(),u(n,r)})})}function u(n,t,i){n.operation(function(){var a=o(n),s=r(n,a.query,t?a.posFrom:a.posTo);(s.find(t)||(s=r(n,a.query,t?e.Pos(n.lastLine()):e.Pos(n.firstLine(),0))).find(t))&&(n.setSelection(s.from(),s.to()),n.scrollIntoView({from:s.from(),to:s.to()},20),a.posFrom=s.from(),a.posTo=s.to(),i&&i(s.from(),s.to()))})}function f(e){e.operation(function(){var n=o(e);n.lastQuery=n.query,n.query&&(n.query=n.queryText=null,e.removeOverlay(n.overlay),n.annotate&&(n.annotate.clear(),n.annotate=null))})}var p=' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>',d='<span class="CodeMirror-search-label">With:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/>',y='<span class="CodeMirror-search-label">Replace?</span> <button>Yes</button> <button>No</button> <button>All</button> <button>Stop</button>';function m(e,o,n){e.operation(function(){for(var t=r(e,o);t.findNext();)if("string"!=typeof o){var i=e.getRange(t.from(),t.to()).match(o);t.replace(n.replace(/\$(\d)/g,function(e,o){return i[o]}))}else t.replace(n)})}function g(e,n){if(!e.getOption("readOnly")){var s=e.getSelection()||o(e).lastQuery,c='<span class="CodeMirror-search-label">'+(n?"Replace all:":"Replace:")+"</span>";t(e,c+p,c,s,function(o){o&&(o=a(o),t(e,d,"Replace with:","",function(t){if(t=i(t),n)m(e,o,t);else{f(e);var a=r(e,o,e.getCursor("from")),s=function(){var n,i,l,u,f,p=a.from();!(n=a.findNext())&&(a=r(e,o),!(n=a.findNext())||p&&a.from().line==p.line&&a.from().ch==p.ch)||(e.setSelection(a.from(),a.to()),e.scrollIntoView({from:a.from(),to:a.to()}),l=y,u="Replace?",f=[function(){c(n)},s,function(){m(e,o,t)}],(i=e).openConfirm?i.openConfirm(l,f):confirm(u)&&f[0]())},c=function(e){a.replace("string"==typeof o?t:t.replace(/\$(\d)/g,function(o,n){return e[n]})),s()};s()}}))})}}e.commands.find=function(e){f(e),l(e)},e.commands.findPersistent=function(e){f(e),l(e,!1,!0)},e.commands.findPersistentNext=function(e){l(e,!1,!0,!0)},e.commands.findPersistentPrev=function(e){l(e,!0,!0,!0)},e.commands.findNext=l,e.commands.findPrev=function(e){l(e,!0)},e.commands.clearSearch=f,e.commands.replace=g,e.commands.replaceAll=function(e){g(e,!0)}}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-search-replace/files/addon/search/searchcursor.js b/plugins/tiddlywiki/codemirror-search-replace/files/addon/search/searchcursor.js new file mode 100755 index 000000000..c10445711 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-search-replace/files/addon/search/searchcursor.js @@ -0,0 +1,3 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE +!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],t):t(CodeMirror)}(function(t){"use strict";var e,n,r=t.Pos;function i(t,e){for(var n,r,i=null!=(r=(n=t).flags)?r:(n.ignoreCase?"i":"")+(n.global?"g":"")+(n.multiline?"m":""),o=i,l=0;l<e.length;l++)-1==o.indexOf(e.charAt(l))&&(o+=e.charAt(l));return i==o?t:new RegExp(t.source,o)}function o(t,e,n){e=i(e,"g");for(var o=n.line,l=n.ch,h=t.lastLine();o<=h;o++,l=0){e.lastIndex=l;var s=t.getLine(o),c=e.exec(s);if(c)return{from:r(o,c.index),to:r(o,c.index+c[0].length),match:c}}}function l(t,e){for(var n,r=0;;){e.lastIndex=r;var i=e.exec(t);if(!i)return n;if((r=(n=i).index+(n[0].length||1))==t.length)return n}}function h(t,e,n,r){if(t.length==e.length)return n;for(var i=0,o=n+Math.max(0,t.length-e.length);;){if(i==o)return i;var l=i+o>>1,h=r(t.slice(0,l)).length;if(h==n)return l;h>n?o=l:i=l+1}}function s(t,s,c,f){var u;this.atOccurrence=!1,this.doc=t,c=c?t.clipPos(c):r(0,0),this.pos={from:c,to:c},"object"==typeof f?u=f.caseFold:(u=f,f=null),"string"==typeof s?(null==u&&(u=!1),this.matches=function(i,o){return(i?function(t,i,o,l){if(!i.length)return null;var s=l?e:n,c=s(i).split(/\r|\n\r?/);t:for(var f=o.line,u=o.ch,a=t.firstLine()-1+c.length;f>=a;f--,u=-1){var g=t.getLine(f);u>-1&&(g=g.slice(0,u));var m=s(g);if(1==c.length){var d=m.lastIndexOf(c[0]);if(-1==d)continue t;return{from:r(f,h(g,m,d,s)),to:r(f,h(g,m,d+c[0].length,s))}}var v=c[c.length-1];if(m.slice(0,v.length)==v){var p=1;for(o=f-c.length+1;p<c.length-1;p++)if(s(t.getLine(o+p))!=c[p])continue t;var x=t.getLine(f+1-c.length),L=s(x);if(L.slice(L.length-c[0].length)==c[0])return{from:r(f+1-c.length,h(x,L,x.length-c[0].length,s)),to:r(f,h(g,m,v.length,s))}}}}:function(t,i,o,l){if(!i.length)return null;var s=l?e:n,c=s(i).split(/\r|\n\r?/);t:for(var f=o.line,u=o.ch,a=t.lastLine()+1-c.length;f<=a;f++,u=0){var g=t.getLine(f).slice(u),m=s(g);if(1==c.length){var d=m.indexOf(c[0]);if(-1==d)continue t;return o=h(g,m,d,s)+u,{from:r(f,h(g,m,d,s)+u),to:r(f,h(g,m,d+c[0].length,s)+u)}}var v=m.length-c[0].length;if(m.slice(v)==c[0]){for(var p=1;p<c.length-1;p++)if(s(t.getLine(f+p))!=c[p])continue t;var x=t.getLine(f+c.length-1),L=s(x),C=c[c.length-1];if(L.slice(0,C.length)==C)return{from:r(f,h(g,m,v,s)+u),to:r(f+c.length-1,h(x,L,C.length,s))}}}})(t,s,o,u)}):(s=i(s,"gm"),f&&!1===f.multiline?this.matches=function(e,n){return(e?function(t,e,n){e=i(e,"g");for(var o=n.line,h=n.ch,s=t.firstLine();o>=s;o--,h=-1){var c=t.getLine(o);h>-1&&(c=c.slice(0,h));var f=l(c,e);if(f)return{from:r(o,f.index),to:r(o,f.index+f[0].length),match:f}}}:o)(t,s,n)}:this.matches=function(e,n){return(e?function(t,e,n){e=i(e,"gm");for(var o,h=1,s=n.line,c=t.firstLine();s>=c;){for(var f=0;f<h;f++){var u=t.getLine(s--);o=null==o?u.slice(0,n.ch):u+"\n"+o}h*=2;var a=l(o,e);if(a){var g=o.slice(0,a.index).split("\n"),m=a[0].split("\n"),d=s+g.length,v=g[g.length-1].length;return{from:r(d,v),to:r(d+m.length-1,1==m.length?v+m[0].length:m[m.length-1].length),match:a}}}}:function(t,e,n){if(!/\\s|\\n|\n|\\W|\\D|\[\^/.test(e.source))return o(t,e,n);e=i(e,"gm");for(var l,h=1,s=n.line,c=t.lastLine();s<=c;){for(var f=0;f<h&&!(s>c);f++){var u=t.getLine(s++);l=null==l?u:l+"\n"+u}h*=2,e.lastIndex=n.ch;var a=e.exec(l);if(a){var g=l.slice(0,a.index).split("\n"),m=a[0].split("\n"),d=n.line+g.length-1,v=g[g.length-1].length;return{from:r(d,v),to:r(d+m.length-1,1==m.length?v+m[0].length:m[m.length-1].length),match:a}}}})(t,s,n)})}String.prototype.normalize?(e=function(t){return t.normalize("NFD").toLowerCase()},n=function(t){return t.normalize("NFD")}):(e=function(t){return t.toLowerCase()},n=function(t){return t}),s.prototype={findNext:function(){return this.find(!1)},findPrevious:function(){return this.find(!0)},find:function(e){for(var n=this.matches(e,this.doc.clipPos(e?this.pos.from:this.pos.to));n&&0==t.cmpPos(n.from,n.to);)e?n.from.ch?n.from=r(n.from.line,n.from.ch-1):n=n.from.line==this.doc.firstLine()?null:this.matches(e,this.doc.clipPos(r(n.from.line-1))):n.to.ch<this.doc.getLine(n.to.line).length?n.to=r(n.to.line,n.to.ch+1):n=n.to.line==this.doc.lastLine()?null:this.matches(e,r(n.to.line+1,0));if(n)return this.pos=n,this.atOccurrence=!0,this.pos.match||!0;var i=r(e?this.doc.firstLine():this.doc.lastLine()+1,0);return this.pos={from:i,to:i},this.atOccurrence=!1},from:function(){if(this.atOccurrence)return this.pos.from},to:function(){if(this.atOccurrence)return this.pos.to},replace:function(e,n){if(this.atOccurrence){var i=t.splitLines(e);this.doc.replaceRange(i,this.pos.from,this.pos.to,n),this.pos.to=r(this.pos.from.line+i.length-1,i[i.length-1].length+(1==i.length?this.pos.from.ch:0))}}},t.defineExtension("getSearchCursor",function(t,e,n){return new s(this.doc,t,e,n)}),t.defineDocExtension("getSearchCursor",function(t,e,n){return new s(this,t,e,n)}),t.defineExtension("selectMatches",function(e,n){for(var r=[],i=this.getSearchCursor(e,this.getCursor("from"),n);i.findNext()&&!(t.cmpPos(i.to(),this.getCursor("to"))>0);)r.push({anchor:i.from(),head:i.to()});r.length&&this.setSelections(r,0)})}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror-search-replace/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-search-replace/files/tiddlywiki.files new file mode 100755 index 000000000..23e05c04a --- /dev/null +++ b/plugins/tiddlywiki/codemirror-search-replace/files/tiddlywiki.files @@ -0,0 +1,26 @@ +{ + "tiddlers": [ + { + "file": "addon/search/search.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/search/search.js", + "module-type": "codemirror" + } + },{ + "file": "addon/search/jump-to-line.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/search/jump-to-line.js", + "module-type": "codemirror" + } + },{ + "file": "addon/search/searchcursor.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/search/searchcursor.js", + "module-type": "codemirror" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-search-replace/plugin.info b/plugins/tiddlywiki/codemirror-search-replace/plugin.info new file mode 100755 index 000000000..6f31daa04 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-search-replace/plugin.info @@ -0,0 +1,6 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-search-replace", + "description": "CodeMirror AddOn: Search and Replace", + "author": "JeremyRuston", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-search-replace/readme.tid b/plugins/tiddlywiki/codemirror-search-replace/readme.tid new file mode 100755 index 000000000..4e39426f2 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-search-replace/readme.tid @@ -0,0 +1,15 @@ +title: $:/plugins/tiddlywiki/codemirror-search-replace/readme + +This plugin enhances the [[CodeMirror|http://codemirror.net]] text editor with Search and Replace functionality. It needs the latest [[CodeMirror plugin|$:/plugins/tiddlywiki/codemirror]] to be installed + +It adds these Keyboard Shortcuts to ~CodeMirror: + +|Shortcut |Function |h +|Ctrl-F / Cmd-F |Start searching | +|Ctrl-G / Cmd-G / Shift-F3 |Find next | +|Shift-Ctrl-G / Shift-Cmd-G / F3 |Find previous | +|Shift-Ctrl-F / Cmd-Option-F |Replace | +|Shift-Ctrl-R / Shift-Cmd-Option-F |Replace all | +|Alt-F |Persistent search (dialog doesn't autoclose, enter to find next, Shift-Enter to find previous) | +|Alt-G |Jump to line | + diff --git a/plugins/tiddlywiki/codemirror/config-language.multids b/plugins/tiddlywiki/codemirror/config-language.multids new file mode 100644 index 000000000..13cd693d9 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/config-language.multids @@ -0,0 +1,22 @@ +title: $:/language/codemirror/ + +homeUrl: http://codemirror.net +addOnUrl: http://codemirror.net/doc/manual.html#addons +configUrl: http://codemirror.net/doc/manual.html#config +controlPanel/hint: These settings let you customise the behaviour of [[CodeMirror|$:/plugins/tiddlywiki/codemirror]]. +controlPanel/usage: Usage information +editorFont/hint: Editor font family +editorFont/info: Set the font family for the ~CodeMirror text-editor +controlPanel/keyboard: Keyboard shortcuts +keyMap/hint: ~CodeMirror keymap +keyMap/info: ~The Keyboard KeyMap used within the ~CodeMirror text-editor +lineNumbers/hint: Enable line numbers +lineNumbers/info: Whether to show line numbers to the left of the editor. +lineWrapping/hint: Enable line wrapping +lineWrapping/info: Whether CodeMirror should scroll or wrap for long lines. Defaults to `false` (scroll). +showCursorWhenSelecting/hint: Show cursor, when selecting +showCursorWhenSelecting/info: Whether the cursor should be drawn when a selection is active. +styleActiveLine/hint: Highlight active line +styleActiveLine/info: Whether or not to highlight the active text-editor line +theme/hint: Select a theme +theme/info: Choose between ~CodeMirror themes diff --git a/plugins/tiddlywiki/codemirror/config.tid b/plugins/tiddlywiki/codemirror/config.tid deleted file mode 100755 index 03e2a73f7..000000000 --- a/plugins/tiddlywiki/codemirror/config.tid +++ /dev/null @@ -1,25 +0,0 @@ -title: $:/config/CodeMirror -type: application/json - -{ - "require": [ - "$:/plugins/tiddlywiki/codemirror/addon/dialog/dialog.js", - "$:/plugins/tiddlywiki/codemirror/addon/search/searchcursor.js", - "$:/plugins/tiddlywiki/codemirror/addon/edit/matchbrackets.js", - "$:/plugins/tiddlywiki/codemirror/addon/mode/multiplex.js", - "$:/plugins/tiddlywiki/codemirror/mode/css/css.js", - "$:/plugins/tiddlywiki/codemirror/mode/htmlembedded/htmlembedded.js", - "$:/plugins/tiddlywiki/codemirror/mode/htmlmixed/htmlmixed.js", - "$:/plugins/tiddlywiki/codemirror/mode/javascript/javascript.js", - "$:/plugins/tiddlywiki/codemirror/mode/markdown/markdown.js", - "$:/plugins/tiddlywiki/codemirror/mode/meta.js", - "$:/plugins/tiddlywiki/codemirror/mode/tiddlywiki/tiddlywiki.js", - "$:/plugins/tiddlywiki/codemirror/mode/xml/xml.js", - "$:/plugins/tiddlywiki/codemirror/keymap/vim.js", - "$:/plugins/tiddlywiki/codemirror/keymap/emacs.js" - ], - "configuration": { - "matchBrackets": true, - "showCursorWhenSelecting": true - } -} \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror/config/cursorBlinkRate.tid b/plugins/tiddlywiki/codemirror/config/cursorBlinkRate.tid new file mode 100644 index 000000000..1900bcd5a --- /dev/null +++ b/plugins/tiddlywiki/codemirror/config/cursorBlinkRate.tid @@ -0,0 +1,4 @@ +title: $:/config/codemirror/cursorBlinkRate +type: string + +530 diff --git a/plugins/tiddlywiki/codemirror/config/extraKeysTW.tid b/plugins/tiddlywiki/codemirror/config/extraKeysTW.tid new file mode 100644 index 000000000..1be220f75 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/config/extraKeysTW.tid @@ -0,0 +1,15 @@ +title: $:/config/codemirror/extraKeysTW +extend: extraKeys +type: json + +{ + "Ctrl-Esc": "singleSelection", + "Esc": "", + "Ctrl-S": "", + "Ctrl-U": "", + "Ctrl-T": "", + "Alt-T": "transposeChars", + "Alt-U": "undoSelection", + "Shift-Alt-U": "redoSelection", + "Cmd-U": "" +} diff --git a/plugins/tiddlywiki/codemirror/config/indentUnit.tid b/plugins/tiddlywiki/codemirror/config/indentUnit.tid new file mode 100644 index 000000000..c1f88c4f3 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/config/indentUnit.tid @@ -0,0 +1,3 @@ +title: $:/config/codemirror/indentUnit + +2 diff --git a/plugins/tiddlywiki/codemirror/config/inputStyle.tid b/plugins/tiddlywiki/codemirror/config/inputStyle.tid new file mode 100644 index 000000000..6f711e044 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/config/inputStyle.tid @@ -0,0 +1,4 @@ +title: $:/config/codemirror/inputStyle +type: string + +textarea diff --git a/plugins/tiddlywiki/codemirror/config/keyMap.tid b/plugins/tiddlywiki/codemirror/config/keyMap.tid new file mode 100644 index 000000000..0d5645748 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/config/keyMap.tid @@ -0,0 +1,4 @@ +title: $:/config/codemirror/keyMap +type: string + +default diff --git a/plugins/tiddlywiki/codemirror/config/lineNumbers.tid b/plugins/tiddlywiki/codemirror/config/lineNumbers.tid new file mode 100644 index 000000000..edd982e43 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/config/lineNumbers.tid @@ -0,0 +1,4 @@ +title: $:/config/codemirror/lineNumbers +type: bool + +false diff --git a/plugins/tiddlywiki/codemirror/config/lineWrapping.tid b/plugins/tiddlywiki/codemirror/config/lineWrapping.tid new file mode 100644 index 000000000..c9ea61a21 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/config/lineWrapping.tid @@ -0,0 +1,4 @@ +title: $:/config/codemirror/lineWrapping +type: bool + +true \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror/config/showCursorWhenSelecting.tid b/plugins/tiddlywiki/codemirror/config/showCursorWhenSelecting.tid new file mode 100644 index 000000000..b185e642d --- /dev/null +++ b/plugins/tiddlywiki/codemirror/config/showCursorWhenSelecting.tid @@ -0,0 +1,4 @@ +title: $:/config/codemirror/showCursorWhenSelecting +type: bool + +true diff --git a/plugins/tiddlywiki/codemirror/config/styleActiveLine.tid b/plugins/tiddlywiki/codemirror/config/styleActiveLine.tid new file mode 100644 index 000000000..e4c93af99 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/config/styleActiveLine.tid @@ -0,0 +1,4 @@ +title: $:/config/codemirror/styleActiveLine +type: bool + +false diff --git a/plugins/tiddlywiki/codemirror/config/tabSize.tid b/plugins/tiddlywiki/codemirror/config/tabSize.tid new file mode 100644 index 000000000..d29034594 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/config/tabSize.tid @@ -0,0 +1,3 @@ +title: $:/config/codemirror/tabSize + +4 diff --git a/plugins/tiddlywiki/codemirror/config/theme.tid b/plugins/tiddlywiki/codemirror/config/theme.tid new file mode 100644 index 000000000..a50ff6cc8 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/config/theme.tid @@ -0,0 +1,4 @@ +title: $:/config/codemirror/theme +type: string + +default diff --git a/plugins/tiddlywiki/codemirror/engine.js b/plugins/tiddlywiki/codemirror/engine.js index bec85f5d5..5cfce1f36 100755 --- a/plugins/tiddlywiki/codemirror/engine.js +++ b/plugins/tiddlywiki/codemirror/engine.js @@ -13,14 +13,17 @@ Text editor engine based on a CodeMirror instance "use strict"; var CODEMIRROR_OPTIONS = "$:/config/CodeMirror", - HEIGHT_VALUE_TITLE = "$:/config/TextEditor/EditorHeight/Height" - +HEIGHT_VALUE_TITLE = "$:/config/TextEditor/EditorHeight/Height", +CONFIG_FILTER = "[all[shadows+tiddlers]prefix[$:/config/codemirror/]]" + // Install CodeMirror if($tw.browser && !window.CodeMirror) { + + var modules = $tw.modules.types["codemirror"]; + var req = Object.getOwnPropertyNames(modules); + window.CodeMirror = require("$:/plugins/tiddlywiki/codemirror/lib/codemirror.js"); // Install required CodeMirror plugins - var configOptions = $tw.wiki.getTiddlerData(CODEMIRROR_OPTIONS,{}), - req = configOptions.require; if(req) { if($tw.utils.isArray(req)) { for(var index=0; index<req.length; index++) { @@ -32,7 +35,55 @@ if($tw.browser && !window.CodeMirror) { } } +function getCmConfig() { + var type, + test, + value, + element, + extend, + tiddler, + config = {}, + configTiddlers = $tw.wiki.filterTiddlers(CONFIG_FILTER); + + if ($tw.utils.isArray(configTiddlers)) { + for (var i=0; i<configTiddlers.length; i++) { + tiddler = $tw.wiki.getTiddler(configTiddlers[i]); + if (tiddler) { + element = configTiddlers[i].replace(/\$:\/config\/codemirror\//ig,""); + type = (tiddler.fields.type) ? tiddler.fields.type.trim().toLocaleLowerCase() : "string"; + switch (type) { + case "bool": + test = tiddler.fields.text.trim().toLowerCase(); + value = (test === "true") ? true : false; + config[element] = value; + break; + case "string": + value = tiddler.fields.text.trim(); + config[element] = value; + break; + case "integer": + value = parseInt(tiddler.fields.text.trim(), 10); + config[element] = value; + break; + case "json": + value = JSON.parse(tiddler.fields.text.trim()); + extend = (tiddler.fields.extend) ? tiddler.fields.extend : element; + + if (config[extend]) { + $tw.utils.extend(config[extend], value); + } else { + config[extend] = value; + } + break; + } + } + } + } + return config; +} + function CodeMirrorEngine(options) { + // Save our options var self = this; options = options || {}; @@ -48,14 +99,11 @@ function CodeMirrorEngine(options) { this.domNode.style.display = "inline-block"; this.parentNode.insertBefore(this.domNode,this.nextSibling); this.widget.domNodes.push(this.domNode); + + // Set all cm-plugin defaults // Get the configuration options for the CodeMirror object - var config = $tw.wiki.getTiddlerData(CODEMIRROR_OPTIONS,{}).configuration || {}; - if(!("lineWrapping" in config)) { - config.lineWrapping = true; - } - if(!("lineNumbers" in config)) { - config.lineNumbers = true; - } + var config = getCmConfig(); + config.mode = options.type; config.value = options.value; // Create the CodeMirror instance @@ -63,6 +111,7 @@ function CodeMirrorEngine(options) { // Note that this is a synchronous callback that is called before the constructor returns self.domNode.appendChild(cmDomNode); },config); + // Set up a change event handler this.cm.on("change",function() { self.widget.saveChanges(self.getText()); @@ -80,7 +129,8 @@ function CodeMirrorEngine(options) { Set the text of the engine if it doesn't currently have focus */ CodeMirrorEngine.prototype.setText = function(text,type) { - this.cm.setOption("mode",type); + var self = this; + self.cm.setOption("mode",type); if(!this.cm.hasFocus()) { this.cm.setValue(text); } @@ -121,7 +171,7 @@ CodeMirrorEngine.prototype.createTextOperation = function() { var selections = this.cm.listSelections(); if(selections.length > 0) { var anchorPos = this.cm.indexFromPos(selections[0].anchor), - headPos = this.cm.indexFromPos(selections[0].head); + headPos = this.cm.indexFromPos(selections[0].head); } var operation = { text: this.cm.getValue(), diff --git a/plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.js b/plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.js index f10bb5bf1..99cbb0325 100755 --- a/plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.js +++ b/plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.js @@ -1,157 +1 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -// Open simple dialogs on top of an editor. Relies on dialog.css. - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - function dialogDiv(cm, template, bottom) { - var wrap = cm.getWrapperElement(); - var dialog; - dialog = wrap.appendChild(document.createElement("div")); - if (bottom) - dialog.className = "CodeMirror-dialog CodeMirror-dialog-bottom"; - else - dialog.className = "CodeMirror-dialog CodeMirror-dialog-top"; - - if (typeof template == "string") { - dialog.innerHTML = template; - } else { // Assuming it's a detached DOM element. - dialog.appendChild(template); - } - return dialog; - } - - function closeNotification(cm, newVal) { - if (cm.state.currentNotificationClose) - cm.state.currentNotificationClose(); - cm.state.currentNotificationClose = newVal; - } - - CodeMirror.defineExtension("openDialog", function(template, callback, options) { - if (!options) options = {}; - - closeNotification(this, null); - - var dialog = dialogDiv(this, template, options.bottom); - var closed = false, me = this; - function close(newVal) { - if (typeof newVal == 'string') { - inp.value = newVal; - } else { - if (closed) return; - closed = true; - dialog.parentNode.removeChild(dialog); - me.focus(); - - if (options.onClose) options.onClose(dialog); - } - } - - var inp = dialog.getElementsByTagName("input")[0], button; - if (inp) { - inp.focus(); - - if (options.value) { - inp.value = options.value; - if (options.selectValueOnOpen !== false) { - inp.select(); - } - } - - if (options.onInput) - CodeMirror.on(inp, "input", function(e) { options.onInput(e, inp.value, close);}); - if (options.onKeyUp) - CodeMirror.on(inp, "keyup", function(e) {options.onKeyUp(e, inp.value, close);}); - - CodeMirror.on(inp, "keydown", function(e) { - if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; } - if (e.keyCode == 27 || (options.closeOnEnter !== false && e.keyCode == 13)) { - inp.blur(); - CodeMirror.e_stop(e); - close(); - } - if (e.keyCode == 13) callback(inp.value, e); - }); - - if (options.closeOnBlur !== false) CodeMirror.on(inp, "blur", close); - } else if (button = dialog.getElementsByTagName("button")[0]) { - CodeMirror.on(button, "click", function() { - close(); - me.focus(); - }); - - if (options.closeOnBlur !== false) CodeMirror.on(button, "blur", close); - - button.focus(); - } - return close; - }); - - CodeMirror.defineExtension("openConfirm", function(template, callbacks, options) { - closeNotification(this, null); - var dialog = dialogDiv(this, template, options && options.bottom); - var buttons = dialog.getElementsByTagName("button"); - var closed = false, me = this, blurring = 1; - function close() { - if (closed) return; - closed = true; - dialog.parentNode.removeChild(dialog); - me.focus(); - } - buttons[0].focus(); - for (var i = 0; i < buttons.length; ++i) { - var b = buttons[i]; - (function(callback) { - CodeMirror.on(b, "click", function(e) { - CodeMirror.e_preventDefault(e); - close(); - if (callback) callback(me); - }); - })(callbacks[i]); - CodeMirror.on(b, "blur", function() { - --blurring; - setTimeout(function() { if (blurring <= 0) close(); }, 200); - }); - CodeMirror.on(b, "focus", function() { ++blurring; }); - } - }); - - /* - * openNotification - * Opens a notification, that can be closed with an optional timer - * (default 5000ms timer) and always closes on click. - * - * If a notification is opened while another is opened, it will close the - * currently opened one and open the new one immediately. - */ - CodeMirror.defineExtension("openNotification", function(template, options) { - closeNotification(this, close); - var dialog = dialogDiv(this, template, options && options.bottom); - var closed = false, doneTimer; - var duration = options && typeof options.duration !== "undefined" ? options.duration : 5000; - - function close() { - if (closed) return; - closed = true; - clearTimeout(doneTimer); - dialog.parentNode.removeChild(dialog); - } - - CodeMirror.on(dialog, 'click', function(e) { - CodeMirror.e_preventDefault(e); - close(); - }); - - if (duration) - doneTimer = setTimeout(close, duration); - - return close; - }); -}); +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){function o(e,o,n){var t;return(t=e.getWrapperElement().appendChild(document.createElement("div"))).className=n?"CodeMirror-dialog CodeMirror-dialog-bottom":"CodeMirror-dialog CodeMirror-dialog-top","string"==typeof o?t.innerHTML=o:t.appendChild(o),t}function n(e,o){e.state.currentNotificationClose&&e.state.currentNotificationClose(),e.state.currentNotificationClose=o}e.defineExtension("openDialog",function(t,i,r){r||(r={}),n(this,null);var u=o(this,t,r.bottom),l=!1,c=this;function a(e){if("string"==typeof e)s.value=e;else{if(l)return;l=!0,u.parentNode.removeChild(u),c.focus(),r.onClose&&r.onClose(u)}}var f,s=u.getElementsByTagName("input")[0];return s?(s.focus(),r.value&&(s.value=r.value,!1!==r.selectValueOnOpen&&s.select()),r.onInput&&e.on(s,"input",function(e){r.onInput(e,s.value,a)}),r.onKeyUp&&e.on(s,"keyup",function(e){r.onKeyUp(e,s.value,a)}),e.on(s,"keydown",function(o){r&&r.onKeyDown&&r.onKeyDown(o,s.value,a)||((27==o.keyCode||!1!==r.closeOnEnter&&13==o.keyCode)&&(s.blur(),e.e_stop(o),a()),13==o.keyCode&&i(s.value,o))}),!1!==r.closeOnBlur&&e.on(s,"blur",a)):(f=u.getElementsByTagName("button")[0])&&(e.on(f,"click",function(){a(),c.focus()}),!1!==r.closeOnBlur&&e.on(f,"blur",a),f.focus()),a}),e.defineExtension("openConfirm",function(t,i,r){n(this,null);var u=o(this,t,r&&r.bottom),l=u.getElementsByTagName("button"),c=!1,a=this,f=1;function s(){c||(c=!0,u.parentNode.removeChild(u),a.focus())}l[0].focus();for(var d=0;d<l.length;++d){var p=l[d];!function(o){e.on(p,"click",function(n){e.e_preventDefault(n),s(),o&&o(a)})}(i[d]),e.on(p,"blur",function(){--f,setTimeout(function(){f<=0&&s()},200)}),e.on(p,"focus",function(){++f})}}),e.defineExtension("openNotification",function(t,i){n(this,a);var r,u=o(this,t,i&&i.bottom),l=!1,c=i&&void 0!==i.duration?i.duration:5e3;function a(){l||(l=!0,clearTimeout(r),u.parentNode.removeChild(u))}return e.on(u,"click",function(o){e.e_preventDefault(o),a()}),c&&(r=setTimeout(a,c)),a})}); \ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror/files/addon/edit/matchbrackets.js b/plugins/tiddlywiki/codemirror/files/addon/edit/matchbrackets.js deleted file mode 100755 index 70e1ae18c..000000000 --- a/plugins/tiddlywiki/codemirror/files/addon/edit/matchbrackets.js +++ /dev/null @@ -1,120 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - var ie_lt8 = /MSIE \d/.test(navigator.userAgent) && - (document.documentMode == null || document.documentMode < 8); - - var Pos = CodeMirror.Pos; - - var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"}; - - function findMatchingBracket(cm, where, strict, config) { - var line = cm.getLineHandle(where.line), pos = where.ch - 1; - var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)]; - if (!match) return null; - var dir = match.charAt(1) == ">" ? 1 : -1; - if (strict && (dir > 0) != (pos == where.ch)) return null; - var style = cm.getTokenTypeAt(Pos(where.line, pos + 1)); - - var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config); - if (found == null) return null; - return {from: Pos(where.line, pos), to: found && found.pos, - match: found && found.ch == match.charAt(0), forward: dir > 0}; - } - - // bracketRegex is used to specify which type of bracket to scan - // should be a regexp, e.g. /[[\]]/ - // - // Note: If "where" is on an open bracket, then this bracket is ignored. - // - // Returns false when no bracket was found, null when it reached - // maxScanLines and gave up - function scanForBracket(cm, where, dir, style, config) { - var maxScanLen = (config && config.maxScanLineLength) || 10000; - var maxScanLines = (config && config.maxScanLines) || 1000; - - var stack = []; - var re = config && config.bracketRegex ? config.bracketRegex : /[(){}[\]]/; - var lineEnd = dir > 0 ? Math.min(where.line + maxScanLines, cm.lastLine() + 1) - : Math.max(cm.firstLine() - 1, where.line - maxScanLines); - for (var lineNo = where.line; lineNo != lineEnd; lineNo += dir) { - var line = cm.getLine(lineNo); - if (!line) continue; - var pos = dir > 0 ? 0 : line.length - 1, end = dir > 0 ? line.length : -1; - if (line.length > maxScanLen) continue; - if (lineNo == where.line) pos = where.ch - (dir < 0 ? 1 : 0); - for (; pos != end; pos += dir) { - var ch = line.charAt(pos); - if (re.test(ch) && (style === undefined || cm.getTokenTypeAt(Pos(lineNo, pos + 1)) == style)) { - var match = matching[ch]; - if ((match.charAt(1) == ">") == (dir > 0)) stack.push(ch); - else if (!stack.length) return {pos: Pos(lineNo, pos), ch: ch}; - else stack.pop(); - } - } - } - return lineNo - dir == (dir > 0 ? cm.lastLine() : cm.firstLine()) ? false : null; - } - - function matchBrackets(cm, autoclear, config) { - // Disable brace matching in long lines, since it'll cause hugely slow updates - var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000; - var marks = [], ranges = cm.listSelections(); - for (var i = 0; i < ranges.length; i++) { - var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, false, config); - if (match && cm.getLine(match.from.line).length <= maxHighlightLen) { - var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket"; - marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style})); - if (match.to && cm.getLine(match.to.line).length <= maxHighlightLen) - marks.push(cm.markText(match.to, Pos(match.to.line, match.to.ch + 1), {className: style})); - } - } - - if (marks.length) { - // Kludge to work around the IE bug from issue #1193, where text - // input stops going to the textare whever this fires. - if (ie_lt8 && cm.state.focused) cm.focus(); - - var clear = function() { - cm.operation(function() { - for (var i = 0; i < marks.length; i++) marks[i].clear(); - }); - }; - if (autoclear) setTimeout(clear, 800); - else return clear; - } - } - - var currentlyHighlighted = null; - function doMatchBrackets(cm) { - cm.operation(function() { - if (currentlyHighlighted) {currentlyHighlighted(); currentlyHighlighted = null;} - currentlyHighlighted = matchBrackets(cm, false, cm.state.matchBrackets); - }); - } - - CodeMirror.defineOption("matchBrackets", false, function(cm, val, old) { - if (old && old != CodeMirror.Init) - cm.off("cursorActivity", doMatchBrackets); - if (val) { - cm.state.matchBrackets = typeof val == "object" ? val : {}; - cm.on("cursorActivity", doMatchBrackets); - } - }); - - CodeMirror.defineExtension("matchBrackets", function() {matchBrackets(this, true);}); - CodeMirror.defineExtension("findMatchingBracket", function(pos, strict, config){ - return findMatchingBracket(this, pos, strict, config); - }); - CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, config){ - return scanForBracket(this, pos, dir, style, config); - }); -}); diff --git a/plugins/tiddlywiki/codemirror/files/addon/mode/multiplex.js b/plugins/tiddlywiki/codemirror/files/addon/mode/multiplex.js deleted file mode 100755 index 3d8b34c45..000000000 --- a/plugins/tiddlywiki/codemirror/files/addon/mode/multiplex.js +++ /dev/null @@ -1,123 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.multiplexingMode = function(outer /*, others */) { - // Others should be {open, close, mode [, delimStyle] [, innerStyle]} objects - var others = Array.prototype.slice.call(arguments, 1); - - function indexOf(string, pattern, from, returnEnd) { - if (typeof pattern == "string") { - var found = string.indexOf(pattern, from); - return returnEnd && found > -1 ? found + pattern.length : found; - } - var m = pattern.exec(from ? string.slice(from) : string); - return m ? m.index + from + (returnEnd ? m[0].length : 0) : -1; - } - - return { - startState: function() { - return { - outer: CodeMirror.startState(outer), - innerActive: null, - inner: null - }; - }, - - copyState: function(state) { - return { - outer: CodeMirror.copyState(outer, state.outer), - innerActive: state.innerActive, - inner: state.innerActive && CodeMirror.copyState(state.innerActive.mode, state.inner) - }; - }, - - token: function(stream, state) { - if (!state.innerActive) { - var cutOff = Infinity, oldContent = stream.string; - for (var i = 0; i < others.length; ++i) { - var other = others[i]; - var found = indexOf(oldContent, other.open, stream.pos); - if (found == stream.pos) { - if (!other.parseDelimiters) stream.match(other.open); - state.innerActive = other; - state.inner = CodeMirror.startState(other.mode, outer.indent ? outer.indent(state.outer, "") : 0); - return other.delimStyle && (other.delimStyle + " " + other.delimStyle + "-open"); - } else if (found != -1 && found < cutOff) { - cutOff = found; - } - } - if (cutOff != Infinity) stream.string = oldContent.slice(0, cutOff); - var outerToken = outer.token(stream, state.outer); - if (cutOff != Infinity) stream.string = oldContent; - return outerToken; - } else { - var curInner = state.innerActive, oldContent = stream.string; - if (!curInner.close && stream.sol()) { - state.innerActive = state.inner = null; - return this.token(stream, state); - } - var found = curInner.close ? indexOf(oldContent, curInner.close, stream.pos, curInner.parseDelimiters) : -1; - if (found == stream.pos && !curInner.parseDelimiters) { - stream.match(curInner.close); - state.innerActive = state.inner = null; - return curInner.delimStyle && (curInner.delimStyle + " " + curInner.delimStyle + "-close"); - } - if (found > -1) stream.string = oldContent.slice(0, found); - var innerToken = curInner.mode.token(stream, state.inner); - if (found > -1) stream.string = oldContent; - - if (found == stream.pos && curInner.parseDelimiters) - state.innerActive = state.inner = null; - - if (curInner.innerStyle) { - if (innerToken) innerToken = innerToken + " " + curInner.innerStyle; - else innerToken = curInner.innerStyle; - } - - return innerToken; - } - }, - - indent: function(state, textAfter) { - var mode = state.innerActive ? state.innerActive.mode : outer; - if (!mode.indent) return CodeMirror.Pass; - return mode.indent(state.innerActive ? state.inner : state.outer, textAfter); - }, - - blankLine: function(state) { - var mode = state.innerActive ? state.innerActive.mode : outer; - if (mode.blankLine) { - mode.blankLine(state.innerActive ? state.inner : state.outer); - } - if (!state.innerActive) { - for (var i = 0; i < others.length; ++i) { - var other = others[i]; - if (other.open === "\n") { - state.innerActive = other; - state.inner = CodeMirror.startState(other.mode, mode.indent ? mode.indent(state.outer, "") : 0); - } - } - } else if (state.innerActive.close === "\n") { - state.innerActive = state.inner = null; - } - }, - - electricChars: outer.electricChars, - - innerMode: function(state) { - return state.inner ? {state: state.inner, mode: state.innerActive.mode} : {state: state.outer, mode: outer}; - } - }; -}; - -}); diff --git a/plugins/tiddlywiki/codemirror/files/addon/search/searchcursor.js b/plugins/tiddlywiki/codemirror/files/addon/search/searchcursor.js deleted file mode 100755 index b70242ee4..000000000 --- a/plugins/tiddlywiki/codemirror/files/addon/search/searchcursor.js +++ /dev/null @@ -1,189 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - "use strict"; - var Pos = CodeMirror.Pos; - - function SearchCursor(doc, query, pos, caseFold) { - this.atOccurrence = false; this.doc = doc; - if (caseFold == null && typeof query == "string") caseFold = false; - - pos = pos ? doc.clipPos(pos) : Pos(0, 0); - this.pos = {from: pos, to: pos}; - - // The matches method is filled in based on the type of query. - // It takes a position and a direction, and returns an object - // describing the next occurrence of the query, or null if no - // more matches were found. - if (typeof query != "string") { // Regexp match - if (!query.global) query = new RegExp(query.source, query.ignoreCase ? "ig" : "g"); - this.matches = function(reverse, pos) { - if (reverse) { - query.lastIndex = 0; - var line = doc.getLine(pos.line).slice(0, pos.ch), cutOff = 0, match, start; - for (;;) { - query.lastIndex = cutOff; - var newMatch = query.exec(line); - if (!newMatch) break; - match = newMatch; - start = match.index; - cutOff = match.index + (match[0].length || 1); - if (cutOff == line.length) break; - } - var matchLen = (match && match[0].length) || 0; - if (!matchLen) { - if (start == 0 && line.length == 0) {match = undefined;} - else if (start != doc.getLine(pos.line).length) { - matchLen++; - } - } - } else { - query.lastIndex = pos.ch; - var line = doc.getLine(pos.line), match = query.exec(line); - var matchLen = (match && match[0].length) || 0; - var start = match && match.index; - if (start + matchLen != line.length && !matchLen) matchLen = 1; - } - if (match && matchLen) - return {from: Pos(pos.line, start), - to: Pos(pos.line, start + matchLen), - match: match}; - }; - } else { // String query - var origQuery = query; - if (caseFold) query = query.toLowerCase(); - var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;}; - var target = query.split("\n"); - // Different methods for single-line and multi-line queries - if (target.length == 1) { - if (!query.length) { - // Empty string would match anything and never progress, so - // we define it to match nothing instead. - this.matches = function() {}; - } else { - this.matches = function(reverse, pos) { - if (reverse) { - var orig = doc.getLine(pos.line).slice(0, pos.ch), line = fold(orig); - var match = line.lastIndexOf(query); - if (match > -1) { - match = adjustPos(orig, line, match); - return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)}; - } - } else { - var orig = doc.getLine(pos.line).slice(pos.ch), line = fold(orig); - var match = line.indexOf(query); - if (match > -1) { - match = adjustPos(orig, line, match) + pos.ch; - return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)}; - } - } - }; - } - } else { - var origTarget = origQuery.split("\n"); - this.matches = function(reverse, pos) { - var last = target.length - 1; - if (reverse) { - if (pos.line - (target.length - 1) < doc.firstLine()) return; - if (fold(doc.getLine(pos.line).slice(0, origTarget[last].length)) != target[target.length - 1]) return; - var to = Pos(pos.line, origTarget[last].length); - for (var ln = pos.line - 1, i = last - 1; i >= 1; --i, --ln) - if (target[i] != fold(doc.getLine(ln))) return; - var line = doc.getLine(ln), cut = line.length - origTarget[0].length; - if (fold(line.slice(cut)) != target[0]) return; - return {from: Pos(ln, cut), to: to}; - } else { - if (pos.line + (target.length - 1) > doc.lastLine()) return; - var line = doc.getLine(pos.line), cut = line.length - origTarget[0].length; - if (fold(line.slice(cut)) != target[0]) return; - var from = Pos(pos.line, cut); - for (var ln = pos.line + 1, i = 1; i < last; ++i, ++ln) - if (target[i] != fold(doc.getLine(ln))) return; - if (fold(doc.getLine(ln).slice(0, origTarget[last].length)) != target[last]) return; - return {from: from, to: Pos(ln, origTarget[last].length)}; - } - }; - } - } - } - - SearchCursor.prototype = { - findNext: function() {return this.find(false);}, - findPrevious: function() {return this.find(true);}, - - find: function(reverse) { - var self = this, pos = this.doc.clipPos(reverse ? this.pos.from : this.pos.to); - function savePosAndFail(line) { - var pos = Pos(line, 0); - self.pos = {from: pos, to: pos}; - self.atOccurrence = false; - return false; - } - - for (;;) { - if (this.pos = this.matches(reverse, pos)) { - this.atOccurrence = true; - return this.pos.match || true; - } - if (reverse) { - if (!pos.line) return savePosAndFail(0); - pos = Pos(pos.line-1, this.doc.getLine(pos.line-1).length); - } - else { - var maxLine = this.doc.lineCount(); - if (pos.line == maxLine - 1) return savePosAndFail(maxLine); - pos = Pos(pos.line + 1, 0); - } - } - }, - - from: function() {if (this.atOccurrence) return this.pos.from;}, - to: function() {if (this.atOccurrence) return this.pos.to;}, - - replace: function(newText, origin) { - if (!this.atOccurrence) return; - var lines = CodeMirror.splitLines(newText); - this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin); - this.pos.to = Pos(this.pos.from.line + lines.length - 1, - lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0)); - } - }; - - // Maps a position in a case-folded line back to a position in the original line - // (compensating for codepoints increasing in number during folding) - function adjustPos(orig, folded, pos) { - if (orig.length == folded.length) return pos; - for (var pos1 = Math.min(pos, orig.length);;) { - var len1 = orig.slice(0, pos1).toLowerCase().length; - if (len1 < pos) ++pos1; - else if (len1 > pos) --pos1; - else return pos1; - } - } - - CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) { - return new SearchCursor(this.doc, query, pos, caseFold); - }); - CodeMirror.defineDocExtension("getSearchCursor", function(query, pos, caseFold) { - return new SearchCursor(this, query, pos, caseFold); - }); - - CodeMirror.defineExtension("selectMatches", function(query, caseFold) { - var ranges = []; - var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold); - while (cur.findNext()) { - if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break; - ranges.push({anchor: cur.from(), head: cur.to()}); - } - if (ranges.length) - this.setSelections(ranges, 0); - }); -}); diff --git a/plugins/tiddlywiki/codemirror/files/addon/selection/activeline.js b/plugins/tiddlywiki/codemirror/files/addon/selection/activeline.js new file mode 100644 index 000000000..7b9555681 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/files/addon/selection/activeline.js @@ -0,0 +1 @@ +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";var t="CodeMirror-activeline",n="CodeMirror-activeline-background",i="CodeMirror-activeline-gutter";function r(e){for(var r=0;r<e.state.activeLines.length;r++)e.removeLineClass(e.state.activeLines[r],"wrap",t),e.removeLineClass(e.state.activeLines[r],"background",n),e.removeLineClass(e.state.activeLines[r],"gutter",i)}function o(e,o){for(var a=[],s=0;s<o.length;s++){var c=o[s],l=e.getOption("styleActiveLine");if("object"==typeof l&&l.nonEmpty?c.anchor.line==c.head.line:c.empty()){var f=e.getLineHandleVisualStart(c.head.line);a[a.length-1]!=f&&a.push(f)}}(function(e,t){if(e.length!=t.length)return!1;for(var n=0;n<e.length;n++)if(e[n]!=t[n])return!1;return!0})(e.state.activeLines,a)||e.operation(function(){r(e);for(var o=0;o<a.length;o++)e.addLineClass(a[o],"wrap",t),e.addLineClass(a[o],"background",n),e.addLineClass(a[o],"gutter",i);e.state.activeLines=a})}function a(e,t){o(e,t.ranges)}e.defineOption("styleActiveLine",!1,function(t,n,i){var s=i!=e.Init&&i;n!=s&&(s&&(t.off("beforeSelectionChange",a),r(t),delete t.state.activeLines),n&&(t.state.activeLines=[],o(t,t.listSelections()),t.on("beforeSelectionChange",a)))})}); diff --git a/plugins/tiddlywiki/codemirror/files/codemirror.css b/plugins/tiddlywiki/codemirror/files/codemirror.css index 1cf66a9fa..0c3bcf300 100755 --- a/plugins/tiddlywiki/codemirror/files/codemirror.css +++ b/plugins/tiddlywiki/codemirror/files/codemirror.css @@ -1,338 +1 @@ -/* BASICS */ - -.CodeMirror { - /* Set height, width, borders, and global font properties here */ - font-family: monospace; - height: 300px; - color: black; -} - -/* PADDING */ - -.CodeMirror-lines { - padding: 4px 0; /* Vertical padding around content */ -} -.CodeMirror pre { - padding: 0 4px; /* Horizontal padding of content */ -} - -.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler { - background-color: white; /* The little square between H and V scrollbars */ -} - -/* GUTTER */ - -.CodeMirror-gutters { - border-right: 1px solid #ddd; - background-color: #f7f7f7; - white-space: nowrap; -} -.CodeMirror-linenumbers {} -.CodeMirror-linenumber { - padding: 0 3px 0 5px; - min-width: 20px; - text-align: right; - color: #999; - white-space: nowrap; -} - -.CodeMirror-guttermarker { color: black; } -.CodeMirror-guttermarker-subtle { color: #999; } - -/* CURSOR */ - -.CodeMirror-cursor { - border-left: 1px solid black; - border-right: none; - width: 0; -} -/* Shown when moving in bi-directional text */ -.CodeMirror div.CodeMirror-secondarycursor { - border-left: 1px solid silver; -} -.cm-fat-cursor .CodeMirror-cursor { - width: auto; - border: 0; - background: #7e7; -} -.cm-fat-cursor div.CodeMirror-cursors { - z-index: 1; -} - -.cm-animate-fat-cursor { - width: auto; - border: 0; - -webkit-animation: blink 1.06s steps(1) infinite; - -moz-animation: blink 1.06s steps(1) infinite; - animation: blink 1.06s steps(1) infinite; - background-color: #7e7; -} -@-moz-keyframes blink { - 0% {} - 50% { background-color: transparent; } - 100% {} -} -@-webkit-keyframes blink { - 0% {} - 50% { background-color: transparent; } - 100% {} -} -@keyframes blink { - 0% {} - 50% { background-color: transparent; } - 100% {} -} - -/* Can style cursor different in overwrite (non-insert) mode */ -.CodeMirror-overwrite .CodeMirror-cursor {} - -.cm-tab { display: inline-block; text-decoration: inherit; } - -.CodeMirror-ruler { - border-left: 1px solid #ccc; - position: absolute; -} - -/* DEFAULT THEME */ - -.cm-s-default .cm-header {color: blue;} -.cm-s-default .cm-quote {color: #090;} -.cm-negative {color: #d44;} -.cm-positive {color: #292;} -.cm-header, .cm-strong {font-weight: bold;} -.cm-em {font-style: italic;} -.cm-link {text-decoration: underline;} -.cm-strikethrough {text-decoration: line-through;} - -.cm-s-default .cm-keyword {color: #708;} -.cm-s-default .cm-atom {color: #219;} -.cm-s-default .cm-number {color: #164;} -.cm-s-default .cm-def {color: #00f;} -.cm-s-default .cm-variable, -.cm-s-default .cm-punctuation, -.cm-s-default .cm-property, -.cm-s-default .cm-operator {} -.cm-s-default .cm-variable-2 {color: #05a;} -.cm-s-default .cm-variable-3 {color: #085;} -.cm-s-default .cm-comment {color: #a50;} -.cm-s-default .cm-string {color: #a11;} -.cm-s-default .cm-string-2 {color: #f50;} -.cm-s-default .cm-meta {color: #555;} -.cm-s-default .cm-qualifier {color: #555;} -.cm-s-default .cm-builtin {color: #30a;} -.cm-s-default .cm-bracket {color: #997;} -.cm-s-default .cm-tag {color: #170;} -.cm-s-default .cm-attribute {color: #00c;} -.cm-s-default .cm-hr {color: #999;} -.cm-s-default .cm-link {color: #00c;} - -.cm-s-default .cm-error {color: #f00;} -.cm-invalidchar {color: #f00;} - -.CodeMirror-composing { border-bottom: 2px solid; } - -/* Default styles for common addons */ - -div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;} -div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} -.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); } -.CodeMirror-activeline-background {background: #e8f2ff;} - -/* STOP */ - -/* The rest of this file contains styles related to the mechanics of - the editor. You probably shouldn't touch them. */ - -.CodeMirror { - position: relative; - overflow: hidden; - background: white; -} - -.CodeMirror-scroll { - overflow: scroll !important; /* Things will break if this is overridden */ - /* 30px is the magic margin used to hide the element's real scrollbars */ - /* See overflow: hidden in .CodeMirror */ - margin-bottom: -30px; margin-right: -30px; - padding-bottom: 30px; - height: 100%; - outline: none; /* Prevent dragging from highlighting the element */ - position: relative; -} -.CodeMirror-sizer { - position: relative; - border-right: 30px solid transparent; -} - -/* The fake, visible scrollbars. Used to force redraw during scrolling - before actual scrolling happens, thus preventing shaking and - flickering artifacts. */ -.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler { - position: absolute; - z-index: 6; - display: none; -} -.CodeMirror-vscrollbar { - right: 0; top: 0; - overflow-x: hidden; - overflow-y: scroll; -} -.CodeMirror-hscrollbar { - bottom: 0; left: 0; - overflow-y: hidden; - overflow-x: scroll; -} -.CodeMirror-scrollbar-filler { - right: 0; bottom: 0; -} -.CodeMirror-gutter-filler { - left: 0; bottom: 0; -} - -.CodeMirror-gutters { - position: absolute; left: 0; top: 0; - min-height: 100%; - z-index: 3; -} -.CodeMirror-gutter { - white-space: normal; - height: 100%; - display: inline-block; - vertical-align: top; - margin-bottom: -30px; - /* Hack to make IE7 behave */ - *zoom:1; - *display:inline; -} -.CodeMirror-gutter-wrapper { - position: absolute; - z-index: 4; - background: none !important; - border: none !important; -} -.CodeMirror-gutter-background { - position: absolute; - top: 0; bottom: 0; - z-index: 4; -} -.CodeMirror-gutter-elt { - position: absolute; - cursor: default; - z-index: 4; -} -.CodeMirror-gutter-wrapper { - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; -} - -.CodeMirror-lines { - cursor: text; - min-height: 1px; /* prevents collapsing before first draw */ -} -.CodeMirror pre { - /* Reset some styles that the rest of the page might have set */ - -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; - border-width: 0; - background: transparent; - font-family: inherit; - font-size: inherit; - margin: 0; - white-space: pre; - word-wrap: normal; - line-height: inherit; - color: inherit; - z-index: 2; - position: relative; - overflow: visible; - -webkit-tap-highlight-color: transparent; - -webkit-font-variant-ligatures: none; - font-variant-ligatures: none; -} -.CodeMirror-wrap pre { - word-wrap: break-word; - white-space: pre-wrap; - word-break: normal; -} - -.CodeMirror-linebackground { - position: absolute; - left: 0; right: 0; top: 0; bottom: 0; - z-index: 0; -} - -.CodeMirror-linewidget { - position: relative; - z-index: 2; - overflow: auto; -} - -.CodeMirror-widget {} - -.CodeMirror-code { - outline: none; -} - -/* Force content-box sizing for the elements where we expect it */ -.CodeMirror-scroll, -.CodeMirror-sizer, -.CodeMirror-gutter, -.CodeMirror-gutters, -.CodeMirror-linenumber { - -moz-box-sizing: content-box; - box-sizing: content-box; -} - -.CodeMirror-measure { - position: absolute; - width: 100%; - height: 0; - overflow: hidden; - visibility: hidden; -} - -.CodeMirror-cursor { position: absolute; } -.CodeMirror-measure pre { position: static; } - -div.CodeMirror-cursors { - visibility: hidden; - position: relative; - z-index: 3; -} -div.CodeMirror-dragcursors { - visibility: visible; -} - -.CodeMirror-focused div.CodeMirror-cursors { - visibility: visible; -} - -.CodeMirror-selected { background: #d9d9d9; } -.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; } -.CodeMirror-crosshair { cursor: crosshair; } -.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; } -.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; } - -.cm-searching { - background: #ffa; - background: rgba(255, 255, 0, .4); -} - -/* IE7 hack to prevent it from returning funny offsetTops on the spans */ -.CodeMirror span { *vertical-align: text-bottom; } - -/* Used to force a border model for a node */ -.cm-force-border { padding-right: .1px; } - -@media print { - /* Hide the cursor when printing */ - .CodeMirror div.CodeMirror-cursors { - visibility: hidden; - } -} - -/* See issue #2901 */ -.cm-tab-wrap-hack:after { content: ''; } - -/* Help users use markselection to safely style text background */ -span.CodeMirror-selectedtext { background: none; } +.CodeMirror{font-family:monospace;height:300px;color:black;direction:ltr}.CodeMirror-lines{padding:4px 0}.CodeMirror pre{padding:0 4px}.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{background-color:white}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:black}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid black;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-fat-cursor-mark{background-color:rgba(20,255,20,.5);-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{0%{}50%{background-color:transparent}}@-webkit-keyframes blink{0%{}50%{background-color:transparent}}@keyframes blink{0%{}50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:-20px;overflow:hidden}.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}.cm-s-default .cm-header{color:blue}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3,.cm-s-default .cm-type{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta{color:#555}.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-s-default .cm-error{color:red}.cm-invalidchar{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0b0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#a22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:white}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:none;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-vscrollbar,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:none!important;border:none!important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper ::selection{background-color:transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color:transparent}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:transparent;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;padding:.1px}.CodeMirror-rtl pre{direction:rtl}.CodeMirror-code{outline:none}.CodeMirror-scroll,.CodeMirror-sizer,.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute;pointer-events:none}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-focused div.CodeMirror-cursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background-color:#ffa;background-color:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:none} diff --git a/plugins/tiddlywiki/codemirror/files/codemirror.js b/plugins/tiddlywiki/codemirror/files/codemirror.js index ec49e3a33..d302148a3 100755 --- a/plugins/tiddlywiki/codemirror/files/codemirror.js +++ b/plugins/tiddlywiki/codemirror/files/codemirror.js @@ -1,8895 +1 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -// This is CodeMirror (http://codemirror.net), a code editor -// implemented in JavaScript on top of the browser's DOM. -// -// You can find some technical background for some of the code below -// at http://marijnhaverbeke.nl/blog/#cm-internals . - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - module.exports = mod(); - else if (typeof define == "function" && define.amd) // AMD - return define([], mod); - else // Plain browser env - (this || window).CodeMirror = mod(); -})(function() { - "use strict"; - - // BROWSER SNIFFING - - // Kludges for bugs and behavior differences that can't be feature - // detected are enabled based on userAgent etc sniffing. - var userAgent = navigator.userAgent; - var platform = navigator.platform; - - var gecko = /gecko\/\d/i.test(userAgent); - var ie_upto10 = /MSIE \d/.test(userAgent); - var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent); - var ie = ie_upto10 || ie_11up; - var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]); - var webkit = /WebKit\//.test(userAgent); - var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent); - var chrome = /Chrome\//.test(userAgent); - var presto = /Opera\//.test(userAgent); - var safari = /Apple Computer/.test(navigator.vendor); - var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent); - var phantom = /PhantomJS/.test(userAgent); - - var ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent); - // This is woefully incomplete. Suggestions for alternative methods welcome. - var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent); - var mac = ios || /Mac/.test(platform); - var windows = /win/i.test(platform); - - var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/); - if (presto_version) presto_version = Number(presto_version[1]); - if (presto_version && presto_version >= 15) { presto = false; webkit = true; } - // Some browsers use the wrong event properties to signal cmd/ctrl on OS X - var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11)); - var captureRightClick = gecko || (ie && ie_version >= 9); - - // Optimize some code when these features are not used. - var sawReadOnlySpans = false, sawCollapsedSpans = false; - - // EDITOR CONSTRUCTOR - - // A CodeMirror instance represents an editor. This is the object - // that user code is usually dealing with. - - function CodeMirror(place, options) { - if (!(this instanceof CodeMirror)) return new CodeMirror(place, options); - - this.options = options = options ? copyObj(options) : {}; - // Determine effective options based on given values and defaults. - copyObj(defaults, options, false); - setGuttersForLineNumbers(options); - - var doc = options.value; - if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator); - this.doc = doc; - - var input = new CodeMirror.inputStyles[options.inputStyle](this); - var display = this.display = new Display(place, doc, input); - display.wrapper.CodeMirror = this; - updateGutters(this); - themeChanged(this); - if (options.lineWrapping) - this.display.wrapper.className += " CodeMirror-wrap"; - if (options.autofocus && !mobile) display.input.focus(); - initScrollbars(this); - - this.state = { - keyMaps: [], // stores maps added by addKeyMap - overlays: [], // highlighting overlays, as added by addOverlay - modeGen: 0, // bumped when mode/overlay changes, used to invalidate highlighting info - overwrite: false, - delayingBlurEvent: false, - focused: false, - suppressEdits: false, // used to disable editing during key handlers when in readOnly mode - pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll - selectingText: false, - draggingText: false, - highlight: new Delayed(), // stores highlight worker timeout - keySeq: null, // Unfinished key sequence - specialChars: null - }; - - var cm = this; - - // Override magic textarea content restore that IE sometimes does - // on our hidden textarea on reload - if (ie && ie_version < 11) setTimeout(function() { cm.display.input.reset(true); }, 20); - - registerEventHandlers(this); - ensureGlobalHandlers(); - - startOperation(this); - this.curOp.forceUpdate = true; - attachDoc(this, doc); - - if ((options.autofocus && !mobile) || cm.hasFocus()) - setTimeout(bind(onFocus, this), 20); - else - onBlur(this); - - for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt)) - optionHandlers[opt](this, options[opt], Init); - maybeUpdateLineNumberWidth(this); - if (options.finishInit) options.finishInit(this); - for (var i = 0; i < initHooks.length; ++i) initHooks[i](this); - endOperation(this); - // Suppress optimizelegibility in Webkit, since it breaks text - // measuring on line wrapping boundaries. - if (webkit && options.lineWrapping && - getComputedStyle(display.lineDiv).textRendering == "optimizelegibility") - display.lineDiv.style.textRendering = "auto"; - } - - // DISPLAY CONSTRUCTOR - - // The display handles the DOM integration, both for input reading - // and content drawing. It holds references to DOM nodes and - // display-related state. - - function Display(place, doc, input) { - var d = this; - this.input = input; - - // Covers bottom-right square when both scrollbars are present. - d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler"); - d.scrollbarFiller.setAttribute("cm-not-content", "true"); - // Covers bottom of gutter when coverGutterNextToScrollbar is on - // and h scrollbar is present. - d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler"); - d.gutterFiller.setAttribute("cm-not-content", "true"); - // Will contain the actual code, positioned to cover the viewport. - d.lineDiv = elt("div", null, "CodeMirror-code"); - // Elements are added to these to represent selection and cursors. - d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1"); - d.cursorDiv = elt("div", null, "CodeMirror-cursors"); - // A visibility: hidden element used to find the size of things. - d.measure = elt("div", null, "CodeMirror-measure"); - // When lines outside of the viewport are measured, they are drawn in this. - d.lineMeasure = elt("div", null, "CodeMirror-measure"); - // Wraps everything that needs to exist inside the vertically-padded coordinate system - d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv], - null, "position: relative; outline: none"); - // Moved around its parent to cover visible view. - d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative"); - // Set to the height of the document, allowing scrolling. - d.sizer = elt("div", [d.mover], "CodeMirror-sizer"); - d.sizerWidth = null; - // Behavior of elts with overflow: auto and padding is - // inconsistent across browsers. This is used to ensure the - // scrollable area is big enough. - d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;"); - // Will contain the gutters, if any. - d.gutters = elt("div", null, "CodeMirror-gutters"); - d.lineGutter = null; - // Actual scrollable element. - d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll"); - d.scroller.setAttribute("tabIndex", "-1"); - // The element in which the editor lives. - d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror"); - - // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported) - if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; } - if (!webkit && !(gecko && mobile)) d.scroller.draggable = true; - - if (place) { - if (place.appendChild) place.appendChild(d.wrapper); - else place(d.wrapper); - } - - // Current rendered range (may be bigger than the view window). - d.viewFrom = d.viewTo = doc.first; - d.reportedViewFrom = d.reportedViewTo = doc.first; - // Information about the rendered lines. - d.view = []; - d.renderedView = null; - // Holds info about a single rendered line when it was rendered - // for measurement, while not in view. - d.externalMeasured = null; - // Empty space (in pixels) above the view - d.viewOffset = 0; - d.lastWrapHeight = d.lastWrapWidth = 0; - d.updateLineNumbers = null; - - d.nativeBarWidth = d.barHeight = d.barWidth = 0; - d.scrollbarsClipped = false; - - // Used to only resize the line number gutter when necessary (when - // the amount of lines crosses a boundary that makes its width change) - d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null; - // Set to true when a non-horizontal-scrolling line widget is - // added. As an optimization, line widget aligning is skipped when - // this is false. - d.alignWidgets = false; - - d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null; - - // Tracks the maximum line length so that the horizontal scrollbar - // can be kept static when scrolling. - d.maxLine = null; - d.maxLineLength = 0; - d.maxLineChanged = false; - - // Used for measuring wheel scrolling granularity - d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null; - - // True when shift is held down. - d.shift = false; - - // Used to track whether anything happened since the context menu - // was opened. - d.selForContextMenu = null; - - d.activeTouch = null; - - input.init(d); - } - - // STATE UPDATES - - // Used to get the editor into a consistent state again when options change. - - function loadMode(cm) { - cm.doc.mode = CodeMirror.getMode(cm.options, cm.doc.modeOption); - resetModeState(cm); - } - - function resetModeState(cm) { - cm.doc.iter(function(line) { - if (line.stateAfter) line.stateAfter = null; - if (line.styles) line.styles = null; - }); - cm.doc.frontier = cm.doc.first; - startWorker(cm, 100); - cm.state.modeGen++; - if (cm.curOp) regChange(cm); - } - - function wrappingChanged(cm) { - if (cm.options.lineWrapping) { - addClass(cm.display.wrapper, "CodeMirror-wrap"); - cm.display.sizer.style.minWidth = ""; - cm.display.sizerWidth = null; - } else { - rmClass(cm.display.wrapper, "CodeMirror-wrap"); - findMaxLine(cm); - } - estimateLineHeights(cm); - regChange(cm); - clearCaches(cm); - setTimeout(function(){updateScrollbars(cm);}, 100); - } - - // Returns a function that estimates the height of a line, to use as - // first approximation until the line becomes visible (and is thus - // properly measurable). - function estimateHeight(cm) { - var th = textHeight(cm.display), wrapping = cm.options.lineWrapping; - var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3); - return function(line) { - if (lineIsHidden(cm.doc, line)) return 0; - - var widgetsHeight = 0; - if (line.widgets) for (var i = 0; i < line.widgets.length; i++) { - if (line.widgets[i].height) widgetsHeight += line.widgets[i].height; - } - - if (wrapping) - return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th; - else - return widgetsHeight + th; - }; - } - - function estimateLineHeights(cm) { - var doc = cm.doc, est = estimateHeight(cm); - doc.iter(function(line) { - var estHeight = est(line); - if (estHeight != line.height) updateLineHeight(line, estHeight); - }); - } - - function themeChanged(cm) { - cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") + - cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-"); - clearCaches(cm); - } - - function guttersChanged(cm) { - updateGutters(cm); - regChange(cm); - setTimeout(function(){alignHorizontally(cm);}, 20); - } - - // Rebuild the gutter elements, ensure the margin to the left of the - // code matches their width. - function updateGutters(cm) { - var gutters = cm.display.gutters, specs = cm.options.gutters; - removeChildren(gutters); - for (var i = 0; i < specs.length; ++i) { - var gutterClass = specs[i]; - var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass)); - if (gutterClass == "CodeMirror-linenumbers") { - cm.display.lineGutter = gElt; - gElt.style.width = (cm.display.lineNumWidth || 1) + "px"; - } - } - gutters.style.display = i ? "" : "none"; - updateGutterSpace(cm); - } - - function updateGutterSpace(cm) { - var width = cm.display.gutters.offsetWidth; - cm.display.sizer.style.marginLeft = width + "px"; - } - - // Compute the character length of a line, taking into account - // collapsed ranges (see markText) that might hide parts, and join - // other lines onto it. - function lineLength(line) { - if (line.height == 0) return 0; - var len = line.text.length, merged, cur = line; - while (merged = collapsedSpanAtStart(cur)) { - var found = merged.find(0, true); - cur = found.from.line; - len += found.from.ch - found.to.ch; - } - cur = line; - while (merged = collapsedSpanAtEnd(cur)) { - var found = merged.find(0, true); - len -= cur.text.length - found.from.ch; - cur = found.to.line; - len += cur.text.length - found.to.ch; - } - return len; - } - - // Find the longest line in the document. - function findMaxLine(cm) { - var d = cm.display, doc = cm.doc; - d.maxLine = getLine(doc, doc.first); - d.maxLineLength = lineLength(d.maxLine); - d.maxLineChanged = true; - doc.iter(function(line) { - var len = lineLength(line); - if (len > d.maxLineLength) { - d.maxLineLength = len; - d.maxLine = line; - } - }); - } - - // Make sure the gutters options contains the element - // "CodeMirror-linenumbers" when the lineNumbers option is true. - function setGuttersForLineNumbers(options) { - var found = indexOf(options.gutters, "CodeMirror-linenumbers"); - if (found == -1 && options.lineNumbers) { - options.gutters = options.gutters.concat(["CodeMirror-linenumbers"]); - } else if (found > -1 && !options.lineNumbers) { - options.gutters = options.gutters.slice(0); - options.gutters.splice(found, 1); - } - } - - // SCROLLBARS - - // Prepare DOM reads needed to update the scrollbars. Done in one - // shot to minimize update/measure roundtrips. - function measureForScrollbars(cm) { - var d = cm.display, gutterW = d.gutters.offsetWidth; - var docH = Math.round(cm.doc.height + paddingVert(cm.display)); - return { - clientHeight: d.scroller.clientHeight, - viewHeight: d.wrapper.clientHeight, - scrollWidth: d.scroller.scrollWidth, clientWidth: d.scroller.clientWidth, - viewWidth: d.wrapper.clientWidth, - barLeft: cm.options.fixedGutter ? gutterW : 0, - docHeight: docH, - scrollHeight: docH + scrollGap(cm) + d.barHeight, - nativeBarWidth: d.nativeBarWidth, - gutterWidth: gutterW - }; - } - - function NativeScrollbars(place, scroll, cm) { - this.cm = cm; - var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar"); - var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar"); - place(vert); place(horiz); - - on(vert, "scroll", function() { - if (vert.clientHeight) scroll(vert.scrollTop, "vertical"); - }); - on(horiz, "scroll", function() { - if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal"); - }); - - this.checkedZeroWidth = false; - // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8). - if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px"; - } - - NativeScrollbars.prototype = copyObj({ - update: function(measure) { - var needsH = measure.scrollWidth > measure.clientWidth + 1; - var needsV = measure.scrollHeight > measure.clientHeight + 1; - var sWidth = measure.nativeBarWidth; - - if (needsV) { - this.vert.style.display = "block"; - this.vert.style.bottom = needsH ? sWidth + "px" : "0"; - var totalHeight = measure.viewHeight - (needsH ? sWidth : 0); - // A bug in IE8 can cause this value to be negative, so guard it. - this.vert.firstChild.style.height = - Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px"; - } else { - this.vert.style.display = ""; - this.vert.firstChild.style.height = "0"; - } - - if (needsH) { - this.horiz.style.display = "block"; - this.horiz.style.right = needsV ? sWidth + "px" : "0"; - this.horiz.style.left = measure.barLeft + "px"; - var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0); - this.horiz.firstChild.style.width = - (measure.scrollWidth - measure.clientWidth + totalWidth) + "px"; - } else { - this.horiz.style.display = ""; - this.horiz.firstChild.style.width = "0"; - } - - if (!this.checkedZeroWidth && measure.clientHeight > 0) { - if (sWidth == 0) this.zeroWidthHack(); - this.checkedZeroWidth = true; - } - - return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0}; - }, - setScrollLeft: function(pos) { - if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos; - if (this.disableHoriz) this.enableZeroWidthBar(this.horiz, this.disableHoriz); - }, - setScrollTop: function(pos) { - if (this.vert.scrollTop != pos) this.vert.scrollTop = pos; - if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert); - }, - zeroWidthHack: function() { - var w = mac && !mac_geMountainLion ? "12px" : "18px"; - this.horiz.style.height = this.vert.style.width = w; - this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none"; - this.disableHoriz = new Delayed; - this.disableVert = new Delayed; - }, - enableZeroWidthBar: function(bar, delay) { - bar.style.pointerEvents = "auto"; - function maybeDisable() { - // To find out whether the scrollbar is still visible, we - // check whether the element under the pixel in the bottom - // left corner of the scrollbar box is the scrollbar box - // itself (when the bar is still visible) or its filler child - // (when the bar is hidden). If it is still visible, we keep - // it enabled, if it's hidden, we disable pointer events. - var box = bar.getBoundingClientRect(); - var elt = document.elementFromPoint(box.left + 1, box.bottom - 1); - if (elt != bar) bar.style.pointerEvents = "none"; - else delay.set(1000, maybeDisable); - } - delay.set(1000, maybeDisable); - }, - clear: function() { - var parent = this.horiz.parentNode; - parent.removeChild(this.horiz); - parent.removeChild(this.vert); - } - }, NativeScrollbars.prototype); - - function NullScrollbars() {} - - NullScrollbars.prototype = copyObj({ - update: function() { return {bottom: 0, right: 0}; }, - setScrollLeft: function() {}, - setScrollTop: function() {}, - clear: function() {} - }, NullScrollbars.prototype); - - CodeMirror.scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars}; - - function initScrollbars(cm) { - if (cm.display.scrollbars) { - cm.display.scrollbars.clear(); - if (cm.display.scrollbars.addClass) - rmClass(cm.display.wrapper, cm.display.scrollbars.addClass); - } - - cm.display.scrollbars = new CodeMirror.scrollbarModel[cm.options.scrollbarStyle](function(node) { - cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller); - // Prevent clicks in the scrollbars from killing focus - on(node, "mousedown", function() { - if (cm.state.focused) setTimeout(function() { cm.display.input.focus(); }, 0); - }); - node.setAttribute("cm-not-content", "true"); - }, function(pos, axis) { - if (axis == "horizontal") setScrollLeft(cm, pos); - else setScrollTop(cm, pos); - }, cm); - if (cm.display.scrollbars.addClass) - addClass(cm.display.wrapper, cm.display.scrollbars.addClass); - } - - function updateScrollbars(cm, measure) { - if (!measure) measure = measureForScrollbars(cm); - var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight; - updateScrollbarsInner(cm, measure); - for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) { - if (startWidth != cm.display.barWidth && cm.options.lineWrapping) - updateHeightsInViewport(cm); - updateScrollbarsInner(cm, measureForScrollbars(cm)); - startWidth = cm.display.barWidth; startHeight = cm.display.barHeight; - } - } - - // Re-synchronize the fake scrollbars with the actual size of the - // content. - function updateScrollbarsInner(cm, measure) { - var d = cm.display; - var sizes = d.scrollbars.update(measure); - - d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px"; - d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px"; - d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent" - - if (sizes.right && sizes.bottom) { - d.scrollbarFiller.style.display = "block"; - d.scrollbarFiller.style.height = sizes.bottom + "px"; - d.scrollbarFiller.style.width = sizes.right + "px"; - } else d.scrollbarFiller.style.display = ""; - if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) { - d.gutterFiller.style.display = "block"; - d.gutterFiller.style.height = sizes.bottom + "px"; - d.gutterFiller.style.width = measure.gutterWidth + "px"; - } else d.gutterFiller.style.display = ""; - } - - // Compute the lines that are visible in a given viewport (defaults - // the the current scroll position). viewport may contain top, - // height, and ensure (see op.scrollToPos) properties. - function visibleLines(display, doc, viewport) { - var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop; - top = Math.floor(top - paddingTop(display)); - var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight; - - var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom); - // Ensure is a {from: {line, ch}, to: {line, ch}} object, and - // forces those lines into the viewport (if possible). - if (viewport && viewport.ensure) { - var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line; - if (ensureFrom < from) { - from = ensureFrom; - to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight); - } else if (Math.min(ensureTo, doc.lastLine()) >= to) { - from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight); - to = ensureTo; - } - } - return {from: from, to: Math.max(to, from + 1)}; - } - - // LINE NUMBERS - - // Re-align line numbers and gutter marks to compensate for - // horizontal scrolling. - function alignHorizontally(cm) { - var display = cm.display, view = display.view; - if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) return; - var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft; - var gutterW = display.gutters.offsetWidth, left = comp + "px"; - for (var i = 0; i < view.length; i++) if (!view[i].hidden) { - if (cm.options.fixedGutter && view[i].gutter) - view[i].gutter.style.left = left; - var align = view[i].alignable; - if (align) for (var j = 0; j < align.length; j++) - align[j].style.left = left; - } - if (cm.options.fixedGutter) - display.gutters.style.left = (comp + gutterW) + "px"; - } - - // Used to ensure that the line number gutter is still the right - // size for the current document size. Returns true when an update - // is needed. - function maybeUpdateLineNumberWidth(cm) { - if (!cm.options.lineNumbers) return false; - var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display; - if (last.length != display.lineNumChars) { - var test = display.measure.appendChild(elt("div", [elt("div", last)], - "CodeMirror-linenumber CodeMirror-gutter-elt")); - var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW; - display.lineGutter.style.width = ""; - display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1; - display.lineNumWidth = display.lineNumInnerWidth + padding; - display.lineNumChars = display.lineNumInnerWidth ? last.length : -1; - display.lineGutter.style.width = display.lineNumWidth + "px"; - updateGutterSpace(cm); - return true; - } - return false; - } - - function lineNumberFor(options, i) { - return String(options.lineNumberFormatter(i + options.firstLineNumber)); - } - - // Computes display.scroller.scrollLeft + display.gutters.offsetWidth, - // but using getBoundingClientRect to get a sub-pixel-accurate - // result. - function compensateForHScroll(display) { - return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left; - } - - // DISPLAY DRAWING - - function DisplayUpdate(cm, viewport, force) { - var display = cm.display; - - this.viewport = viewport; - // Store some values that we'll need later (but don't want to force a relayout for) - this.visible = visibleLines(display, cm.doc, viewport); - this.editorIsHidden = !display.wrapper.offsetWidth; - this.wrapperHeight = display.wrapper.clientHeight; - this.wrapperWidth = display.wrapper.clientWidth; - this.oldDisplayWidth = displayWidth(cm); - this.force = force; - this.dims = getDimensions(cm); - this.events = []; - } - - DisplayUpdate.prototype.signal = function(emitter, type) { - if (hasHandler(emitter, type)) - this.events.push(arguments); - }; - DisplayUpdate.prototype.finish = function() { - for (var i = 0; i < this.events.length; i++) - signal.apply(null, this.events[i]); - }; - - function maybeClipScrollbars(cm) { - var display = cm.display; - if (!display.scrollbarsClipped && display.scroller.offsetWidth) { - display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth; - display.heightForcer.style.height = scrollGap(cm) + "px"; - display.sizer.style.marginBottom = -display.nativeBarWidth + "px"; - display.sizer.style.borderRightWidth = scrollGap(cm) + "px"; - display.scrollbarsClipped = true; - } - } - - // Does the actual updating of the line display. Bails out - // (returning false) when there is nothing to be done and forced is - // false. - function updateDisplayIfNeeded(cm, update) { - var display = cm.display, doc = cm.doc; - - if (update.editorIsHidden) { - resetView(cm); - return false; - } - - // Bail out if the visible area is already rendered and nothing changed. - if (!update.force && - update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo && - (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) && - display.renderedView == display.view && countDirtyView(cm) == 0) - return false; - - if (maybeUpdateLineNumberWidth(cm)) { - resetView(cm); - update.dims = getDimensions(cm); - } - - // Compute a suitable new viewport (from & to) - var end = doc.first + doc.size; - var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first); - var to = Math.min(end, update.visible.to + cm.options.viewportMargin); - if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom); - if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo); - if (sawCollapsedSpans) { - from = visualLineNo(cm.doc, from); - to = visualLineEndNo(cm.doc, to); - } - - var different = from != display.viewFrom || to != display.viewTo || - display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth; - adjustView(cm, from, to); - - display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom)); - // Position the mover div to align with the current scroll position - cm.display.mover.style.top = display.viewOffset + "px"; - - var toUpdate = countDirtyView(cm); - if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view && - (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo)) - return false; - - // For big changes, we hide the enclosing element during the - // update, since that speeds up the operations on most browsers. - var focused = activeElt(); - if (toUpdate > 4) display.lineDiv.style.display = "none"; - patchDisplay(cm, display.updateLineNumbers, update.dims); - if (toUpdate > 4) display.lineDiv.style.display = ""; - display.renderedView = display.view; - // There might have been a widget with a focused element that got - // hidden or updated, if so re-focus it. - if (focused && activeElt() != focused && focused.offsetHeight) focused.focus(); - - // Prevent selection and cursors from interfering with the scroll - // width and height. - removeChildren(display.cursorDiv); - removeChildren(display.selectionDiv); - display.gutters.style.height = display.sizer.style.minHeight = 0; - - if (different) { - display.lastWrapHeight = update.wrapperHeight; - display.lastWrapWidth = update.wrapperWidth; - startWorker(cm, 400); - } - - display.updateLineNumbers = null; - - return true; - } - - function postUpdateDisplay(cm, update) { - var viewport = update.viewport; - - for (var first = true;; first = false) { - if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) { - // Clip forced viewport to actual scrollable area. - if (viewport && viewport.top != null) - viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)}; - // Updated line heights might result in the drawn area not - // actually covering the viewport. Keep looping until it does. - update.visible = visibleLines(cm.display, cm.doc, viewport); - if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo) - break; - } - if (!updateDisplayIfNeeded(cm, update)) break; - updateHeightsInViewport(cm); - var barMeasure = measureForScrollbars(cm); - updateSelection(cm); - updateScrollbars(cm, barMeasure); - setDocumentHeight(cm, barMeasure); - } - - update.signal(cm, "update", cm); - if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) { - update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo); - cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo; - } - } - - function updateDisplaySimple(cm, viewport) { - var update = new DisplayUpdate(cm, viewport); - if (updateDisplayIfNeeded(cm, update)) { - updateHeightsInViewport(cm); - postUpdateDisplay(cm, update); - var barMeasure = measureForScrollbars(cm); - updateSelection(cm); - updateScrollbars(cm, barMeasure); - setDocumentHeight(cm, barMeasure); - update.finish(); - } - } - - function setDocumentHeight(cm, measure) { - cm.display.sizer.style.minHeight = measure.docHeight + "px"; - cm.display.heightForcer.style.top = measure.docHeight + "px"; - cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px"; - } - - // Read the actual heights of the rendered lines, and update their - // stored heights to match. - function updateHeightsInViewport(cm) { - var display = cm.display; - var prevBottom = display.lineDiv.offsetTop; - for (var i = 0; i < display.view.length; i++) { - var cur = display.view[i], height; - if (cur.hidden) continue; - if (ie && ie_version < 8) { - var bot = cur.node.offsetTop + cur.node.offsetHeight; - height = bot - prevBottom; - prevBottom = bot; - } else { - var box = cur.node.getBoundingClientRect(); - height = box.bottom - box.top; - } - var diff = cur.line.height - height; - if (height < 2) height = textHeight(display); - if (diff > .001 || diff < -.001) { - updateLineHeight(cur.line, height); - updateWidgetHeight(cur.line); - if (cur.rest) for (var j = 0; j < cur.rest.length; j++) - updateWidgetHeight(cur.rest[j]); - } - } - } - - // Read and store the height of line widgets associated with the - // given line. - function updateWidgetHeight(line) { - if (line.widgets) for (var i = 0; i < line.widgets.length; ++i) - line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight; - } - - // Do a bulk-read of the DOM positions and sizes needed to draw the - // view, so that we don't interleave reading and writing to the DOM. - function getDimensions(cm) { - var d = cm.display, left = {}, width = {}; - var gutterLeft = d.gutters.clientLeft; - for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) { - left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft; - width[cm.options.gutters[i]] = n.clientWidth; - } - return {fixedPos: compensateForHScroll(d), - gutterTotalWidth: d.gutters.offsetWidth, - gutterLeft: left, - gutterWidth: width, - wrapperWidth: d.wrapper.clientWidth}; - } - - // Sync the actual display DOM structure with display.view, removing - // nodes for lines that are no longer in view, and creating the ones - // that are not there yet, and updating the ones that are out of - // date. - function patchDisplay(cm, updateNumbersFrom, dims) { - var display = cm.display, lineNumbers = cm.options.lineNumbers; - var container = display.lineDiv, cur = container.firstChild; - - function rm(node) { - var next = node.nextSibling; - // Works around a throw-scroll bug in OS X Webkit - if (webkit && mac && cm.display.currentWheelTarget == node) - node.style.display = "none"; - else - node.parentNode.removeChild(node); - return next; - } - - var view = display.view, lineN = display.viewFrom; - // Loop over the elements in the view, syncing cur (the DOM nodes - // in display.lineDiv) with the view as we go. - for (var i = 0; i < view.length; i++) { - var lineView = view[i]; - if (lineView.hidden) { - } else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet - var node = buildLineElement(cm, lineView, lineN, dims); - container.insertBefore(node, cur); - } else { // Already drawn - while (cur != lineView.node) cur = rm(cur); - var updateNumber = lineNumbers && updateNumbersFrom != null && - updateNumbersFrom <= lineN && lineView.lineNumber; - if (lineView.changes) { - if (indexOf(lineView.changes, "gutter") > -1) updateNumber = false; - updateLineForChanges(cm, lineView, lineN, dims); - } - if (updateNumber) { - removeChildren(lineView.lineNumber); - lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN))); - } - cur = lineView.node.nextSibling; - } - lineN += lineView.size; - } - while (cur) cur = rm(cur); - } - - // When an aspect of a line changes, a string is added to - // lineView.changes. This updates the relevant part of the line's - // DOM structure. - function updateLineForChanges(cm, lineView, lineN, dims) { - for (var j = 0; j < lineView.changes.length; j++) { - var type = lineView.changes[j]; - if (type == "text") updateLineText(cm, lineView); - else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims); - else if (type == "class") updateLineClasses(lineView); - else if (type == "widget") updateLineWidgets(cm, lineView, dims); - } - lineView.changes = null; - } - - // Lines with gutter elements, widgets or a background class need to - // be wrapped, and have the extra elements added to the wrapper div - function ensureLineWrapped(lineView) { - if (lineView.node == lineView.text) { - lineView.node = elt("div", null, null, "position: relative"); - if (lineView.text.parentNode) - lineView.text.parentNode.replaceChild(lineView.node, lineView.text); - lineView.node.appendChild(lineView.text); - if (ie && ie_version < 8) lineView.node.style.zIndex = 2; - } - return lineView.node; - } - - function updateLineBackground(lineView) { - var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass; - if (cls) cls += " CodeMirror-linebackground"; - if (lineView.background) { - if (cls) lineView.background.className = cls; - else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null; } - } else if (cls) { - var wrap = ensureLineWrapped(lineView); - lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild); - } - } - - // Wrapper around buildLineContent which will reuse the structure - // in display.externalMeasured when possible. - function getLineContent(cm, lineView) { - var ext = cm.display.externalMeasured; - if (ext && ext.line == lineView.line) { - cm.display.externalMeasured = null; - lineView.measure = ext.measure; - return ext.built; - } - return buildLineContent(cm, lineView); - } - - // Redraw the line's text. Interacts with the background and text - // classes because the mode may output tokens that influence these - // classes. - function updateLineText(cm, lineView) { - var cls = lineView.text.className; - var built = getLineContent(cm, lineView); - if (lineView.text == lineView.node) lineView.node = built.pre; - lineView.text.parentNode.replaceChild(built.pre, lineView.text); - lineView.text = built.pre; - if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) { - lineView.bgClass = built.bgClass; - lineView.textClass = built.textClass; - updateLineClasses(lineView); - } else if (cls) { - lineView.text.className = cls; - } - } - - function updateLineClasses(lineView) { - updateLineBackground(lineView); - if (lineView.line.wrapClass) - ensureLineWrapped(lineView).className = lineView.line.wrapClass; - else if (lineView.node != lineView.text) - lineView.node.className = ""; - var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass; - lineView.text.className = textClass || ""; - } - - function updateLineGutter(cm, lineView, lineN, dims) { - if (lineView.gutter) { - lineView.node.removeChild(lineView.gutter); - lineView.gutter = null; - } - if (lineView.gutterBackground) { - lineView.node.removeChild(lineView.gutterBackground); - lineView.gutterBackground = null; - } - if (lineView.line.gutterClass) { - var wrap = ensureLineWrapped(lineView); - lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass, - "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + - "px; width: " + dims.gutterTotalWidth + "px"); - wrap.insertBefore(lineView.gutterBackground, lineView.text); - } - var markers = lineView.line.gutterMarkers; - if (cm.options.lineNumbers || markers) { - var wrap = ensureLineWrapped(lineView); - var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " + - (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"); - cm.display.input.setUneditable(gutterWrap); - wrap.insertBefore(gutterWrap, lineView.text); - if (lineView.line.gutterClass) - gutterWrap.className += " " + lineView.line.gutterClass; - if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"])) - lineView.lineNumber = gutterWrap.appendChild( - elt("div", lineNumberFor(cm.options, lineN), - "CodeMirror-linenumber CodeMirror-gutter-elt", - "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: " - + cm.display.lineNumInnerWidth + "px")); - if (markers) for (var k = 0; k < cm.options.gutters.length; ++k) { - var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id]; - if (found) - gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " + - dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px")); - } - } - } - - function updateLineWidgets(cm, lineView, dims) { - if (lineView.alignable) lineView.alignable = null; - for (var node = lineView.node.firstChild, next; node; node = next) { - var next = node.nextSibling; - if (node.className == "CodeMirror-linewidget") - lineView.node.removeChild(node); - } - insertLineWidgets(cm, lineView, dims); - } - - // Build a line's DOM representation from scratch - function buildLineElement(cm, lineView, lineN, dims) { - var built = getLineContent(cm, lineView); - lineView.text = lineView.node = built.pre; - if (built.bgClass) lineView.bgClass = built.bgClass; - if (built.textClass) lineView.textClass = built.textClass; - - updateLineClasses(lineView); - updateLineGutter(cm, lineView, lineN, dims); - insertLineWidgets(cm, lineView, dims); - return lineView.node; - } - - // A lineView may contain multiple logical lines (when merged by - // collapsed spans). The widgets for all of them need to be drawn. - function insertLineWidgets(cm, lineView, dims) { - insertLineWidgetsFor(cm, lineView.line, lineView, dims, true); - if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++) - insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false); - } - - function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) { - if (!line.widgets) return; - var wrap = ensureLineWrapped(lineView); - for (var i = 0, ws = line.widgets; i < ws.length; ++i) { - var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget"); - if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true"); - positionLineWidget(widget, node, lineView, dims); - cm.display.input.setUneditable(node); - if (allowAbove && widget.above) - wrap.insertBefore(node, lineView.gutter || lineView.text); - else - wrap.appendChild(node); - signalLater(widget, "redraw"); - } - } - - function positionLineWidget(widget, node, lineView, dims) { - if (widget.noHScroll) { - (lineView.alignable || (lineView.alignable = [])).push(node); - var width = dims.wrapperWidth; - node.style.left = dims.fixedPos + "px"; - if (!widget.coverGutter) { - width -= dims.gutterTotalWidth; - node.style.paddingLeft = dims.gutterTotalWidth + "px"; - } - node.style.width = width + "px"; - } - if (widget.coverGutter) { - node.style.zIndex = 5; - node.style.position = "relative"; - if (!widget.noHScroll) node.style.marginLeft = -dims.gutterTotalWidth + "px"; - } - } - - // POSITION OBJECT - - // A Pos instance represents a position within the text. - var Pos = CodeMirror.Pos = function(line, ch) { - if (!(this instanceof Pos)) return new Pos(line, ch); - this.line = line; this.ch = ch; - }; - - // Compare two positions, return 0 if they are the same, a negative - // number when a is less, and a positive number otherwise. - var cmp = CodeMirror.cmpPos = function(a, b) { return a.line - b.line || a.ch - b.ch; }; - - function copyPos(x) {return Pos(x.line, x.ch);} - function maxPos(a, b) { return cmp(a, b) < 0 ? b : a; } - function minPos(a, b) { return cmp(a, b) < 0 ? a : b; } - - // INPUT HANDLING - - function ensureFocus(cm) { - if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); } - } - - // This will be set to an array of strings when copying, so that, - // when pasting, we know what kind of selections the copied text - // was made out of. - var lastCopied = null; - - function applyTextInput(cm, inserted, deleted, sel, origin) { - var doc = cm.doc; - cm.display.shift = false; - if (!sel) sel = doc.sel; - - var paste = cm.state.pasteIncoming || origin == "paste"; - var textLines = doc.splitLines(inserted), multiPaste = null; - // When pasing N lines into N selections, insert one line per selection - if (paste && sel.ranges.length > 1) { - if (lastCopied && lastCopied.join("\n") == inserted) { - if (sel.ranges.length % lastCopied.length == 0) { - multiPaste = []; - for (var i = 0; i < lastCopied.length; i++) - multiPaste.push(doc.splitLines(lastCopied[i])); - } - } else if (textLines.length == sel.ranges.length) { - multiPaste = map(textLines, function(l) { return [l]; }); - } - } - - // Normal behavior is to insert the new text into every selection - for (var i = sel.ranges.length - 1; i >= 0; i--) { - var range = sel.ranges[i]; - var from = range.from(), to = range.to(); - if (range.empty()) { - if (deleted && deleted > 0) // Handle deletion - from = Pos(from.line, from.ch - deleted); - else if (cm.state.overwrite && !paste) // Handle overwrite - to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length)); - } - var updateInput = cm.curOp.updateInput; - var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines, - origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")}; - makeChange(cm.doc, changeEvent); - signalLater(cm, "inputRead", cm, changeEvent); - } - if (inserted && !paste) - triggerElectric(cm, inserted); - - ensureCursorVisible(cm); - cm.curOp.updateInput = updateInput; - cm.curOp.typing = true; - cm.state.pasteIncoming = cm.state.cutIncoming = false; - } - - function handlePaste(e, cm) { - var pasted = e.clipboardData && e.clipboardData.getData("text/plain"); - if (pasted) { - e.preventDefault(); - if (!cm.isReadOnly() && !cm.options.disableInput) - runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); }); - return true; - } - } - - function triggerElectric(cm, inserted) { - // When an 'electric' character is inserted, immediately trigger a reindent - if (!cm.options.electricChars || !cm.options.smartIndent) return; - var sel = cm.doc.sel; - - for (var i = sel.ranges.length - 1; i >= 0; i--) { - var range = sel.ranges[i]; - if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) continue; - var mode = cm.getModeAt(range.head); - var indented = false; - if (mode.electricChars) { - for (var j = 0; j < mode.electricChars.length; j++) - if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) { - indented = indentLine(cm, range.head.line, "smart"); - break; - } - } else if (mode.electricInput) { - if (mode.electricInput.test(getLine(cm.doc, range.head.line).text.slice(0, range.head.ch))) - indented = indentLine(cm, range.head.line, "smart"); - } - if (indented) signalLater(cm, "electricInput", cm, range.head.line); - } - } - - function copyableRanges(cm) { - var text = [], ranges = []; - for (var i = 0; i < cm.doc.sel.ranges.length; i++) { - var line = cm.doc.sel.ranges[i].head.line; - var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)}; - ranges.push(lineRange); - text.push(cm.getRange(lineRange.anchor, lineRange.head)); - } - return {text: text, ranges: ranges}; - } - - function disableBrowserMagic(field) { - field.setAttribute("autocorrect", "off"); - field.setAttribute("autocapitalize", "off"); - field.setAttribute("spellcheck", "false"); - } - - // TEXTAREA INPUT STYLE - - function TextareaInput(cm) { - this.cm = cm; - // See input.poll and input.reset - this.prevInput = ""; - - // Flag that indicates whether we expect input to appear real soon - // now (after some event like 'keypress' or 'input') and are - // polling intensively. - this.pollingFast = false; - // Self-resetting timeout for the poller - this.polling = new Delayed(); - // Tracks when input.reset has punted to just putting a short - // string into the textarea instead of the full selection. - this.inaccurateSelection = false; - // Used to work around IE issue with selection being forgotten when focus moves away from textarea - this.hasSelection = false; - this.composing = null; - }; - - function hiddenTextarea() { - var te = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none"); - var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;"); - // The textarea is kept positioned near the cursor to prevent the - // fact that it'll be scrolled into view on input from scrolling - // our fake cursor out of view. On webkit, when wrap=off, paste is - // very slow. So make the area wide instead. - if (webkit) te.style.width = "1000px"; - else te.setAttribute("wrap", "off"); - // If border: 0; -- iOS fails to open keyboard (issue #1287) - if (ios) te.style.border = "1px solid black"; - disableBrowserMagic(te); - return div; - } - - TextareaInput.prototype = copyObj({ - init: function(display) { - var input = this, cm = this.cm; - - // Wraps and hides input textarea - var div = this.wrapper = hiddenTextarea(); - // The semihidden textarea that is focused when the editor is - // focused, and receives input. - var te = this.textarea = div.firstChild; - display.wrapper.insertBefore(div, display.wrapper.firstChild); - - // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore) - if (ios) te.style.width = "0px"; - - on(te, "input", function() { - if (ie && ie_version >= 9 && input.hasSelection) input.hasSelection = null; - input.poll(); - }); - - on(te, "paste", function(e) { - if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return - - cm.state.pasteIncoming = true; - input.fastPoll(); - }); - - function prepareCopyCut(e) { - if (signalDOMEvent(cm, e)) return - if (cm.somethingSelected()) { - lastCopied = cm.getSelections(); - if (input.inaccurateSelection) { - input.prevInput = ""; - input.inaccurateSelection = false; - te.value = lastCopied.join("\n"); - selectInput(te); - } - } else if (!cm.options.lineWiseCopyCut) { - return; - } else { - var ranges = copyableRanges(cm); - lastCopied = ranges.text; - if (e.type == "cut") { - cm.setSelections(ranges.ranges, null, sel_dontScroll); - } else { - input.prevInput = ""; - te.value = ranges.text.join("\n"); - selectInput(te); - } - } - if (e.type == "cut") cm.state.cutIncoming = true; - } - on(te, "cut", prepareCopyCut); - on(te, "copy", prepareCopyCut); - - on(display.scroller, "paste", function(e) { - if (eventInWidget(display, e) || signalDOMEvent(cm, e)) return; - cm.state.pasteIncoming = true; - input.focus(); - }); - - // Prevent normal selection in the editor (we handle our own) - on(display.lineSpace, "selectstart", function(e) { - if (!eventInWidget(display, e)) e_preventDefault(e); - }); - - on(te, "compositionstart", function() { - var start = cm.getCursor("from"); - if (input.composing) input.composing.range.clear() - input.composing = { - start: start, - range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"}) - }; - }); - on(te, "compositionend", function() { - if (input.composing) { - input.poll(); - input.composing.range.clear(); - input.composing = null; - } - }); - }, - - prepareSelection: function() { - // Redraw the selection and/or cursor - var cm = this.cm, display = cm.display, doc = cm.doc; - var result = prepareSelection(cm); - - // Move the hidden textarea near the cursor to prevent scrolling artifacts - if (cm.options.moveInputWithCursor) { - var headPos = cursorCoords(cm, doc.sel.primary().head, "div"); - var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect(); - result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10, - headPos.top + lineOff.top - wrapOff.top)); - result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10, - headPos.left + lineOff.left - wrapOff.left)); - } - - return result; - }, - - showSelection: function(drawn) { - var cm = this.cm, display = cm.display; - removeChildrenAndAdd(display.cursorDiv, drawn.cursors); - removeChildrenAndAdd(display.selectionDiv, drawn.selection); - if (drawn.teTop != null) { - this.wrapper.style.top = drawn.teTop + "px"; - this.wrapper.style.left = drawn.teLeft + "px"; - } - }, - - // Reset the input to correspond to the selection (or to be empty, - // when not typing and nothing is selected) - reset: function(typing) { - if (this.contextMenuPending) return; - var minimal, selected, cm = this.cm, doc = cm.doc; - if (cm.somethingSelected()) { - this.prevInput = ""; - var range = doc.sel.primary(); - minimal = hasCopyEvent && - (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000); - var content = minimal ? "-" : selected || cm.getSelection(); - this.textarea.value = content; - if (cm.state.focused) selectInput(this.textarea); - if (ie && ie_version >= 9) this.hasSelection = content; - } else if (!typing) { - this.prevInput = this.textarea.value = ""; - if (ie && ie_version >= 9) this.hasSelection = null; - } - this.inaccurateSelection = minimal; - }, - - getField: function() { return this.textarea; }, - - supportsTouch: function() { return false; }, - - focus: function() { - if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) { - try { this.textarea.focus(); } - catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM - } - }, - - blur: function() { this.textarea.blur(); }, - - resetPosition: function() { - this.wrapper.style.top = this.wrapper.style.left = 0; - }, - - receivedFocus: function() { this.slowPoll(); }, - - // Poll for input changes, using the normal rate of polling. This - // runs as long as the editor is focused. - slowPoll: function() { - var input = this; - if (input.pollingFast) return; - input.polling.set(this.cm.options.pollInterval, function() { - input.poll(); - if (input.cm.state.focused) input.slowPoll(); - }); - }, - - // When an event has just come in that is likely to add or change - // something in the input textarea, we poll faster, to ensure that - // the change appears on the screen quickly. - fastPoll: function() { - var missed = false, input = this; - input.pollingFast = true; - function p() { - var changed = input.poll(); - if (!changed && !missed) {missed = true; input.polling.set(60, p);} - else {input.pollingFast = false; input.slowPoll();} - } - input.polling.set(20, p); - }, - - // Read input from the textarea, and update the document to match. - // When something is selected, it is present in the textarea, and - // selected (unless it is huge, in which case a placeholder is - // used). When nothing is selected, the cursor sits after previously - // seen text (can be empty), which is stored in prevInput (we must - // not reset the textarea when typing, because that breaks IME). - poll: function() { - var cm = this.cm, input = this.textarea, prevInput = this.prevInput; - // Since this is called a *lot*, try to bail out as cheaply as - // possible when it is clear that nothing happened. hasSelection - // will be the case when there is a lot of text in the textarea, - // in which case reading its value would be expensive. - if (this.contextMenuPending || !cm.state.focused || - (hasSelection(input) && !prevInput && !this.composing) || - cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq) - return false; - - var text = input.value; - // If nothing changed, bail. - if (text == prevInput && !cm.somethingSelected()) return false; - // Work around nonsensical selection resetting in IE9/10, and - // inexplicable appearance of private area unicode characters on - // some key combos in Mac (#2689). - if (ie && ie_version >= 9 && this.hasSelection === text || - mac && /[\uf700-\uf7ff]/.test(text)) { - cm.display.input.reset(); - return false; - } - - if (cm.doc.sel == cm.display.selForContextMenu) { - var first = text.charCodeAt(0); - if (first == 0x200b && !prevInput) prevInput = "\u200b"; - if (first == 0x21da) { this.reset(); return this.cm.execCommand("undo"); } - } - // Find the part of the input that is actually new - var same = 0, l = Math.min(prevInput.length, text.length); - while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same; - - var self = this; - runInOp(cm, function() { - applyTextInput(cm, text.slice(same), prevInput.length - same, - null, self.composing ? "*compose" : null); - - // Don't leave long text in the textarea, since it makes further polling slow - if (text.length > 1000 || text.indexOf("\n") > -1) input.value = self.prevInput = ""; - else self.prevInput = text; - - if (self.composing) { - self.composing.range.clear(); - self.composing.range = cm.markText(self.composing.start, cm.getCursor("to"), - {className: "CodeMirror-composing"}); - } - }); - return true; - }, - - ensurePolled: function() { - if (this.pollingFast && this.poll()) this.pollingFast = false; - }, - - onKeyPress: function() { - if (ie && ie_version >= 9) this.hasSelection = null; - this.fastPoll(); - }, - - onContextMenu: function(e) { - var input = this, cm = input.cm, display = cm.display, te = input.textarea; - var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop; - if (!pos || presto) return; // Opera is difficult. - - // Reset the current text selection only if the click is done outside of the selection - // and 'resetSelectionOnContextMenu' option is true. - var reset = cm.options.resetSelectionOnContextMenu; - if (reset && cm.doc.sel.contains(pos) == -1) - operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll); - - var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText; - input.wrapper.style.cssText = "position: absolute" - var wrapperBox = input.wrapper.getBoundingClientRect() - te.style.cssText = "position: absolute; width: 30px; height: 30px; top: " + (e.clientY - wrapperBox.top - 5) + - "px; left: " + (e.clientX - wrapperBox.left - 5) + "px; z-index: 1000; background: " + - (ie ? "rgba(255, 255, 255, .05)" : "transparent") + - "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);"; - if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712) - display.input.focus(); - if (webkit) window.scrollTo(null, oldScrollY); - display.input.reset(); - // Adds "Select all" to context menu in FF - if (!cm.somethingSelected()) te.value = input.prevInput = " "; - input.contextMenuPending = true; - display.selForContextMenu = cm.doc.sel; - clearTimeout(display.detectingSelectAll); - - // Select-all will be greyed out if there's nothing to select, so - // this adds a zero-width space so that we can later check whether - // it got selected. - function prepareSelectAllHack() { - if (te.selectionStart != null) { - var selected = cm.somethingSelected(); - var extval = "\u200b" + (selected ? te.value : ""); - te.value = "\u21da"; // Used to catch context-menu undo - te.value = extval; - input.prevInput = selected ? "" : "\u200b"; - te.selectionStart = 1; te.selectionEnd = extval.length; - // Re-set this, in case some other handler touched the - // selection in the meantime. - display.selForContextMenu = cm.doc.sel; - } - } - function rehide() { - input.contextMenuPending = false; - input.wrapper.style.cssText = oldWrapperCSS - te.style.cssText = oldCSS; - if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos); - - // Try to detect the user choosing select-all - if (te.selectionStart != null) { - if (!ie || (ie && ie_version < 9)) prepareSelectAllHack(); - var i = 0, poll = function() { - if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 && - te.selectionEnd > 0 && input.prevInput == "\u200b") - operation(cm, commands.selectAll)(cm); - else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500); - else display.input.reset(); - }; - display.detectingSelectAll = setTimeout(poll, 200); - } - } - - if (ie && ie_version >= 9) prepareSelectAllHack(); - if (captureRightClick) { - e_stop(e); - var mouseup = function() { - off(window, "mouseup", mouseup); - setTimeout(rehide, 20); - }; - on(window, "mouseup", mouseup); - } else { - setTimeout(rehide, 50); - } - }, - - readOnlyChanged: function(val) { - if (!val) this.reset(); - }, - - setUneditable: nothing, - - needsContentAttribute: false - }, TextareaInput.prototype); - - // CONTENTEDITABLE INPUT STYLE - - function ContentEditableInput(cm) { - this.cm = cm; - this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null; - this.polling = new Delayed(); - this.gracePeriod = false; - } - - ContentEditableInput.prototype = copyObj({ - init: function(display) { - var input = this, cm = input.cm; - var div = input.div = display.lineDiv; - disableBrowserMagic(div); - - on(div, "paste", function(e) { - if (!signalDOMEvent(cm, e)) handlePaste(e, cm); - }) - - on(div, "compositionstart", function(e) { - var data = e.data; - input.composing = {sel: cm.doc.sel, data: data, startData: data}; - if (!data) return; - var prim = cm.doc.sel.primary(); - var line = cm.getLine(prim.head.line); - var found = line.indexOf(data, Math.max(0, prim.head.ch - data.length)); - if (found > -1 && found <= prim.head.ch) - input.composing.sel = simpleSelection(Pos(prim.head.line, found), - Pos(prim.head.line, found + data.length)); - }); - on(div, "compositionupdate", function(e) { - input.composing.data = e.data; - }); - on(div, "compositionend", function(e) { - var ours = input.composing; - if (!ours) return; - if (e.data != ours.startData && !/\u200b/.test(e.data)) - ours.data = e.data; - // Need a small delay to prevent other code (input event, - // selection polling) from doing damage when fired right after - // compositionend. - setTimeout(function() { - if (!ours.handled) - input.applyComposition(ours); - if (input.composing == ours) - input.composing = null; - }, 50); - }); - - on(div, "touchstart", function() { - input.forceCompositionEnd(); - }); - - on(div, "input", function() { - if (input.composing) return; - if (cm.isReadOnly() || !input.pollContent()) - runInOp(input.cm, function() {regChange(cm);}); - }); - - function onCopyCut(e) { - if (signalDOMEvent(cm, e)) return - if (cm.somethingSelected()) { - lastCopied = cm.getSelections(); - if (e.type == "cut") cm.replaceSelection("", null, "cut"); - } else if (!cm.options.lineWiseCopyCut) { - return; - } else { - var ranges = copyableRanges(cm); - lastCopied = ranges.text; - if (e.type == "cut") { - cm.operation(function() { - cm.setSelections(ranges.ranges, 0, sel_dontScroll); - cm.replaceSelection("", null, "cut"); - }); - } - } - // iOS exposes the clipboard API, but seems to discard content inserted into it - if (e.clipboardData && !ios) { - e.preventDefault(); - e.clipboardData.clearData(); - e.clipboardData.setData("text/plain", lastCopied.join("\n")); - } else { - // Old-fashioned briefly-focus-a-textarea hack - var kludge = hiddenTextarea(), te = kludge.firstChild; - cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild); - te.value = lastCopied.join("\n"); - var hadFocus = document.activeElement; - selectInput(te); - setTimeout(function() { - cm.display.lineSpace.removeChild(kludge); - hadFocus.focus(); - }, 50); - } - } - on(div, "copy", onCopyCut); - on(div, "cut", onCopyCut); - }, - - prepareSelection: function() { - var result = prepareSelection(this.cm, false); - result.focus = this.cm.state.focused; - return result; - }, - - showSelection: function(info) { - if (!info || !this.cm.display.view.length) return; - if (info.focus) this.showPrimarySelection(); - this.showMultipleSelections(info); - }, - - showPrimarySelection: function() { - var sel = window.getSelection(), prim = this.cm.doc.sel.primary(); - var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset); - var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset); - if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad && - cmp(minPos(curAnchor, curFocus), prim.from()) == 0 && - cmp(maxPos(curAnchor, curFocus), prim.to()) == 0) - return; - - var start = posToDOM(this.cm, prim.from()); - var end = posToDOM(this.cm, prim.to()); - if (!start && !end) return; - - var view = this.cm.display.view; - var old = sel.rangeCount && sel.getRangeAt(0); - if (!start) { - start = {node: view[0].measure.map[2], offset: 0}; - } else if (!end) { // FIXME dangerously hacky - var measure = view[view.length - 1].measure; - var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map; - end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]}; - } - - try { var rng = range(start.node, start.offset, end.offset, end.node); } - catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible - if (rng) { - if (!gecko && this.cm.state.focused) { - sel.collapse(start.node, start.offset); - if (!rng.collapsed) sel.addRange(rng); - } else { - sel.removeAllRanges(); - sel.addRange(rng); - } - if (old && sel.anchorNode == null) sel.addRange(old); - else if (gecko) this.startGracePeriod(); - } - this.rememberSelection(); - }, - - startGracePeriod: function() { - var input = this; - clearTimeout(this.gracePeriod); - this.gracePeriod = setTimeout(function() { - input.gracePeriod = false; - if (input.selectionChanged()) - input.cm.operation(function() { input.cm.curOp.selectionChanged = true; }); - }, 20); - }, - - showMultipleSelections: function(info) { - removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors); - removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection); - }, - - rememberSelection: function() { - var sel = window.getSelection(); - this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset; - this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset; - }, - - selectionInEditor: function() { - var sel = window.getSelection(); - if (!sel.rangeCount) return false; - var node = sel.getRangeAt(0).commonAncestorContainer; - return contains(this.div, node); - }, - - focus: function() { - if (this.cm.options.readOnly != "nocursor") this.div.focus(); - }, - blur: function() { this.div.blur(); }, - getField: function() { return this.div; }, - - supportsTouch: function() { return true; }, - - receivedFocus: function() { - var input = this; - if (this.selectionInEditor()) - this.pollSelection(); - else - runInOp(this.cm, function() { input.cm.curOp.selectionChanged = true; }); - - function poll() { - if (input.cm.state.focused) { - input.pollSelection(); - input.polling.set(input.cm.options.pollInterval, poll); - } - } - this.polling.set(this.cm.options.pollInterval, poll); - }, - - selectionChanged: function() { - var sel = window.getSelection(); - return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset || - sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset; - }, - - pollSelection: function() { - if (!this.composing && !this.gracePeriod && this.selectionChanged()) { - var sel = window.getSelection(), cm = this.cm; - this.rememberSelection(); - var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset); - var head = domToPos(cm, sel.focusNode, sel.focusOffset); - if (anchor && head) runInOp(cm, function() { - setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll); - if (anchor.bad || head.bad) cm.curOp.selectionChanged = true; - }); - } - }, - - pollContent: function() { - var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary(); - var from = sel.from(), to = sel.to(); - if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false; - - var fromIndex; - if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) { - var fromLine = lineNo(display.view[0].line); - var fromNode = display.view[0].node; - } else { - var fromLine = lineNo(display.view[fromIndex].line); - var fromNode = display.view[fromIndex - 1].node.nextSibling; - } - var toIndex = findViewIndex(cm, to.line); - if (toIndex == display.view.length - 1) { - var toLine = display.viewTo - 1; - var toNode = display.lineDiv.lastChild; - } else { - var toLine = lineNo(display.view[toIndex + 1].line) - 1; - var toNode = display.view[toIndex + 1].node.previousSibling; - } - - var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine)); - var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length)); - while (newText.length > 1 && oldText.length > 1) { - if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; } - else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++; } - else break; - } - - var cutFront = 0, cutEnd = 0; - var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length); - while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront)) - ++cutFront; - var newBot = lst(newText), oldBot = lst(oldText); - var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0), - oldBot.length - (oldText.length == 1 ? cutFront : 0)); - while (cutEnd < maxCutEnd && - newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1)) - ++cutEnd; - - newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd); - newText[0] = newText[0].slice(cutFront); - - var chFrom = Pos(fromLine, cutFront); - var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0); - if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) { - replaceRange(cm.doc, newText, chFrom, chTo, "+input"); - return true; - } - }, - - ensurePolled: function() { - this.forceCompositionEnd(); - }, - reset: function() { - this.forceCompositionEnd(); - }, - forceCompositionEnd: function() { - if (!this.composing || this.composing.handled) return; - this.applyComposition(this.composing); - this.composing.handled = true; - this.div.blur(); - this.div.focus(); - }, - applyComposition: function(composing) { - if (this.cm.isReadOnly()) - operation(this.cm, regChange)(this.cm) - else if (composing.data && composing.data != composing.startData) - operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel); - }, - - setUneditable: function(node) { - node.contentEditable = "false" - }, - - onKeyPress: function(e) { - e.preventDefault(); - if (!this.cm.isReadOnly()) - operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0); - }, - - readOnlyChanged: function(val) { - this.div.contentEditable = String(val != "nocursor") - }, - - onContextMenu: nothing, - resetPosition: nothing, - - needsContentAttribute: true - }, ContentEditableInput.prototype); - - function posToDOM(cm, pos) { - var view = findViewForLine(cm, pos.line); - if (!view || view.hidden) return null; - var line = getLine(cm.doc, pos.line); - var info = mapFromLineView(view, line, pos.line); - - var order = getOrder(line), side = "left"; - if (order) { - var partPos = getBidiPartAt(order, pos.ch); - side = partPos % 2 ? "right" : "left"; - } - var result = nodeAndOffsetInLineMap(info.map, pos.ch, side); - result.offset = result.collapse == "right" ? result.end : result.start; - return result; - } - - function badPos(pos, bad) { if (bad) pos.bad = true; return pos; } - - function domToPos(cm, node, offset) { - var lineNode; - if (node == cm.display.lineDiv) { - lineNode = cm.display.lineDiv.childNodes[offset]; - if (!lineNode) return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true); - node = null; offset = 0; - } else { - for (lineNode = node;; lineNode = lineNode.parentNode) { - if (!lineNode || lineNode == cm.display.lineDiv) return null; - if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break; - } - } - for (var i = 0; i < cm.display.view.length; i++) { - var lineView = cm.display.view[i]; - if (lineView.node == lineNode) - return locateNodeInLineView(lineView, node, offset); - } - } - - function locateNodeInLineView(lineView, node, offset) { - var wrapper = lineView.text.firstChild, bad = false; - if (!node || !contains(wrapper, node)) return badPos(Pos(lineNo(lineView.line), 0), true); - if (node == wrapper) { - bad = true; - node = wrapper.childNodes[offset]; - offset = 0; - if (!node) { - var line = lineView.rest ? lst(lineView.rest) : lineView.line; - return badPos(Pos(lineNo(line), line.text.length), bad); - } - } - - var textNode = node.nodeType == 3 ? node : null, topNode = node; - if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) { - textNode = node.firstChild; - if (offset) offset = textNode.nodeValue.length; - } - while (topNode.parentNode != wrapper) topNode = topNode.parentNode; - var measure = lineView.measure, maps = measure.maps; - - function find(textNode, topNode, offset) { - for (var i = -1; i < (maps ? maps.length : 0); i++) { - var map = i < 0 ? measure.map : maps[i]; - for (var j = 0; j < map.length; j += 3) { - var curNode = map[j + 2]; - if (curNode == textNode || curNode == topNode) { - var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]); - var ch = map[j] + offset; - if (offset < 0 || curNode != textNode) ch = map[j + (offset ? 1 : 0)]; - return Pos(line, ch); - } - } - } - } - var found = find(textNode, topNode, offset); - if (found) return badPos(found, bad); - - // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems - for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) { - found = find(after, after.firstChild, 0); - if (found) - return badPos(Pos(found.line, found.ch - dist), bad); - else - dist += after.textContent.length; - } - for (var before = topNode.previousSibling, dist = offset; before; before = before.previousSibling) { - found = find(before, before.firstChild, -1); - if (found) - return badPos(Pos(found.line, found.ch + dist), bad); - else - dist += after.textContent.length; - } - } - - function domTextBetween(cm, from, to, fromLine, toLine) { - var text = "", closing = false, lineSep = cm.doc.lineSeparator(); - function recognizeMarker(id) { return function(marker) { return marker.id == id; }; } - function walk(node) { - if (node.nodeType == 1) { - var cmText = node.getAttribute("cm-text"); - if (cmText != null) { - if (cmText == "") cmText = node.textContent.replace(/\u200b/g, ""); - text += cmText; - return; - } - var markerID = node.getAttribute("cm-marker"), range; - if (markerID) { - var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID)); - if (found.length && (range = found[0].find())) - text += getBetween(cm.doc, range.from, range.to).join(lineSep); - return; - } - if (node.getAttribute("contenteditable") == "false") return; - for (var i = 0; i < node.childNodes.length; i++) - walk(node.childNodes[i]); - if (/^(pre|div|p)$/i.test(node.nodeName)) - closing = true; - } else if (node.nodeType == 3) { - var val = node.nodeValue; - if (!val) return; - if (closing) { - text += lineSep; - closing = false; - } - text += val; - } - } - for (;;) { - walk(from); - if (from == to) break; - from = from.nextSibling; - } - return text; - } - - CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput}; - - // SELECTION / CURSOR - - // Selection objects are immutable. A new one is created every time - // the selection changes. A selection is one or more non-overlapping - // (and non-touching) ranges, sorted, and an integer that indicates - // which one is the primary selection (the one that's scrolled into - // view, that getCursor returns, etc). - function Selection(ranges, primIndex) { - this.ranges = ranges; - this.primIndex = primIndex; - } - - Selection.prototype = { - primary: function() { return this.ranges[this.primIndex]; }, - equals: function(other) { - if (other == this) return true; - if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) return false; - for (var i = 0; i < this.ranges.length; i++) { - var here = this.ranges[i], there = other.ranges[i]; - if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) return false; - } - return true; - }, - deepCopy: function() { - for (var out = [], i = 0; i < this.ranges.length; i++) - out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head)); - return new Selection(out, this.primIndex); - }, - somethingSelected: function() { - for (var i = 0; i < this.ranges.length; i++) - if (!this.ranges[i].empty()) return true; - return false; - }, - contains: function(pos, end) { - if (!end) end = pos; - for (var i = 0; i < this.ranges.length; i++) { - var range = this.ranges[i]; - if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0) - return i; - } - return -1; - } - }; - - function Range(anchor, head) { - this.anchor = anchor; this.head = head; - } - - Range.prototype = { - from: function() { return minPos(this.anchor, this.head); }, - to: function() { return maxPos(this.anchor, this.head); }, - empty: function() { - return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch; - } - }; - - // Take an unsorted, potentially overlapping set of ranges, and - // build a selection out of it. 'Consumes' ranges array (modifying - // it). - function normalizeSelection(ranges, primIndex) { - var prim = ranges[primIndex]; - ranges.sort(function(a, b) { return cmp(a.from(), b.from()); }); - primIndex = indexOf(ranges, prim); - for (var i = 1; i < ranges.length; i++) { - var cur = ranges[i], prev = ranges[i - 1]; - if (cmp(prev.to(), cur.from()) >= 0) { - var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to()); - var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head; - if (i <= primIndex) --primIndex; - ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to)); - } - } - return new Selection(ranges, primIndex); - } - - function simpleSelection(anchor, head) { - return new Selection([new Range(anchor, head || anchor)], 0); - } - - // Most of the external API clips given positions to make sure they - // actually exist within the document. - function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1));} - function clipPos(doc, pos) { - if (pos.line < doc.first) return Pos(doc.first, 0); - var last = doc.first + doc.size - 1; - if (pos.line > last) return Pos(last, getLine(doc, last).text.length); - return clipToLen(pos, getLine(doc, pos.line).text.length); - } - function clipToLen(pos, linelen) { - var ch = pos.ch; - if (ch == null || ch > linelen) return Pos(pos.line, linelen); - else if (ch < 0) return Pos(pos.line, 0); - else return pos; - } - function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size;} - function clipPosArray(doc, array) { - for (var out = [], i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i]); - return out; - } - - // SELECTION UPDATES - - // The 'scroll' parameter given to many of these indicated whether - // the new cursor position should be scrolled into view after - // modifying the selection. - - // If shift is held or the extend flag is set, extends a range to - // include a given position (and optionally a second position). - // Otherwise, simply returns the range between the given positions. - // Used for cursor motion and such. - function extendRange(doc, range, head, other) { - if (doc.cm && doc.cm.display.shift || doc.extend) { - var anchor = range.anchor; - if (other) { - var posBefore = cmp(head, anchor) < 0; - if (posBefore != (cmp(other, anchor) < 0)) { - anchor = head; - head = other; - } else if (posBefore != (cmp(head, other) < 0)) { - head = other; - } - } - return new Range(anchor, head); - } else { - return new Range(other || head, head); - } - } - - // Extend the primary selection range, discard the rest. - function extendSelection(doc, head, other, options) { - setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), options); - } - - // Extend all selections (pos is an array of selections with length - // equal the number of selections) - function extendSelections(doc, heads, options) { - for (var out = [], i = 0; i < doc.sel.ranges.length; i++) - out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null); - var newSel = normalizeSelection(out, doc.sel.primIndex); - setSelection(doc, newSel, options); - } - - // Updates a single range in the selection. - function replaceOneSelection(doc, i, range, options) { - var ranges = doc.sel.ranges.slice(0); - ranges[i] = range; - setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options); - } - - // Reset the selection to a single range. - function setSimpleSelection(doc, anchor, head, options) { - setSelection(doc, simpleSelection(anchor, head), options); - } - - // Give beforeSelectionChange handlers a change to influence a - // selection update. - function filterSelectionChange(doc, sel, options) { - var obj = { - ranges: sel.ranges, - update: function(ranges) { - this.ranges = []; - for (var i = 0; i < ranges.length; i++) - this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor), - clipPos(doc, ranges[i].head)); - }, - origin: options && options.origin - }; - signal(doc, "beforeSelectionChange", doc, obj); - if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj); - if (obj.ranges != sel.ranges) return normalizeSelection(obj.ranges, obj.ranges.length - 1); - else return sel; - } - - function setSelectionReplaceHistory(doc, sel, options) { - var done = doc.history.done, last = lst(done); - if (last && last.ranges) { - done[done.length - 1] = sel; - setSelectionNoUndo(doc, sel, options); - } else { - setSelection(doc, sel, options); - } - } - - // Set a new selection. - function setSelection(doc, sel, options) { - setSelectionNoUndo(doc, sel, options); - addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options); - } - - function setSelectionNoUndo(doc, sel, options) { - if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange")) - sel = filterSelectionChange(doc, sel, options); - - var bias = options && options.bias || - (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1); - setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true)); - - if (!(options && options.scroll === false) && doc.cm) - ensureCursorVisible(doc.cm); - } - - function setSelectionInner(doc, sel) { - if (sel.equals(doc.sel)) return; - - doc.sel = sel; - - if (doc.cm) { - doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true; - signalCursorActivity(doc.cm); - } - signalLater(doc, "cursorActivity", doc); - } - - // Verify that the selection does not partially select any atomic - // marked ranges. - function reCheckSelection(doc) { - setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), sel_dontScroll); - } - - // Return a selection that does not partially select any atomic - // ranges. - function skipAtomicInSelection(doc, sel, bias, mayClear) { - var out; - for (var i = 0; i < sel.ranges.length; i++) { - var range = sel.ranges[i]; - var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i]; - var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear); - var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear); - if (out || newAnchor != range.anchor || newHead != range.head) { - if (!out) out = sel.ranges.slice(0, i); - out[i] = new Range(newAnchor, newHead); - } - } - return out ? normalizeSelection(out, sel.primIndex) : sel; - } - - function skipAtomicInner(doc, pos, oldPos, dir, mayClear) { - var line = getLine(doc, pos.line); - if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) { - var sp = line.markedSpans[i], m = sp.marker; - if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) && - (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) { - if (mayClear) { - signal(m, "beforeCursorEnter"); - if (m.explicitlyCleared) { - if (!line.markedSpans) break; - else {--i; continue;} - } - } - if (!m.atomic) continue; - - if (oldPos) { - var near = m.find(dir < 0 ? 1 : -1), diff; - if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft) - near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null); - if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0)) - return skipAtomicInner(doc, near, pos, dir, mayClear); - } - - var far = m.find(dir < 0 ? -1 : 1); - if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight) - far = movePos(doc, far, dir, far.line == pos.line ? line : null); - return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null; - } - } - return pos; - } - - // Ensure a given position is not inside an atomic range. - function skipAtomic(doc, pos, oldPos, bias, mayClear) { - var dir = bias || 1; - var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) || - (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) || - skipAtomicInner(doc, pos, oldPos, -dir, mayClear) || - (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true)); - if (!found) { - doc.cantEdit = true; - return Pos(doc.first, 0); - } - return found; - } - - function movePos(doc, pos, dir, line) { - if (dir < 0 && pos.ch == 0) { - if (pos.line > doc.first) return clipPos(doc, Pos(pos.line - 1)); - else return null; - } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) { - if (pos.line < doc.first + doc.size - 1) return Pos(pos.line + 1, 0); - else return null; - } else { - return new Pos(pos.line, pos.ch + dir); - } - } - - // SELECTION DRAWING - - function updateSelection(cm) { - cm.display.input.showSelection(cm.display.input.prepareSelection()); - } - - function prepareSelection(cm, primary) { - var doc = cm.doc, result = {}; - var curFragment = result.cursors = document.createDocumentFragment(); - var selFragment = result.selection = document.createDocumentFragment(); - - for (var i = 0; i < doc.sel.ranges.length; i++) { - if (primary === false && i == doc.sel.primIndex) continue; - var range = doc.sel.ranges[i]; - if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) continue; - var collapsed = range.empty(); - if (collapsed || cm.options.showCursorWhenSelecting) - drawSelectionCursor(cm, range.head, curFragment); - if (!collapsed) - drawSelectionRange(cm, range, selFragment); - } - return result; - } - - // Draws a cursor for the given range - function drawSelectionCursor(cm, head, output) { - var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine); - - var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor")); - cursor.style.left = pos.left + "px"; - cursor.style.top = pos.top + "px"; - cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px"; - - if (pos.other) { - // Secondary cursor, shown when on a 'jump' in bi-directional text - var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor")); - otherCursor.style.display = ""; - otherCursor.style.left = pos.other.left + "px"; - otherCursor.style.top = pos.other.top + "px"; - otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px"; - } - } - - // Draws the given range as a highlighted selection - function drawSelectionRange(cm, range, output) { - var display = cm.display, doc = cm.doc; - var fragment = document.createDocumentFragment(); - var padding = paddingH(cm.display), leftSide = padding.left; - var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right; - - function add(left, top, width, bottom) { - if (top < 0) top = 0; - top = Math.round(top); - bottom = Math.round(bottom); - fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left + - "px; top: " + top + "px; width: " + (width == null ? rightSide - left : width) + - "px; height: " + (bottom - top) + "px")); - } - - function drawForLine(line, fromArg, toArg) { - var lineObj = getLine(doc, line); - var lineLen = lineObj.text.length; - var start, end; - function coords(ch, bias) { - return charCoords(cm, Pos(line, ch), "div", lineObj, bias); - } - - iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function(from, to, dir) { - var leftPos = coords(from, "left"), rightPos, left, right; - if (from == to) { - rightPos = leftPos; - left = right = leftPos.left; - } else { - rightPos = coords(to - 1, "right"); - if (dir == "rtl") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp; } - left = leftPos.left; - right = rightPos.right; - } - if (fromArg == null && from == 0) left = leftSide; - if (rightPos.top - leftPos.top > 3) { // Different lines, draw top part - add(left, leftPos.top, null, leftPos.bottom); - left = leftSide; - if (leftPos.bottom < rightPos.top) add(left, leftPos.bottom, null, rightPos.top); - } - if (toArg == null && to == lineLen) right = rightSide; - if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left) - start = leftPos; - if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right) - end = rightPos; - if (left < leftSide + 1) left = leftSide; - add(left, rightPos.top, right - left, rightPos.bottom); - }); - return {start: start, end: end}; - } - - var sFrom = range.from(), sTo = range.to(); - if (sFrom.line == sTo.line) { - drawForLine(sFrom.line, sFrom.ch, sTo.ch); - } else { - var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line); - var singleVLine = visualLine(fromLine) == visualLine(toLine); - var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end; - var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start; - if (singleVLine) { - if (leftEnd.top < rightStart.top - 2) { - add(leftEnd.right, leftEnd.top, null, leftEnd.bottom); - add(leftSide, rightStart.top, rightStart.left, rightStart.bottom); - } else { - add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom); - } - } - if (leftEnd.bottom < rightStart.top) - add(leftSide, leftEnd.bottom, null, rightStart.top); - } - - output.appendChild(fragment); - } - - // Cursor-blinking - function restartBlink(cm) { - if (!cm.state.focused) return; - var display = cm.display; - clearInterval(display.blinker); - var on = true; - display.cursorDiv.style.visibility = ""; - if (cm.options.cursorBlinkRate > 0) - display.blinker = setInterval(function() { - display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden"; - }, cm.options.cursorBlinkRate); - else if (cm.options.cursorBlinkRate < 0) - display.cursorDiv.style.visibility = "hidden"; - } - - // HIGHLIGHT WORKER - - function startWorker(cm, time) { - if (cm.doc.mode.startState && cm.doc.frontier < cm.display.viewTo) - cm.state.highlight.set(time, bind(highlightWorker, cm)); - } - - function highlightWorker(cm) { - var doc = cm.doc; - if (doc.frontier < doc.first) doc.frontier = doc.first; - if (doc.frontier >= cm.display.viewTo) return; - var end = +new Date + cm.options.workTime; - var state = copyState(doc.mode, getStateBefore(cm, doc.frontier)); - var changedLines = []; - - doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) { - if (doc.frontier >= cm.display.viewFrom) { // Visible - var oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength; - var highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true); - line.styles = highlighted.styles; - var oldCls = line.styleClasses, newCls = highlighted.classes; - if (newCls) line.styleClasses = newCls; - else if (oldCls) line.styleClasses = null; - var ischange = !oldStyles || oldStyles.length != line.styles.length || - oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass); - for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i]; - if (ischange) changedLines.push(doc.frontier); - line.stateAfter = tooLong ? state : copyState(doc.mode, state); - } else { - if (line.text.length <= cm.options.maxHighlightLength) - processLine(cm, line.text, state); - line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null; - } - ++doc.frontier; - if (+new Date > end) { - startWorker(cm, cm.options.workDelay); - return true; - } - }); - if (changedLines.length) runInOp(cm, function() { - for (var i = 0; i < changedLines.length; i++) - regLineChange(cm, changedLines[i], "text"); - }); - } - - // Finds the line to start with when starting a parse. Tries to - // find a line with a stateAfter, so that it can start with a - // valid state. If that fails, it returns the line with the - // smallest indentation, which tends to need the least context to - // parse correctly. - function findStartLine(cm, n, precise) { - var minindent, minline, doc = cm.doc; - var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100); - for (var search = n; search > lim; --search) { - if (search <= doc.first) return doc.first; - var line = getLine(doc, search - 1); - if (line.stateAfter && (!precise || search <= doc.frontier)) return search; - var indented = countColumn(line.text, null, cm.options.tabSize); - if (minline == null || minindent > indented) { - minline = search - 1; - minindent = indented; - } - } - return minline; - } - - function getStateBefore(cm, n, precise) { - var doc = cm.doc, display = cm.display; - if (!doc.mode.startState) return true; - var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter; - if (!state) state = startState(doc.mode); - else state = copyState(doc.mode, state); - doc.iter(pos, n, function(line) { - processLine(cm, line.text, state); - var save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo; - line.stateAfter = save ? copyState(doc.mode, state) : null; - ++pos; - }); - if (precise) doc.frontier = pos; - return state; - } - - // POSITION MEASUREMENT - - function paddingTop(display) {return display.lineSpace.offsetTop;} - function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight;} - function paddingH(display) { - if (display.cachedPaddingH) return display.cachedPaddingH; - var e = removeChildrenAndAdd(display.measure, elt("pre", "x")); - var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle; - var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)}; - if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data; - return data; - } - - function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth; } - function displayWidth(cm) { - return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth; - } - function displayHeight(cm) { - return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight; - } - - // Ensure the lineView.wrapping.heights array is populated. This is - // an array of bottom offsets for the lines that make up a drawn - // line. When lineWrapping is on, there might be more than one - // height. - function ensureLineHeights(cm, lineView, rect) { - var wrapping = cm.options.lineWrapping; - var curWidth = wrapping && displayWidth(cm); - if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) { - var heights = lineView.measure.heights = []; - if (wrapping) { - lineView.measure.width = curWidth; - var rects = lineView.text.firstChild.getClientRects(); - for (var i = 0; i < rects.length - 1; i++) { - var cur = rects[i], next = rects[i + 1]; - if (Math.abs(cur.bottom - next.bottom) > 2) - heights.push((cur.bottom + next.top) / 2 - rect.top); - } - } - heights.push(rect.bottom - rect.top); - } - } - - // Find a line map (mapping character offsets to text nodes) and a - // measurement cache for the given line number. (A line view might - // contain multiple lines when collapsed ranges are present.) - function mapFromLineView(lineView, line, lineN) { - if (lineView.line == line) - return {map: lineView.measure.map, cache: lineView.measure.cache}; - for (var i = 0; i < lineView.rest.length; i++) - if (lineView.rest[i] == line) - return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]}; - for (var i = 0; i < lineView.rest.length; i++) - if (lineNo(lineView.rest[i]) > lineN) - return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i], before: true}; - } - - // Render a line into the hidden node display.externalMeasured. Used - // when measurement is needed for a line that's not in the viewport. - function updateExternalMeasurement(cm, line) { - line = visualLine(line); - var lineN = lineNo(line); - var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN); - view.lineN = lineN; - var built = view.built = buildLineContent(cm, view); - view.text = built.pre; - removeChildrenAndAdd(cm.display.lineMeasure, built.pre); - return view; - } - - // Get a {top, bottom, left, right} box (in line-local coordinates) - // for a given character. - function measureChar(cm, line, ch, bias) { - return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias); - } - - // Find a line view that corresponds to the given line number. - function findViewForLine(cm, lineN) { - if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo) - return cm.display.view[findViewIndex(cm, lineN)]; - var ext = cm.display.externalMeasured; - if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size) - return ext; - } - - // Measurement can be split in two steps, the set-up work that - // applies to the whole line, and the measurement of the actual - // character. Functions like coordsChar, that need to do a lot of - // measurements in a row, can thus ensure that the set-up work is - // only done once. - function prepareMeasureForLine(cm, line) { - var lineN = lineNo(line); - var view = findViewForLine(cm, lineN); - if (view && !view.text) { - view = null; - } else if (view && view.changes) { - updateLineForChanges(cm, view, lineN, getDimensions(cm)); - cm.curOp.forceUpdate = true; - } - if (!view) - view = updateExternalMeasurement(cm, line); - - var info = mapFromLineView(view, line, lineN); - return { - line: line, view: view, rect: null, - map: info.map, cache: info.cache, before: info.before, - hasHeights: false - }; - } - - // Given a prepared measurement object, measures the position of an - // actual character (or fetches it from the cache). - function measureCharPrepared(cm, prepared, ch, bias, varHeight) { - if (prepared.before) ch = -1; - var key = ch + (bias || ""), found; - if (prepared.cache.hasOwnProperty(key)) { - found = prepared.cache[key]; - } else { - if (!prepared.rect) - prepared.rect = prepared.view.text.getBoundingClientRect(); - if (!prepared.hasHeights) { - ensureLineHeights(cm, prepared.view, prepared.rect); - prepared.hasHeights = true; - } - found = measureCharInner(cm, prepared, ch, bias); - if (!found.bogus) prepared.cache[key] = found; - } - return {left: found.left, right: found.right, - top: varHeight ? found.rtop : found.top, - bottom: varHeight ? found.rbottom : found.bottom}; - } - - var nullRect = {left: 0, right: 0, top: 0, bottom: 0}; - - function nodeAndOffsetInLineMap(map, ch, bias) { - var node, start, end, collapse; - // First, search the line map for the text node corresponding to, - // or closest to, the target character. - for (var i = 0; i < map.length; i += 3) { - var mStart = map[i], mEnd = map[i + 1]; - if (ch < mStart) { - start = 0; end = 1; - collapse = "left"; - } else if (ch < mEnd) { - start = ch - mStart; - end = start + 1; - } else if (i == map.length - 3 || ch == mEnd && map[i + 3] > ch) { - end = mEnd - mStart; - start = end - 1; - if (ch >= mEnd) collapse = "right"; - } - if (start != null) { - node = map[i + 2]; - if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right")) - collapse = bias; - if (bias == "left" && start == 0) - while (i && map[i - 2] == map[i - 3] && map[i - 1].insertLeft) { - node = map[(i -= 3) + 2]; - collapse = "left"; - } - if (bias == "right" && start == mEnd - mStart) - while (i < map.length - 3 && map[i + 3] == map[i + 4] && !map[i + 5].insertLeft) { - node = map[(i += 3) + 2]; - collapse = "right"; - } - break; - } - } - return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd}; - } - - function measureCharInner(cm, prepared, ch, bias) { - var place = nodeAndOffsetInLineMap(prepared.map, ch, bias); - var node = place.node, start = place.start, end = place.end, collapse = place.collapse; - - var rect; - if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates. - for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned - while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) --start; - while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) ++end; - if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart) { - rect = node.parentNode.getBoundingClientRect(); - } else if (ie && cm.options.lineWrapping) { - var rects = range(node, start, end).getClientRects(); - if (rects.length) - rect = rects[bias == "right" ? rects.length - 1 : 0]; - else - rect = nullRect; - } else { - rect = range(node, start, end).getBoundingClientRect() || nullRect; - } - if (rect.left || rect.right || start == 0) break; - end = start; - start = start - 1; - collapse = "right"; - } - if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect); - } else { // If it is a widget, simply get the box for the whole widget. - if (start > 0) collapse = bias = "right"; - var rects; - if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1) - rect = rects[bias == "right" ? rects.length - 1 : 0]; - else - rect = node.getBoundingClientRect(); - } - if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) { - var rSpan = node.parentNode.getClientRects()[0]; - if (rSpan) - rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom}; - else - rect = nullRect; - } - - var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top; - var mid = (rtop + rbot) / 2; - var heights = prepared.view.measure.heights; - for (var i = 0; i < heights.length - 1; i++) - if (mid < heights[i]) break; - var top = i ? heights[i - 1] : 0, bot = heights[i]; - var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left, - right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left, - top: top, bottom: bot}; - if (!rect.left && !rect.right) result.bogus = true; - if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; } - - return result; - } - - // Work around problem with bounding client rects on ranges being - // returned incorrectly when zoomed on IE10 and below. - function maybeUpdateRectForZooming(measure, rect) { - if (!window.screen || screen.logicalXDPI == null || - screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure)) - return rect; - var scaleX = screen.logicalXDPI / screen.deviceXDPI; - var scaleY = screen.logicalYDPI / screen.deviceYDPI; - return {left: rect.left * scaleX, right: rect.right * scaleX, - top: rect.top * scaleY, bottom: rect.bottom * scaleY}; - } - - function clearLineMeasurementCacheFor(lineView) { - if (lineView.measure) { - lineView.measure.cache = {}; - lineView.measure.heights = null; - if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++) - lineView.measure.caches[i] = {}; - } - } - - function clearLineMeasurementCache(cm) { - cm.display.externalMeasure = null; - removeChildren(cm.display.lineMeasure); - for (var i = 0; i < cm.display.view.length; i++) - clearLineMeasurementCacheFor(cm.display.view[i]); - } - - function clearCaches(cm) { - clearLineMeasurementCache(cm); - cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null; - if (!cm.options.lineWrapping) cm.display.maxLineChanged = true; - cm.display.lineNumChars = null; - } - - function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft; } - function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop; } - - // Converts a {top, bottom, left, right} box from line-local - // coordinates into another coordinate system. Context may be one of - // "line", "div" (display.lineDiv), "local"/null (editor), "window", - // or "page". - function intoCoordSystem(cm, lineObj, rect, context) { - if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) { - var size = widgetHeight(lineObj.widgets[i]); - rect.top += size; rect.bottom += size; - } - if (context == "line") return rect; - if (!context) context = "local"; - var yOff = heightAtLine(lineObj); - if (context == "local") yOff += paddingTop(cm.display); - else yOff -= cm.display.viewOffset; - if (context == "page" || context == "window") { - var lOff = cm.display.lineSpace.getBoundingClientRect(); - yOff += lOff.top + (context == "window" ? 0 : pageScrollY()); - var xOff = lOff.left + (context == "window" ? 0 : pageScrollX()); - rect.left += xOff; rect.right += xOff; - } - rect.top += yOff; rect.bottom += yOff; - return rect; - } - - // Coverts a box from "div" coords to another coordinate system. - // Context may be "window", "page", "div", or "local"/null. - function fromCoordSystem(cm, coords, context) { - if (context == "div") return coords; - var left = coords.left, top = coords.top; - // First move into "page" coordinate system - if (context == "page") { - left -= pageScrollX(); - top -= pageScrollY(); - } else if (context == "local" || !context) { - var localBox = cm.display.sizer.getBoundingClientRect(); - left += localBox.left; - top += localBox.top; - } - - var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect(); - return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top}; - } - - function charCoords(cm, pos, context, lineObj, bias) { - if (!lineObj) lineObj = getLine(cm.doc, pos.line); - return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context); - } - - // Returns a box for a given cursor position, which may have an - // 'other' property containing the position of the secondary cursor - // on a bidi boundary. - function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) { - lineObj = lineObj || getLine(cm.doc, pos.line); - if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj); - function get(ch, right) { - var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight); - if (right) m.left = m.right; else m.right = m.left; - return intoCoordSystem(cm, lineObj, m, context); - } - function getBidi(ch, partPos) { - var part = order[partPos], right = part.level % 2; - if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) { - part = order[--partPos]; - ch = bidiRight(part) - (part.level % 2 ? 0 : 1); - right = true; - } else if (ch == bidiRight(part) && partPos < order.length - 1 && part.level < order[partPos + 1].level) { - part = order[++partPos]; - ch = bidiLeft(part) - part.level % 2; - right = false; - } - if (right && ch == part.to && ch > part.from) return get(ch - 1); - return get(ch, right); - } - var order = getOrder(lineObj), ch = pos.ch; - if (!order) return get(ch); - var partPos = getBidiPartAt(order, ch); - var val = getBidi(ch, partPos); - if (bidiOther != null) val.other = getBidi(ch, bidiOther); - return val; - } - - // Used to cheaply estimate the coordinates for a position. Used for - // intermediate scroll updates. - function estimateCoords(cm, pos) { - var left = 0, pos = clipPos(cm.doc, pos); - if (!cm.options.lineWrapping) left = charWidth(cm.display) * pos.ch; - var lineObj = getLine(cm.doc, pos.line); - var top = heightAtLine(lineObj) + paddingTop(cm.display); - return {left: left, right: left, top: top, bottom: top + lineObj.height}; - } - - // Positions returned by coordsChar contain some extra information. - // xRel is the relative x position of the input coordinates compared - // to the found position (so xRel > 0 means the coordinates are to - // the right of the character position, for example). When outside - // is true, that means the coordinates lie outside the line's - // vertical range. - function PosWithInfo(line, ch, outside, xRel) { - var pos = Pos(line, ch); - pos.xRel = xRel; - if (outside) pos.outside = true; - return pos; - } - - // Compute the character position closest to the given coordinates. - // Input must be lineSpace-local ("div" coordinate system). - function coordsChar(cm, x, y) { - var doc = cm.doc; - y += cm.display.viewOffset; - if (y < 0) return PosWithInfo(doc.first, 0, true, -1); - var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1; - if (lineN > last) - return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1); - if (x < 0) x = 0; - - var lineObj = getLine(doc, lineN); - for (;;) { - var found = coordsCharInner(cm, lineObj, lineN, x, y); - var merged = collapsedSpanAtEnd(lineObj); - var mergedPos = merged && merged.find(0, true); - if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0)) - lineN = lineNo(lineObj = mergedPos.to.line); - else - return found; - } - } - - function coordsCharInner(cm, lineObj, lineNo, x, y) { - var innerOff = y - heightAtLine(lineObj); - var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth; - var preparedMeasure = prepareMeasureForLine(cm, lineObj); - - function getX(ch) { - var sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure); - wrongLine = true; - if (innerOff > sp.bottom) return sp.left - adjust; - else if (innerOff < sp.top) return sp.left + adjust; - else wrongLine = false; - return sp.left; - } - - var bidi = getOrder(lineObj), dist = lineObj.text.length; - var from = lineLeft(lineObj), to = lineRight(lineObj); - var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine; - - if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1); - // Do a binary search between these bounds. - for (;;) { - if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) { - var ch = x < fromX || x - fromX <= toX - x ? from : to; - var xDiff = x - (ch == from ? fromX : toX); - while (isExtendingChar(lineObj.text.charAt(ch))) ++ch; - var pos = PosWithInfo(lineNo, ch, ch == from ? fromOutside : toOutside, - xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0); - return pos; - } - var step = Math.ceil(dist / 2), middle = from + step; - if (bidi) { - middle = from; - for (var i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1); - } - var middleX = getX(middle); - if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) toX += 1000; dist = step;} - else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step;} - } - } - - var measureText; - // Compute the default text height. - function textHeight(display) { - if (display.cachedTextHeight != null) return display.cachedTextHeight; - if (measureText == null) { - measureText = elt("pre"); - // Measure a bunch of lines, for browsers that compute - // fractional heights. - for (var i = 0; i < 49; ++i) { - measureText.appendChild(document.createTextNode("x")); - measureText.appendChild(elt("br")); - } - measureText.appendChild(document.createTextNode("x")); - } - removeChildrenAndAdd(display.measure, measureText); - var height = measureText.offsetHeight / 50; - if (height > 3) display.cachedTextHeight = height; - removeChildren(display.measure); - return height || 1; - } - - // Compute the default character width. - function charWidth(display) { - if (display.cachedCharWidth != null) return display.cachedCharWidth; - var anchor = elt("span", "xxxxxxxxxx"); - var pre = elt("pre", [anchor]); - removeChildrenAndAdd(display.measure, pre); - var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10; - if (width > 2) display.cachedCharWidth = width; - return width || 10; - } - - // OPERATIONS - - // Operations are used to wrap a series of changes to the editor - // state in such a way that each change won't have to update the - // cursor and display (which would be awkward, slow, and - // error-prone). Instead, display updates are batched and then all - // combined and executed at once. - - var operationGroup = null; - - var nextOpId = 0; - // Start a new operation. - function startOperation(cm) { - cm.curOp = { - cm: cm, - viewChanged: false, // Flag that indicates that lines might need to be redrawn - startHeight: cm.doc.height, // Used to detect need to update scrollbar - forceUpdate: false, // Used to force a redraw - updateInput: null, // Whether to reset the input textarea - typing: false, // Whether this reset should be careful to leave existing text (for compositing) - changeObjs: null, // Accumulated changes, for firing change events - cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on - cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already - selectionChanged: false, // Whether the selection needs to be redrawn - updateMaxLine: false, // Set when the widest line needs to be determined anew - scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet - scrollToPos: null, // Used to scroll to a specific position - focus: false, - id: ++nextOpId // Unique ID - }; - if (operationGroup) { - operationGroup.ops.push(cm.curOp); - } else { - cm.curOp.ownsGroup = operationGroup = { - ops: [cm.curOp], - delayedCallbacks: [] - }; - } - } - - function fireCallbacksForOps(group) { - // Calls delayed callbacks and cursorActivity handlers until no - // new ones appear - var callbacks = group.delayedCallbacks, i = 0; - do { - for (; i < callbacks.length; i++) - callbacks[i].call(null); - for (var j = 0; j < group.ops.length; j++) { - var op = group.ops[j]; - if (op.cursorActivityHandlers) - while (op.cursorActivityCalled < op.cursorActivityHandlers.length) - op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm); - } - } while (i < callbacks.length); - } - - // Finish an operation, updating the display and signalling delayed events - function endOperation(cm) { - var op = cm.curOp, group = op.ownsGroup; - if (!group) return; - - try { fireCallbacksForOps(group); } - finally { - operationGroup = null; - for (var i = 0; i < group.ops.length; i++) - group.ops[i].cm.curOp = null; - endOperations(group); - } - } - - // The DOM updates done when an operation finishes are batched so - // that the minimum number of relayouts are required. - function endOperations(group) { - var ops = group.ops; - for (var i = 0; i < ops.length; i++) // Read DOM - endOperation_R1(ops[i]); - for (var i = 0; i < ops.length; i++) // Write DOM (maybe) - endOperation_W1(ops[i]); - for (var i = 0; i < ops.length; i++) // Read DOM - endOperation_R2(ops[i]); - for (var i = 0; i < ops.length; i++) // Write DOM (maybe) - endOperation_W2(ops[i]); - for (var i = 0; i < ops.length; i++) // Read DOM - endOperation_finish(ops[i]); - } - - function endOperation_R1(op) { - var cm = op.cm, display = cm.display; - maybeClipScrollbars(cm); - if (op.updateMaxLine) findMaxLine(cm); - - op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null || - op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom || - op.scrollToPos.to.line >= display.viewTo) || - display.maxLineChanged && cm.options.lineWrapping; - op.update = op.mustUpdate && - new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate); - } - - function endOperation_W1(op) { - op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update); - } - - function endOperation_R2(op) { - var cm = op.cm, display = cm.display; - if (op.updatedDisplay) updateHeightsInViewport(cm); - - op.barMeasure = measureForScrollbars(cm); - - // If the max line changed since it was last measured, measure it, - // and ensure the document's width matches it. - // updateDisplay_W2 will use these properties to do the actual resizing - if (display.maxLineChanged && !cm.options.lineWrapping) { - op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3; - cm.display.sizerWidth = op.adjustWidthTo; - op.barMeasure.scrollWidth = - Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth); - op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm)); - } - - if (op.updatedDisplay || op.selectionChanged) - op.preparedSelection = display.input.prepareSelection(); - } - - function endOperation_W2(op) { - var cm = op.cm; - - if (op.adjustWidthTo != null) { - cm.display.sizer.style.minWidth = op.adjustWidthTo + "px"; - if (op.maxScrollLeft < cm.doc.scrollLeft) - setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true); - cm.display.maxLineChanged = false; - } - - if (op.preparedSelection) - cm.display.input.showSelection(op.preparedSelection); - if (op.updatedDisplay || op.startHeight != cm.doc.height) - updateScrollbars(cm, op.barMeasure); - if (op.updatedDisplay) - setDocumentHeight(cm, op.barMeasure); - - if (op.selectionChanged) restartBlink(cm); - - if (cm.state.focused && op.updateInput) - cm.display.input.reset(op.typing); - if (op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus())) - ensureFocus(op.cm); - } - - function endOperation_finish(op) { - var cm = op.cm, display = cm.display, doc = cm.doc; - - if (op.updatedDisplay) postUpdateDisplay(cm, op.update); - - // Abort mouse wheel delta measurement, when scrolling explicitly - if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos)) - display.wheelStartX = display.wheelStartY = null; - - // Propagate the scroll position to the actual DOM scroller - if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) { - doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop)); - display.scrollbars.setScrollTop(doc.scrollTop); - display.scroller.scrollTop = doc.scrollTop; - } - if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) { - doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft)); - display.scrollbars.setScrollLeft(doc.scrollLeft); - display.scroller.scrollLeft = doc.scrollLeft; - alignHorizontally(cm); - } - // If we need to scroll a specific position into view, do so. - if (op.scrollToPos) { - var coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from), - clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin); - if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords); - } - - // Fire events for markers that are hidden/unidden by editing or - // undoing - var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers; - if (hidden) for (var i = 0; i < hidden.length; ++i) - if (!hidden[i].lines.length) signal(hidden[i], "hide"); - if (unhidden) for (var i = 0; i < unhidden.length; ++i) - if (unhidden[i].lines.length) signal(unhidden[i], "unhide"); - - if (display.wrapper.offsetHeight) - doc.scrollTop = cm.display.scroller.scrollTop; - - // Fire change events, and delayed event handlers - if (op.changeObjs) - signal(cm, "changes", cm, op.changeObjs); - if (op.update) - op.update.finish(); - } - - // Run the given function in an operation - function runInOp(cm, f) { - if (cm.curOp) return f(); - startOperation(cm); - try { return f(); } - finally { endOperation(cm); } - } - // Wraps a function in an operation. Returns the wrapped function. - function operation(cm, f) { - return function() { - if (cm.curOp) return f.apply(cm, arguments); - startOperation(cm); - try { return f.apply(cm, arguments); } - finally { endOperation(cm); } - }; - } - // Used to add methods to editor and doc instances, wrapping them in - // operations. - function methodOp(f) { - return function() { - if (this.curOp) return f.apply(this, arguments); - startOperation(this); - try { return f.apply(this, arguments); } - finally { endOperation(this); } - }; - } - function docMethodOp(f) { - return function() { - var cm = this.cm; - if (!cm || cm.curOp) return f.apply(this, arguments); - startOperation(cm); - try { return f.apply(this, arguments); } - finally { endOperation(cm); } - }; - } - - // VIEW TRACKING - - // These objects are used to represent the visible (currently drawn) - // part of the document. A LineView may correspond to multiple - // logical lines, if those are connected by collapsed ranges. - function LineView(doc, line, lineN) { - // The starting line - this.line = line; - // Continuing lines, if any - this.rest = visualLineContinued(line); - // Number of logical lines in this visual line - this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1; - this.node = this.text = null; - this.hidden = lineIsHidden(doc, line); - } - - // Create a range of LineView objects for the given lines. - function buildViewArray(cm, from, to) { - var array = [], nextPos; - for (var pos = from; pos < to; pos = nextPos) { - var view = new LineView(cm.doc, getLine(cm.doc, pos), pos); - nextPos = pos + view.size; - array.push(view); - } - return array; - } - - // Updates the display.view data structure for a given change to the - // document. From and to are in pre-change coordinates. Lendiff is - // the amount of lines added or subtracted by the change. This is - // used for changes that span multiple lines, or change the way - // lines are divided into visual lines. regLineChange (below) - // registers single-line changes. - function regChange(cm, from, to, lendiff) { - if (from == null) from = cm.doc.first; - if (to == null) to = cm.doc.first + cm.doc.size; - if (!lendiff) lendiff = 0; - - var display = cm.display; - if (lendiff && to < display.viewTo && - (display.updateLineNumbers == null || display.updateLineNumbers > from)) - display.updateLineNumbers = from; - - cm.curOp.viewChanged = true; - - if (from >= display.viewTo) { // Change after - if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo) - resetView(cm); - } else if (to <= display.viewFrom) { // Change before - if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) { - resetView(cm); - } else { - display.viewFrom += lendiff; - display.viewTo += lendiff; - } - } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap - resetView(cm); - } else if (from <= display.viewFrom) { // Top overlap - var cut = viewCuttingPoint(cm, to, to + lendiff, 1); - if (cut) { - display.view = display.view.slice(cut.index); - display.viewFrom = cut.lineN; - display.viewTo += lendiff; - } else { - resetView(cm); - } - } else if (to >= display.viewTo) { // Bottom overlap - var cut = viewCuttingPoint(cm, from, from, -1); - if (cut) { - display.view = display.view.slice(0, cut.index); - display.viewTo = cut.lineN; - } else { - resetView(cm); - } - } else { // Gap in the middle - var cutTop = viewCuttingPoint(cm, from, from, -1); - var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1); - if (cutTop && cutBot) { - display.view = display.view.slice(0, cutTop.index) - .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN)) - .concat(display.view.slice(cutBot.index)); - display.viewTo += lendiff; - } else { - resetView(cm); - } - } - - var ext = display.externalMeasured; - if (ext) { - if (to < ext.lineN) - ext.lineN += lendiff; - else if (from < ext.lineN + ext.size) - display.externalMeasured = null; - } - } - - // Register a change to a single line. Type must be one of "text", - // "gutter", "class", "widget" - function regLineChange(cm, line, type) { - cm.curOp.viewChanged = true; - var display = cm.display, ext = cm.display.externalMeasured; - if (ext && line >= ext.lineN && line < ext.lineN + ext.size) - display.externalMeasured = null; - - if (line < display.viewFrom || line >= display.viewTo) return; - var lineView = display.view[findViewIndex(cm, line)]; - if (lineView.node == null) return; - var arr = lineView.changes || (lineView.changes = []); - if (indexOf(arr, type) == -1) arr.push(type); - } - - // Clear the view. - function resetView(cm) { - cm.display.viewFrom = cm.display.viewTo = cm.doc.first; - cm.display.view = []; - cm.display.viewOffset = 0; - } - - // Find the view element corresponding to a given line. Return null - // when the line isn't visible. - function findViewIndex(cm, n) { - if (n >= cm.display.viewTo) return null; - n -= cm.display.viewFrom; - if (n < 0) return null; - var view = cm.display.view; - for (var i = 0; i < view.length; i++) { - n -= view[i].size; - if (n < 0) return i; - } - } - - function viewCuttingPoint(cm, oldN, newN, dir) { - var index = findViewIndex(cm, oldN), diff, view = cm.display.view; - if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size) - return {index: index, lineN: newN}; - for (var i = 0, n = cm.display.viewFrom; i < index; i++) - n += view[i].size; - if (n != oldN) { - if (dir > 0) { - if (index == view.length - 1) return null; - diff = (n + view[index].size) - oldN; - index++; - } else { - diff = n - oldN; - } - oldN += diff; newN += diff; - } - while (visualLineNo(cm.doc, newN) != newN) { - if (index == (dir < 0 ? 0 : view.length - 1)) return null; - newN += dir * view[index - (dir < 0 ? 1 : 0)].size; - index += dir; - } - return {index: index, lineN: newN}; - } - - // Force the view to cover a given range, adding empty view element - // or clipping off existing ones as needed. - function adjustView(cm, from, to) { - var display = cm.display, view = display.view; - if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) { - display.view = buildViewArray(cm, from, to); - display.viewFrom = from; - } else { - if (display.viewFrom > from) - display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view); - else if (display.viewFrom < from) - display.view = display.view.slice(findViewIndex(cm, from)); - display.viewFrom = from; - if (display.viewTo < to) - display.view = display.view.concat(buildViewArray(cm, display.viewTo, to)); - else if (display.viewTo > to) - display.view = display.view.slice(0, findViewIndex(cm, to)); - } - display.viewTo = to; - } - - // Count the number of lines in the view whose DOM representation is - // out of date (or nonexistent). - function countDirtyView(cm) { - var view = cm.display.view, dirty = 0; - for (var i = 0; i < view.length; i++) { - var lineView = view[i]; - if (!lineView.hidden && (!lineView.node || lineView.changes)) ++dirty; - } - return dirty; - } - - // EVENT HANDLERS - - // Attach the necessary event handlers when initializing the editor - function registerEventHandlers(cm) { - var d = cm.display; - on(d.scroller, "mousedown", operation(cm, onMouseDown)); - // Older IE's will not fire a second mousedown for a double click - if (ie && ie_version < 11) - on(d.scroller, "dblclick", operation(cm, function(e) { - if (signalDOMEvent(cm, e)) return; - var pos = posFromMouse(cm, e); - if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return; - e_preventDefault(e); - var word = cm.findWordAt(pos); - extendSelection(cm.doc, word.anchor, word.head); - })); - else - on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); }); - // Some browsers fire contextmenu *after* opening the menu, at - // which point we can't mess with it anymore. Context menu is - // handled in onMouseDown for these browsers. - if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);}); - - // Used to suppress mouse event handling when a touch happens - var touchFinished, prevTouch = {end: 0}; - function finishTouch() { - if (d.activeTouch) { - touchFinished = setTimeout(function() {d.activeTouch = null;}, 1000); - prevTouch = d.activeTouch; - prevTouch.end = +new Date; - } - }; - function isMouseLikeTouchEvent(e) { - if (e.touches.length != 1) return false; - var touch = e.touches[0]; - return touch.radiusX <= 1 && touch.radiusY <= 1; - } - function farAway(touch, other) { - if (other.left == null) return true; - var dx = other.left - touch.left, dy = other.top - touch.top; - return dx * dx + dy * dy > 20 * 20; - } - on(d.scroller, "touchstart", function(e) { - if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) { - clearTimeout(touchFinished); - var now = +new Date; - d.activeTouch = {start: now, moved: false, - prev: now - prevTouch.end <= 300 ? prevTouch : null}; - if (e.touches.length == 1) { - d.activeTouch.left = e.touches[0].pageX; - d.activeTouch.top = e.touches[0].pageY; - } - } - }); - on(d.scroller, "touchmove", function() { - if (d.activeTouch) d.activeTouch.moved = true; - }); - on(d.scroller, "touchend", function(e) { - var touch = d.activeTouch; - if (touch && !eventInWidget(d, e) && touch.left != null && - !touch.moved && new Date - touch.start < 300) { - var pos = cm.coordsChar(d.activeTouch, "page"), range; - if (!touch.prev || farAway(touch, touch.prev)) // Single tap - range = new Range(pos, pos); - else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap - range = cm.findWordAt(pos); - else // Triple tap - range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))); - cm.setSelection(range.anchor, range.head); - cm.focus(); - e_preventDefault(e); - } - finishTouch(); - }); - on(d.scroller, "touchcancel", finishTouch); - - // Sync scrolling between fake scrollbars and real scrollable - // area, ensure viewport is updated when scrolling. - on(d.scroller, "scroll", function() { - if (d.scroller.clientHeight) { - setScrollTop(cm, d.scroller.scrollTop); - setScrollLeft(cm, d.scroller.scrollLeft, true); - signal(cm, "scroll", cm); - } - }); - - // Listen to wheel events in order to try and update the viewport on time. - on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e);}); - on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e);}); - - // Prevent wrapper from ever scrolling - on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; }); - - d.dragFunctions = { - enter: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e);}, - over: function(e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }}, - start: function(e){onDragStart(cm, e);}, - drop: operation(cm, onDrop), - leave: function(e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm); }} - }; - - var inp = d.input.getField(); - on(inp, "keyup", function(e) { onKeyUp.call(cm, e); }); - on(inp, "keydown", operation(cm, onKeyDown)); - on(inp, "keypress", operation(cm, onKeyPress)); - on(inp, "focus", bind(onFocus, cm)); - on(inp, "blur", bind(onBlur, cm)); - } - - function dragDropChanged(cm, value, old) { - var wasOn = old && old != CodeMirror.Init; - if (!value != !wasOn) { - var funcs = cm.display.dragFunctions; - var toggle = value ? on : off; - toggle(cm.display.scroller, "dragstart", funcs.start); - toggle(cm.display.scroller, "dragenter", funcs.enter); - toggle(cm.display.scroller, "dragover", funcs.over); - toggle(cm.display.scroller, "dragleave", funcs.leave); - toggle(cm.display.scroller, "drop", funcs.drop); - } - } - - // Called when the window resizes - function onResize(cm) { - var d = cm.display; - if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth) - return; - // Might be a text scaling operation, clear size caches. - d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null; - d.scrollbarsClipped = false; - cm.setSize(); - } - - // MOUSE EVENTS - - // Return true when the given mouse event happened in a widget - function eventInWidget(display, e) { - for (var n = e_target(e); n != display.wrapper; n = n.parentNode) { - if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") || - (n.parentNode == display.sizer && n != display.mover)) - return true; - } - } - - // Given a mouse event, find the corresponding position. If liberal - // is false, it checks whether a gutter or scrollbar was clicked, - // and returns null if it was. forRect is used by rectangular - // selections, and tries to estimate a character position even for - // coordinates beyond the right of the text. - function posFromMouse(cm, e, liberal, forRect) { - var display = cm.display; - if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") return null; - - var x, y, space = display.lineSpace.getBoundingClientRect(); - // Fails unpredictably on IE[67] when mouse is dragged around quickly. - try { x = e.clientX - space.left; y = e.clientY - space.top; } - catch (e) { return null; } - var coords = coordsChar(cm, x, y), line; - if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) { - var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length; - coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff)); - } - return coords; - } - - // A mouse down can be a single click, double click, triple click, - // start of selection drag, start of text drag, new cursor - // (ctrl-click), rectangle drag (alt-drag), or xwin - // middle-click-paste. Or it might be a click on something we should - // not interfere with, such as a scrollbar or widget. - function onMouseDown(e) { - var cm = this, display = cm.display; - if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return; - display.shift = e.shiftKey; - - if (eventInWidget(display, e)) { - if (!webkit) { - // Briefly turn off draggability, to allow widgets to do - // normal dragging things. - display.scroller.draggable = false; - setTimeout(function(){display.scroller.draggable = true;}, 100); - } - return; - } - if (clickInGutter(cm, e)) return; - var start = posFromMouse(cm, e); - window.focus(); - - switch (e_button(e)) { - case 1: - // #3261: make sure, that we're not starting a second selection - if (cm.state.selectingText) - cm.state.selectingText(e); - else if (start) - leftButtonDown(cm, e, start); - else if (e_target(e) == display.scroller) - e_preventDefault(e); - break; - case 2: - if (webkit) cm.state.lastMiddleDown = +new Date; - if (start) extendSelection(cm.doc, start); - setTimeout(function() {display.input.focus();}, 20); - e_preventDefault(e); - break; - case 3: - if (captureRightClick) onContextMenu(cm, e); - else delayBlurEvent(cm); - break; - } - } - - var lastClick, lastDoubleClick; - function leftButtonDown(cm, e, start) { - if (ie) setTimeout(bind(ensureFocus, cm), 0); - else cm.curOp.focus = activeElt(); - - var now = +new Date, type; - if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) { - type = "triple"; - } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) { - type = "double"; - lastDoubleClick = {time: now, pos: start}; - } else { - type = "single"; - lastClick = {time: now, pos: start}; - } - - var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained; - if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() && - type == "single" && (contained = sel.contains(start)) > -1 && - (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) && - (cmp(contained.to(), start) > 0 || start.xRel < 0)) - leftButtonStartDrag(cm, e, start, modifier); - else - leftButtonSelect(cm, e, start, type, modifier); - } - - // Start a text drag. When it ends, see if any dragging actually - // happen, and treat as a click if it didn't. - function leftButtonStartDrag(cm, e, start, modifier) { - var display = cm.display, startTime = +new Date; - var dragEnd = operation(cm, function(e2) { - if (webkit) display.scroller.draggable = false; - cm.state.draggingText = false; - off(document, "mouseup", dragEnd); - off(display.scroller, "drop", dragEnd); - if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) { - e_preventDefault(e2); - if (!modifier && +new Date - 200 < startTime) - extendSelection(cm.doc, start); - // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081) - if (webkit || ie && ie_version == 9) - setTimeout(function() {document.body.focus(); display.input.focus();}, 20); - else - display.input.focus(); - } - }); - // Let the drag handler handle this. - if (webkit) display.scroller.draggable = true; - cm.state.draggingText = dragEnd; - // IE's approach to draggable - if (display.scroller.dragDrop) display.scroller.dragDrop(); - on(document, "mouseup", dragEnd); - on(display.scroller, "drop", dragEnd); - } - - // Normal selection, as opposed to text dragging. - function leftButtonSelect(cm, e, start, type, addNew) { - var display = cm.display, doc = cm.doc; - e_preventDefault(e); - - var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges; - if (addNew && !e.shiftKey) { - ourIndex = doc.sel.contains(start); - if (ourIndex > -1) - ourRange = ranges[ourIndex]; - else - ourRange = new Range(start, start); - } else { - ourRange = doc.sel.primary(); - ourIndex = doc.sel.primIndex; - } - - if (e.altKey) { - type = "rect"; - if (!addNew) ourRange = new Range(start, start); - start = posFromMouse(cm, e, true, true); - ourIndex = -1; - } else if (type == "double") { - var word = cm.findWordAt(start); - if (cm.display.shift || doc.extend) - ourRange = extendRange(doc, ourRange, word.anchor, word.head); - else - ourRange = word; - } else if (type == "triple") { - var line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0))); - if (cm.display.shift || doc.extend) - ourRange = extendRange(doc, ourRange, line.anchor, line.head); - else - ourRange = line; - } else { - ourRange = extendRange(doc, ourRange, start); - } - - if (!addNew) { - ourIndex = 0; - setSelection(doc, new Selection([ourRange], 0), sel_mouse); - startSel = doc.sel; - } else if (ourIndex == -1) { - ourIndex = ranges.length; - setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex), - {scroll: false, origin: "*mouse"}); - } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) { - setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0), - {scroll: false, origin: "*mouse"}); - startSel = doc.sel; - } else { - replaceOneSelection(doc, ourIndex, ourRange, sel_mouse); - } - - var lastPos = start; - function extendTo(pos) { - if (cmp(lastPos, pos) == 0) return; - lastPos = pos; - - if (type == "rect") { - var ranges = [], tabSize = cm.options.tabSize; - var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize); - var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize); - var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol); - for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line)); - line <= end; line++) { - var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize); - if (left == right) - ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos))); - else if (text.length > leftPos) - ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize)))); - } - if (!ranges.length) ranges.push(new Range(start, start)); - setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex), - {origin: "*mouse", scroll: false}); - cm.scrollIntoView(pos); - } else { - var oldRange = ourRange; - var anchor = oldRange.anchor, head = pos; - if (type != "single") { - if (type == "double") - var range = cm.findWordAt(pos); - else - var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0))); - if (cmp(range.anchor, anchor) > 0) { - head = range.head; - anchor = minPos(oldRange.from(), range.anchor); - } else { - head = range.anchor; - anchor = maxPos(oldRange.to(), range.head); - } - } - var ranges = startSel.ranges.slice(0); - ranges[ourIndex] = new Range(clipPos(doc, anchor), head); - setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse); - } - } - - var editorSize = display.wrapper.getBoundingClientRect(); - // Used to ensure timeout re-tries don't fire when another extend - // happened in the meantime (clearTimeout isn't reliable -- at - // least on Chrome, the timeouts still happen even when cleared, - // if the clear happens after their scheduled firing time). - var counter = 0; - - function extend(e) { - var curCount = ++counter; - var cur = posFromMouse(cm, e, true, type == "rect"); - if (!cur) return; - if (cmp(cur, lastPos) != 0) { - cm.curOp.focus = activeElt(); - extendTo(cur); - var visible = visibleLines(display, doc); - if (cur.line >= visible.to || cur.line < visible.from) - setTimeout(operation(cm, function(){if (counter == curCount) extend(e);}), 150); - } else { - var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0; - if (outside) setTimeout(operation(cm, function() { - if (counter != curCount) return; - display.scroller.scrollTop += outside; - extend(e); - }), 50); - } - } - - function done(e) { - cm.state.selectingText = false; - counter = Infinity; - e_preventDefault(e); - display.input.focus(); - off(document, "mousemove", move); - off(document, "mouseup", up); - doc.history.lastSelOrigin = null; - } - - var move = operation(cm, function(e) { - if (!e_button(e)) done(e); - else extend(e); - }); - var up = operation(cm, done); - cm.state.selectingText = up; - on(document, "mousemove", move); - on(document, "mouseup", up); - } - - // Determines whether an event happened in the gutter, and fires the - // handlers for the corresponding event. - function gutterEvent(cm, e, type, prevent) { - try { var mX = e.clientX, mY = e.clientY; } - catch(e) { return false; } - if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false; - if (prevent) e_preventDefault(e); - - var display = cm.display; - var lineBox = display.lineDiv.getBoundingClientRect(); - - if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e); - mY -= lineBox.top - display.viewOffset; - - for (var i = 0; i < cm.options.gutters.length; ++i) { - var g = display.gutters.childNodes[i]; - if (g && g.getBoundingClientRect().right >= mX) { - var line = lineAtHeight(cm.doc, mY); - var gutter = cm.options.gutters[i]; - signal(cm, type, cm, line, gutter, e); - return e_defaultPrevented(e); - } - } - } - - function clickInGutter(cm, e) { - return gutterEvent(cm, e, "gutterClick", true); - } - - // Kludge to work around strange IE behavior where it'll sometimes - // re-fire a series of drag-related events right after the drop (#1551) - var lastDrop = 0; - - function onDrop(e) { - var cm = this; - clearDragCursor(cm); - if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) - return; - e_preventDefault(e); - if (ie) lastDrop = +new Date; - var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files; - if (!pos || cm.isReadOnly()) return; - // Might be a file drop, in which case we simply extract the text - // and insert it. - if (files && files.length && window.FileReader && window.File) { - var n = files.length, text = Array(n), read = 0; - var loadFile = function(file, i) { - if (cm.options.allowDropFileTypes && - indexOf(cm.options.allowDropFileTypes, file.type) == -1) - return; - - var reader = new FileReader; - reader.onload = operation(cm, function() { - var content = reader.result; - if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = ""; - text[i] = content; - if (++read == n) { - pos = clipPos(cm.doc, pos); - var change = {from: pos, to: pos, - text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())), - origin: "paste"}; - makeChange(cm.doc, change); - setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change))); - } - }); - reader.readAsText(file); - }; - for (var i = 0; i < n; ++i) loadFile(files[i], i); - } else { // Normal drop - // Don't do a replace if the drop happened inside of the selected text. - if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) { - cm.state.draggingText(e); - // Ensure the editor is re-focused - setTimeout(function() {cm.display.input.focus();}, 20); - return; - } - try { - var text = e.dataTransfer.getData("Text"); - if (text) { - if (cm.state.draggingText && !(mac ? e.altKey : e.ctrlKey)) - var selected = cm.listSelections(); - setSelectionNoUndo(cm.doc, simpleSelection(pos, pos)); - if (selected) for (var i = 0; i < selected.length; ++i) - replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag"); - cm.replaceSelection(text, "around", "paste"); - cm.display.input.focus(); - } - } - catch(e){} - } - } - - function onDragStart(cm, e) { - if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; } - if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return; - - e.dataTransfer.setData("Text", cm.getSelection()); - - // Use dummy image instead of default browsers image. - // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there. - if (e.dataTransfer.setDragImage && !safari) { - var img = elt("img", null, null, "position: fixed; left: 0; top: 0;"); - img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="; - if (presto) { - img.width = img.height = 1; - cm.display.wrapper.appendChild(img); - // Force a relayout, or Opera won't use our image for some obscure reason - img._top = img.offsetTop; - } - e.dataTransfer.setDragImage(img, 0, 0); - if (presto) img.parentNode.removeChild(img); - } - } - - function onDragOver(cm, e) { - var pos = posFromMouse(cm, e); - if (!pos) return; - var frag = document.createDocumentFragment(); - drawSelectionCursor(cm, pos, frag); - if (!cm.display.dragCursor) { - cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors"); - cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv); - } - removeChildrenAndAdd(cm.display.dragCursor, frag); - } - - function clearDragCursor(cm) { - if (cm.display.dragCursor) { - cm.display.lineSpace.removeChild(cm.display.dragCursor); - cm.display.dragCursor = null; - } - } - - // SCROLL EVENTS - - // Sync the scrollable area and scrollbars, ensure the viewport - // covers the visible area. - function setScrollTop(cm, val) { - if (Math.abs(cm.doc.scrollTop - val) < 2) return; - cm.doc.scrollTop = val; - if (!gecko) updateDisplaySimple(cm, {top: val}); - if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val; - cm.display.scrollbars.setScrollTop(val); - if (gecko) updateDisplaySimple(cm); - startWorker(cm, 100); - } - // Sync scroller and scrollbar, ensure the gutter elements are - // aligned. - function setScrollLeft(cm, val, isScroller) { - if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) return; - val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth); - cm.doc.scrollLeft = val; - alignHorizontally(cm); - if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val; - cm.display.scrollbars.setScrollLeft(val); - } - - // Since the delta values reported on mouse wheel events are - // unstandardized between browsers and even browser versions, and - // generally horribly unpredictable, this code starts by measuring - // the scroll effect that the first few mouse wheel events have, - // and, from that, detects the way it can convert deltas to pixel - // offsets afterwards. - // - // The reason we want to know the amount a wheel event will scroll - // is that it gives us a chance to update the display before the - // actual scrolling happens, reducing flickering. - - var wheelSamples = 0, wheelPixelsPerUnit = null; - // Fill in a browser-detected starting value on browsers where we - // know one. These don't have to be accurate -- the result of them - // being wrong would just be a slight flicker on the first wheel - // scroll (if it is large enough). - if (ie) wheelPixelsPerUnit = -.53; - else if (gecko) wheelPixelsPerUnit = 15; - else if (chrome) wheelPixelsPerUnit = -.7; - else if (safari) wheelPixelsPerUnit = -1/3; - - var wheelEventDelta = function(e) { - var dx = e.wheelDeltaX, dy = e.wheelDeltaY; - if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail; - if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail; - else if (dy == null) dy = e.wheelDelta; - return {x: dx, y: dy}; - }; - CodeMirror.wheelEventPixels = function(e) { - var delta = wheelEventDelta(e); - delta.x *= wheelPixelsPerUnit; - delta.y *= wheelPixelsPerUnit; - return delta; - }; - - function onScrollWheel(cm, e) { - var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y; - - var display = cm.display, scroll = display.scroller; - // Quit if there's nothing to scroll here - var canScrollX = scroll.scrollWidth > scroll.clientWidth; - var canScrollY = scroll.scrollHeight > scroll.clientHeight; - if (!(dx && canScrollX || dy && canScrollY)) return; - - // Webkit browsers on OS X abort momentum scrolls when the target - // of the scroll event is removed from the scrollable element. - // This hack (see related code in patchDisplay) makes sure the - // element is kept around. - if (dy && mac && webkit) { - outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) { - for (var i = 0; i < view.length; i++) { - if (view[i].node == cur) { - cm.display.currentWheelTarget = cur; - break outer; - } - } - } - } - - // On some browsers, horizontal scrolling will cause redraws to - // happen before the gutter has been realigned, causing it to - // wriggle around in a most unseemly way. When we have an - // estimated pixels/delta value, we just handle horizontal - // scrolling entirely here. It'll be slightly off from native, but - // better than glitching out. - if (dx && !gecko && !presto && wheelPixelsPerUnit != null) { - if (dy && canScrollY) - setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight))); - setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth))); - // Only prevent default scrolling if vertical scrolling is - // actually possible. Otherwise, it causes vertical scroll - // jitter on OSX trackpads when deltaX is small and deltaY - // is large (issue #3579) - if (!dy || (dy && canScrollY)) - e_preventDefault(e); - display.wheelStartX = null; // Abort measurement, if in progress - return; - } - - // 'Project' the visible viewport to cover the area that is being - // scrolled into view (if we know enough to estimate it). - if (dy && wheelPixelsPerUnit != null) { - var pixels = dy * wheelPixelsPerUnit; - var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight; - if (pixels < 0) top = Math.max(0, top + pixels - 50); - else bot = Math.min(cm.doc.height, bot + pixels + 50); - updateDisplaySimple(cm, {top: top, bottom: bot}); - } - - if (wheelSamples < 20) { - if (display.wheelStartX == null) { - display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop; - display.wheelDX = dx; display.wheelDY = dy; - setTimeout(function() { - if (display.wheelStartX == null) return; - var movedX = scroll.scrollLeft - display.wheelStartX; - var movedY = scroll.scrollTop - display.wheelStartY; - var sample = (movedY && display.wheelDY && movedY / display.wheelDY) || - (movedX && display.wheelDX && movedX / display.wheelDX); - display.wheelStartX = display.wheelStartY = null; - if (!sample) return; - wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1); - ++wheelSamples; - }, 200); - } else { - display.wheelDX += dx; display.wheelDY += dy; - } - } - } - - // KEY EVENTS - - // Run a handler that was bound to a key. - function doHandleBinding(cm, bound, dropShift) { - if (typeof bound == "string") { - bound = commands[bound]; - if (!bound) return false; - } - // Ensure previous input has been read, so that the handler sees a - // consistent view of the document - cm.display.input.ensurePolled(); - var prevShift = cm.display.shift, done = false; - try { - if (cm.isReadOnly()) cm.state.suppressEdits = true; - if (dropShift) cm.display.shift = false; - done = bound(cm) != Pass; - } finally { - cm.display.shift = prevShift; - cm.state.suppressEdits = false; - } - return done; - } - - function lookupKeyForEditor(cm, name, handle) { - for (var i = 0; i < cm.state.keyMaps.length; i++) { - var result = lookupKey(name, cm.state.keyMaps[i], handle, cm); - if (result) return result; - } - return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm)) - || lookupKey(name, cm.options.keyMap, handle, cm); - } - - var stopSeq = new Delayed; - function dispatchKey(cm, name, e, handle) { - var seq = cm.state.keySeq; - if (seq) { - if (isModifierKey(name)) return "handled"; - stopSeq.set(50, function() { - if (cm.state.keySeq == seq) { - cm.state.keySeq = null; - cm.display.input.reset(); - } - }); - name = seq + " " + name; - } - var result = lookupKeyForEditor(cm, name, handle); - - if (result == "multi") - cm.state.keySeq = name; - if (result == "handled") - signalLater(cm, "keyHandled", cm, name, e); - - if (result == "handled" || result == "multi") { - e_preventDefault(e); - restartBlink(cm); - } - - if (seq && !result && /\'$/.test(name)) { - e_preventDefault(e); - return true; - } - return !!result; - } - - // Handle a key from the keydown event. - function handleKeyBinding(cm, e) { - var name = keyName(e, true); - if (!name) return false; - - if (e.shiftKey && !cm.state.keySeq) { - // First try to resolve full name (including 'Shift-'). Failing - // that, see if there is a cursor-motion command (starting with - // 'go') bound to the keyname without 'Shift-'. - return dispatchKey(cm, "Shift-" + name, e, function(b) {return doHandleBinding(cm, b, true);}) - || dispatchKey(cm, name, e, function(b) { - if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion) - return doHandleBinding(cm, b); - }); - } else { - return dispatchKey(cm, name, e, function(b) { return doHandleBinding(cm, b); }); - } - } - - // Handle a key from the keypress event - function handleCharBinding(cm, e, ch) { - return dispatchKey(cm, "'" + ch + "'", e, - function(b) { return doHandleBinding(cm, b, true); }); - } - - var lastStoppedKey = null; - function onKeyDown(e) { - var cm = this; - cm.curOp.focus = activeElt(); - if (signalDOMEvent(cm, e)) return; - // IE does strange things with escape. - if (ie && ie_version < 11 && e.keyCode == 27) e.returnValue = false; - var code = e.keyCode; - cm.display.shift = code == 16 || e.shiftKey; - var handled = handleKeyBinding(cm, e); - if (presto) { - lastStoppedKey = handled ? code : null; - // Opera has no cut event... we try to at least catch the key combo - if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey)) - cm.replaceSelection("", null, "cut"); - } - - // Turn mouse into crosshair when Alt is held on Mac. - if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className)) - showCrossHair(cm); - } - - function showCrossHair(cm) { - var lineDiv = cm.display.lineDiv; - addClass(lineDiv, "CodeMirror-crosshair"); - - function up(e) { - if (e.keyCode == 18 || !e.altKey) { - rmClass(lineDiv, "CodeMirror-crosshair"); - off(document, "keyup", up); - off(document, "mouseover", up); - } - } - on(document, "keyup", up); - on(document, "mouseover", up); - } - - function onKeyUp(e) { - if (e.keyCode == 16) this.doc.sel.shift = false; - signalDOMEvent(this, e); - } - - function onKeyPress(e) { - var cm = this; - if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return; - var keyCode = e.keyCode, charCode = e.charCode; - if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;} - if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) return; - var ch = String.fromCharCode(charCode == null ? keyCode : charCode); - if (handleCharBinding(cm, e, ch)) return; - cm.display.input.onKeyPress(e); - } - - // FOCUS/BLUR EVENTS - - function delayBlurEvent(cm) { - cm.state.delayingBlurEvent = true; - setTimeout(function() { - if (cm.state.delayingBlurEvent) { - cm.state.delayingBlurEvent = false; - onBlur(cm); - } - }, 100); - } - - function onFocus(cm) { - if (cm.state.delayingBlurEvent) cm.state.delayingBlurEvent = false; - - if (cm.options.readOnly == "nocursor") return; - if (!cm.state.focused) { - signal(cm, "focus", cm); - cm.state.focused = true; - addClass(cm.display.wrapper, "CodeMirror-focused"); - // This test prevents this from firing when a context - // menu is closed (since the input reset would kill the - // select-all detection hack) - if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) { - cm.display.input.reset(); - if (webkit) setTimeout(function() { cm.display.input.reset(true); }, 20); // Issue #1730 - } - cm.display.input.receivedFocus(); - } - restartBlink(cm); - } - function onBlur(cm) { - if (cm.state.delayingBlurEvent) return; - - if (cm.state.focused) { - signal(cm, "blur", cm); - cm.state.focused = false; - rmClass(cm.display.wrapper, "CodeMirror-focused"); - } - clearInterval(cm.display.blinker); - setTimeout(function() {if (!cm.state.focused) cm.display.shift = false;}, 150); - } - - // CONTEXT MENU HANDLING - - // To make the context menu work, we need to briefly unhide the - // textarea (making it as unobtrusive as possible) to let the - // right-click take effect on it. - function onContextMenu(cm, e) { - if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return; - if (signalDOMEvent(cm, e, "contextmenu")) return; - cm.display.input.onContextMenu(e); - } - - function contextMenuInGutter(cm, e) { - if (!hasHandler(cm, "gutterContextMenu")) return false; - return gutterEvent(cm, e, "gutterContextMenu", false); - } - - // UPDATING - - // Compute the position of the end of a change (its 'to' property - // refers to the pre-change end). - var changeEnd = CodeMirror.changeEnd = function(change) { - if (!change.text) return change.to; - return Pos(change.from.line + change.text.length - 1, - lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0)); - }; - - // Adjust a position to refer to the post-change position of the - // same text, or the end of the change if the change covers it. - function adjustForChange(pos, change) { - if (cmp(pos, change.from) < 0) return pos; - if (cmp(pos, change.to) <= 0) return changeEnd(change); - - var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch; - if (pos.line == change.to.line) ch += changeEnd(change).ch - change.to.ch; - return Pos(line, ch); - } - - function computeSelAfterChange(doc, change) { - var out = []; - for (var i = 0; i < doc.sel.ranges.length; i++) { - var range = doc.sel.ranges[i]; - out.push(new Range(adjustForChange(range.anchor, change), - adjustForChange(range.head, change))); - } - return normalizeSelection(out, doc.sel.primIndex); - } - - function offsetPos(pos, old, nw) { - if (pos.line == old.line) - return Pos(nw.line, pos.ch - old.ch + nw.ch); - else - return Pos(nw.line + (pos.line - old.line), pos.ch); - } - - // Used by replaceSelections to allow moving the selection to the - // start or around the replaced test. Hint may be "start" or "around". - function computeReplacedSel(doc, changes, hint) { - var out = []; - var oldPrev = Pos(doc.first, 0), newPrev = oldPrev; - for (var i = 0; i < changes.length; i++) { - var change = changes[i]; - var from = offsetPos(change.from, oldPrev, newPrev); - var to = offsetPos(changeEnd(change), oldPrev, newPrev); - oldPrev = change.to; - newPrev = to; - if (hint == "around") { - var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0; - out[i] = new Range(inv ? to : from, inv ? from : to); - } else { - out[i] = new Range(from, from); - } - } - return new Selection(out, doc.sel.primIndex); - } - - // Allow "beforeChange" event handlers to influence a change - function filterChange(doc, change, update) { - var obj = { - canceled: false, - from: change.from, - to: change.to, - text: change.text, - origin: change.origin, - cancel: function() { this.canceled = true; } - }; - if (update) obj.update = function(from, to, text, origin) { - if (from) this.from = clipPos(doc, from); - if (to) this.to = clipPos(doc, to); - if (text) this.text = text; - if (origin !== undefined) this.origin = origin; - }; - signal(doc, "beforeChange", doc, obj); - if (doc.cm) signal(doc.cm, "beforeChange", doc.cm, obj); - - if (obj.canceled) return null; - return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin}; - } - - // Apply a change to a document, and add it to the document's - // history, and propagating it to all linked documents. - function makeChange(doc, change, ignoreReadOnly) { - if (doc.cm) { - if (!doc.cm.curOp) return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly); - if (doc.cm.state.suppressEdits) return; - } - - if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) { - change = filterChange(doc, change, true); - if (!change) return; - } - - // Possibly split or suppress the update based on the presence - // of read-only spans in its range. - var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to); - if (split) { - for (var i = split.length - 1; i >= 0; --i) - makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text}); - } else { - makeChangeInner(doc, change); - } - } - - function makeChangeInner(doc, change) { - if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) return; - var selAfter = computeSelAfterChange(doc, change); - addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN); - - makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change)); - var rebased = []; - - linkedDocs(doc, function(doc, sharedHist) { - if (!sharedHist && indexOf(rebased, doc.history) == -1) { - rebaseHist(doc.history, change); - rebased.push(doc.history); - } - makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change)); - }); - } - - // Revert a change stored in a document's history. - function makeChangeFromHistory(doc, type, allowSelectionOnly) { - if (doc.cm && doc.cm.state.suppressEdits) return; - - var hist = doc.history, event, selAfter = doc.sel; - var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done; - - // Verify that there is a useable event (so that ctrl-z won't - // needlessly clear selection events) - for (var i = 0; i < source.length; i++) { - event = source[i]; - if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges) - break; - } - if (i == source.length) return; - hist.lastOrigin = hist.lastSelOrigin = null; - - for (;;) { - event = source.pop(); - if (event.ranges) { - pushSelectionToHistory(event, dest); - if (allowSelectionOnly && !event.equals(doc.sel)) { - setSelection(doc, event, {clearRedo: false}); - return; - } - selAfter = event; - } - else break; - } - - // Build up a reverse change object to add to the opposite history - // stack (redo when undoing, and vice versa). - var antiChanges = []; - pushSelectionToHistory(selAfter, dest); - dest.push({changes: antiChanges, generation: hist.generation}); - hist.generation = event.generation || ++hist.maxGeneration; - - var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange"); - - for (var i = event.changes.length - 1; i >= 0; --i) { - var change = event.changes[i]; - change.origin = type; - if (filter && !filterChange(doc, change, false)) { - source.length = 0; - return; - } - - antiChanges.push(historyChangeFromChange(doc, change)); - - var after = i ? computeSelAfterChange(doc, change) : lst(source); - makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change)); - if (!i && doc.cm) doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)}); - var rebased = []; - - // Propagate to the linked documents - linkedDocs(doc, function(doc, sharedHist) { - if (!sharedHist && indexOf(rebased, doc.history) == -1) { - rebaseHist(doc.history, change); - rebased.push(doc.history); - } - makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change)); - }); - } - } - - // Sub-views need their line numbers shifted when text is added - // above or below them in the parent document. - function shiftDoc(doc, distance) { - if (distance == 0) return; - doc.first += distance; - doc.sel = new Selection(map(doc.sel.ranges, function(range) { - return new Range(Pos(range.anchor.line + distance, range.anchor.ch), - Pos(range.head.line + distance, range.head.ch)); - }), doc.sel.primIndex); - if (doc.cm) { - regChange(doc.cm, doc.first, doc.first - distance, distance); - for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++) - regLineChange(doc.cm, l, "gutter"); - } - } - - // More lower-level change function, handling only a single document - // (not linked ones). - function makeChangeSingleDoc(doc, change, selAfter, spans) { - if (doc.cm && !doc.cm.curOp) - return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans); - - if (change.to.line < doc.first) { - shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line)); - return; - } - if (change.from.line > doc.lastLine()) return; - - // Clip the change to the size of this doc - if (change.from.line < doc.first) { - var shift = change.text.length - 1 - (doc.first - change.from.line); - shiftDoc(doc, shift); - change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch), - text: [lst(change.text)], origin: change.origin}; - } - var last = doc.lastLine(); - if (change.to.line > last) { - change = {from: change.from, to: Pos(last, getLine(doc, last).text.length), - text: [change.text[0]], origin: change.origin}; - } - - change.removed = getBetween(doc, change.from, change.to); - - if (!selAfter) selAfter = computeSelAfterChange(doc, change); - if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans); - else updateDoc(doc, change, spans); - setSelectionNoUndo(doc, selAfter, sel_dontScroll); - } - - // Handle the interaction of a change to a document with the editor - // that this document is part of. - function makeChangeSingleDocInEditor(cm, change, spans) { - var doc = cm.doc, display = cm.display, from = change.from, to = change.to; - - var recomputeMaxLength = false, checkWidthStart = from.line; - if (!cm.options.lineWrapping) { - checkWidthStart = lineNo(visualLine(getLine(doc, from.line))); - doc.iter(checkWidthStart, to.line + 1, function(line) { - if (line == display.maxLine) { - recomputeMaxLength = true; - return true; - } - }); - } - - if (doc.sel.contains(change.from, change.to) > -1) - signalCursorActivity(cm); - - updateDoc(doc, change, spans, estimateHeight(cm)); - - if (!cm.options.lineWrapping) { - doc.iter(checkWidthStart, from.line + change.text.length, function(line) { - var len = lineLength(line); - if (len > display.maxLineLength) { - display.maxLine = line; - display.maxLineLength = len; - display.maxLineChanged = true; - recomputeMaxLength = false; - } - }); - if (recomputeMaxLength) cm.curOp.updateMaxLine = true; - } - - // Adjust frontier, schedule worker - doc.frontier = Math.min(doc.frontier, from.line); - startWorker(cm, 400); - - var lendiff = change.text.length - (to.line - from.line) - 1; - // Remember that these lines changed, for updating the display - if (change.full) - regChange(cm); - else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change)) - regLineChange(cm, from.line, "text"); - else - regChange(cm, from.line, to.line + 1, lendiff); - - var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change"); - if (changeHandler || changesHandler) { - var obj = { - from: from, to: to, - text: change.text, - removed: change.removed, - origin: change.origin - }; - if (changeHandler) signalLater(cm, "change", cm, obj); - if (changesHandler) (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj); - } - cm.display.selForContextMenu = null; - } - - function replaceRange(doc, code, from, to, origin) { - if (!to) to = from; - if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp; } - if (typeof code == "string") code = doc.splitLines(code); - makeChange(doc, {from: from, to: to, text: code, origin: origin}); - } - - // SCROLLING THINGS INTO VIEW - - // If an editor sits on the top or bottom of the window, partially - // scrolled out of view, this ensures that the cursor is visible. - function maybeScrollWindow(cm, coords) { - if (signalDOMEvent(cm, "scrollCursorIntoView")) return; - - var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null; - if (coords.top + box.top < 0) doScroll = true; - else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false; - if (doScroll != null && !phantom) { - var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " + - (coords.top - display.viewOffset - paddingTop(cm.display)) + "px; height: " + - (coords.bottom - coords.top + scrollGap(cm) + display.barHeight) + "px; left: " + - coords.left + "px; width: 2px;"); - cm.display.lineSpace.appendChild(scrollNode); - scrollNode.scrollIntoView(doScroll); - cm.display.lineSpace.removeChild(scrollNode); - } - } - - // Scroll a given position into view (immediately), verifying that - // it actually became visible (as line heights are accurately - // measured, the position of something may 'drift' during drawing). - function scrollPosIntoView(cm, pos, end, margin) { - if (margin == null) margin = 0; - for (var limit = 0; limit < 5; limit++) { - var changed = false, coords = cursorCoords(cm, pos); - var endCoords = !end || end == pos ? coords : cursorCoords(cm, end); - var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left), - Math.min(coords.top, endCoords.top) - margin, - Math.max(coords.left, endCoords.left), - Math.max(coords.bottom, endCoords.bottom) + margin); - var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft; - if (scrollPos.scrollTop != null) { - setScrollTop(cm, scrollPos.scrollTop); - if (Math.abs(cm.doc.scrollTop - startTop) > 1) changed = true; - } - if (scrollPos.scrollLeft != null) { - setScrollLeft(cm, scrollPos.scrollLeft); - if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) changed = true; - } - if (!changed) break; - } - return coords; - } - - // Scroll a given set of coordinates into view (immediately). - function scrollIntoView(cm, x1, y1, x2, y2) { - var scrollPos = calculateScrollPos(cm, x1, y1, x2, y2); - if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop); - if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft); - } - - // Calculate a new scroll position needed to scroll the given - // rectangle into view. Returns an object with scrollTop and - // scrollLeft properties. When these are undefined, the - // vertical/horizontal position does not need to be adjusted. - function calculateScrollPos(cm, x1, y1, x2, y2) { - var display = cm.display, snapMargin = textHeight(cm.display); - if (y1 < 0) y1 = 0; - var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop; - var screen = displayHeight(cm), result = {}; - if (y2 - y1 > screen) y2 = y1 + screen; - var docBottom = cm.doc.height + paddingVert(display); - var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin; - if (y1 < screentop) { - result.scrollTop = atTop ? 0 : y1; - } else if (y2 > screentop + screen) { - var newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen); - if (newTop != screentop) result.scrollTop = newTop; - } - - var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft; - var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0); - var tooWide = x2 - x1 > screenw; - if (tooWide) x2 = x1 + screenw; - if (x1 < 10) - result.scrollLeft = 0; - else if (x1 < screenleft) - result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10)); - else if (x2 > screenw + screenleft - 3) - result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw; - return result; - } - - // Store a relative adjustment to the scroll position in the current - // operation (to be applied when the operation finishes). - function addToScrollPos(cm, left, top) { - if (left != null || top != null) resolveScrollToPos(cm); - if (left != null) - cm.curOp.scrollLeft = (cm.curOp.scrollLeft == null ? cm.doc.scrollLeft : cm.curOp.scrollLeft) + left; - if (top != null) - cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top; - } - - // Make sure that at the end of the operation the current cursor is - // shown. - function ensureCursorVisible(cm) { - resolveScrollToPos(cm); - var cur = cm.getCursor(), from = cur, to = cur; - if (!cm.options.lineWrapping) { - from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur; - to = Pos(cur.line, cur.ch + 1); - } - cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin, isCursor: true}; - } - - // When an operation has its scrollToPos property set, and another - // scroll action is applied before the end of the operation, this - // 'simulates' scrolling that position into view in a cheap way, so - // that the effect of intermediate scroll commands is not ignored. - function resolveScrollToPos(cm) { - var range = cm.curOp.scrollToPos; - if (range) { - cm.curOp.scrollToPos = null; - var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to); - var sPos = calculateScrollPos(cm, Math.min(from.left, to.left), - Math.min(from.top, to.top) - range.margin, - Math.max(from.right, to.right), - Math.max(from.bottom, to.bottom) + range.margin); - cm.scrollTo(sPos.scrollLeft, sPos.scrollTop); - } - } - - // API UTILITIES - - // Indent the given line. The how parameter can be "smart", - // "add"/null, "subtract", or "prev". When aggressive is false - // (typically set to true for forced single-line indents), empty - // lines are not indented, and places where the mode returns Pass - // are left alone. - function indentLine(cm, n, how, aggressive) { - var doc = cm.doc, state; - if (how == null) how = "add"; - if (how == "smart") { - // Fall back to "prev" when the mode doesn't have an indentation - // method. - if (!doc.mode.indent) how = "prev"; - else state = getStateBefore(cm, n); - } - - var tabSize = cm.options.tabSize; - var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize); - if (line.stateAfter) line.stateAfter = null; - var curSpaceString = line.text.match(/^\s*/)[0], indentation; - if (!aggressive && !/\S/.test(line.text)) { - indentation = 0; - how = "not"; - } else if (how == "smart") { - indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text); - if (indentation == Pass || indentation > 150) { - if (!aggressive) return; - how = "prev"; - } - } - if (how == "prev") { - if (n > doc.first) indentation = countColumn(getLine(doc, n-1).text, null, tabSize); - else indentation = 0; - } else if (how == "add") { - indentation = curSpace + cm.options.indentUnit; - } else if (how == "subtract") { - indentation = curSpace - cm.options.indentUnit; - } else if (typeof how == "number") { - indentation = curSpace + how; - } - indentation = Math.max(0, indentation); - - var indentString = "", pos = 0; - if (cm.options.indentWithTabs) - for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";} - if (pos < indentation) indentString += spaceStr(indentation - pos); - - if (indentString != curSpaceString) { - replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input"); - line.stateAfter = null; - return true; - } else { - // Ensure that, if the cursor was in the whitespace at the start - // of the line, it is moved to the end of that space. - for (var i = 0; i < doc.sel.ranges.length; i++) { - var range = doc.sel.ranges[i]; - if (range.head.line == n && range.head.ch < curSpaceString.length) { - var pos = Pos(n, curSpaceString.length); - replaceOneSelection(doc, i, new Range(pos, pos)); - break; - } - } - } - } - - // Utility for applying a change to a line by handle or number, - // returning the number and optionally registering the line as - // changed. - function changeLine(doc, handle, changeType, op) { - var no = handle, line = handle; - if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle)); - else no = lineNo(handle); - if (no == null) return null; - if (op(line, no) && doc.cm) regLineChange(doc.cm, no, changeType); - return line; - } - - // Helper for deleting text near the selection(s), used to implement - // backspace, delete, and similar functionality. - function deleteNearSelection(cm, compute) { - var ranges = cm.doc.sel.ranges, kill = []; - // Build up a set of ranges to kill first, merging overlapping - // ranges. - for (var i = 0; i < ranges.length; i++) { - var toKill = compute(ranges[i]); - while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) { - var replaced = kill.pop(); - if (cmp(replaced.from, toKill.from) < 0) { - toKill.from = replaced.from; - break; - } - } - kill.push(toKill); - } - // Next, remove those actual ranges. - runInOp(cm, function() { - for (var i = kill.length - 1; i >= 0; i--) - replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete"); - ensureCursorVisible(cm); - }); - } - - // Used for horizontal relative motion. Dir is -1 or 1 (left or - // right), unit can be "char", "column" (like char, but doesn't - // cross line boundaries), "word" (across next word), or "group" (to - // the start of next group of word or non-word-non-whitespace - // chars). The visually param controls whether, in right-to-left - // text, direction 1 means to move towards the next index in the - // string, or towards the character to the right of the current - // position. The resulting position will have a hitSide=true - // property if it reached the end of the document. - function findPosH(doc, pos, dir, unit, visually) { - var line = pos.line, ch = pos.ch, origDir = dir; - var lineObj = getLine(doc, line); - function findNextLine() { - var l = line + dir; - if (l < doc.first || l >= doc.first + doc.size) return false - line = l; - return lineObj = getLine(doc, l); - } - function moveOnce(boundToLine) { - var next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true); - if (next == null) { - if (!boundToLine && findNextLine()) { - if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj); - else ch = dir < 0 ? lineObj.text.length : 0; - } else return false - } else ch = next; - return true; - } - - if (unit == "char") { - moveOnce() - } else if (unit == "column") { - moveOnce(true) - } else if (unit == "word" || unit == "group") { - var sawType = null, group = unit == "group"; - var helper = doc.cm && doc.cm.getHelper(pos, "wordChars"); - for (var first = true;; first = false) { - if (dir < 0 && !moveOnce(!first)) break; - var cur = lineObj.text.charAt(ch) || "\n"; - var type = isWordChar(cur, helper) ? "w" - : group && cur == "\n" ? "n" - : !group || /\s/.test(cur) ? null - : "p"; - if (group && !first && !type) type = "s"; - if (sawType && sawType != type) { - if (dir < 0) {dir = 1; moveOnce();} - break; - } - - if (type) sawType = type; - if (dir > 0 && !moveOnce(!first)) break; - } - } - var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true); - if (!cmp(pos, result)) result.hitSide = true; - return result; - } - - // For relative vertical movement. Dir may be -1 or 1. Unit can be - // "page" or "line". The resulting position will have a hitSide=true - // property if it reached the end of the document. - function findPosV(cm, pos, dir, unit) { - var doc = cm.doc, x = pos.left, y; - if (unit == "page") { - var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight); - y = pos.top + dir * (pageSize - (dir < 0 ? 1.5 : .5) * textHeight(cm.display)); - } else if (unit == "line") { - y = dir > 0 ? pos.bottom + 3 : pos.top - 3; - } - for (;;) { - var target = coordsChar(cm, x, y); - if (!target.outside) break; - if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break; } - y += dir * 5; - } - return target; - } - - // EDITOR METHODS - - // The publicly visible API. Note that methodOp(f) means - // 'wrap f in an operation, performed on its `this` parameter'. - - // This is not the complete set of editor methods. Most of the - // methods defined on the Doc type are also injected into - // CodeMirror.prototype, for backwards compatibility and - // convenience. - - CodeMirror.prototype = { - constructor: CodeMirror, - focus: function(){window.focus(); this.display.input.focus();}, - - setOption: function(option, value) { - var options = this.options, old = options[option]; - if (options[option] == value && option != "mode") return; - options[option] = value; - if (optionHandlers.hasOwnProperty(option)) - operation(this, optionHandlers[option])(this, value, old); - }, - - getOption: function(option) {return this.options[option];}, - getDoc: function() {return this.doc;}, - - addKeyMap: function(map, bottom) { - this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map)); - }, - removeKeyMap: function(map) { - var maps = this.state.keyMaps; - for (var i = 0; i < maps.length; ++i) - if (maps[i] == map || maps[i].name == map) { - maps.splice(i, 1); - return true; - } - }, - - addOverlay: methodOp(function(spec, options) { - var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec); - if (mode.startState) throw new Error("Overlays may not be stateful."); - this.state.overlays.push({mode: mode, modeSpec: spec, opaque: options && options.opaque}); - this.state.modeGen++; - regChange(this); - }), - removeOverlay: methodOp(function(spec) { - var overlays = this.state.overlays; - for (var i = 0; i < overlays.length; ++i) { - var cur = overlays[i].modeSpec; - if (cur == spec || typeof spec == "string" && cur.name == spec) { - overlays.splice(i, 1); - this.state.modeGen++; - regChange(this); - return; - } - } - }), - - indentLine: methodOp(function(n, dir, aggressive) { - if (typeof dir != "string" && typeof dir != "number") { - if (dir == null) dir = this.options.smartIndent ? "smart" : "prev"; - else dir = dir ? "add" : "subtract"; - } - if (isLine(this.doc, n)) indentLine(this, n, dir, aggressive); - }), - indentSelection: methodOp(function(how) { - var ranges = this.doc.sel.ranges, end = -1; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i]; - if (!range.empty()) { - var from = range.from(), to = range.to(); - var start = Math.max(end, from.line); - end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1; - for (var j = start; j < end; ++j) - indentLine(this, j, how); - var newRanges = this.doc.sel.ranges; - if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0) - replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll); - } else if (range.head.line > end) { - indentLine(this, range.head.line, how, true); - end = range.head.line; - if (i == this.doc.sel.primIndex) ensureCursorVisible(this); - } - } - }), - - // Fetch the parser token for a given character. Useful for hacks - // that want to inspect the mode state (say, for completion). - getTokenAt: function(pos, precise) { - return takeToken(this, pos, precise); - }, - - getLineTokens: function(line, precise) { - return takeToken(this, Pos(line), precise, true); - }, - - getTokenTypeAt: function(pos) { - pos = clipPos(this.doc, pos); - var styles = getLineStyles(this, getLine(this.doc, pos.line)); - var before = 0, after = (styles.length - 1) / 2, ch = pos.ch; - var type; - if (ch == 0) type = styles[2]; - else for (;;) { - var mid = (before + after) >> 1; - if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid; - else if (styles[mid * 2 + 1] < ch) before = mid + 1; - else { type = styles[mid * 2 + 2]; break; } - } - var cut = type ? type.indexOf("cm-overlay ") : -1; - return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1); - }, - - getModeAt: function(pos) { - var mode = this.doc.mode; - if (!mode.innerMode) return mode; - return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode; - }, - - getHelper: function(pos, type) { - return this.getHelpers(pos, type)[0]; - }, - - getHelpers: function(pos, type) { - var found = []; - if (!helpers.hasOwnProperty(type)) return found; - var help = helpers[type], mode = this.getModeAt(pos); - if (typeof mode[type] == "string") { - if (help[mode[type]]) found.push(help[mode[type]]); - } else if (mode[type]) { - for (var i = 0; i < mode[type].length; i++) { - var val = help[mode[type][i]]; - if (val) found.push(val); - } - } else if (mode.helperType && help[mode.helperType]) { - found.push(help[mode.helperType]); - } else if (help[mode.name]) { - found.push(help[mode.name]); - } - for (var i = 0; i < help._global.length; i++) { - var cur = help._global[i]; - if (cur.pred(mode, this) && indexOf(found, cur.val) == -1) - found.push(cur.val); - } - return found; - }, - - getStateAfter: function(line, precise) { - var doc = this.doc; - line = clipLine(doc, line == null ? doc.first + doc.size - 1: line); - return getStateBefore(this, line + 1, precise); - }, - - cursorCoords: function(start, mode) { - var pos, range = this.doc.sel.primary(); - if (start == null) pos = range.head; - else if (typeof start == "object") pos = clipPos(this.doc, start); - else pos = start ? range.from() : range.to(); - return cursorCoords(this, pos, mode || "page"); - }, - - charCoords: function(pos, mode) { - return charCoords(this, clipPos(this.doc, pos), mode || "page"); - }, - - coordsChar: function(coords, mode) { - coords = fromCoordSystem(this, coords, mode || "page"); - return coordsChar(this, coords.left, coords.top); - }, - - lineAtHeight: function(height, mode) { - height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top; - return lineAtHeight(this.doc, height + this.display.viewOffset); - }, - heightAtLine: function(line, mode) { - var end = false, lineObj; - if (typeof line == "number") { - var last = this.doc.first + this.doc.size - 1; - if (line < this.doc.first) line = this.doc.first; - else if (line > last) { line = last; end = true; } - lineObj = getLine(this.doc, line); - } else { - lineObj = line; - } - return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page").top + - (end ? this.doc.height - heightAtLine(lineObj) : 0); - }, - - defaultTextHeight: function() { return textHeight(this.display); }, - defaultCharWidth: function() { return charWidth(this.display); }, - - setGutterMarker: methodOp(function(line, gutterID, value) { - return changeLine(this.doc, line, "gutter", function(line) { - var markers = line.gutterMarkers || (line.gutterMarkers = {}); - markers[gutterID] = value; - if (!value && isEmpty(markers)) line.gutterMarkers = null; - return true; - }); - }), - - clearGutter: methodOp(function(gutterID) { - var cm = this, doc = cm.doc, i = doc.first; - doc.iter(function(line) { - if (line.gutterMarkers && line.gutterMarkers[gutterID]) { - line.gutterMarkers[gutterID] = null; - regLineChange(cm, i, "gutter"); - if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null; - } - ++i; - }); - }), - - lineInfo: function(line) { - if (typeof line == "number") { - if (!isLine(this.doc, line)) return null; - var n = line; - line = getLine(this.doc, line); - if (!line) return null; - } else { - var n = lineNo(line); - if (n == null) return null; - } - return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers, - textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass, - widgets: line.widgets}; - }, - - getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo};}, - - addWidget: function(pos, node, scroll, vert, horiz) { - var display = this.display; - pos = cursorCoords(this, clipPos(this.doc, pos)); - var top = pos.bottom, left = pos.left; - node.style.position = "absolute"; - node.setAttribute("cm-ignore-events", "true"); - this.display.input.setUneditable(node); - display.sizer.appendChild(node); - if (vert == "over") { - top = pos.top; - } else if (vert == "above" || vert == "near") { - var vspace = Math.max(display.wrapper.clientHeight, this.doc.height), - hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth); - // Default to positioning above (if specified and possible); otherwise default to positioning below - if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight) - top = pos.top - node.offsetHeight; - else if (pos.bottom + node.offsetHeight <= vspace) - top = pos.bottom; - if (left + node.offsetWidth > hspace) - left = hspace - node.offsetWidth; - } - node.style.top = top + "px"; - node.style.left = node.style.right = ""; - if (horiz == "right") { - left = display.sizer.clientWidth - node.offsetWidth; - node.style.right = "0px"; - } else { - if (horiz == "left") left = 0; - else if (horiz == "middle") left = (display.sizer.clientWidth - node.offsetWidth) / 2; - node.style.left = left + "px"; - } - if (scroll) - scrollIntoView(this, left, top, left + node.offsetWidth, top + node.offsetHeight); - }, - - triggerOnKeyDown: methodOp(onKeyDown), - triggerOnKeyPress: methodOp(onKeyPress), - triggerOnKeyUp: onKeyUp, - - execCommand: function(cmd) { - if (commands.hasOwnProperty(cmd)) - return commands[cmd].call(null, this); - }, - - triggerElectric: methodOp(function(text) { triggerElectric(this, text); }), - - findPosH: function(from, amount, unit, visually) { - var dir = 1; - if (amount < 0) { dir = -1; amount = -amount; } - for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) { - cur = findPosH(this.doc, cur, dir, unit, visually); - if (cur.hitSide) break; - } - return cur; - }, - - moveH: methodOp(function(dir, unit) { - var cm = this; - cm.extendSelectionsBy(function(range) { - if (cm.display.shift || cm.doc.extend || range.empty()) - return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually); - else - return dir < 0 ? range.from() : range.to(); - }, sel_move); - }), - - deleteH: methodOp(function(dir, unit) { - var sel = this.doc.sel, doc = this.doc; - if (sel.somethingSelected()) - doc.replaceSelection("", null, "+delete"); - else - deleteNearSelection(this, function(range) { - var other = findPosH(doc, range.head, dir, unit, false); - return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other}; - }); - }), - - findPosV: function(from, amount, unit, goalColumn) { - var dir = 1, x = goalColumn; - if (amount < 0) { dir = -1; amount = -amount; } - for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) { - var coords = cursorCoords(this, cur, "div"); - if (x == null) x = coords.left; - else coords.left = x; - cur = findPosV(this, coords, dir, unit); - if (cur.hitSide) break; - } - return cur; - }, - - moveV: methodOp(function(dir, unit) { - var cm = this, doc = this.doc, goals = []; - var collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected(); - doc.extendSelectionsBy(function(range) { - if (collapse) - return dir < 0 ? range.from() : range.to(); - var headPos = cursorCoords(cm, range.head, "div"); - if (range.goalColumn != null) headPos.left = range.goalColumn; - goals.push(headPos.left); - var pos = findPosV(cm, headPos, dir, unit); - if (unit == "page" && range == doc.sel.primary()) - addToScrollPos(cm, null, charCoords(cm, pos, "div").top - headPos.top); - return pos; - }, sel_move); - if (goals.length) for (var i = 0; i < doc.sel.ranges.length; i++) - doc.sel.ranges[i].goalColumn = goals[i]; - }), - - // Find the word at the given position (as returned by coordsChar). - findWordAt: function(pos) { - var doc = this.doc, line = getLine(doc, pos.line).text; - var start = pos.ch, end = pos.ch; - if (line) { - var helper = this.getHelper(pos, "wordChars"); - if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end; - var startChar = line.charAt(start); - var check = isWordChar(startChar, helper) - ? function(ch) { return isWordChar(ch, helper); } - : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);} - : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);}; - while (start > 0 && check(line.charAt(start - 1))) --start; - while (end < line.length && check(line.charAt(end))) ++end; - } - return new Range(Pos(pos.line, start), Pos(pos.line, end)); - }, - - toggleOverwrite: function(value) { - if (value != null && value == this.state.overwrite) return; - if (this.state.overwrite = !this.state.overwrite) - addClass(this.display.cursorDiv, "CodeMirror-overwrite"); - else - rmClass(this.display.cursorDiv, "CodeMirror-overwrite"); - - signal(this, "overwriteToggle", this, this.state.overwrite); - }, - hasFocus: function() { return this.display.input.getField() == activeElt(); }, - isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit); }, - - scrollTo: methodOp(function(x, y) { - if (x != null || y != null) resolveScrollToPos(this); - if (x != null) this.curOp.scrollLeft = x; - if (y != null) this.curOp.scrollTop = y; - }), - getScrollInfo: function() { - var scroller = this.display.scroller; - return {left: scroller.scrollLeft, top: scroller.scrollTop, - height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight, - width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth, - clientHeight: displayHeight(this), clientWidth: displayWidth(this)}; - }, - - scrollIntoView: methodOp(function(range, margin) { - if (range == null) { - range = {from: this.doc.sel.primary().head, to: null}; - if (margin == null) margin = this.options.cursorScrollMargin; - } else if (typeof range == "number") { - range = {from: Pos(range, 0), to: null}; - } else if (range.from == null) { - range = {from: range, to: null}; - } - if (!range.to) range.to = range.from; - range.margin = margin || 0; - - if (range.from.line != null) { - resolveScrollToPos(this); - this.curOp.scrollToPos = range; - } else { - var sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left), - Math.min(range.from.top, range.to.top) - range.margin, - Math.max(range.from.right, range.to.right), - Math.max(range.from.bottom, range.to.bottom) + range.margin); - this.scrollTo(sPos.scrollLeft, sPos.scrollTop); - } - }), - - setSize: methodOp(function(width, height) { - var cm = this; - function interpret(val) { - return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val; - } - if (width != null) cm.display.wrapper.style.width = interpret(width); - if (height != null) cm.display.wrapper.style.height = interpret(height); - if (cm.options.lineWrapping) clearLineMeasurementCache(this); - var lineNo = cm.display.viewFrom; - cm.doc.iter(lineNo, cm.display.viewTo, function(line) { - if (line.widgets) for (var i = 0; i < line.widgets.length; i++) - if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break; } - ++lineNo; - }); - cm.curOp.forceUpdate = true; - signal(cm, "refresh", this); - }), - - operation: function(f){return runInOp(this, f);}, - - refresh: methodOp(function() { - var oldHeight = this.display.cachedTextHeight; - regChange(this); - this.curOp.forceUpdate = true; - clearCaches(this); - this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop); - updateGutterSpace(this); - if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5) - estimateLineHeights(this); - signal(this, "refresh", this); - }), - - swapDoc: methodOp(function(doc) { - var old = this.doc; - old.cm = null; - attachDoc(this, doc); - clearCaches(this); - this.display.input.reset(); - this.scrollTo(doc.scrollLeft, doc.scrollTop); - this.curOp.forceScroll = true; - signalLater(this, "swapDoc", this, old); - return old; - }), - - getInputField: function(){return this.display.input.getField();}, - getWrapperElement: function(){return this.display.wrapper;}, - getScrollerElement: function(){return this.display.scroller;}, - getGutterElement: function(){return this.display.gutters;} - }; - eventMixin(CodeMirror); - - // OPTION DEFAULTS - - // The default configuration options. - var defaults = CodeMirror.defaults = {}; - // Functions to run when options are changed. - var optionHandlers = CodeMirror.optionHandlers = {}; - - function option(name, deflt, handle, notOnInit) { - CodeMirror.defaults[name] = deflt; - if (handle) optionHandlers[name] = - notOnInit ? function(cm, val, old) {if (old != Init) handle(cm, val, old);} : handle; - } - - // Passed to option handlers when there is no old value. - var Init = CodeMirror.Init = {toString: function(){return "CodeMirror.Init";}}; - - // These two are, on init, called from the constructor because they - // have to be initialized before the editor can start at all. - option("value", "", function(cm, val) { - cm.setValue(val); - }, true); - option("mode", null, function(cm, val) { - cm.doc.modeOption = val; - loadMode(cm); - }, true); - - option("indentUnit", 2, loadMode, true); - option("indentWithTabs", false); - option("smartIndent", true); - option("tabSize", 4, function(cm) { - resetModeState(cm); - clearCaches(cm); - regChange(cm); - }, true); - option("lineSeparator", null, function(cm, val) { - cm.doc.lineSep = val; - if (!val) return; - var newBreaks = [], lineNo = cm.doc.first; - cm.doc.iter(function(line) { - for (var pos = 0;;) { - var found = line.text.indexOf(val, pos); - if (found == -1) break; - pos = found + val.length; - newBreaks.push(Pos(lineNo, found)); - } - lineNo++; - }); - for (var i = newBreaks.length - 1; i >= 0; i--) - replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)) - }); - option("specialChars", /[\t\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) { - cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g"); - if (old != CodeMirror.Init) cm.refresh(); - }); - option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true); - option("electricChars", true); - option("inputStyle", mobile ? "contenteditable" : "textarea", function() { - throw new Error("inputStyle can not (yet) be changed in a running editor"); // FIXME - }, true); - option("rtlMoveVisually", !windows); - option("wholeLineUpdateBefore", true); - - option("theme", "default", function(cm) { - themeChanged(cm); - guttersChanged(cm); - }, true); - option("keyMap", "default", function(cm, val, old) { - var next = getKeyMap(val); - var prev = old != CodeMirror.Init && getKeyMap(old); - if (prev && prev.detach) prev.detach(cm, next); - if (next.attach) next.attach(cm, prev || null); - }); - option("extraKeys", null); - - option("lineWrapping", false, wrappingChanged, true); - option("gutters", [], function(cm) { - setGuttersForLineNumbers(cm.options); - guttersChanged(cm); - }, true); - option("fixedGutter", true, function(cm, val) { - cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0"; - cm.refresh(); - }, true); - option("coverGutterNextToScrollbar", false, function(cm) {updateScrollbars(cm);}, true); - option("scrollbarStyle", "native", function(cm) { - initScrollbars(cm); - updateScrollbars(cm); - cm.display.scrollbars.setScrollTop(cm.doc.scrollTop); - cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft); - }, true); - option("lineNumbers", false, function(cm) { - setGuttersForLineNumbers(cm.options); - guttersChanged(cm); - }, true); - option("firstLineNumber", 1, guttersChanged, true); - option("lineNumberFormatter", function(integer) {return integer;}, guttersChanged, true); - option("showCursorWhenSelecting", false, updateSelection, true); - - option("resetSelectionOnContextMenu", true); - option("lineWiseCopyCut", true); - - option("readOnly", false, function(cm, val) { - if (val == "nocursor") { - onBlur(cm); - cm.display.input.blur(); - cm.display.disabled = true; - } else { - cm.display.disabled = false; - } - cm.display.input.readOnlyChanged(val) - }); - option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset();}, true); - option("dragDrop", true, dragDropChanged); - option("allowDropFileTypes", null); - - option("cursorBlinkRate", 530); - option("cursorScrollMargin", 0); - option("cursorHeight", 1, updateSelection, true); - option("singleCursorHeightPerLine", true, updateSelection, true); - option("workTime", 100); - option("workDelay", 100); - option("flattenSpans", true, resetModeState, true); - option("addModeClass", false, resetModeState, true); - option("pollInterval", 100); - option("undoDepth", 200, function(cm, val){cm.doc.history.undoDepth = val;}); - option("historyEventDelay", 1250); - option("viewportMargin", 10, function(cm){cm.refresh();}, true); - option("maxHighlightLength", 10000, resetModeState, true); - option("moveInputWithCursor", true, function(cm, val) { - if (!val) cm.display.input.resetPosition(); - }); - - option("tabindex", null, function(cm, val) { - cm.display.input.getField().tabIndex = val || ""; - }); - option("autofocus", null); - - // MODE DEFINITION AND QUERYING - - // Known modes, by name and by MIME - var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {}; - - // Extra arguments are stored as the mode's dependencies, which is - // used by (legacy) mechanisms like loadmode.js to automatically - // load a mode. (Preferred mechanism is the require/define calls.) - CodeMirror.defineMode = function(name, mode) { - if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name; - if (arguments.length > 2) - mode.dependencies = Array.prototype.slice.call(arguments, 2); - modes[name] = mode; - }; - - CodeMirror.defineMIME = function(mime, spec) { - mimeModes[mime] = spec; - }; - - // Given a MIME type, a {name, ...options} config object, or a name - // string, return a mode config object. - CodeMirror.resolveMode = function(spec) { - if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) { - spec = mimeModes[spec]; - } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) { - var found = mimeModes[spec.name]; - if (typeof found == "string") found = {name: found}; - spec = createObj(found, spec); - spec.name = found.name; - } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) { - return CodeMirror.resolveMode("application/xml"); - } - if (typeof spec == "string") return {name: spec}; - else return spec || {name: "null"}; - }; - - // Given a mode spec (anything that resolveMode accepts), find and - // initialize an actual mode object. - CodeMirror.getMode = function(options, spec) { - var spec = CodeMirror.resolveMode(spec); - var mfactory = modes[spec.name]; - if (!mfactory) return CodeMirror.getMode(options, "text/plain"); - var modeObj = mfactory(options, spec); - if (modeExtensions.hasOwnProperty(spec.name)) { - var exts = modeExtensions[spec.name]; - for (var prop in exts) { - if (!exts.hasOwnProperty(prop)) continue; - if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop]; - modeObj[prop] = exts[prop]; - } - } - modeObj.name = spec.name; - if (spec.helperType) modeObj.helperType = spec.helperType; - if (spec.modeProps) for (var prop in spec.modeProps) - modeObj[prop] = spec.modeProps[prop]; - - return modeObj; - }; - - // Minimal default mode. - CodeMirror.defineMode("null", function() { - return {token: function(stream) {stream.skipToEnd();}}; - }); - CodeMirror.defineMIME("text/plain", "null"); - - // This can be used to attach properties to mode objects from - // outside the actual mode definition. - var modeExtensions = CodeMirror.modeExtensions = {}; - CodeMirror.extendMode = function(mode, properties) { - var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {}); - copyObj(properties, exts); - }; - - // EXTENSIONS - - CodeMirror.defineExtension = function(name, func) { - CodeMirror.prototype[name] = func; - }; - CodeMirror.defineDocExtension = function(name, func) { - Doc.prototype[name] = func; - }; - CodeMirror.defineOption = option; - - var initHooks = []; - CodeMirror.defineInitHook = function(f) {initHooks.push(f);}; - - var helpers = CodeMirror.helpers = {}; - CodeMirror.registerHelper = function(type, name, value) { - if (!helpers.hasOwnProperty(type)) helpers[type] = CodeMirror[type] = {_global: []}; - helpers[type][name] = value; - }; - CodeMirror.registerGlobalHelper = function(type, name, predicate, value) { - CodeMirror.registerHelper(type, name, value); - helpers[type]._global.push({pred: predicate, val: value}); - }; - - // MODE STATE HANDLING - - // Utility functions for working with state. Exported because nested - // modes need to do this for their inner modes. - - var copyState = CodeMirror.copyState = function(mode, state) { - if (state === true) return state; - if (mode.copyState) return mode.copyState(state); - var nstate = {}; - for (var n in state) { - var val = state[n]; - if (val instanceof Array) val = val.concat([]); - nstate[n] = val; - } - return nstate; - }; - - var startState = CodeMirror.startState = function(mode, a1, a2) { - return mode.startState ? mode.startState(a1, a2) : true; - }; - - // Given a mode and a state (for that mode), find the inner mode and - // state at the position that the state refers to. - CodeMirror.innerMode = function(mode, state) { - while (mode.innerMode) { - var info = mode.innerMode(state); - if (!info || info.mode == mode) break; - state = info.state; - mode = info.mode; - } - return info || {mode: mode, state: state}; - }; - - // STANDARD COMMANDS - - // Commands are parameter-less actions that can be performed on an - // editor, mostly used for keybindings. - var commands = CodeMirror.commands = { - selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll);}, - singleSelection: function(cm) { - cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll); - }, - killLine: function(cm) { - deleteNearSelection(cm, function(range) { - if (range.empty()) { - var len = getLine(cm.doc, range.head.line).text.length; - if (range.head.ch == len && range.head.line < cm.lastLine()) - return {from: range.head, to: Pos(range.head.line + 1, 0)}; - else - return {from: range.head, to: Pos(range.head.line, len)}; - } else { - return {from: range.from(), to: range.to()}; - } - }); - }, - deleteLine: function(cm) { - deleteNearSelection(cm, function(range) { - return {from: Pos(range.from().line, 0), - to: clipPos(cm.doc, Pos(range.to().line + 1, 0))}; - }); - }, - delLineLeft: function(cm) { - deleteNearSelection(cm, function(range) { - return {from: Pos(range.from().line, 0), to: range.from()}; - }); - }, - delWrappedLineLeft: function(cm) { - deleteNearSelection(cm, function(range) { - var top = cm.charCoords(range.head, "div").top + 5; - var leftPos = cm.coordsChar({left: 0, top: top}, "div"); - return {from: leftPos, to: range.from()}; - }); - }, - delWrappedLineRight: function(cm) { - deleteNearSelection(cm, function(range) { - var top = cm.charCoords(range.head, "div").top + 5; - var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div"); - return {from: range.from(), to: rightPos }; - }); - }, - undo: function(cm) {cm.undo();}, - redo: function(cm) {cm.redo();}, - undoSelection: function(cm) {cm.undoSelection();}, - redoSelection: function(cm) {cm.redoSelection();}, - goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));}, - goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));}, - goLineStart: function(cm) { - cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); }, - {origin: "+move", bias: 1}); - }, - goLineStartSmart: function(cm) { - cm.extendSelectionsBy(function(range) { - return lineStartSmart(cm, range.head); - }, {origin: "+move", bias: 1}); - }, - goLineEnd: function(cm) { - cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); }, - {origin: "+move", bias: -1}); - }, - goLineRight: function(cm) { - cm.extendSelectionsBy(function(range) { - var top = cm.charCoords(range.head, "div").top + 5; - return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div"); - }, sel_move); - }, - goLineLeft: function(cm) { - cm.extendSelectionsBy(function(range) { - var top = cm.charCoords(range.head, "div").top + 5; - return cm.coordsChar({left: 0, top: top}, "div"); - }, sel_move); - }, - goLineLeftSmart: function(cm) { - cm.extendSelectionsBy(function(range) { - var top = cm.charCoords(range.head, "div").top + 5; - var pos = cm.coordsChar({left: 0, top: top}, "div"); - if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head); - return pos; - }, sel_move); - }, - goLineUp: function(cm) {cm.moveV(-1, "line");}, - goLineDown: function(cm) {cm.moveV(1, "line");}, - goPageUp: function(cm) {cm.moveV(-1, "page");}, - goPageDown: function(cm) {cm.moveV(1, "page");}, - goCharLeft: function(cm) {cm.moveH(-1, "char");}, - goCharRight: function(cm) {cm.moveH(1, "char");}, - goColumnLeft: function(cm) {cm.moveH(-1, "column");}, - goColumnRight: function(cm) {cm.moveH(1, "column");}, - goWordLeft: function(cm) {cm.moveH(-1, "word");}, - goGroupRight: function(cm) {cm.moveH(1, "group");}, - goGroupLeft: function(cm) {cm.moveH(-1, "group");}, - goWordRight: function(cm) {cm.moveH(1, "word");}, - delCharBefore: function(cm) {cm.deleteH(-1, "char");}, - delCharAfter: function(cm) {cm.deleteH(1, "char");}, - delWordBefore: function(cm) {cm.deleteH(-1, "word");}, - delWordAfter: function(cm) {cm.deleteH(1, "word");}, - delGroupBefore: function(cm) {cm.deleteH(-1, "group");}, - delGroupAfter: function(cm) {cm.deleteH(1, "group");}, - indentAuto: function(cm) {cm.indentSelection("smart");}, - indentMore: function(cm) {cm.indentSelection("add");}, - indentLess: function(cm) {cm.indentSelection("subtract");}, - insertTab: function(cm) {cm.replaceSelection("\t");}, - insertSoftTab: function(cm) { - var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize; - for (var i = 0; i < ranges.length; i++) { - var pos = ranges[i].from(); - var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize); - spaces.push(new Array(tabSize - col % tabSize + 1).join(" ")); - } - cm.replaceSelections(spaces); - }, - defaultTab: function(cm) { - if (cm.somethingSelected()) cm.indentSelection("add"); - else cm.execCommand("insertTab"); - }, - transposeChars: function(cm) { - runInOp(cm, function() { - var ranges = cm.listSelections(), newSel = []; - for (var i = 0; i < ranges.length; i++) { - var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text; - if (line) { - if (cur.ch == line.length) cur = new Pos(cur.line, cur.ch - 1); - if (cur.ch > 0) { - cur = new Pos(cur.line, cur.ch + 1); - cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2), - Pos(cur.line, cur.ch - 2), cur, "+transpose"); - } else if (cur.line > cm.doc.first) { - var prev = getLine(cm.doc, cur.line - 1).text; - if (prev) - cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() + - prev.charAt(prev.length - 1), - Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose"); - } - } - newSel.push(new Range(cur, cur)); - } - cm.setSelections(newSel); - }); - }, - newlineAndIndent: function(cm) { - runInOp(cm, function() { - var len = cm.listSelections().length; - for (var i = 0; i < len; i++) { - var range = cm.listSelections()[i]; - cm.replaceRange(cm.doc.lineSeparator(), range.anchor, range.head, "+input"); - cm.indentLine(range.from().line + 1, null, true); - } - ensureCursorVisible(cm); - }); - }, - toggleOverwrite: function(cm) {cm.toggleOverwrite();} - }; - - - // STANDARD KEYMAPS - - var keyMap = CodeMirror.keyMap = {}; - - keyMap.basic = { - "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown", - "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown", - "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore", - "Tab": "defaultTab", "Shift-Tab": "indentAuto", - "Enter": "newlineAndIndent", "Insert": "toggleOverwrite", - "Esc": "singleSelection" - }; - // Note that the save and find-related commands aren't defined by - // default. User code or addons can define them. Unknown commands - // are simply ignored. - keyMap.pcDefault = { - "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo", - "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown", - "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd", - "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find", - "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll", - "Ctrl-[": "indentLess", "Ctrl-]": "indentMore", - "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection", - fallthrough: "basic" - }; - // Very basic readline/emacs-style bindings, which are standard on Mac. - keyMap.emacsy = { - "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown", - "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd", - "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore", - "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars" - }; - keyMap.macDefault = { - "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo", - "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft", - "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore", - "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find", - "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll", - "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight", - "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd", - fallthrough: ["basic", "emacsy"] - }; - keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault; - - // KEYMAP DISPATCH - - function normalizeKeyName(name) { - var parts = name.split(/-(?!$)/), name = parts[parts.length - 1]; - var alt, ctrl, shift, cmd; - for (var i = 0; i < parts.length - 1; i++) { - var mod = parts[i]; - if (/^(cmd|meta|m)$/i.test(mod)) cmd = true; - else if (/^a(lt)?$/i.test(mod)) alt = true; - else if (/^(c|ctrl|control)$/i.test(mod)) ctrl = true; - else if (/^s(hift)$/i.test(mod)) shift = true; - else throw new Error("Unrecognized modifier name: " + mod); - } - if (alt) name = "Alt-" + name; - if (ctrl) name = "Ctrl-" + name; - if (cmd) name = "Cmd-" + name; - if (shift) name = "Shift-" + name; - return name; - } - - // This is a kludge to keep keymaps mostly working as raw objects - // (backwards compatibility) while at the same time support features - // like normalization and multi-stroke key bindings. It compiles a - // new normalized keymap, and then updates the old object to reflect - // this. - CodeMirror.normalizeKeyMap = function(keymap) { - var copy = {}; - for (var keyname in keymap) if (keymap.hasOwnProperty(keyname)) { - var value = keymap[keyname]; - if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) continue; - if (value == "...") { delete keymap[keyname]; continue; } - - var keys = map(keyname.split(" "), normalizeKeyName); - for (var i = 0; i < keys.length; i++) { - var val, name; - if (i == keys.length - 1) { - name = keys.join(" "); - val = value; - } else { - name = keys.slice(0, i + 1).join(" "); - val = "..."; - } - var prev = copy[name]; - if (!prev) copy[name] = val; - else if (prev != val) throw new Error("Inconsistent bindings for " + name); - } - delete keymap[keyname]; - } - for (var prop in copy) keymap[prop] = copy[prop]; - return keymap; - }; - - var lookupKey = CodeMirror.lookupKey = function(key, map, handle, context) { - map = getKeyMap(map); - var found = map.call ? map.call(key, context) : map[key]; - if (found === false) return "nothing"; - if (found === "...") return "multi"; - if (found != null && handle(found)) return "handled"; - - if (map.fallthrough) { - if (Object.prototype.toString.call(map.fallthrough) != "[object Array]") - return lookupKey(key, map.fallthrough, handle, context); - for (var i = 0; i < map.fallthrough.length; i++) { - var result = lookupKey(key, map.fallthrough[i], handle, context); - if (result) return result; - } - } - }; - - // Modifier key presses don't count as 'real' key presses for the - // purpose of keymap fallthrough. - var isModifierKey = CodeMirror.isModifierKey = function(value) { - var name = typeof value == "string" ? value : keyNames[value.keyCode]; - return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod"; - }; - - // Look up the name of a key as indicated by an event object. - var keyName = CodeMirror.keyName = function(event, noShift) { - if (presto && event.keyCode == 34 && event["char"]) return false; - var base = keyNames[event.keyCode], name = base; - if (name == null || event.altGraphKey) return false; - if (event.altKey && base != "Alt") name = "Alt-" + name; - if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name; - if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") name = "Cmd-" + name; - if (!noShift && event.shiftKey && base != "Shift") name = "Shift-" + name; - return name; - }; - - function getKeyMap(val) { - return typeof val == "string" ? keyMap[val] : val; - } - - // FROMTEXTAREA - - CodeMirror.fromTextArea = function(textarea, options) { - options = options ? copyObj(options) : {}; - options.value = textarea.value; - if (!options.tabindex && textarea.tabIndex) - options.tabindex = textarea.tabIndex; - if (!options.placeholder && textarea.placeholder) - options.placeholder = textarea.placeholder; - // Set autofocus to true if this textarea is focused, or if it has - // autofocus and no other element is focused. - if (options.autofocus == null) { - var hasFocus = activeElt(); - options.autofocus = hasFocus == textarea || - textarea.getAttribute("autofocus") != null && hasFocus == document.body; - } - - function save() {textarea.value = cm.getValue();} - if (textarea.form) { - on(textarea.form, "submit", save); - // Deplorable hack to make the submit method do the right thing. - if (!options.leaveSubmitMethodAlone) { - var form = textarea.form, realSubmit = form.submit; - try { - var wrappedSubmit = form.submit = function() { - save(); - form.submit = realSubmit; - form.submit(); - form.submit = wrappedSubmit; - }; - } catch(e) {} - } - } - - options.finishInit = function(cm) { - cm.save = save; - cm.getTextArea = function() { return textarea; }; - cm.toTextArea = function() { - cm.toTextArea = isNaN; // Prevent this from being ran twice - save(); - textarea.parentNode.removeChild(cm.getWrapperElement()); - textarea.style.display = ""; - if (textarea.form) { - off(textarea.form, "submit", save); - if (typeof textarea.form.submit == "function") - textarea.form.submit = realSubmit; - } - }; - }; - - textarea.style.display = "none"; - var cm = CodeMirror(function(node) { - textarea.parentNode.insertBefore(node, textarea.nextSibling); - }, options); - return cm; - }; - - // STRING STREAM - - // Fed to the mode parsers, provides helper functions to make - // parsers more succinct. - - var StringStream = CodeMirror.StringStream = function(string, tabSize) { - this.pos = this.start = 0; - this.string = string; - this.tabSize = tabSize || 8; - this.lastColumnPos = this.lastColumnValue = 0; - this.lineStart = 0; - }; - - StringStream.prototype = { - eol: function() {return this.pos >= this.string.length;}, - sol: function() {return this.pos == this.lineStart;}, - peek: function() {return this.string.charAt(this.pos) || undefined;}, - next: function() { - if (this.pos < this.string.length) - return this.string.charAt(this.pos++); - }, - eat: function(match) { - var ch = this.string.charAt(this.pos); - if (typeof match == "string") var ok = ch == match; - else var ok = ch && (match.test ? match.test(ch) : match(ch)); - if (ok) {++this.pos; return ch;} - }, - eatWhile: function(match) { - var start = this.pos; - while (this.eat(match)){} - return this.pos > start; - }, - eatSpace: function() { - var start = this.pos; - while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos; - return this.pos > start; - }, - skipToEnd: function() {this.pos = this.string.length;}, - skipTo: function(ch) { - var found = this.string.indexOf(ch, this.pos); - if (found > -1) {this.pos = found; return true;} - }, - backUp: function(n) {this.pos -= n;}, - column: function() { - if (this.lastColumnPos < this.start) { - this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue); - this.lastColumnPos = this.start; - } - return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0); - }, - indentation: function() { - return countColumn(this.string, null, this.tabSize) - - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0); - }, - match: function(pattern, consume, caseInsensitive) { - if (typeof pattern == "string") { - var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;}; - var substr = this.string.substr(this.pos, pattern.length); - if (cased(substr) == cased(pattern)) { - if (consume !== false) this.pos += pattern.length; - return true; - } - } else { - var match = this.string.slice(this.pos).match(pattern); - if (match && match.index > 0) return null; - if (match && consume !== false) this.pos += match[0].length; - return match; - } - }, - current: function(){return this.string.slice(this.start, this.pos);}, - hideFirstChars: function(n, inner) { - this.lineStart += n; - try { return inner(); } - finally { this.lineStart -= n; } - } - }; - - // TEXTMARKERS - - // Created with markText and setBookmark methods. A TextMarker is a - // handle that can be used to clear or find a marked position in the - // document. Line objects hold arrays (markedSpans) containing - // {from, to, marker} object pointing to such marker objects, and - // indicating that such a marker is present on that line. Multiple - // lines may point to the same marker when it spans across lines. - // The spans will have null for their from/to properties when the - // marker continues beyond the start/end of the line. Markers have - // links back to the lines they currently touch. - - var nextMarkerId = 0; - - var TextMarker = CodeMirror.TextMarker = function(doc, type) { - this.lines = []; - this.type = type; - this.doc = doc; - this.id = ++nextMarkerId; - }; - eventMixin(TextMarker); - - // Clear the marker. - TextMarker.prototype.clear = function() { - if (this.explicitlyCleared) return; - var cm = this.doc.cm, withOp = cm && !cm.curOp; - if (withOp) startOperation(cm); - if (hasHandler(this, "clear")) { - var found = this.find(); - if (found) signalLater(this, "clear", found.from, found.to); - } - var min = null, max = null; - for (var i = 0; i < this.lines.length; ++i) { - var line = this.lines[i]; - var span = getMarkedSpanFor(line.markedSpans, this); - if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text"); - else if (cm) { - if (span.to != null) max = lineNo(line); - if (span.from != null) min = lineNo(line); - } - line.markedSpans = removeMarkedSpan(line.markedSpans, span); - if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm) - updateLineHeight(line, textHeight(cm.display)); - } - if (cm && this.collapsed && !cm.options.lineWrapping) for (var i = 0; i < this.lines.length; ++i) { - var visual = visualLine(this.lines[i]), len = lineLength(visual); - if (len > cm.display.maxLineLength) { - cm.display.maxLine = visual; - cm.display.maxLineLength = len; - cm.display.maxLineChanged = true; - } - } - - if (min != null && cm && this.collapsed) regChange(cm, min, max + 1); - this.lines.length = 0; - this.explicitlyCleared = true; - if (this.atomic && this.doc.cantEdit) { - this.doc.cantEdit = false; - if (cm) reCheckSelection(cm.doc); - } - if (cm) signalLater(cm, "markerCleared", cm, this); - if (withOp) endOperation(cm); - if (this.parent) this.parent.clear(); - }; - - // Find the position of the marker in the document. Returns a {from, - // to} object by default. Side can be passed to get a specific side - // -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the - // Pos objects returned contain a line object, rather than a line - // number (used to prevent looking up the same line twice). - TextMarker.prototype.find = function(side, lineObj) { - if (side == null && this.type == "bookmark") side = 1; - var from, to; - for (var i = 0; i < this.lines.length; ++i) { - var line = this.lines[i]; - var span = getMarkedSpanFor(line.markedSpans, this); - if (span.from != null) { - from = Pos(lineObj ? line : lineNo(line), span.from); - if (side == -1) return from; - } - if (span.to != null) { - to = Pos(lineObj ? line : lineNo(line), span.to); - if (side == 1) return to; - } - } - return from && {from: from, to: to}; - }; - - // Signals that the marker's widget changed, and surrounding layout - // should be recomputed. - TextMarker.prototype.changed = function() { - var pos = this.find(-1, true), widget = this, cm = this.doc.cm; - if (!pos || !cm) return; - runInOp(cm, function() { - var line = pos.line, lineN = lineNo(pos.line); - var view = findViewForLine(cm, lineN); - if (view) { - clearLineMeasurementCacheFor(view); - cm.curOp.selectionChanged = cm.curOp.forceUpdate = true; - } - cm.curOp.updateMaxLine = true; - if (!lineIsHidden(widget.doc, line) && widget.height != null) { - var oldHeight = widget.height; - widget.height = null; - var dHeight = widgetHeight(widget) - oldHeight; - if (dHeight) - updateLineHeight(line, line.height + dHeight); - } - }); - }; - - TextMarker.prototype.attachLine = function(line) { - if (!this.lines.length && this.doc.cm) { - var op = this.doc.cm.curOp; - if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1) - (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this); - } - this.lines.push(line); - }; - TextMarker.prototype.detachLine = function(line) { - this.lines.splice(indexOf(this.lines, line), 1); - if (!this.lines.length && this.doc.cm) { - var op = this.doc.cm.curOp; - (op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this); - } - }; - - // Collapsed markers have unique ids, in order to be able to order - // them, which is needed for uniquely determining an outer marker - // when they overlap (they may nest, but not partially overlap). - var nextMarkerId = 0; - - // Create a marker, wire it up to the right lines, and - function markText(doc, from, to, options, type) { - // Shared markers (across linked documents) are handled separately - // (markTextShared will call out to this again, once per - // document). - if (options && options.shared) return markTextShared(doc, from, to, options, type); - // Ensure we are in an operation. - if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type); - - var marker = new TextMarker(doc, type), diff = cmp(from, to); - if (options) copyObj(options, marker, false); - // Don't connect empty markers unless clearWhenEmpty is false - if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false) - return marker; - if (marker.replacedWith) { - // Showing up as a widget implies collapsed (widget replaces text) - marker.collapsed = true; - marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget"); - if (!options.handleMouseEvents) marker.widgetNode.setAttribute("cm-ignore-events", "true"); - if (options.insertLeft) marker.widgetNode.insertLeft = true; - } - if (marker.collapsed) { - if (conflictingCollapsedRange(doc, from.line, from, to, marker) || - from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker)) - throw new Error("Inserting collapsed marker partially overlapping an existing one"); - sawCollapsedSpans = true; - } - - if (marker.addToHistory) - addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN); - - var curLine = from.line, cm = doc.cm, updateMaxLine; - doc.iter(curLine, to.line + 1, function(line) { - if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine) - updateMaxLine = true; - if (marker.collapsed && curLine != from.line) updateLineHeight(line, 0); - addMarkedSpan(line, new MarkedSpan(marker, - curLine == from.line ? from.ch : null, - curLine == to.line ? to.ch : null)); - ++curLine; - }); - // lineIsHidden depends on the presence of the spans, so needs a second pass - if (marker.collapsed) doc.iter(from.line, to.line + 1, function(line) { - if (lineIsHidden(doc, line)) updateLineHeight(line, 0); - }); - - if (marker.clearOnEnter) on(marker, "beforeCursorEnter", function() { marker.clear(); }); - - if (marker.readOnly) { - sawReadOnlySpans = true; - if (doc.history.done.length || doc.history.undone.length) - doc.clearHistory(); - } - if (marker.collapsed) { - marker.id = ++nextMarkerId; - marker.atomic = true; - } - if (cm) { - // Sync editor state - if (updateMaxLine) cm.curOp.updateMaxLine = true; - if (marker.collapsed) - regChange(cm, from.line, to.line + 1); - else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css) - for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text"); - if (marker.atomic) reCheckSelection(cm.doc); - signalLater(cm, "markerAdded", cm, marker); - } - return marker; - } - - // SHARED TEXTMARKERS - - // A shared marker spans multiple linked documents. It is - // implemented as a meta-marker-object controlling multiple normal - // markers. - var SharedTextMarker = CodeMirror.SharedTextMarker = function(markers, primary) { - this.markers = markers; - this.primary = primary; - for (var i = 0; i < markers.length; ++i) - markers[i].parent = this; - }; - eventMixin(SharedTextMarker); - - SharedTextMarker.prototype.clear = function() { - if (this.explicitlyCleared) return; - this.explicitlyCleared = true; - for (var i = 0; i < this.markers.length; ++i) - this.markers[i].clear(); - signalLater(this, "clear"); - }; - SharedTextMarker.prototype.find = function(side, lineObj) { - return this.primary.find(side, lineObj); - }; - - function markTextShared(doc, from, to, options, type) { - options = copyObj(options); - options.shared = false; - var markers = [markText(doc, from, to, options, type)], primary = markers[0]; - var widget = options.widgetNode; - linkedDocs(doc, function(doc) { - if (widget) options.widgetNode = widget.cloneNode(true); - markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type)); - for (var i = 0; i < doc.linked.length; ++i) - if (doc.linked[i].isParent) return; - primary = lst(markers); - }); - return new SharedTextMarker(markers, primary); - } - - function findSharedMarkers(doc) { - return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())), - function(m) { return m.parent; }); - } - - function copySharedMarkers(doc, markers) { - for (var i = 0; i < markers.length; i++) { - var marker = markers[i], pos = marker.find(); - var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to); - if (cmp(mFrom, mTo)) { - var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type); - marker.markers.push(subMark); - subMark.parent = marker; - } - } - } - - function detachSharedMarkers(markers) { - for (var i = 0; i < markers.length; i++) { - var marker = markers[i], linked = [marker.primary.doc];; - linkedDocs(marker.primary.doc, function(d) { linked.push(d); }); - for (var j = 0; j < marker.markers.length; j++) { - var subMarker = marker.markers[j]; - if (indexOf(linked, subMarker.doc) == -1) { - subMarker.parent = null; - marker.markers.splice(j--, 1); - } - } - } - } - - // TEXTMARKER SPANS - - function MarkedSpan(marker, from, to) { - this.marker = marker; - this.from = from; this.to = to; - } - - // Search an array of spans for a span matching the given marker. - function getMarkedSpanFor(spans, marker) { - if (spans) for (var i = 0; i < spans.length; ++i) { - var span = spans[i]; - if (span.marker == marker) return span; - } - } - // Remove a span from an array, returning undefined if no spans are - // left (we don't store arrays for lines without spans). - function removeMarkedSpan(spans, span) { - for (var r, i = 0; i < spans.length; ++i) - if (spans[i] != span) (r || (r = [])).push(spans[i]); - return r; - } - // Add a span to a line. - function addMarkedSpan(line, span) { - line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span]; - span.marker.attachLine(line); - } - - // Used for the algorithm that adjusts markers for a change in the - // document. These functions cut an array of spans at a given - // character position, returning an array of remaining chunks (or - // undefined if nothing remains). - function markedSpansBefore(old, startCh, isInsert) { - if (old) for (var i = 0, nw; i < old.length; ++i) { - var span = old[i], marker = span.marker; - var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh); - if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) { - var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh); - (nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to)); - } - } - return nw; - } - function markedSpansAfter(old, endCh, isInsert) { - if (old) for (var i = 0, nw; i < old.length; ++i) { - var span = old[i], marker = span.marker; - var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh); - if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) { - var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh); - (nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh, - span.to == null ? null : span.to - endCh)); - } - } - return nw; - } - - // Given a change object, compute the new set of marker spans that - // cover the line in which the change took place. Removes spans - // entirely within the change, reconnects spans belonging to the - // same marker that appear on both sides of the change, and cuts off - // spans partially within the change. Returns an array of span - // arrays with one element for each line in (after) the change. - function stretchSpansOverChange(doc, change) { - if (change.full) return null; - var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans; - var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans; - if (!oldFirst && !oldLast) return null; - - var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0; - // Get the spans that 'stick out' on both sides - var first = markedSpansBefore(oldFirst, startCh, isInsert); - var last = markedSpansAfter(oldLast, endCh, isInsert); - - // Next, merge those two ends - var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0); - if (first) { - // Fix up .to properties of first - for (var i = 0; i < first.length; ++i) { - var span = first[i]; - if (span.to == null) { - var found = getMarkedSpanFor(last, span.marker); - if (!found) span.to = startCh; - else if (sameLine) span.to = found.to == null ? null : found.to + offset; - } - } - } - if (last) { - // Fix up .from in last (or move them into first in case of sameLine) - for (var i = 0; i < last.length; ++i) { - var span = last[i]; - if (span.to != null) span.to += offset; - if (span.from == null) { - var found = getMarkedSpanFor(first, span.marker); - if (!found) { - span.from = offset; - if (sameLine) (first || (first = [])).push(span); - } - } else { - span.from += offset; - if (sameLine) (first || (first = [])).push(span); - } - } - } - // Make sure we didn't create any zero-length spans - if (first) first = clearEmptySpans(first); - if (last && last != first) last = clearEmptySpans(last); - - var newMarkers = [first]; - if (!sameLine) { - // Fill gap with whole-line-spans - var gap = change.text.length - 2, gapMarkers; - if (gap > 0 && first) - for (var i = 0; i < first.length; ++i) - if (first[i].to == null) - (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i].marker, null, null)); - for (var i = 0; i < gap; ++i) - newMarkers.push(gapMarkers); - newMarkers.push(last); - } - return newMarkers; - } - - // Remove spans that are empty and don't have a clearWhenEmpty - // option of false. - function clearEmptySpans(spans) { - for (var i = 0; i < spans.length; ++i) { - var span = spans[i]; - if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false) - spans.splice(i--, 1); - } - if (!spans.length) return null; - return spans; - } - - // Used for un/re-doing changes from the history. Combines the - // result of computing the existing spans with the set of spans that - // existed in the history (so that deleting around a span and then - // undoing brings back the span). - function mergeOldSpans(doc, change) { - var old = getOldSpans(doc, change); - var stretched = stretchSpansOverChange(doc, change); - if (!old) return stretched; - if (!stretched) return old; - - for (var i = 0; i < old.length; ++i) { - var oldCur = old[i], stretchCur = stretched[i]; - if (oldCur && stretchCur) { - spans: for (var j = 0; j < stretchCur.length; ++j) { - var span = stretchCur[j]; - for (var k = 0; k < oldCur.length; ++k) - if (oldCur[k].marker == span.marker) continue spans; - oldCur.push(span); - } - } else if (stretchCur) { - old[i] = stretchCur; - } - } - return old; - } - - // Used to 'clip' out readOnly ranges when making a change. - function removeReadOnlyRanges(doc, from, to) { - var markers = null; - doc.iter(from.line, to.line + 1, function(line) { - if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) { - var mark = line.markedSpans[i].marker; - if (mark.readOnly && (!markers || indexOf(markers, mark) == -1)) - (markers || (markers = [])).push(mark); - } - }); - if (!markers) return null; - var parts = [{from: from, to: to}]; - for (var i = 0; i < markers.length; ++i) { - var mk = markers[i], m = mk.find(0); - for (var j = 0; j < parts.length; ++j) { - var p = parts[j]; - if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) continue; - var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to); - if (dfrom < 0 || !mk.inclusiveLeft && !dfrom) - newParts.push({from: p.from, to: m.from}); - if (dto > 0 || !mk.inclusiveRight && !dto) - newParts.push({from: m.to, to: p.to}); - parts.splice.apply(parts, newParts); - j += newParts.length - 1; - } - } - return parts; - } - - // Connect or disconnect spans from a line. - function detachMarkedSpans(line) { - var spans = line.markedSpans; - if (!spans) return; - for (var i = 0; i < spans.length; ++i) - spans[i].marker.detachLine(line); - line.markedSpans = null; - } - function attachMarkedSpans(line, spans) { - if (!spans) return; - for (var i = 0; i < spans.length; ++i) - spans[i].marker.attachLine(line); - line.markedSpans = spans; - } - - // Helpers used when computing which overlapping collapsed span - // counts as the larger one. - function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0; } - function extraRight(marker) { return marker.inclusiveRight ? 1 : 0; } - - // Returns a number indicating which of two overlapping collapsed - // spans is larger (and thus includes the other). Falls back to - // comparing ids when the spans cover exactly the same range. - function compareCollapsedMarkers(a, b) { - var lenDiff = a.lines.length - b.lines.length; - if (lenDiff != 0) return lenDiff; - var aPos = a.find(), bPos = b.find(); - var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b); - if (fromCmp) return -fromCmp; - var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b); - if (toCmp) return toCmp; - return b.id - a.id; - } - - // Find out whether a line ends or starts in a collapsed span. If - // so, return the marker for that span. - function collapsedSpanAtSide(line, start) { - var sps = sawCollapsedSpans && line.markedSpans, found; - if (sps) for (var sp, i = 0; i < sps.length; ++i) { - sp = sps[i]; - if (sp.marker.collapsed && (start ? sp.from : sp.to) == null && - (!found || compareCollapsedMarkers(found, sp.marker) < 0)) - found = sp.marker; - } - return found; - } - function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true); } - function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false); } - - // Test whether there exists a collapsed span that partially - // overlaps (covers the start or end, but not both) of a new span. - // Such overlap is not allowed. - function conflictingCollapsedRange(doc, lineNo, from, to, marker) { - var line = getLine(doc, lineNo); - var sps = sawCollapsedSpans && line.markedSpans; - if (sps) for (var i = 0; i < sps.length; ++i) { - var sp = sps[i]; - if (!sp.marker.collapsed) continue; - var found = sp.marker.find(0); - var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker); - var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker); - if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue; - if (fromCmp <= 0 && (cmp(found.to, from) > 0 || (sp.marker.inclusiveRight && marker.inclusiveLeft)) || - fromCmp >= 0 && (cmp(found.from, to) < 0 || (sp.marker.inclusiveLeft && marker.inclusiveRight))) - return true; - } - } - - // A visual line is a line as drawn on the screen. Folding, for - // example, can cause multiple logical lines to appear on the same - // visual line. This finds the start of the visual line that the - // given line is part of (usually that is the line itself). - function visualLine(line) { - var merged; - while (merged = collapsedSpanAtStart(line)) - line = merged.find(-1, true).line; - return line; - } - - // Returns an array of logical lines that continue the visual line - // started by the argument, or undefined if there are no such lines. - function visualLineContinued(line) { - var merged, lines; - while (merged = collapsedSpanAtEnd(line)) { - line = merged.find(1, true).line; - (lines || (lines = [])).push(line); - } - return lines; - } - - // Get the line number of the start of the visual line that the - // given line number is part of. - function visualLineNo(doc, lineN) { - var line = getLine(doc, lineN), vis = visualLine(line); - if (line == vis) return lineN; - return lineNo(vis); - } - // Get the line number of the start of the next visual line after - // the given line. - function visualLineEndNo(doc, lineN) { - if (lineN > doc.lastLine()) return lineN; - var line = getLine(doc, lineN), merged; - if (!lineIsHidden(doc, line)) return lineN; - while (merged = collapsedSpanAtEnd(line)) - line = merged.find(1, true).line; - return lineNo(line) + 1; - } - - // Compute whether a line is hidden. Lines count as hidden when they - // are part of a visual line that starts with another line, or when - // they are entirely covered by collapsed, non-widget span. - function lineIsHidden(doc, line) { - var sps = sawCollapsedSpans && line.markedSpans; - if (sps) for (var sp, i = 0; i < sps.length; ++i) { - sp = sps[i]; - if (!sp.marker.collapsed) continue; - if (sp.from == null) return true; - if (sp.marker.widgetNode) continue; - if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp)) - return true; - } - } - function lineIsHiddenInner(doc, line, span) { - if (span.to == null) { - var end = span.marker.find(1, true); - return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker)); - } - if (span.marker.inclusiveRight && span.to == line.text.length) - return true; - for (var sp, i = 0; i < line.markedSpans.length; ++i) { - sp = line.markedSpans[i]; - if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to && - (sp.to == null || sp.to != span.from) && - (sp.marker.inclusiveLeft || span.marker.inclusiveRight) && - lineIsHiddenInner(doc, line, sp)) return true; - } - } - - // LINE WIDGETS - - // Line widgets are block elements displayed above or below a line. - - var LineWidget = CodeMirror.LineWidget = function(doc, node, options) { - if (options) for (var opt in options) if (options.hasOwnProperty(opt)) - this[opt] = options[opt]; - this.doc = doc; - this.node = node; - }; - eventMixin(LineWidget); - - function adjustScrollWhenAboveVisible(cm, line, diff) { - if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop)) - addToScrollPos(cm, null, diff); - } - - LineWidget.prototype.clear = function() { - var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line); - if (no == null || !ws) return; - for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1); - if (!ws.length) line.widgets = null; - var height = widgetHeight(this); - updateLineHeight(line, Math.max(0, line.height - height)); - if (cm) runInOp(cm, function() { - adjustScrollWhenAboveVisible(cm, line, -height); - regLineChange(cm, no, "widget"); - }); - }; - LineWidget.prototype.changed = function() { - var oldH = this.height, cm = this.doc.cm, line = this.line; - this.height = null; - var diff = widgetHeight(this) - oldH; - if (!diff) return; - updateLineHeight(line, line.height + diff); - if (cm) runInOp(cm, function() { - cm.curOp.forceUpdate = true; - adjustScrollWhenAboveVisible(cm, line, diff); - }); - }; - - function widgetHeight(widget) { - if (widget.height != null) return widget.height; - var cm = widget.doc.cm; - if (!cm) return 0; - if (!contains(document.body, widget.node)) { - var parentStyle = "position: relative;"; - if (widget.coverGutter) - parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;"; - if (widget.noHScroll) - parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;"; - removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle)); - } - return widget.height = widget.node.parentNode.offsetHeight; - } - - function addLineWidget(doc, handle, node, options) { - var widget = new LineWidget(doc, node, options); - var cm = doc.cm; - if (cm && widget.noHScroll) cm.display.alignWidgets = true; - changeLine(doc, handle, "widget", function(line) { - var widgets = line.widgets || (line.widgets = []); - if (widget.insertAt == null) widgets.push(widget); - else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget); - widget.line = line; - if (cm && !lineIsHidden(doc, line)) { - var aboveVisible = heightAtLine(line) < doc.scrollTop; - updateLineHeight(line, line.height + widgetHeight(widget)); - if (aboveVisible) addToScrollPos(cm, null, widget.height); - cm.curOp.forceUpdate = true; - } - return true; - }); - return widget; - } - - // LINE DATA STRUCTURE - - // Line objects. These hold state related to a line, including - // highlighting info (the styles array). - var Line = CodeMirror.Line = function(text, markedSpans, estimateHeight) { - this.text = text; - attachMarkedSpans(this, markedSpans); - this.height = estimateHeight ? estimateHeight(this) : 1; - }; - eventMixin(Line); - Line.prototype.lineNo = function() { return lineNo(this); }; - - // Change the content (text, markers) of a line. Automatically - // invalidates cached information and tries to re-estimate the - // line's height. - function updateLine(line, text, markedSpans, estimateHeight) { - line.text = text; - if (line.stateAfter) line.stateAfter = null; - if (line.styles) line.styles = null; - if (line.order != null) line.order = null; - detachMarkedSpans(line); - attachMarkedSpans(line, markedSpans); - var estHeight = estimateHeight ? estimateHeight(line) : 1; - if (estHeight != line.height) updateLineHeight(line, estHeight); - } - - // Detach a line from the document tree and its markers. - function cleanUpLine(line) { - line.parent = null; - detachMarkedSpans(line); - } - - function extractLineClasses(type, output) { - if (type) for (;;) { - var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/); - if (!lineClass) break; - type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length); - var prop = lineClass[1] ? "bgClass" : "textClass"; - if (output[prop] == null) - output[prop] = lineClass[2]; - else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop])) - output[prop] += " " + lineClass[2]; - } - return type; - } - - function callBlankLine(mode, state) { - if (mode.blankLine) return mode.blankLine(state); - if (!mode.innerMode) return; - var inner = CodeMirror.innerMode(mode, state); - if (inner.mode.blankLine) return inner.mode.blankLine(inner.state); - } - - function readToken(mode, stream, state, inner) { - for (var i = 0; i < 10; i++) { - if (inner) inner[0] = CodeMirror.innerMode(mode, state).mode; - var style = mode.token(stream, state); - if (stream.pos > stream.start) return style; - } - throw new Error("Mode " + mode.name + " failed to advance stream."); - } - - // Utility for getTokenAt and getLineTokens - function takeToken(cm, pos, precise, asArray) { - function getObj(copy) { - return {start: stream.start, end: stream.pos, - string: stream.current(), - type: style || null, - state: copy ? copyState(doc.mode, state) : state}; - } - - var doc = cm.doc, mode = doc.mode, style; - pos = clipPos(doc, pos); - var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise); - var stream = new StringStream(line.text, cm.options.tabSize), tokens; - if (asArray) tokens = []; - while ((asArray || stream.pos < pos.ch) && !stream.eol()) { - stream.start = stream.pos; - style = readToken(mode, stream, state); - if (asArray) tokens.push(getObj(true)); - } - return asArray ? tokens : getObj(); - } - - // Run the given mode's parser over a line, calling f for each token. - function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) { - var flattenSpans = mode.flattenSpans; - if (flattenSpans == null) flattenSpans = cm.options.flattenSpans; - var curStart = 0, curStyle = null; - var stream = new StringStream(text, cm.options.tabSize), style; - var inner = cm.options.addModeClass && [null]; - if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses); - while (!stream.eol()) { - if (stream.pos > cm.options.maxHighlightLength) { - flattenSpans = false; - if (forceToEnd) processLine(cm, text, state, stream.pos); - stream.pos = text.length; - style = null; - } else { - style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses); - } - if (inner) { - var mName = inner[0].name; - if (mName) style = "m-" + (style ? mName + " " + style : mName); - } - if (!flattenSpans || curStyle != style) { - while (curStart < stream.start) { - curStart = Math.min(stream.start, curStart + 50000); - f(curStart, curStyle); - } - curStyle = style; - } - stream.start = stream.pos; - } - while (curStart < stream.pos) { - // Webkit seems to refuse to render text nodes longer than 57444 characters - var pos = Math.min(stream.pos, curStart + 50000); - f(pos, curStyle); - curStart = pos; - } - } - - // Compute a style array (an array starting with a mode generation - // -- for invalidation -- followed by pairs of end positions and - // style strings), which is used to highlight the tokens on the - // line. - function highlightLine(cm, line, state, forceToEnd) { - // A styles array always starts with a number identifying the - // mode/overlays that it is based on (for easy invalidation). - var st = [cm.state.modeGen], lineClasses = {}; - // Compute the base array of styles - runMode(cm, line.text, cm.doc.mode, state, function(end, style) { - st.push(end, style); - }, lineClasses, forceToEnd); - - // Run overlays, adjust style array. - for (var o = 0; o < cm.state.overlays.length; ++o) { - var overlay = cm.state.overlays[o], i = 1, at = 0; - runMode(cm, line.text, overlay.mode, true, function(end, style) { - var start = i; - // Ensure there's a token end at the current position, and that i points at it - while (at < end) { - var i_end = st[i]; - if (i_end > end) - st.splice(i, 1, end, st[i+1], i_end); - i += 2; - at = Math.min(end, i_end); - } - if (!style) return; - if (overlay.opaque) { - st.splice(start, i - start, end, "cm-overlay " + style); - i = start + 2; - } else { - for (; start < i; start += 2) { - var cur = st[start+1]; - st[start+1] = (cur ? cur + " " : "") + "cm-overlay " + style; - } - } - }, lineClasses); - } - - return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null}; - } - - function getLineStyles(cm, line, updateFrontier) { - if (!line.styles || line.styles[0] != cm.state.modeGen) { - var state = getStateBefore(cm, lineNo(line)); - var result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state); - line.stateAfter = state; - line.styles = result.styles; - if (result.classes) line.styleClasses = result.classes; - else if (line.styleClasses) line.styleClasses = null; - if (updateFrontier === cm.doc.frontier) cm.doc.frontier++; - } - return line.styles; - } - - // Lightweight form of highlight -- proceed over this line and - // update state, but don't save a style array. Used for lines that - // aren't currently visible. - function processLine(cm, text, state, startAt) { - var mode = cm.doc.mode; - var stream = new StringStream(text, cm.options.tabSize); - stream.start = stream.pos = startAt || 0; - if (text == "") callBlankLine(mode, state); - while (!stream.eol()) { - readToken(mode, stream, state); - stream.start = stream.pos; - } - } - - // Convert a style as returned by a mode (either null, or a string - // containing one or more styles) to a CSS style. This is cached, - // and also looks for line-wide styles. - var styleToClassCache = {}, styleToClassCacheWithMode = {}; - function interpretTokenStyle(style, options) { - if (!style || /^\s*$/.test(style)) return null; - var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache; - return cache[style] || - (cache[style] = style.replace(/\S+/g, "cm-$&")); - } - - // Render the DOM representation of the text of a line. Also builds - // up a 'line map', which points at the DOM nodes that represent - // specific stretches of text, and is used by the measuring code. - // The returned object contains the DOM node, this map, and - // information about line-wide styles that were set by the mode. - function buildLineContent(cm, lineView) { - // The padding-right forces the element to have a 'border', which - // is needed on Webkit to be able to get line-level bounding - // rectangles for it (in measureChar). - var content = elt("span", null, null, webkit ? "padding-right: .1px" : null); - var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content, - col: 0, pos: 0, cm: cm, - splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")}; - lineView.measure = {}; - - // Iterate over the logical lines that make up this visual line. - for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) { - var line = i ? lineView.rest[i - 1] : lineView.line, order; - builder.pos = 0; - builder.addToken = buildToken; - // Optionally wire in some hacks into the token-rendering - // algorithm, to deal with browser quirks. - if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line))) - builder.addToken = buildTokenBadBidi(builder.addToken, order); - builder.map = []; - var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line); - insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate)); - if (line.styleClasses) { - if (line.styleClasses.bgClass) - builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || ""); - if (line.styleClasses.textClass) - builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || ""); - } - - // Ensure at least a single node is present, for measuring. - if (builder.map.length == 0) - builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure))); - - // Store the map and a cache object for the current logical line - if (i == 0) { - lineView.measure.map = builder.map; - lineView.measure.cache = {}; - } else { - (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map); - (lineView.measure.caches || (lineView.measure.caches = [])).push({}); - } - } - - // See issue #2901 - if (webkit && /\bcm-tab\b/.test(builder.content.lastChild.className)) - builder.content.className = "cm-tab-wrap-hack"; - - signal(cm, "renderLine", cm, lineView.line, builder.pre); - if (builder.pre.className) - builder.textClass = joinClasses(builder.pre.className, builder.textClass || ""); - - return builder; - } - - function defaultSpecialCharPlaceholder(ch) { - var token = elt("span", "\u2022", "cm-invalidchar"); - token.title = "\\u" + ch.charCodeAt(0).toString(16); - token.setAttribute("aria-label", token.title); - return token; - } - - // Build up the DOM representation for a single token, and add it to - // the line map. Takes care to render special characters separately. - function buildToken(builder, text, style, startStyle, endStyle, title, css) { - if (!text) return; - var displayText = builder.splitSpaces ? text.replace(/ {3,}/g, splitSpaces) : text; - var special = builder.cm.state.specialChars, mustWrap = false; - if (!special.test(text)) { - builder.col += text.length; - var content = document.createTextNode(displayText); - builder.map.push(builder.pos, builder.pos + text.length, content); - if (ie && ie_version < 9) mustWrap = true; - builder.pos += text.length; - } else { - var content = document.createDocumentFragment(), pos = 0; - while (true) { - special.lastIndex = pos; - var m = special.exec(text); - var skipped = m ? m.index - pos : text.length - pos; - if (skipped) { - var txt = document.createTextNode(displayText.slice(pos, pos + skipped)); - if (ie && ie_version < 9) content.appendChild(elt("span", [txt])); - else content.appendChild(txt); - builder.map.push(builder.pos, builder.pos + skipped, txt); - builder.col += skipped; - builder.pos += skipped; - } - if (!m) break; - pos += skipped + 1; - if (m[0] == "\t") { - var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize; - var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab")); - txt.setAttribute("role", "presentation"); - txt.setAttribute("cm-text", "\t"); - builder.col += tabWidth; - } else if (m[0] == "\r" || m[0] == "\n") { - var txt = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar")); - txt.setAttribute("cm-text", m[0]); - builder.col += 1; - } else { - var txt = builder.cm.options.specialCharPlaceholder(m[0]); - txt.setAttribute("cm-text", m[0]); - if (ie && ie_version < 9) content.appendChild(elt("span", [txt])); - else content.appendChild(txt); - builder.col += 1; - } - builder.map.push(builder.pos, builder.pos + 1, txt); - builder.pos++; - } - } - if (style || startStyle || endStyle || mustWrap || css) { - var fullStyle = style || ""; - if (startStyle) fullStyle += startStyle; - if (endStyle) fullStyle += endStyle; - var token = elt("span", [content], fullStyle, css); - if (title) token.title = title; - return builder.content.appendChild(token); - } - builder.content.appendChild(content); - } - - function splitSpaces(old) { - var out = " "; - for (var i = 0; i < old.length - 2; ++i) out += i % 2 ? " " : "\u00a0"; - out += " "; - return out; - } - - // Work around nonsense dimensions being reported for stretches of - // right-to-left text. - function buildTokenBadBidi(inner, order) { - return function(builder, text, style, startStyle, endStyle, title, css) { - style = style ? style + " cm-force-border" : "cm-force-border"; - var start = builder.pos, end = start + text.length; - for (;;) { - // Find the part that overlaps with the start of this text - for (var i = 0; i < order.length; i++) { - var part = order[i]; - if (part.to > start && part.from <= start) break; - } - if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title, css); - inner(builder, text.slice(0, part.to - start), style, startStyle, null, title, css); - startStyle = null; - text = text.slice(part.to - start); - start = part.to; - } - }; - } - - function buildCollapsedSpan(builder, size, marker, ignoreWidget) { - var widget = !ignoreWidget && marker.widgetNode; - if (widget) builder.map.push(builder.pos, builder.pos + size, widget); - if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) { - if (!widget) - widget = builder.content.appendChild(document.createElement("span")); - widget.setAttribute("cm-marker", marker.id); - } - if (widget) { - builder.cm.display.input.setUneditable(widget); - builder.content.appendChild(widget); - } - builder.pos += size; - } - - // Outputs a number of spans to make up a line, taking highlighting - // and marked text into account. - function insertLineContent(line, builder, styles) { - var spans = line.markedSpans, allText = line.text, at = 0; - if (!spans) { - for (var i = 1; i < styles.length; i+=2) - builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder.cm.options)); - return; - } - - var len = allText.length, pos = 0, i = 1, text = "", style, css; - var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed; - for (;;) { - if (nextChange == pos) { // Update current marker set - spanStyle = spanEndStyle = spanStartStyle = title = css = ""; - collapsed = null; nextChange = Infinity; - var foundBookmarks = [], endStyles - for (var j = 0; j < spans.length; ++j) { - var sp = spans[j], m = sp.marker; - if (m.type == "bookmark" && sp.from == pos && m.widgetNode) { - foundBookmarks.push(m); - } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) { - if (sp.to != null && sp.to != pos && nextChange > sp.to) { - nextChange = sp.to; - spanEndStyle = ""; - } - if (m.className) spanStyle += " " + m.className; - if (m.css) css = (css ? css + ";" : "") + m.css; - if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle; - if (m.endStyle && sp.to == nextChange) (endStyles || (endStyles = [])).push(m.endStyle, sp.to) - if (m.title && !title) title = m.title; - if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0)) - collapsed = sp; - } else if (sp.from > pos && nextChange > sp.from) { - nextChange = sp.from; - } - } - if (endStyles) for (var j = 0; j < endStyles.length; j += 2) - if (endStyles[j + 1] == nextChange) spanEndStyle += " " + endStyles[j] - - if (!collapsed || collapsed.from == pos) for (var j = 0; j < foundBookmarks.length; ++j) - buildCollapsedSpan(builder, 0, foundBookmarks[j]); - if (collapsed && (collapsed.from || 0) == pos) { - buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos, - collapsed.marker, collapsed.from == null); - if (collapsed.to == null) return; - if (collapsed.to == pos) collapsed = false; - } - } - if (pos >= len) break; - - var upto = Math.min(len, nextChange); - while (true) { - if (text) { - var end = pos + text.length; - if (!collapsed) { - var tokenText = end > upto ? text.slice(0, upto - pos) : text; - builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle, - spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css); - } - if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;} - pos = end; - spanStartStyle = ""; - } - text = allText.slice(at, at = styles[i++]); - style = interpretTokenStyle(styles[i++], builder.cm.options); - } - } - } - - // DOCUMENT DATA STRUCTURE - - // By default, updates that start and end at the beginning of a line - // are treated specially, in order to make the association of line - // widgets and marker elements with the text behave more intuitive. - function isWholeLineUpdate(doc, change) { - return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" && - (!doc.cm || doc.cm.options.wholeLineUpdateBefore); - } - - // Perform a change on the document data structure. - function updateDoc(doc, change, markedSpans, estimateHeight) { - function spansFor(n) {return markedSpans ? markedSpans[n] : null;} - function update(line, text, spans) { - updateLine(line, text, spans, estimateHeight); - signalLater(line, "change", line, change); - } - function linesFor(start, end) { - for (var i = start, result = []; i < end; ++i) - result.push(new Line(text[i], spansFor(i), estimateHeight)); - return result; - } - - var from = change.from, to = change.to, text = change.text; - var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line); - var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line; - - // Adjust the line structure - if (change.full) { - doc.insert(0, linesFor(0, text.length)); - doc.remove(text.length, doc.size - text.length); - } else if (isWholeLineUpdate(doc, change)) { - // This is a whole-line replace. Treated specially to make - // sure line objects move the way they are supposed to. - var added = linesFor(0, text.length - 1); - update(lastLine, lastLine.text, lastSpans); - if (nlines) doc.remove(from.line, nlines); - if (added.length) doc.insert(from.line, added); - } else if (firstLine == lastLine) { - if (text.length == 1) { - update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans); - } else { - var added = linesFor(1, text.length - 1); - added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight)); - update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0)); - doc.insert(from.line + 1, added); - } - } else if (text.length == 1) { - update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0)); - doc.remove(from.line + 1, nlines); - } else { - update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0)); - update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans); - var added = linesFor(1, text.length - 1); - if (nlines > 1) doc.remove(from.line + 1, nlines - 1); - doc.insert(from.line + 1, added); - } - - signalLater(doc, "change", doc, change); - } - - // The document is represented as a BTree consisting of leaves, with - // chunk of lines in them, and branches, with up to ten leaves or - // other branch nodes below them. The top node is always a branch - // node, and is the document object itself (meaning it has - // additional methods and properties). - // - // All nodes have parent links. The tree is used both to go from - // line numbers to line objects, and to go from objects to numbers. - // It also indexes by height, and is used to convert between height - // and line object, and to find the total height of the document. - // - // See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html - - function LeafChunk(lines) { - this.lines = lines; - this.parent = null; - for (var i = 0, height = 0; i < lines.length; ++i) { - lines[i].parent = this; - height += lines[i].height; - } - this.height = height; - } - - LeafChunk.prototype = { - chunkSize: function() { return this.lines.length; }, - // Remove the n lines at offset 'at'. - removeInner: function(at, n) { - for (var i = at, e = at + n; i < e; ++i) { - var line = this.lines[i]; - this.height -= line.height; - cleanUpLine(line); - signalLater(line, "delete"); - } - this.lines.splice(at, n); - }, - // Helper used to collapse a small branch into a single leaf. - collapse: function(lines) { - lines.push.apply(lines, this.lines); - }, - // Insert the given array of lines at offset 'at', count them as - // having the given height. - insertInner: function(at, lines, height) { - this.height += height; - this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at)); - for (var i = 0; i < lines.length; ++i) lines[i].parent = this; - }, - // Used to iterate over a part of the tree. - iterN: function(at, n, op) { - for (var e = at + n; at < e; ++at) - if (op(this.lines[at])) return true; - } - }; - - function BranchChunk(children) { - this.children = children; - var size = 0, height = 0; - for (var i = 0; i < children.length; ++i) { - var ch = children[i]; - size += ch.chunkSize(); height += ch.height; - ch.parent = this; - } - this.size = size; - this.height = height; - this.parent = null; - } - - BranchChunk.prototype = { - chunkSize: function() { return this.size; }, - removeInner: function(at, n) { - this.size -= n; - for (var i = 0; i < this.children.length; ++i) { - var child = this.children[i], sz = child.chunkSize(); - if (at < sz) { - var rm = Math.min(n, sz - at), oldHeight = child.height; - child.removeInner(at, rm); - this.height -= oldHeight - child.height; - if (sz == rm) { this.children.splice(i--, 1); child.parent = null; } - if ((n -= rm) == 0) break; - at = 0; - } else at -= sz; - } - // If the result is smaller than 25 lines, ensure that it is a - // single leaf node. - if (this.size - n < 25 && - (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) { - var lines = []; - this.collapse(lines); - this.children = [new LeafChunk(lines)]; - this.children[0].parent = this; - } - }, - collapse: function(lines) { - for (var i = 0; i < this.children.length; ++i) this.children[i].collapse(lines); - }, - insertInner: function(at, lines, height) { - this.size += lines.length; - this.height += height; - for (var i = 0; i < this.children.length; ++i) { - var child = this.children[i], sz = child.chunkSize(); - if (at <= sz) { - child.insertInner(at, lines, height); - if (child.lines && child.lines.length > 50) { - while (child.lines.length > 50) { - var spilled = child.lines.splice(child.lines.length - 25, 25); - var newleaf = new LeafChunk(spilled); - child.height -= newleaf.height; - this.children.splice(i + 1, 0, newleaf); - newleaf.parent = this; - } - this.maybeSpill(); - } - break; - } - at -= sz; - } - }, - // When a node has grown, check whether it should be split. - maybeSpill: function() { - if (this.children.length <= 10) return; - var me = this; - do { - var spilled = me.children.splice(me.children.length - 5, 5); - var sibling = new BranchChunk(spilled); - if (!me.parent) { // Become the parent node - var copy = new BranchChunk(me.children); - copy.parent = me; - me.children = [copy, sibling]; - me = copy; - } else { - me.size -= sibling.size; - me.height -= sibling.height; - var myIndex = indexOf(me.parent.children, me); - me.parent.children.splice(myIndex + 1, 0, sibling); - } - sibling.parent = me.parent; - } while (me.children.length > 10); - me.parent.maybeSpill(); - }, - iterN: function(at, n, op) { - for (var i = 0; i < this.children.length; ++i) { - var child = this.children[i], sz = child.chunkSize(); - if (at < sz) { - var used = Math.min(n, sz - at); - if (child.iterN(at, used, op)) return true; - if ((n -= used) == 0) break; - at = 0; - } else at -= sz; - } - } - }; - - var nextDocId = 0; - var Doc = CodeMirror.Doc = function(text, mode, firstLine, lineSep) { - if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep); - if (firstLine == null) firstLine = 0; - - BranchChunk.call(this, [new LeafChunk([new Line("", null)])]); - this.first = firstLine; - this.scrollTop = this.scrollLeft = 0; - this.cantEdit = false; - this.cleanGeneration = 1; - this.frontier = firstLine; - var start = Pos(firstLine, 0); - this.sel = simpleSelection(start); - this.history = new History(null); - this.id = ++nextDocId; - this.modeOption = mode; - this.lineSep = lineSep; - this.extend = false; - - if (typeof text == "string") text = this.splitLines(text); - updateDoc(this, {from: start, to: start, text: text}); - setSelection(this, simpleSelection(start), sel_dontScroll); - }; - - Doc.prototype = createObj(BranchChunk.prototype, { - constructor: Doc, - // Iterate over the document. Supports two forms -- with only one - // argument, it calls that for each line in the document. With - // three, it iterates over the range given by the first two (with - // the second being non-inclusive). - iter: function(from, to, op) { - if (op) this.iterN(from - this.first, to - from, op); - else this.iterN(this.first, this.first + this.size, from); - }, - - // Non-public interface for adding and removing lines. - insert: function(at, lines) { - var height = 0; - for (var i = 0; i < lines.length; ++i) height += lines[i].height; - this.insertInner(at - this.first, lines, height); - }, - remove: function(at, n) { this.removeInner(at - this.first, n); }, - - // From here, the methods are part of the public interface. Most - // are also available from CodeMirror (editor) instances. - - getValue: function(lineSep) { - var lines = getLines(this, this.first, this.first + this.size); - if (lineSep === false) return lines; - return lines.join(lineSep || this.lineSeparator()); - }, - setValue: docMethodOp(function(code) { - var top = Pos(this.first, 0), last = this.first + this.size - 1; - makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length), - text: this.splitLines(code), origin: "setValue", full: true}, true); - setSelection(this, simpleSelection(top)); - }), - replaceRange: function(code, from, to, origin) { - from = clipPos(this, from); - to = to ? clipPos(this, to) : from; - replaceRange(this, code, from, to, origin); - }, - getRange: function(from, to, lineSep) { - var lines = getBetween(this, clipPos(this, from), clipPos(this, to)); - if (lineSep === false) return lines; - return lines.join(lineSep || this.lineSeparator()); - }, - - getLine: function(line) {var l = this.getLineHandle(line); return l && l.text;}, - - getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line);}, - getLineNumber: function(line) {return lineNo(line);}, - - getLineHandleVisualStart: function(line) { - if (typeof line == "number") line = getLine(this, line); - return visualLine(line); - }, - - lineCount: function() {return this.size;}, - firstLine: function() {return this.first;}, - lastLine: function() {return this.first + this.size - 1;}, - - clipPos: function(pos) {return clipPos(this, pos);}, - - getCursor: function(start) { - var range = this.sel.primary(), pos; - if (start == null || start == "head") pos = range.head; - else if (start == "anchor") pos = range.anchor; - else if (start == "end" || start == "to" || start === false) pos = range.to(); - else pos = range.from(); - return pos; - }, - listSelections: function() { return this.sel.ranges; }, - somethingSelected: function() {return this.sel.somethingSelected();}, - - setCursor: docMethodOp(function(line, ch, options) { - setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options); - }), - setSelection: docMethodOp(function(anchor, head, options) { - setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options); - }), - extendSelection: docMethodOp(function(head, other, options) { - extendSelection(this, clipPos(this, head), other && clipPos(this, other), options); - }), - extendSelections: docMethodOp(function(heads, options) { - extendSelections(this, clipPosArray(this, heads), options); - }), - extendSelectionsBy: docMethodOp(function(f, options) { - var heads = map(this.sel.ranges, f); - extendSelections(this, clipPosArray(this, heads), options); - }), - setSelections: docMethodOp(function(ranges, primary, options) { - if (!ranges.length) return; - for (var i = 0, out = []; i < ranges.length; i++) - out[i] = new Range(clipPos(this, ranges[i].anchor), - clipPos(this, ranges[i].head)); - if (primary == null) primary = Math.min(ranges.length - 1, this.sel.primIndex); - setSelection(this, normalizeSelection(out, primary), options); - }), - addSelection: docMethodOp(function(anchor, head, options) { - var ranges = this.sel.ranges.slice(0); - ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor))); - setSelection(this, normalizeSelection(ranges, ranges.length - 1), options); - }), - - getSelection: function(lineSep) { - var ranges = this.sel.ranges, lines; - for (var i = 0; i < ranges.length; i++) { - var sel = getBetween(this, ranges[i].from(), ranges[i].to()); - lines = lines ? lines.concat(sel) : sel; - } - if (lineSep === false) return lines; - else return lines.join(lineSep || this.lineSeparator()); - }, - getSelections: function(lineSep) { - var parts = [], ranges = this.sel.ranges; - for (var i = 0; i < ranges.length; i++) { - var sel = getBetween(this, ranges[i].from(), ranges[i].to()); - if (lineSep !== false) sel = sel.join(lineSep || this.lineSeparator()); - parts[i] = sel; - } - return parts; - }, - replaceSelection: function(code, collapse, origin) { - var dup = []; - for (var i = 0; i < this.sel.ranges.length; i++) - dup[i] = code; - this.replaceSelections(dup, collapse, origin || "+input"); - }, - replaceSelections: docMethodOp(function(code, collapse, origin) { - var changes = [], sel = this.sel; - for (var i = 0; i < sel.ranges.length; i++) { - var range = sel.ranges[i]; - changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin}; - } - var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse); - for (var i = changes.length - 1; i >= 0; i--) - makeChange(this, changes[i]); - if (newSel) setSelectionReplaceHistory(this, newSel); - else if (this.cm) ensureCursorVisible(this.cm); - }), - undo: docMethodOp(function() {makeChangeFromHistory(this, "undo");}), - redo: docMethodOp(function() {makeChangeFromHistory(this, "redo");}), - undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true);}), - redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true);}), - - setExtending: function(val) {this.extend = val;}, - getExtending: function() {return this.extend;}, - - historySize: function() { - var hist = this.history, done = 0, undone = 0; - for (var i = 0; i < hist.done.length; i++) if (!hist.done[i].ranges) ++done; - for (var i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone; - return {undo: done, redo: undone}; - }, - clearHistory: function() {this.history = new History(this.history.maxGeneration);}, - - markClean: function() { - this.cleanGeneration = this.changeGeneration(true); - }, - changeGeneration: function(forceSplit) { - if (forceSplit) - this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null; - return this.history.generation; - }, - isClean: function (gen) { - return this.history.generation == (gen || this.cleanGeneration); - }, - - getHistory: function() { - return {done: copyHistoryArray(this.history.done), - undone: copyHistoryArray(this.history.undone)}; - }, - setHistory: function(histData) { - var hist = this.history = new History(this.history.maxGeneration); - hist.done = copyHistoryArray(histData.done.slice(0), null, true); - hist.undone = copyHistoryArray(histData.undone.slice(0), null, true); - }, - - addLineClass: docMethodOp(function(handle, where, cls) { - return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) { - var prop = where == "text" ? "textClass" - : where == "background" ? "bgClass" - : where == "gutter" ? "gutterClass" : "wrapClass"; - if (!line[prop]) line[prop] = cls; - else if (classTest(cls).test(line[prop])) return false; - else line[prop] += " " + cls; - return true; - }); - }), - removeLineClass: docMethodOp(function(handle, where, cls) { - return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) { - var prop = where == "text" ? "textClass" - : where == "background" ? "bgClass" - : where == "gutter" ? "gutterClass" : "wrapClass"; - var cur = line[prop]; - if (!cur) return false; - else if (cls == null) line[prop] = null; - else { - var found = cur.match(classTest(cls)); - if (!found) return false; - var end = found.index + found[0].length; - line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null; - } - return true; - }); - }), - - addLineWidget: docMethodOp(function(handle, node, options) { - return addLineWidget(this, handle, node, options); - }), - removeLineWidget: function(widget) { widget.clear(); }, - - markText: function(from, to, options) { - return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range"); - }, - setBookmark: function(pos, options) { - var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options), - insertLeft: options && options.insertLeft, - clearWhenEmpty: false, shared: options && options.shared, - handleMouseEvents: options && options.handleMouseEvents}; - pos = clipPos(this, pos); - return markText(this, pos, pos, realOpts, "bookmark"); - }, - findMarksAt: function(pos) { - pos = clipPos(this, pos); - var markers = [], spans = getLine(this, pos.line).markedSpans; - if (spans) for (var i = 0; i < spans.length; ++i) { - var span = spans[i]; - if ((span.from == null || span.from <= pos.ch) && - (span.to == null || span.to >= pos.ch)) - markers.push(span.marker.parent || span.marker); - } - return markers; - }, - findMarks: function(from, to, filter) { - from = clipPos(this, from); to = clipPos(this, to); - var found = [], lineNo = from.line; - this.iter(from.line, to.line + 1, function(line) { - var spans = line.markedSpans; - if (spans) for (var i = 0; i < spans.length; i++) { - var span = spans[i]; - if (!(span.to != null && lineNo == from.line && from.ch > span.to || - span.from == null && lineNo != from.line || - span.from != null && lineNo == to.line && span.from > to.ch) && - (!filter || filter(span.marker))) - found.push(span.marker.parent || span.marker); - } - ++lineNo; - }); - return found; - }, - getAllMarks: function() { - var markers = []; - this.iter(function(line) { - var sps = line.markedSpans; - if (sps) for (var i = 0; i < sps.length; ++i) - if (sps[i].from != null) markers.push(sps[i].marker); - }); - return markers; - }, - - posFromIndex: function(off) { - var ch, lineNo = this.first; - this.iter(function(line) { - var sz = line.text.length + 1; - if (sz > off) { ch = off; return true; } - off -= sz; - ++lineNo; - }); - return clipPos(this, Pos(lineNo, ch)); - }, - indexFromPos: function (coords) { - coords = clipPos(this, coords); - var index = coords.ch; - if (coords.line < this.first || coords.ch < 0) return 0; - this.iter(this.first, coords.line, function (line) { - index += line.text.length + 1; - }); - return index; - }, - - copy: function(copyHistory) { - var doc = new Doc(getLines(this, this.first, this.first + this.size), - this.modeOption, this.first, this.lineSep); - doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft; - doc.sel = this.sel; - doc.extend = false; - if (copyHistory) { - doc.history.undoDepth = this.history.undoDepth; - doc.setHistory(this.getHistory()); - } - return doc; - }, - - linkedDoc: function(options) { - if (!options) options = {}; - var from = this.first, to = this.first + this.size; - if (options.from != null && options.from > from) from = options.from; - if (options.to != null && options.to < to) to = options.to; - var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep); - if (options.sharedHist) copy.history = this.history; - (this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist}); - copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}]; - copySharedMarkers(copy, findSharedMarkers(this)); - return copy; - }, - unlinkDoc: function(other) { - if (other instanceof CodeMirror) other = other.doc; - if (this.linked) for (var i = 0; i < this.linked.length; ++i) { - var link = this.linked[i]; - if (link.doc != other) continue; - this.linked.splice(i, 1); - other.unlinkDoc(this); - detachSharedMarkers(findSharedMarkers(this)); - break; - } - // If the histories were shared, split them again - if (other.history == this.history) { - var splitIds = [other.id]; - linkedDocs(other, function(doc) {splitIds.push(doc.id);}, true); - other.history = new History(null); - other.history.done = copyHistoryArray(this.history.done, splitIds); - other.history.undone = copyHistoryArray(this.history.undone, splitIds); - } - }, - iterLinkedDocs: function(f) {linkedDocs(this, f);}, - - getMode: function() {return this.mode;}, - getEditor: function() {return this.cm;}, - - splitLines: function(str) { - if (this.lineSep) return str.split(this.lineSep); - return splitLinesAuto(str); - }, - lineSeparator: function() { return this.lineSep || "\n"; } - }); - - // Public alias. - Doc.prototype.eachLine = Doc.prototype.iter; - - // Set up methods on CodeMirror's prototype to redirect to the editor's document. - var dontDelegate = "iter insert remove copy getEditor constructor".split(" "); - for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0) - CodeMirror.prototype[prop] = (function(method) { - return function() {return method.apply(this.doc, arguments);}; - })(Doc.prototype[prop]); - - eventMixin(Doc); - - // Call f for all linked documents. - function linkedDocs(doc, f, sharedHistOnly) { - function propagate(doc, skip, sharedHist) { - if (doc.linked) for (var i = 0; i < doc.linked.length; ++i) { - var rel = doc.linked[i]; - if (rel.doc == skip) continue; - var shared = sharedHist && rel.sharedHist; - if (sharedHistOnly && !shared) continue; - f(rel.doc, shared); - propagate(rel.doc, doc, shared); - } - } - propagate(doc, null, true); - } - - // Attach a document to an editor. - function attachDoc(cm, doc) { - if (doc.cm) throw new Error("This document is already in use."); - cm.doc = doc; - doc.cm = cm; - estimateLineHeights(cm); - loadMode(cm); - if (!cm.options.lineWrapping) findMaxLine(cm); - cm.options.mode = doc.modeOption; - regChange(cm); - } - - // LINE UTILITIES - - // Find the line object corresponding to the given line number. - function getLine(doc, n) { - n -= doc.first; - if (n < 0 || n >= doc.size) throw new Error("There is no line " + (n + doc.first) + " in the document."); - for (var chunk = doc; !chunk.lines;) { - for (var i = 0;; ++i) { - var child = chunk.children[i], sz = child.chunkSize(); - if (n < sz) { chunk = child; break; } - n -= sz; - } - } - return chunk.lines[n]; - } - - // Get the part of a document between two positions, as an array of - // strings. - function getBetween(doc, start, end) { - var out = [], n = start.line; - doc.iter(start.line, end.line + 1, function(line) { - var text = line.text; - if (n == end.line) text = text.slice(0, end.ch); - if (n == start.line) text = text.slice(start.ch); - out.push(text); - ++n; - }); - return out; - } - // Get the lines between from and to, as array of strings. - function getLines(doc, from, to) { - var out = []; - doc.iter(from, to, function(line) { out.push(line.text); }); - return out; - } - - // Update the height of a line, propagating the height change - // upwards to parent nodes. - function updateLineHeight(line, height) { - var diff = height - line.height; - if (diff) for (var n = line; n; n = n.parent) n.height += diff; - } - - // Given a line object, find its line number by walking up through - // its parent links. - function lineNo(line) { - if (line.parent == null) return null; - var cur = line.parent, no = indexOf(cur.lines, line); - for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) { - for (var i = 0;; ++i) { - if (chunk.children[i] == cur) break; - no += chunk.children[i].chunkSize(); - } - } - return no + cur.first; - } - - // Find the line at the given vertical position, using the height - // information in the document tree. - function lineAtHeight(chunk, h) { - var n = chunk.first; - outer: do { - for (var i = 0; i < chunk.children.length; ++i) { - var child = chunk.children[i], ch = child.height; - if (h < ch) { chunk = child; continue outer; } - h -= ch; - n += child.chunkSize(); - } - return n; - } while (!chunk.lines); - for (var i = 0; i < chunk.lines.length; ++i) { - var line = chunk.lines[i], lh = line.height; - if (h < lh) break; - h -= lh; - } - return n + i; - } - - - // Find the height above the given line. - function heightAtLine(lineObj) { - lineObj = visualLine(lineObj); - - var h = 0, chunk = lineObj.parent; - for (var i = 0; i < chunk.lines.length; ++i) { - var line = chunk.lines[i]; - if (line == lineObj) break; - else h += line.height; - } - for (var p = chunk.parent; p; chunk = p, p = chunk.parent) { - for (var i = 0; i < p.children.length; ++i) { - var cur = p.children[i]; - if (cur == chunk) break; - else h += cur.height; - } - } - return h; - } - - // Get the bidi ordering for the given line (and cache it). Returns - // false for lines that are fully left-to-right, and an array of - // BidiSpan objects otherwise. - function getOrder(line) { - var order = line.order; - if (order == null) order = line.order = bidiOrdering(line.text); - return order; - } - - // HISTORY - - function History(startGen) { - // Arrays of change events and selections. Doing something adds an - // event to done and clears undo. Undoing moves events from done - // to undone, redoing moves them in the other direction. - this.done = []; this.undone = []; - this.undoDepth = Infinity; - // Used to track when changes can be merged into a single undo - // event - this.lastModTime = this.lastSelTime = 0; - this.lastOp = this.lastSelOp = null; - this.lastOrigin = this.lastSelOrigin = null; - // Used by the isClean() method - this.generation = this.maxGeneration = startGen || 1; - } - - // Create a history change event from an updateDoc-style change - // object. - function historyChangeFromChange(doc, change) { - var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)}; - attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1); - linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);}, true); - return histChange; - } - - // Pop all selection events off the end of a history array. Stop at - // a change event. - function clearSelectionEvents(array) { - while (array.length) { - var last = lst(array); - if (last.ranges) array.pop(); - else break; - } - } - - // Find the top change event in the history. Pop off selection - // events that are in the way. - function lastChangeEvent(hist, force) { - if (force) { - clearSelectionEvents(hist.done); - return lst(hist.done); - } else if (hist.done.length && !lst(hist.done).ranges) { - return lst(hist.done); - } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) { - hist.done.pop(); - return lst(hist.done); - } - } - - // Register a change in the history. Merges changes that are within - // a single operation, ore are close together with an origin that - // allows merging (starting with "+") into a single event. - function addChangeToHistory(doc, change, selAfter, opId) { - var hist = doc.history; - hist.undone.length = 0; - var time = +new Date, cur; - - if ((hist.lastOp == opId || - hist.lastOrigin == change.origin && change.origin && - ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) || - change.origin.charAt(0) == "*")) && - (cur = lastChangeEvent(hist, hist.lastOp == opId))) { - // Merge this change into the last event - var last = lst(cur.changes); - if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) { - // Optimized case for simple insertion -- don't want to add - // new changesets for every character typed - last.to = changeEnd(change); - } else { - // Add new sub-event - cur.changes.push(historyChangeFromChange(doc, change)); - } - } else { - // Can not be merged, start a new event. - var before = lst(hist.done); - if (!before || !before.ranges) - pushSelectionToHistory(doc.sel, hist.done); - cur = {changes: [historyChangeFromChange(doc, change)], - generation: hist.generation}; - hist.done.push(cur); - while (hist.done.length > hist.undoDepth) { - hist.done.shift(); - if (!hist.done[0].ranges) hist.done.shift(); - } - } - hist.done.push(selAfter); - hist.generation = ++hist.maxGeneration; - hist.lastModTime = hist.lastSelTime = time; - hist.lastOp = hist.lastSelOp = opId; - hist.lastOrigin = hist.lastSelOrigin = change.origin; - - if (!last) signal(doc, "historyAdded"); - } - - function selectionEventCanBeMerged(doc, origin, prev, sel) { - var ch = origin.charAt(0); - return ch == "*" || - ch == "+" && - prev.ranges.length == sel.ranges.length && - prev.somethingSelected() == sel.somethingSelected() && - new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500); - } - - // Called whenever the selection changes, sets the new selection as - // the pending selection in the history, and pushes the old pending - // selection into the 'done' array when it was significantly - // different (in number of selected ranges, emptiness, or time). - function addSelectionToHistory(doc, sel, opId, options) { - var hist = doc.history, origin = options && options.origin; - - // A new event is started when the previous origin does not match - // the current, or the origins don't allow matching. Origins - // starting with * are always merged, those starting with + are - // merged when similar and close together in time. - if (opId == hist.lastSelOp || - (origin && hist.lastSelOrigin == origin && - (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin || - selectionEventCanBeMerged(doc, origin, lst(hist.done), sel)))) - hist.done[hist.done.length - 1] = sel; - else - pushSelectionToHistory(sel, hist.done); - - hist.lastSelTime = +new Date; - hist.lastSelOrigin = origin; - hist.lastSelOp = opId; - if (options && options.clearRedo !== false) - clearSelectionEvents(hist.undone); - } - - function pushSelectionToHistory(sel, dest) { - var top = lst(dest); - if (!(top && top.ranges && top.equals(sel))) - dest.push(sel); - } - - // Used to store marked span information in the history. - function attachLocalSpans(doc, change, from, to) { - var existing = change["spans_" + doc.id], n = 0; - doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function(line) { - if (line.markedSpans) - (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans; - ++n; - }); - } - - // When un/re-doing restores text containing marked spans, those - // that have been explicitly cleared should not be restored. - function removeClearedSpans(spans) { - if (!spans) return null; - for (var i = 0, out; i < spans.length; ++i) { - if (spans[i].marker.explicitlyCleared) { if (!out) out = spans.slice(0, i); } - else if (out) out.push(spans[i]); - } - return !out ? spans : out.length ? out : null; - } - - // Retrieve and filter the old marked spans stored in a change event. - function getOldSpans(doc, change) { - var found = change["spans_" + doc.id]; - if (!found) return null; - for (var i = 0, nw = []; i < change.text.length; ++i) - nw.push(removeClearedSpans(found[i])); - return nw; - } - - // Used both to provide a JSON-safe object in .getHistory, and, when - // detaching a document, to split the history in two - function copyHistoryArray(events, newGroup, instantiateSel) { - for (var i = 0, copy = []; i < events.length; ++i) { - var event = events[i]; - if (event.ranges) { - copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event); - continue; - } - var changes = event.changes, newChanges = []; - copy.push({changes: newChanges}); - for (var j = 0; j < changes.length; ++j) { - var change = changes[j], m; - newChanges.push({from: change.from, to: change.to, text: change.text}); - if (newGroup) for (var prop in change) if (m = prop.match(/^spans_(\d+)$/)) { - if (indexOf(newGroup, Number(m[1])) > -1) { - lst(newChanges)[prop] = change[prop]; - delete change[prop]; - } - } - } - } - return copy; - } - - // Rebasing/resetting history to deal with externally-sourced changes - - function rebaseHistSelSingle(pos, from, to, diff) { - if (to < pos.line) { - pos.line += diff; - } else if (from < pos.line) { - pos.line = from; - pos.ch = 0; - } - } - - // Tries to rebase an array of history events given a change in the - // document. If the change touches the same lines as the event, the - // event, and everything 'behind' it, is discarded. If the change is - // before the event, the event's positions are updated. Uses a - // copy-on-write scheme for the positions, to avoid having to - // reallocate them all on every rebase, but also avoid problems with - // shared position objects being unsafely updated. - function rebaseHistArray(array, from, to, diff) { - for (var i = 0; i < array.length; ++i) { - var sub = array[i], ok = true; - if (sub.ranges) { - if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true; } - for (var j = 0; j < sub.ranges.length; j++) { - rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff); - rebaseHistSelSingle(sub.ranges[j].head, from, to, diff); - } - continue; - } - for (var j = 0; j < sub.changes.length; ++j) { - var cur = sub.changes[j]; - if (to < cur.from.line) { - cur.from = Pos(cur.from.line + diff, cur.from.ch); - cur.to = Pos(cur.to.line + diff, cur.to.ch); - } else if (from <= cur.to.line) { - ok = false; - break; - } - } - if (!ok) { - array.splice(0, i + 1); - i = 0; - } - } - } - - function rebaseHist(hist, change) { - var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1; - rebaseHistArray(hist.done, from, to, diff); - rebaseHistArray(hist.undone, from, to, diff); - } - - // EVENT UTILITIES - - // Due to the fact that we still support jurassic IE versions, some - // compatibility wrappers are needed. - - var e_preventDefault = CodeMirror.e_preventDefault = function(e) { - if (e.preventDefault) e.preventDefault(); - else e.returnValue = false; - }; - var e_stopPropagation = CodeMirror.e_stopPropagation = function(e) { - if (e.stopPropagation) e.stopPropagation(); - else e.cancelBubble = true; - }; - function e_defaultPrevented(e) { - return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false; - } - var e_stop = CodeMirror.e_stop = function(e) {e_preventDefault(e); e_stopPropagation(e);}; - - function e_target(e) {return e.target || e.srcElement;} - function e_button(e) { - var b = e.which; - if (b == null) { - if (e.button & 1) b = 1; - else if (e.button & 2) b = 3; - else if (e.button & 4) b = 2; - } - if (mac && e.ctrlKey && b == 1) b = 3; - return b; - } - - // EVENT HANDLING - - // Lightweight event framework. on/off also work on DOM nodes, - // registering native DOM handlers. - - var on = CodeMirror.on = function(emitter, type, f) { - if (emitter.addEventListener) - emitter.addEventListener(type, f, false); - else if (emitter.attachEvent) - emitter.attachEvent("on" + type, f); - else { - var map = emitter._handlers || (emitter._handlers = {}); - var arr = map[type] || (map[type] = []); - arr.push(f); - } - }; - - var noHandlers = [] - function getHandlers(emitter, type, copy) { - var arr = emitter._handlers && emitter._handlers[type] - if (copy) return arr && arr.length > 0 ? arr.slice() : noHandlers - else return arr || noHandlers - } - - var off = CodeMirror.off = function(emitter, type, f) { - if (emitter.removeEventListener) - emitter.removeEventListener(type, f, false); - else if (emitter.detachEvent) - emitter.detachEvent("on" + type, f); - else { - var handlers = getHandlers(emitter, type, false) - for (var i = 0; i < handlers.length; ++i) - if (handlers[i] == f) { handlers.splice(i, 1); break; } - } - }; - - var signal = CodeMirror.signal = function(emitter, type /*, values...*/) { - var handlers = getHandlers(emitter, type, true) - if (!handlers.length) return; - var args = Array.prototype.slice.call(arguments, 2); - for (var i = 0; i < handlers.length; ++i) handlers[i].apply(null, args); - }; - - var orphanDelayedCallbacks = null; - - // Often, we want to signal events at a point where we are in the - // middle of some work, but don't want the handler to start calling - // other methods on the editor, which might be in an inconsistent - // state or simply not expect any other events to happen. - // signalLater looks whether there are any handlers, and schedules - // them to be executed when the last operation ends, or, if no - // operation is active, when a timeout fires. - function signalLater(emitter, type /*, values...*/) { - var arr = getHandlers(emitter, type, false) - if (!arr.length) return; - var args = Array.prototype.slice.call(arguments, 2), list; - if (operationGroup) { - list = operationGroup.delayedCallbacks; - } else if (orphanDelayedCallbacks) { - list = orphanDelayedCallbacks; - } else { - list = orphanDelayedCallbacks = []; - setTimeout(fireOrphanDelayed, 0); - } - function bnd(f) {return function(){f.apply(null, args);};}; - for (var i = 0; i < arr.length; ++i) - list.push(bnd(arr[i])); - } - - function fireOrphanDelayed() { - var delayed = orphanDelayedCallbacks; - orphanDelayedCallbacks = null; - for (var i = 0; i < delayed.length; ++i) delayed[i](); - } - - // The DOM events that CodeMirror handles can be overridden by - // registering a (non-DOM) handler on the editor for the event name, - // and preventDefault-ing the event in that handler. - function signalDOMEvent(cm, e, override) { - if (typeof e == "string") - e = {type: e, preventDefault: function() { this.defaultPrevented = true; }}; - signal(cm, override || e.type, cm, e); - return e_defaultPrevented(e) || e.codemirrorIgnore; - } - - function signalCursorActivity(cm) { - var arr = cm._handlers && cm._handlers.cursorActivity; - if (!arr) return; - var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []); - for (var i = 0; i < arr.length; ++i) if (indexOf(set, arr[i]) == -1) - set.push(arr[i]); - } - - function hasHandler(emitter, type) { - return getHandlers(emitter, type).length > 0 - } - - // Add on and off methods to a constructor's prototype, to make - // registering events on such objects more convenient. - function eventMixin(ctor) { - ctor.prototype.on = function(type, f) {on(this, type, f);}; - ctor.prototype.off = function(type, f) {off(this, type, f);}; - } - - // MISC UTILITIES - - // Number of pixels added to scroller and sizer to hide scrollbar - var scrollerGap = 30; - - // Returned or thrown by various protocols to signal 'I'm not - // handling this'. - var Pass = CodeMirror.Pass = {toString: function(){return "CodeMirror.Pass";}}; - - // Reused option objects for setSelection & friends - var sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"}; - - function Delayed() {this.id = null;} - Delayed.prototype.set = function(ms, f) { - clearTimeout(this.id); - this.id = setTimeout(f, ms); - }; - - // Counts the column offset in a string, taking tabs into account. - // Used mostly to find indentation. - var countColumn = CodeMirror.countColumn = function(string, end, tabSize, startIndex, startValue) { - if (end == null) { - end = string.search(/[^\s\u00a0]/); - if (end == -1) end = string.length; - } - for (var i = startIndex || 0, n = startValue || 0;;) { - var nextTab = string.indexOf("\t", i); - if (nextTab < 0 || nextTab >= end) - return n + (end - i); - n += nextTab - i; - n += tabSize - (n % tabSize); - i = nextTab + 1; - } - }; - - // The inverse of countColumn -- find the offset that corresponds to - // a particular column. - var findColumn = CodeMirror.findColumn = function(string, goal, tabSize) { - for (var pos = 0, col = 0;;) { - var nextTab = string.indexOf("\t", pos); - if (nextTab == -1) nextTab = string.length; - var skipped = nextTab - pos; - if (nextTab == string.length || col + skipped >= goal) - return pos + Math.min(skipped, goal - col); - col += nextTab - pos; - col += tabSize - (col % tabSize); - pos = nextTab + 1; - if (col >= goal) return pos; - } - } - - var spaceStrs = [""]; - function spaceStr(n) { - while (spaceStrs.length <= n) - spaceStrs.push(lst(spaceStrs) + " "); - return spaceStrs[n]; - } - - function lst(arr) { return arr[arr.length-1]; } - - var selectInput = function(node) { node.select(); }; - if (ios) // Mobile Safari apparently has a bug where select() is broken. - selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length; }; - else if (ie) // Suppress mysterious IE10 errors - selectInput = function(node) { try { node.select(); } catch(_e) {} }; - - function indexOf(array, elt) { - for (var i = 0; i < array.length; ++i) - if (array[i] == elt) return i; - return -1; - } - function map(array, f) { - var out = []; - for (var i = 0; i < array.length; i++) out[i] = f(array[i], i); - return out; - } - - function nothing() {} - - function createObj(base, props) { - var inst; - if (Object.create) { - inst = Object.create(base); - } else { - nothing.prototype = base; - inst = new nothing(); - } - if (props) copyObj(props, inst); - return inst; - }; - - function copyObj(obj, target, overwrite) { - if (!target) target = {}; - for (var prop in obj) - if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop))) - target[prop] = obj[prop]; - return target; - } - - function bind(f) { - var args = Array.prototype.slice.call(arguments, 1); - return function(){return f.apply(null, args);}; - } - - var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/; - var isWordCharBasic = CodeMirror.isWordChar = function(ch) { - return /\w/.test(ch) || ch > "\x80" && - (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch)); - }; - function isWordChar(ch, helper) { - if (!helper) return isWordCharBasic(ch); - if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) return true; - return helper.test(ch); - } - - function isEmpty(obj) { - for (var n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false; - return true; - } - - // Extending unicode characters. A series of a non-extending char + - // any number of extending chars is treated as a single unit as far - // as editing and measuring is concerned. This is not fully correct, - // since some scripts/fonts/browsers also treat other configurations - // of code points as a group. - var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/; - function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch); } - - // DOM UTILITIES - - function elt(tag, content, className, style) { - var e = document.createElement(tag); - if (className) e.className = className; - if (style) e.style.cssText = style; - if (typeof content == "string") e.appendChild(document.createTextNode(content)); - else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]); - return e; - } - - var range; - if (document.createRange) range = function(node, start, end, endNode) { - var r = document.createRange(); - r.setEnd(endNode || node, end); - r.setStart(node, start); - return r; - }; - else range = function(node, start, end) { - var r = document.body.createTextRange(); - try { r.moveToElementText(node.parentNode); } - catch(e) { return r; } - r.collapse(true); - r.moveEnd("character", end); - r.moveStart("character", start); - return r; - }; - - function removeChildren(e) { - for (var count = e.childNodes.length; count > 0; --count) - e.removeChild(e.firstChild); - return e; - } - - function removeChildrenAndAdd(parent, e) { - return removeChildren(parent).appendChild(e); - } - - var contains = CodeMirror.contains = function(parent, child) { - if (child.nodeType == 3) // Android browser always returns false when child is a textnode - child = child.parentNode; - if (parent.contains) - return parent.contains(child); - do { - if (child.nodeType == 11) child = child.host; - if (child == parent) return true; - } while (child = child.parentNode); - }; - - function activeElt() { - var activeElement = document.activeElement; - while (activeElement && activeElement.root && activeElement.root.activeElement) - activeElement = activeElement.root.activeElement; - return activeElement; - } - // Older versions of IE throws unspecified error when touching - // document.activeElement in some cases (during loading, in iframe) - if (ie && ie_version < 11) activeElt = function() { - try { return document.activeElement; } - catch(e) { return document.body; } - }; - - function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*"); } - var rmClass = CodeMirror.rmClass = function(node, cls) { - var current = node.className; - var match = classTest(cls).exec(current); - if (match) { - var after = current.slice(match.index + match[0].length); - node.className = current.slice(0, match.index) + (after ? match[1] + after : ""); - } - }; - var addClass = CodeMirror.addClass = function(node, cls) { - var current = node.className; - if (!classTest(cls).test(current)) node.className += (current ? " " : "") + cls; - }; - function joinClasses(a, b) { - var as = a.split(" "); - for (var i = 0; i < as.length; i++) - if (as[i] && !classTest(as[i]).test(b)) b += " " + as[i]; - return b; - } - - // WINDOW-WIDE EVENTS - - // These must be handled carefully, because naively registering a - // handler for each editor will cause the editors to never be - // garbage collected. - - function forEachCodeMirror(f) { - if (!document.body.getElementsByClassName) return; - var byClass = document.body.getElementsByClassName("CodeMirror"); - for (var i = 0; i < byClass.length; i++) { - var cm = byClass[i].CodeMirror; - if (cm) f(cm); - } - } - - var globalsRegistered = false; - function ensureGlobalHandlers() { - if (globalsRegistered) return; - registerGlobalHandlers(); - globalsRegistered = true; - } - function registerGlobalHandlers() { - // When the window resizes, we need to refresh active editors. - var resizeTimer; - on(window, "resize", function() { - if (resizeTimer == null) resizeTimer = setTimeout(function() { - resizeTimer = null; - forEachCodeMirror(onResize); - }, 100); - }); - // When the window loses focus, we want to show the editor as blurred - on(window, "blur", function() { - forEachCodeMirror(onBlur); - }); - } - - // FEATURE DETECTION - - // Detect drag-and-drop - var dragAndDrop = function() { - // There is *some* kind of drag-and-drop support in IE6-8, but I - // couldn't get it to work yet. - if (ie && ie_version < 9) return false; - var div = elt('div'); - return "draggable" in div || "dragDrop" in div; - }(); - - var zwspSupported; - function zeroWidthElement(measure) { - if (zwspSupported == null) { - var test = elt("span", "\u200b"); - removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")])); - if (measure.firstChild.offsetHeight != 0) - zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8); - } - var node = zwspSupported ? elt("span", "\u200b") : - elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px"); - node.setAttribute("cm-text", ""); - return node; - } - - // Feature-detect IE's crummy client rect reporting for bidi text - var badBidiRects; - function hasBadBidiRects(measure) { - if (badBidiRects != null) return badBidiRects; - var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA")); - var r0 = range(txt, 0, 1).getBoundingClientRect(); - if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780) - var r1 = range(txt, 1, 2).getBoundingClientRect(); - return badBidiRects = (r1.right - r0.right < 3); - } - - // See if "".split is the broken IE version, if so, provide an - // alternative way to split lines. - var splitLinesAuto = CodeMirror.splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) { - var pos = 0, result = [], l = string.length; - while (pos <= l) { - var nl = string.indexOf("\n", pos); - if (nl == -1) nl = string.length; - var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl); - var rt = line.indexOf("\r"); - if (rt != -1) { - result.push(line.slice(0, rt)); - pos += rt + 1; - } else { - result.push(line); - pos = nl + 1; - } - } - return result; - } : function(string){return string.split(/\r\n?|\n/);}; - - var hasSelection = window.getSelection ? function(te) { - try { return te.selectionStart != te.selectionEnd; } - catch(e) { return false; } - } : function(te) { - try {var range = te.ownerDocument.selection.createRange();} - catch(e) {} - if (!range || range.parentElement() != te) return false; - return range.compareEndPoints("StartToEnd", range) != 0; - }; - - var hasCopyEvent = (function() { - var e = elt("div"); - if ("oncopy" in e) return true; - e.setAttribute("oncopy", "return;"); - return typeof e.oncopy == "function"; - })(); - - var badZoomedRects = null; - function hasBadZoomedRects(measure) { - if (badZoomedRects != null) return badZoomedRects; - var node = removeChildrenAndAdd(measure, elt("span", "x")); - var normal = node.getBoundingClientRect(); - var fromRange = range(node, 0, 1).getBoundingClientRect(); - return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1; - } - - // KEY NAMES - - var keyNames = CodeMirror.keyNames = { - 3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt", - 19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End", - 36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert", - 46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod", - 106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete", - 173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\", - 221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete", - 63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert" - }; - (function() { - // Number keys - for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i); - // Alphabetic keys - for (var i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i); - // Function keys - for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i; - })(); - - // BIDI HELPERS - - function iterateBidiSections(order, from, to, f) { - if (!order) return f(from, to, "ltr"); - var found = false; - for (var i = 0; i < order.length; ++i) { - var part = order[i]; - if (part.from < to && part.to > from || from == to && part.to == from) { - f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr"); - found = true; - } - } - if (!found) f(from, to, "ltr"); - } - - function bidiLeft(part) { return part.level % 2 ? part.to : part.from; } - function bidiRight(part) { return part.level % 2 ? part.from : part.to; } - - function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0; } - function lineRight(line) { - var order = getOrder(line); - if (!order) return line.text.length; - return bidiRight(lst(order)); - } - - function lineStart(cm, lineN) { - var line = getLine(cm.doc, lineN); - var visual = visualLine(line); - if (visual != line) lineN = lineNo(visual); - var order = getOrder(visual); - var ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual); - return Pos(lineN, ch); - } - function lineEnd(cm, lineN) { - var merged, line = getLine(cm.doc, lineN); - while (merged = collapsedSpanAtEnd(line)) { - line = merged.find(1, true).line; - lineN = null; - } - var order = getOrder(line); - var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line); - return Pos(lineN == null ? lineNo(line) : lineN, ch); - } - function lineStartSmart(cm, pos) { - var start = lineStart(cm, pos.line); - var line = getLine(cm.doc, start.line); - var order = getOrder(line); - if (!order || order[0].level == 0) { - var firstNonWS = Math.max(0, line.text.search(/\S/)); - var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch; - return Pos(start.line, inWS ? 0 : firstNonWS); - } - return start; - } - - function compareBidiLevel(order, a, b) { - var linedir = order[0].level; - if (a == linedir) return true; - if (b == linedir) return false; - return a < b; - } - var bidiOther; - function getBidiPartAt(order, pos) { - bidiOther = null; - for (var i = 0, found; i < order.length; ++i) { - var cur = order[i]; - if (cur.from < pos && cur.to > pos) return i; - if ((cur.from == pos || cur.to == pos)) { - if (found == null) { - found = i; - } else if (compareBidiLevel(order, cur.level, order[found].level)) { - if (cur.from != cur.to) bidiOther = found; - return i; - } else { - if (cur.from != cur.to) bidiOther = i; - return found; - } - } - } - return found; - } - - function moveInLine(line, pos, dir, byUnit) { - if (!byUnit) return pos + dir; - do pos += dir; - while (pos > 0 && isExtendingChar(line.text.charAt(pos))); - return pos; - } - - // This is needed in order to move 'visually' through bi-directional - // text -- i.e., pressing left should make the cursor go left, even - // when in RTL text. The tricky part is the 'jumps', where RTL and - // LTR text touch each other. This often requires the cursor offset - // to move more than one unit, in order to visually move one unit. - function moveVisually(line, start, dir, byUnit) { - var bidi = getOrder(line); - if (!bidi) return moveLogically(line, start, dir, byUnit); - var pos = getBidiPartAt(bidi, start), part = bidi[pos]; - var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit); - - for (;;) { - if (target > part.from && target < part.to) return target; - if (target == part.from || target == part.to) { - if (getBidiPartAt(bidi, target) == pos) return target; - part = bidi[pos += dir]; - return (dir > 0) == part.level % 2 ? part.to : part.from; - } else { - part = bidi[pos += dir]; - if (!part) return null; - if ((dir > 0) == part.level % 2) - target = moveInLine(line, part.to, -1, byUnit); - else - target = moveInLine(line, part.from, 1, byUnit); - } - } - } - - function moveLogically(line, start, dir, byUnit) { - var target = start + dir; - if (byUnit) while (target > 0 && isExtendingChar(line.text.charAt(target))) target += dir; - return target < 0 || target > line.text.length ? null : target; - } - - // Bidirectional ordering algorithm - // See http://unicode.org/reports/tr9/tr9-13.html for the algorithm - // that this (partially) implements. - - // One-char codes used for character types: - // L (L): Left-to-Right - // R (R): Right-to-Left - // r (AL): Right-to-Left Arabic - // 1 (EN): European Number - // + (ES): European Number Separator - // % (ET): European Number Terminator - // n (AN): Arabic Number - // , (CS): Common Number Separator - // m (NSM): Non-Spacing Mark - // b (BN): Boundary Neutral - // s (B): Paragraph Separator - // t (S): Segment Separator - // w (WS): Whitespace - // N (ON): Other Neutrals - - // Returns null if characters are ordered as they appear - // (left-to-right), or an array of sections ({from, to, level} - // objects) in the order in which they occur visually. - var bidiOrdering = (function() { - // Character types for codepoints 0 to 0xff - var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN"; - // Character types for codepoints 0x600 to 0x6ff - var arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm"; - function charType(code) { - if (code <= 0xf7) return lowTypes.charAt(code); - else if (0x590 <= code && code <= 0x5f4) return "R"; - else if (0x600 <= code && code <= 0x6ed) return arabicTypes.charAt(code - 0x600); - else if (0x6ee <= code && code <= 0x8ac) return "r"; - else if (0x2000 <= code && code <= 0x200b) return "w"; - else if (code == 0x200c) return "b"; - else return "L"; - } - - var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/; - var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/; - // Browsers seem to always treat the boundaries of block elements as being L. - var outerType = "L"; - - function BidiSpan(level, from, to) { - this.level = level; - this.from = from; this.to = to; - } - - return function(str) { - if (!bidiRE.test(str)) return false; - var len = str.length, types = []; - for (var i = 0, type; i < len; ++i) - types.push(type = charType(str.charCodeAt(i))); - - // W1. Examine each non-spacing mark (NSM) in the level run, and - // change the type of the NSM to the type of the previous - // character. If the NSM is at the start of the level run, it will - // get the type of sor. - for (var i = 0, prev = outerType; i < len; ++i) { - var type = types[i]; - if (type == "m") types[i] = prev; - else prev = type; - } - - // W2. Search backwards from each instance of a European number - // until the first strong type (R, L, AL, or sor) is found. If an - // AL is found, change the type of the European number to Arabic - // number. - // W3. Change all ALs to R. - for (var i = 0, cur = outerType; i < len; ++i) { - var type = types[i]; - if (type == "1" && cur == "r") types[i] = "n"; - else if (isStrong.test(type)) { cur = type; if (type == "r") types[i] = "R"; } - } - - // W4. A single European separator between two European numbers - // changes to a European number. A single common separator between - // two numbers of the same type changes to that type. - for (var i = 1, prev = types[0]; i < len - 1; ++i) { - var type = types[i]; - if (type == "+" && prev == "1" && types[i+1] == "1") types[i] = "1"; - else if (type == "," && prev == types[i+1] && - (prev == "1" || prev == "n")) types[i] = prev; - prev = type; - } - - // W5. A sequence of European terminators adjacent to European - // numbers changes to all European numbers. - // W6. Otherwise, separators and terminators change to Other - // Neutral. - for (var i = 0; i < len; ++i) { - var type = types[i]; - if (type == ",") types[i] = "N"; - else if (type == "%") { - for (var end = i + 1; end < len && types[end] == "%"; ++end) {} - var replace = (i && types[i-1] == "!") || (end < len && types[end] == "1") ? "1" : "N"; - for (var j = i; j < end; ++j) types[j] = replace; - i = end - 1; - } - } - - // W7. Search backwards from each instance of a European number - // until the first strong type (R, L, or sor) is found. If an L is - // found, then change the type of the European number to L. - for (var i = 0, cur = outerType; i < len; ++i) { - var type = types[i]; - if (cur == "L" && type == "1") types[i] = "L"; - else if (isStrong.test(type)) cur = type; - } - - // N1. A sequence of neutrals takes the direction of the - // surrounding strong text if the text on both sides has the same - // direction. European and Arabic numbers act as if they were R in - // terms of their influence on neutrals. Start-of-level-run (sor) - // and end-of-level-run (eor) are used at level run boundaries. - // N2. Any remaining neutrals take the embedding direction. - for (var i = 0; i < len; ++i) { - if (isNeutral.test(types[i])) { - for (var end = i + 1; end < len && isNeutral.test(types[end]); ++end) {} - var before = (i ? types[i-1] : outerType) == "L"; - var after = (end < len ? types[end] : outerType) == "L"; - var replace = before || after ? "L" : "R"; - for (var j = i; j < end; ++j) types[j] = replace; - i = end - 1; - } - } - - // Here we depart from the documented algorithm, in order to avoid - // building up an actual levels array. Since there are only three - // levels (0, 1, 2) in an implementation that doesn't take - // explicit embedding into account, we can build up the order on - // the fly, without following the level-based algorithm. - var order = [], m; - for (var i = 0; i < len;) { - if (countsAsLeft.test(types[i])) { - var start = i; - for (++i; i < len && countsAsLeft.test(types[i]); ++i) {} - order.push(new BidiSpan(0, start, i)); - } else { - var pos = i, at = order.length; - for (++i; i < len && types[i] != "L"; ++i) {} - for (var j = pos; j < i;) { - if (countsAsNum.test(types[j])) { - if (pos < j) order.splice(at, 0, new BidiSpan(1, pos, j)); - var nstart = j; - for (++j; j < i && countsAsNum.test(types[j]); ++j) {} - order.splice(at, 0, new BidiSpan(2, nstart, j)); - pos = j; - } else ++j; - } - if (pos < i) order.splice(at, 0, new BidiSpan(1, pos, i)); - } - } - if (order[0].level == 1 && (m = str.match(/^\s+/))) { - order[0].from = m[0].length; - order.unshift(new BidiSpan(0, 0, m[0].length)); - } - if (lst(order).level == 1 && (m = str.match(/\s+$/))) { - lst(order).to -= m[0].length; - order.push(new BidiSpan(0, len - m[0].length, len)); - } - if (order[0].level == 2) - order.unshift(new BidiSpan(1, order[0].to, order[0].to)); - if (order[0].level != lst(order).level) - order.push(new BidiSpan(order[0].level, len, len)); - - return order; - }; - })(); - - // THE END - - CodeMirror.version = "5.13.2"; - - return CodeMirror; -}); +!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.CodeMirror=t()}(this,function(){"use strict";var e=navigator.userAgent,t=navigator.platform,r=/gecko\/\d/i.test(e),n=/MSIE \d/.test(e),i=/Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(e),o=/Edge\/(\d+)/.exec(e),l=n||i||o,s=l&&(n?document.documentMode||6:+(o||i)[1]),a=!o&&/WebKit\//.test(e),u=a&&/Qt\/\d+\.\d+/.test(e),c=!o&&/Chrome\//.test(e),h=/Opera\//.test(e),f=/Apple Computer/.test(navigator.vendor),d=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(e),p=/PhantomJS/.test(e),g=!o&&/AppleWebKit/.test(e)&&/Mobile\/\w+/.test(e),v=/Android/.test(e),m=g||v||/webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(e),y=g||/Mac/.test(t),b=/\bCrOS\b/.test(e),w=/win/i.test(t),x=h&&e.match(/Version\/(\d*\.\d*)/);x&&(x=Number(x[1])),x&&x>=15&&(h=!1,a=!0);var C=y&&(u||h&&(null==x||x<12.11)),S=r||l&&s>=9;function L(e){return new RegExp("(^|\\s)"+e+"(?:$|\\s)\\s*")}var k,T=function(e,t){var r=e.className,n=L(t).exec(r);if(n){var i=r.slice(n.index+n[0].length);e.className=r.slice(0,n.index)+(i?n[1]+i:"")}};function M(e){for(var t=e.childNodes.length;t>0;--t)e.removeChild(e.firstChild);return e}function N(e,t){return M(e).appendChild(t)}function O(e,t,r,n){var i=document.createElement(e);if(r&&(i.className=r),n&&(i.style.cssText=n),"string"==typeof t)i.appendChild(document.createTextNode(t));else if(t)for(var o=0;o<t.length;++o)i.appendChild(t[o]);return i}function A(e,t,r,n){var i=O(e,t,r,n);return i.setAttribute("role","presentation"),i}function D(e,t){if(3==t.nodeType&&(t=t.parentNode),e.contains)return e.contains(t);do{if(11==t.nodeType&&(t=t.host),t==e)return!0}while(t=t.parentNode)}function W(){var e;try{e=document.activeElement}catch(t){e=document.body||null}for(;e&&e.shadowRoot&&e.shadowRoot.activeElement;)e=e.shadowRoot.activeElement;return e}function H(e,t){var r=e.className;L(t).test(r)||(e.className+=(r?" ":"")+t)}function F(e,t){for(var r=e.split(" "),n=0;n<r.length;n++)r[n]&&!L(r[n]).test(t)&&(t+=" "+r[n]);return t}k=document.createRange?function(e,t,r,n){var i=document.createRange();return i.setEnd(n||e,r),i.setStart(e,t),i}:function(e,t,r){var n=document.body.createTextRange();try{n.moveToElementText(e.parentNode)}catch(e){return n}return n.collapse(!0),n.moveEnd("character",r),n.moveStart("character",t),n};var P=function(e){e.select()};function E(e){var t=Array.prototype.slice.call(arguments,1);return function(){return e.apply(null,t)}}function z(e,t,r){for(var n in t||(t={}),e)!e.hasOwnProperty(n)||!1===r&&t.hasOwnProperty(n)||(t[n]=e[n]);return t}function I(e,t,r,n,i){null==t&&-1==(t=e.search(/[^\s\u00a0]/))&&(t=e.length);for(var o=n||0,l=i||0;;){var s=e.indexOf("\t",o);if(s<0||s>=t)return l+(t-o);l+=s-o,l+=r-l%r,o=s+1}}g?P=function(e){e.selectionStart=0,e.selectionEnd=e.value.length}:l&&(P=function(e){try{e.select()}catch(e){}});var R=function(){this.id=null};function B(e,t){for(var r=0;r<e.length;++r)if(e[r]==t)return r;return-1}R.prototype.set=function(e,t){clearTimeout(this.id),this.id=setTimeout(t,e)};var G=30,U={toString:function(){return"CodeMirror.Pass"}},V={scroll:!1},K={origin:"*mouse"},j={origin:"+move"};function X(e,t,r){for(var n=0,i=0;;){var o=e.indexOf("\t",n);-1==o&&(o=e.length);var l=o-n;if(o==e.length||i+l>=t)return n+Math.min(l,t-i);if(i+=o-n,n=o+1,(i+=r-i%r)>=t)return n}}var Y=[""];function _(e){for(;Y.length<=e;)Y.push(q(Y)+" ");return Y[e]}function q(e){return e[e.length-1]}function $(e,t){for(var r=[],n=0;n<e.length;n++)r[n]=t(e[n],n);return r}function Z(){}function Q(e,t){var r;return Object.create?r=Object.create(e):(Z.prototype=e,r=new Z),t&&z(t,r),r}var J=/[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;function ee(e){return/\w/.test(e)||e>"€"&&(e.toUpperCase()!=e.toLowerCase()||J.test(e))}function te(e,t){return t?!!(t.source.indexOf("\\w")>-1&&ee(e))||t.test(e):ee(e)}function re(e){for(var t in e)if(e.hasOwnProperty(t)&&e[t])return!1;return!0}var ne=/[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;function ie(e){return e.charCodeAt(0)>=768&&ne.test(e)}function oe(e,t,r){for(;(r<0?t>0:t<e.length)&&ie(e.charAt(t));)t+=r;return t}function le(e,t,r){for(var n=t>r?-1:1;;){if(t==r)return t;var i=(t+r)/2,o=n<0?Math.ceil(i):Math.floor(i);if(o==t)return e(o)?t:r;e(o)?r=o:t=o+n}}function se(e,t){if((t-=e.first)<0||t>=e.size)throw new Error("There is no line "+(t+e.first)+" in the document.");for(var r=e;!r.lines;)for(var n=0;;++n){var i=r.children[n],o=i.chunkSize();if(t<o){r=i;break}t-=o}return r.lines[t]}function ae(e,t,r){var n=[],i=t.line;return e.iter(t.line,r.line+1,function(e){var o=e.text;i==r.line&&(o=o.slice(0,r.ch)),i==t.line&&(o=o.slice(t.ch)),n.push(o),++i}),n}function ue(e,t,r){var n=[];return e.iter(t,r,function(e){n.push(e.text)}),n}function ce(e,t){var r=t-e.height;if(r)for(var n=e;n;n=n.parent)n.height+=r}function he(e){if(null==e.parent)return null;for(var t=e.parent,r=B(t.lines,e),n=t.parent;n;t=n,n=n.parent)for(var i=0;n.children[i]!=t;++i)r+=n.children[i].chunkSize();return r+t.first}function fe(e,t){var r=e.first;e:do{for(var n=0;n<e.children.length;++n){var i=e.children[n],o=i.height;if(t<o){e=i;continue e}t-=o,r+=i.chunkSize()}return r}while(!e.lines);for(var l=0;l<e.lines.length;++l){var s=e.lines[l].height;if(t<s)break;t-=s}return r+l}function de(e,t){return t>=e.first&&t<e.first+e.size}function pe(e,t){return String(e.lineNumberFormatter(t+e.firstLineNumber))}function ge(e,t,r){if(void 0===r&&(r=null),!(this instanceof ge))return new ge(e,t,r);this.line=e,this.ch=t,this.sticky=r}function ve(e,t){return e.line-t.line||e.ch-t.ch}function me(e,t){return e.sticky==t.sticky&&0==ve(e,t)}function ye(e){return ge(e.line,e.ch)}function be(e,t){return ve(e,t)<0?t:e}function we(e,t){return ve(e,t)<0?e:t}function xe(e,t){return Math.max(e.first,Math.min(t,e.first+e.size-1))}function Ce(e,t){if(t.line<e.first)return ge(e.first,0);var r,n,i,o=e.first+e.size-1;return t.line>o?ge(o,se(e,o).text.length):(r=t,n=se(e,t.line).text.length,null==(i=r.ch)||i>n?ge(r.line,n):i<0?ge(r.line,0):r)}function Se(e,t){for(var r=[],n=0;n<t.length;n++)r[n]=Ce(e,t[n]);return r}var Le=!1,ke=!1;function Te(e,t,r){this.marker=e,this.from=t,this.to=r}function Me(e,t){if(e)for(var r=0;r<e.length;++r){var n=e[r];if(n.marker==t)return n}}function Ne(e,t){for(var r,n=0;n<e.length;++n)e[n]!=t&&(r||(r=[])).push(e[n]);return r}function Oe(e,t){if(t.full)return null;var r=de(e,t.from.line)&&se(e,t.from.line).markedSpans,n=de(e,t.to.line)&&se(e,t.to.line).markedSpans;if(!r&&!n)return null;var i=t.from.ch,o=t.to.ch,l=0==ve(t.from,t.to),s=function(e,t,r){var n;if(e)for(var i=0;i<e.length;++i){var o=e[i],l=o.marker;if(null==o.from||(l.inclusiveLeft?o.from<=t:o.from<t)||o.from==t&&"bookmark"==l.type&&(!r||!o.marker.insertLeft)){var s=null==o.to||(l.inclusiveRight?o.to>=t:o.to>t);(n||(n=[])).push(new Te(l,o.from,s?null:o.to))}}return n}(r,i,l),a=function(e,t,r){var n;if(e)for(var i=0;i<e.length;++i){var o=e[i],l=o.marker;if(null==o.to||(l.inclusiveRight?o.to>=t:o.to>t)||o.from==t&&"bookmark"==l.type&&(!r||o.marker.insertLeft)){var s=null==o.from||(l.inclusiveLeft?o.from<=t:o.from<t);(n||(n=[])).push(new Te(l,s?null:o.from-t,null==o.to?null:o.to-t))}}return n}(n,o,l),u=1==t.text.length,c=q(t.text).length+(u?i:0);if(s)for(var h=0;h<s.length;++h){var f=s[h];if(null==f.to){var d=Me(a,f.marker);d?u&&(f.to=null==d.to?null:d.to+c):f.to=i}}if(a)for(var p=0;p<a.length;++p){var g=a[p];if(null!=g.to&&(g.to+=c),null==g.from)Me(s,g.marker)||(g.from=c,u&&(s||(s=[])).push(g));else g.from+=c,u&&(s||(s=[])).push(g)}s&&(s=Ae(s)),a&&a!=s&&(a=Ae(a));var v=[s];if(!u){var m,y=t.text.length-2;if(y>0&&s)for(var b=0;b<s.length;++b)null==s[b].to&&(m||(m=[])).push(new Te(s[b].marker,null,null));for(var w=0;w<y;++w)v.push(m);v.push(a)}return v}function Ae(e){for(var t=0;t<e.length;++t){var r=e[t];null!=r.from&&r.from==r.to&&!1!==r.marker.clearWhenEmpty&&e.splice(t--,1)}return e.length?e:null}function De(e){var t=e.markedSpans;if(t){for(var r=0;r<t.length;++r)t[r].marker.detachLine(e);e.markedSpans=null}}function We(e,t){if(t){for(var r=0;r<t.length;++r)t[r].marker.attachLine(e);e.markedSpans=t}}function He(e){return e.inclusiveLeft?-1:0}function Fe(e){return e.inclusiveRight?1:0}function Pe(e,t){var r=e.lines.length-t.lines.length;if(0!=r)return r;var n=e.find(),i=t.find(),o=ve(n.from,i.from)||He(e)-He(t);if(o)return-o;var l=ve(n.to,i.to)||Fe(e)-Fe(t);return l||t.id-e.id}function Ee(e,t){var r,n=ke&&e.markedSpans;if(n)for(var i=void 0,o=0;o<n.length;++o)(i=n[o]).marker.collapsed&&null==(t?i.from:i.to)&&(!r||Pe(r,i.marker)<0)&&(r=i.marker);return r}function ze(e){return Ee(e,!0)}function Ie(e){return Ee(e,!1)}function Re(e,t,r,n,i){var o=se(e,t),l=ke&&o.markedSpans;if(l)for(var s=0;s<l.length;++s){var a=l[s];if(a.marker.collapsed){var u=a.marker.find(0),c=ve(u.from,r)||He(a.marker)-He(i),h=ve(u.to,n)||Fe(a.marker)-Fe(i);if(!(c>=0&&h<=0||c<=0&&h>=0)&&(c<=0&&(a.marker.inclusiveRight&&i.inclusiveLeft?ve(u.to,r)>=0:ve(u.to,r)>0)||c>=0&&(a.marker.inclusiveRight&&i.inclusiveLeft?ve(u.from,n)<=0:ve(u.from,n)<0)))return!0}}}function Be(e){for(var t;t=ze(e);)e=t.find(-1,!0).line;return e}function Ge(e,t){var r=se(e,t),n=Be(r);return r==n?t:he(n)}function Ue(e,t){if(t>e.lastLine())return t;var r,n=se(e,t);if(!Ve(e,n))return t;for(;r=Ie(n);)n=r.find(1,!0).line;return he(n)+1}function Ve(e,t){var r=ke&&t.markedSpans;if(r)for(var n=void 0,i=0;i<r.length;++i)if((n=r[i]).marker.collapsed){if(null==n.from)return!0;if(!n.marker.widgetNode&&0==n.from&&n.marker.inclusiveLeft&&Ke(e,t,n))return!0}}function Ke(e,t,r){if(null==r.to){var n=r.marker.find(1,!0);return Ke(e,n.line,Me(n.line.markedSpans,r.marker))}if(r.marker.inclusiveRight&&r.to==t.text.length)return!0;for(var i=void 0,o=0;o<t.markedSpans.length;++o)if((i=t.markedSpans[o]).marker.collapsed&&!i.marker.widgetNode&&i.from==r.to&&(null==i.to||i.to!=r.from)&&(i.marker.inclusiveLeft||r.marker.inclusiveRight)&&Ke(e,t,i))return!0}function je(e){for(var t=0,r=(e=Be(e)).parent,n=0;n<r.lines.length;++n){var i=r.lines[n];if(i==e)break;t+=i.height}for(var o=r.parent;o;o=(r=o).parent)for(var l=0;l<o.children.length;++l){var s=o.children[l];if(s==r)break;t+=s.height}return t}function Xe(e){if(0==e.height)return 0;for(var t,r=e.text.length,n=e;t=ze(n);){var i=t.find(0,!0);n=i.from.line,r+=i.from.ch-i.to.ch}for(n=e;t=Ie(n);){var o=t.find(0,!0);r-=n.text.length-o.from.ch,r+=(n=o.to.line).text.length-o.to.ch}return r}function Ye(e){var t=e.display,r=e.doc;t.maxLine=se(r,r.first),t.maxLineLength=Xe(t.maxLine),t.maxLineChanged=!0,r.iter(function(e){var r=Xe(e);r>t.maxLineLength&&(t.maxLineLength=r,t.maxLine=e)})}var _e=null;function qe(e,t,r){var n;_e=null;for(var i=0;i<e.length;++i){var o=e[i];if(o.from<t&&o.to>t)return i;o.to==t&&(o.from!=o.to&&"before"==r?n=i:_e=i),o.from==t&&(o.from!=o.to&&"before"!=r?n=i:_e=i)}return null!=n?n:_e}var $e=function(){var e="bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN",t="nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111";var r=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,n=/[stwN]/,i=/[LRr]/,o=/[Lb1n]/,l=/[1n]/;function s(e,t,r){this.level=e,this.from=t,this.to=r}return function(a,u){var c="ltr"==u?"L":"R";if(0==a.length||"ltr"==u&&!r.test(a))return!1;for(var h,f=a.length,d=[],p=0;p<f;++p)d.push((h=a.charCodeAt(p))<=247?e.charAt(h):1424<=h&&h<=1524?"R":1536<=h&&h<=1785?t.charAt(h-1536):1774<=h&&h<=2220?"r":8192<=h&&h<=8203?"w":8204==h?"b":"L");for(var g=0,v=c;g<f;++g){var m=d[g];"m"==m?d[g]=v:v=m}for(var y=0,b=c;y<f;++y){var w=d[y];"1"==w&&"r"==b?d[y]="n":i.test(w)&&(b=w,"r"==w&&(d[y]="R"))}for(var x=1,C=d[0];x<f-1;++x){var S=d[x];"+"==S&&"1"==C&&"1"==d[x+1]?d[x]="1":","!=S||C!=d[x+1]||"1"!=C&&"n"!=C||(d[x]=C),C=S}for(var L=0;L<f;++L){var k=d[L];if(","==k)d[L]="N";else if("%"==k){var T=void 0;for(T=L+1;T<f&&"%"==d[T];++T);for(var M=L&&"!"==d[L-1]||T<f&&"1"==d[T]?"1":"N",N=L;N<T;++N)d[N]=M;L=T-1}}for(var O=0,A=c;O<f;++O){var D=d[O];"L"==A&&"1"==D?d[O]="L":i.test(D)&&(A=D)}for(var W=0;W<f;++W)if(n.test(d[W])){var H=void 0;for(H=W+1;H<f&&n.test(d[H]);++H);for(var F="L"==(W?d[W-1]:c),P=F==("L"==(H<f?d[H]:c))?F?"L":"R":c,E=W;E<H;++E)d[E]=P;W=H-1}for(var z,I=[],R=0;R<f;)if(o.test(d[R])){var B=R;for(++R;R<f&&o.test(d[R]);++R);I.push(new s(0,B,R))}else{var G=R,U=I.length;for(++R;R<f&&"L"!=d[R];++R);for(var V=G;V<R;)if(l.test(d[V])){G<V&&I.splice(U,0,new s(1,G,V));var K=V;for(++V;V<R&&l.test(d[V]);++V);I.splice(U,0,new s(2,K,V)),G=V}else++V;G<R&&I.splice(U,0,new s(1,G,R))}return"ltr"==u&&(1==I[0].level&&(z=a.match(/^\s+/))&&(I[0].from=z[0].length,I.unshift(new s(0,0,z[0].length))),1==q(I).level&&(z=a.match(/\s+$/))&&(q(I).to-=z[0].length,I.push(new s(0,f-z[0].length,f)))),"rtl"==u?I.reverse():I}}();function Ze(e,t){var r=e.order;return null==r&&(r=e.order=$e(e.text,t)),r}var Qe=[],Je=function(e,t,r){if(e.addEventListener)e.addEventListener(t,r,!1);else if(e.attachEvent)e.attachEvent("on"+t,r);else{var n=e._handlers||(e._handlers={});n[t]=(n[t]||Qe).concat(r)}};function et(e,t){return e._handlers&&e._handlers[t]||Qe}function tt(e,t,r){if(e.removeEventListener)e.removeEventListener(t,r,!1);else if(e.detachEvent)e.detachEvent("on"+t,r);else{var n=e._handlers,i=n&&n[t];if(i){var o=B(i,r);o>-1&&(n[t]=i.slice(0,o).concat(i.slice(o+1)))}}}function rt(e,t){var r=et(e,t);if(r.length)for(var n=Array.prototype.slice.call(arguments,2),i=0;i<r.length;++i)r[i].apply(null,n)}function nt(e,t,r){return"string"==typeof t&&(t={type:t,preventDefault:function(){this.defaultPrevented=!0}}),rt(e,r||t.type,e,t),ut(t)||t.codemirrorIgnore}function it(e){var t=e._handlers&&e._handlers.cursorActivity;if(t)for(var r=e.curOp.cursorActivityHandlers||(e.curOp.cursorActivityHandlers=[]),n=0;n<t.length;++n)-1==B(r,t[n])&&r.push(t[n])}function ot(e,t){return et(e,t).length>0}function lt(e){e.prototype.on=function(e,t){Je(this,e,t)},e.prototype.off=function(e,t){tt(this,e,t)}}function st(e){e.preventDefault?e.preventDefault():e.returnValue=!1}function at(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0}function ut(e){return null!=e.defaultPrevented?e.defaultPrevented:0==e.returnValue}function ct(e){st(e),at(e)}function ht(e){return e.target||e.srcElement}function ft(e){var t=e.which;return null==t&&(1&e.button?t=1:2&e.button?t=3:4&e.button&&(t=2)),y&&e.ctrlKey&&1==t&&(t=3),t}var dt,pt,gt=function(){if(l&&s<9)return!1;var e=O("div");return"draggable"in e||"dragDrop"in e}();function vt(e){if(null==dt){var t=O("span","​");N(e,O("span",[t,document.createTextNode("x")])),0!=e.firstChild.offsetHeight&&(dt=t.offsetWidth<=1&&t.offsetHeight>2&&!(l&&s<8))}var r=dt?O("span","​"):O("span"," ",null,"display: inline-block; width: 1px; margin-right: -1px");return r.setAttribute("cm-text",""),r}function mt(e){if(null!=pt)return pt;var t=N(e,document.createTextNode("AخA")),r=k(t,0,1).getBoundingClientRect(),n=k(t,1,2).getBoundingClientRect();return M(e),!(!r||r.left==r.right)&&(pt=n.right-r.right<3)}var yt,bt=3!="\n\nb".split(/\n/).length?function(e){for(var t=0,r=[],n=e.length;t<=n;){var i=e.indexOf("\n",t);-1==i&&(i=e.length);var o=e.slice(t,"\r"==e.charAt(i-1)?i-1:i),l=o.indexOf("\r");-1!=l?(r.push(o.slice(0,l)),t+=l+1):(r.push(o),t=i+1)}return r}:function(e){return e.split(/\r\n?|\n/)},wt=window.getSelection?function(e){try{return e.selectionStart!=e.selectionEnd}catch(e){return!1}}:function(e){var t;try{t=e.ownerDocument.selection.createRange()}catch(e){}return!(!t||t.parentElement()!=e)&&0!=t.compareEndPoints("StartToEnd",t)},xt="oncopy"in(yt=O("div"))||(yt.setAttribute("oncopy","return;"),"function"==typeof yt.oncopy),Ct=null;var St={},Lt={};function kt(e){if("string"==typeof e&&Lt.hasOwnProperty(e))e=Lt[e];else if(e&&"string"==typeof e.name&&Lt.hasOwnProperty(e.name)){var t=Lt[e.name];"string"==typeof t&&(t={name:t}),(e=Q(t,e)).name=t.name}else{if("string"==typeof e&&/^[\w\-]+\/[\w\-]+\+xml$/.test(e))return kt("application/xml");if("string"==typeof e&&/^[\w\-]+\/[\w\-]+\+json$/.test(e))return kt("application/json")}return"string"==typeof e?{name:e}:e||{name:"null"}}function Tt(e,t){t=kt(t);var r=St[t.name];if(!r)return Tt(e,"text/plain");var n=r(e,t);if(Mt.hasOwnProperty(t.name)){var i=Mt[t.name];for(var o in i)i.hasOwnProperty(o)&&(n.hasOwnProperty(o)&&(n["_"+o]=n[o]),n[o]=i[o])}if(n.name=t.name,t.helperType&&(n.helperType=t.helperType),t.modeProps)for(var l in t.modeProps)n[l]=t.modeProps[l];return n}var Mt={};function Nt(e,t){z(t,Mt.hasOwnProperty(e)?Mt[e]:Mt[e]={})}function Ot(e,t){if(!0===t)return t;if(e.copyState)return e.copyState(t);var r={};for(var n in t){var i=t[n];i instanceof Array&&(i=i.concat([])),r[n]=i}return r}function At(e,t){for(var r;e.innerMode&&(r=e.innerMode(t))&&r.mode!=e;)t=r.state,e=r.mode;return r||{mode:e,state:t}}function Dt(e,t,r){return!e.startState||e.startState(t,r)}var Wt=function(e,t,r){this.pos=this.start=0,this.string=e,this.tabSize=t||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0,this.lineOracle=r};Wt.prototype.eol=function(){return this.pos>=this.string.length},Wt.prototype.sol=function(){return this.pos==this.lineStart},Wt.prototype.peek=function(){return this.string.charAt(this.pos)||void 0},Wt.prototype.next=function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},Wt.prototype.eat=function(e){var t=this.string.charAt(this.pos);if("string"==typeof e?t==e:t&&(e.test?e.test(t):e(t)))return++this.pos,t},Wt.prototype.eatWhile=function(e){for(var t=this.pos;this.eat(e););return this.pos>t},Wt.prototype.eatSpace=function(){for(var e=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>e},Wt.prototype.skipToEnd=function(){this.pos=this.string.length},Wt.prototype.skipTo=function(e){var t=this.string.indexOf(e,this.pos);if(t>-1)return this.pos=t,!0},Wt.prototype.backUp=function(e){this.pos-=e},Wt.prototype.column=function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=I(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue-(this.lineStart?I(this.string,this.lineStart,this.tabSize):0)},Wt.prototype.indentation=function(){return I(this.string,null,this.tabSize)-(this.lineStart?I(this.string,this.lineStart,this.tabSize):0)},Wt.prototype.match=function(e,t,r){if("string"!=typeof e){var n=this.string.slice(this.pos).match(e);return n&&n.index>0?null:(n&&!1!==t&&(this.pos+=n[0].length),n)}var i=function(e){return r?e.toLowerCase():e};if(i(this.string.substr(this.pos,e.length))==i(e))return!1!==t&&(this.pos+=e.length),!0},Wt.prototype.current=function(){return this.string.slice(this.start,this.pos)},Wt.prototype.hideFirstChars=function(e,t){this.lineStart+=e;try{return t()}finally{this.lineStart-=e}},Wt.prototype.lookAhead=function(e){var t=this.lineOracle;return t&&t.lookAhead(e)},Wt.prototype.baseToken=function(){var e=this.lineOracle;return e&&e.baseToken(this.pos)};var Ht=function(e,t){this.state=e,this.lookAhead=t},Ft=function(e,t,r,n){this.state=t,this.doc=e,this.line=r,this.maxLookAhead=n||0,this.baseTokens=null,this.baseTokenPos=1};function Pt(e,t,r,n){var i=[e.state.modeGen],o={};Kt(e,t.text,e.doc.mode,r,function(e,t){return i.push(e,t)},o,n);for(var l=r.state,s=function(n){r.baseTokens=i;var s=e.state.overlays[n],a=1,u=0;r.state=!0,Kt(e,t.text,s.mode,r,function(e,t){for(var r=a;u<e;){var n=i[a];n>e&&i.splice(a,1,e,i[a+1],n),a+=2,u=Math.min(e,n)}if(t)if(s.opaque)i.splice(r,a-r,e,"overlay "+t),a=r+2;else for(;r<a;r+=2){var o=i[r+1];i[r+1]=(o?o+" ":"")+"overlay "+t}},o),r.state=l,r.baseTokens=null,r.baseTokenPos=1},a=0;a<e.state.overlays.length;++a)s(a);return{styles:i,classes:o.bgClass||o.textClass?o:null}}function Et(e,t,r){if(!t.styles||t.styles[0]!=e.state.modeGen){var n=zt(e,he(t)),i=t.text.length>e.options.maxHighlightLength&&Ot(e.doc.mode,n.state),o=Pt(e,t,n);i&&(n.state=i),t.stateAfter=n.save(!i),t.styles=o.styles,o.classes?t.styleClasses=o.classes:t.styleClasses&&(t.styleClasses=null),r===e.doc.highlightFrontier&&(e.doc.modeFrontier=Math.max(e.doc.modeFrontier,++e.doc.highlightFrontier))}return t.styles}function zt(e,t,r){var n=e.doc,i=e.display;if(!n.mode.startState)return new Ft(n,!0,t);var o=function(e,t,r){for(var n,i,o=e.doc,l=r?-1:t-(e.doc.mode.innerMode?1e3:100),s=t;s>l;--s){if(s<=o.first)return o.first;var a=se(o,s-1),u=a.stateAfter;if(u&&(!r||s+(u instanceof Ht?u.lookAhead:0)<=o.modeFrontier))return s;var c=I(a.text,null,e.options.tabSize);(null==i||n>c)&&(i=s-1,n=c)}return i}(e,t,r),l=o>n.first&&se(n,o-1).stateAfter,s=l?Ft.fromSaved(n,l,o):new Ft(n,Dt(n.mode),o);return n.iter(o,t,function(r){It(e,r.text,s);var n=s.line;r.stateAfter=n==t-1||n%5==0||n>=i.viewFrom&&n<i.viewTo?s.save():null,s.nextLine()}),r&&(n.modeFrontier=s.line),s}function It(e,t,r,n){var i=e.doc.mode,o=new Wt(t,e.options.tabSize,r);for(o.start=o.pos=n||0,""==t&&Rt(i,r.state);!o.eol();)Bt(i,o,r.state),o.start=o.pos}function Rt(e,t){if(e.blankLine)return e.blankLine(t);if(e.innerMode){var r=At(e,t);return r.mode.blankLine?r.mode.blankLine(r.state):void 0}}function Bt(e,t,r,n){for(var i=0;i<10;i++){n&&(n[0]=At(e,r).mode);var o=e.token(t,r);if(t.pos>t.start)return o}throw new Error("Mode "+e.name+" failed to advance stream.")}Ft.prototype.lookAhead=function(e){var t=this.doc.getLine(this.line+e);return null!=t&&e>this.maxLookAhead&&(this.maxLookAhead=e),t},Ft.prototype.baseToken=function(e){if(!this.baseTokens)return null;for(;this.baseTokens[this.baseTokenPos]<=e;)this.baseTokenPos+=2;var t=this.baseTokens[this.baseTokenPos+1];return{type:t&&t.replace(/( |^)overlay .*/,""),size:this.baseTokens[this.baseTokenPos]-e}},Ft.prototype.nextLine=function(){this.line++,this.maxLookAhead>0&&this.maxLookAhead--},Ft.fromSaved=function(e,t,r){return t instanceof Ht?new Ft(e,Ot(e.mode,t.state),r,t.lookAhead):new Ft(e,Ot(e.mode,t),r)},Ft.prototype.save=function(e){var t=!1!==e?Ot(this.doc.mode,this.state):this.state;return this.maxLookAhead>0?new Ht(t,this.maxLookAhead):t};var Gt=function(e,t,r){this.start=e.start,this.end=e.pos,this.string=e.current(),this.type=t||null,this.state=r};function Ut(e,t,r,n){var i,o,l=e.doc,s=l.mode,a=se(l,(t=Ce(l,t)).line),u=zt(e,t.line,r),c=new Wt(a.text,e.options.tabSize,u);for(n&&(o=[]);(n||c.pos<t.ch)&&!c.eol();)c.start=c.pos,i=Bt(s,c,u.state),n&&o.push(new Gt(c,i,Ot(l.mode,u.state)));return n?o:new Gt(c,i,u.state)}function Vt(e,t){if(e)for(;;){var r=e.match(/(?:^|\s+)line-(background-)?(\S+)/);if(!r)break;e=e.slice(0,r.index)+e.slice(r.index+r[0].length);var n=r[1]?"bgClass":"textClass";null==t[n]?t[n]=r[2]:new RegExp("(?:^|s)"+r[2]+"(?:$|s)").test(t[n])||(t[n]+=" "+r[2])}return e}function Kt(e,t,r,n,i,o,l){var s=r.flattenSpans;null==s&&(s=e.options.flattenSpans);var a,u=0,c=null,h=new Wt(t,e.options.tabSize,n),f=e.options.addModeClass&&[null];for(""==t&&Vt(Rt(r,n.state),o);!h.eol();){if(h.pos>e.options.maxHighlightLength?(s=!1,l&&It(e,t,n,h.pos),h.pos=t.length,a=null):a=Vt(Bt(r,h,n.state,f),o),f){var d=f[0].name;d&&(a="m-"+(a?d+" "+a:d))}if(!s||c!=a){for(;u<h.start;)i(u=Math.min(h.start,u+5e3),c);c=a}h.start=h.pos}for(;u<h.pos;){var p=Math.min(h.pos,u+5e3);i(p,c),u=p}}var jt=function(e,t,r){this.text=e,We(this,t),this.height=r?r(this):1};jt.prototype.lineNo=function(){return he(this)},lt(jt);var Xt={},Yt={};function _t(e,t){if(!e||/^\s*$/.test(e))return null;var r=t.addModeClass?Yt:Xt;return r[e]||(r[e]=e.replace(/\S+/g,"cm-$&"))}function qt(e,t){var r=A("span",null,null,a?"padding-right: .1px":null),n={pre:A("pre",[r],"CodeMirror-line"),content:r,col:0,pos:0,cm:e,trailingSpace:!1,splitSpaces:(l||a)&&e.getOption("lineWrapping")};t.measure={};for(var i=0;i<=(t.rest?t.rest.length:0);i++){var o=i?t.rest[i-1]:t.line,s=void 0;n.pos=0,n.addToken=Zt,mt(e.display.measure)&&(s=Ze(o,e.doc.direction))&&(n.addToken=Qt(n.addToken,s)),n.map=[],er(o,n,Et(e,o,t!=e.display.externalMeasured&&he(o))),o.styleClasses&&(o.styleClasses.bgClass&&(n.bgClass=F(o.styleClasses.bgClass,n.bgClass||"")),o.styleClasses.textClass&&(n.textClass=F(o.styleClasses.textClass,n.textClass||""))),0==n.map.length&&n.map.push(0,0,n.content.appendChild(vt(e.display.measure))),0==i?(t.measure.map=n.map,t.measure.cache={}):((t.measure.maps||(t.measure.maps=[])).push(n.map),(t.measure.caches||(t.measure.caches=[])).push({}))}if(a){var u=n.content.lastChild;(/\bcm-tab\b/.test(u.className)||u.querySelector&&u.querySelector(".cm-tab"))&&(n.content.className="cm-tab-wrap-hack")}return rt(e,"renderLine",e,t.line,n.pre),n.pre.className&&(n.textClass=F(n.pre.className,n.textClass||"")),n}function $t(e){var t=O("span","•","cm-invalidchar");return t.title="\\u"+e.charCodeAt(0).toString(16),t.setAttribute("aria-label",t.title),t}function Zt(e,t,r,n,i,o,a){if(t){var u,c=e.splitSpaces?function(e,t){if(e.length>1&&!/ /.test(e))return e;for(var r=t,n="",i=0;i<e.length;i++){var o=e.charAt(i);" "!=o||!r||i!=e.length-1&&32!=e.charCodeAt(i+1)||(o=" "),n+=o,r=" "==o}return n}(t,e.trailingSpace):t,h=e.cm.state.specialChars,f=!1;if(h.test(t)){u=document.createDocumentFragment();for(var d=0;;){h.lastIndex=d;var p=h.exec(t),g=p?p.index-d:t.length-d;if(g){var v=document.createTextNode(c.slice(d,d+g));l&&s<9?u.appendChild(O("span",[v])):u.appendChild(v),e.map.push(e.pos,e.pos+g,v),e.col+=g,e.pos+=g}if(!p)break;d+=g+1;var m=void 0;if("\t"==p[0]){var y=e.cm.options.tabSize,b=y-e.col%y;(m=u.appendChild(O("span",_(b),"cm-tab"))).setAttribute("role","presentation"),m.setAttribute("cm-text","\t"),e.col+=b}else"\r"==p[0]||"\n"==p[0]?((m=u.appendChild(O("span","\r"==p[0]?"␍":"␤","cm-invalidchar"))).setAttribute("cm-text",p[0]),e.col+=1):((m=e.cm.options.specialCharPlaceholder(p[0])).setAttribute("cm-text",p[0]),l&&s<9?u.appendChild(O("span",[m])):u.appendChild(m),e.col+=1);e.map.push(e.pos,e.pos+1,m),e.pos++}}else e.col+=t.length,u=document.createTextNode(c),e.map.push(e.pos,e.pos+t.length,u),l&&s<9&&(f=!0),e.pos+=t.length;if(e.trailingSpace=32==c.charCodeAt(t.length-1),r||n||i||f||a){var w=r||"";n&&(w+=n),i&&(w+=i);var x=O("span",[u],w,a);return o&&(x.title=o),e.content.appendChild(x)}e.content.appendChild(u)}}function Qt(e,t){return function(r,n,i,o,l,s,a){i=i?i+" cm-force-border":"cm-force-border";for(var u=r.pos,c=u+n.length;;){for(var h=void 0,f=0;f<t.length&&!((h=t[f]).to>u&&h.from<=u);f++);if(h.to>=c)return e(r,n,i,o,l,s,a);e(r,n.slice(0,h.to-u),i,o,null,s,a),o=null,n=n.slice(h.to-u),u=h.to}}}function Jt(e,t,r,n){var i=!n&&r.widgetNode;i&&e.map.push(e.pos,e.pos+t,i),!n&&e.cm.display.input.needsContentAttribute&&(i||(i=e.content.appendChild(document.createElement("span"))),i.setAttribute("cm-marker",r.id)),i&&(e.cm.display.input.setUneditable(i),e.content.appendChild(i)),e.pos+=t,e.trailingSpace=!1}function er(e,t,r){var n=e.markedSpans,i=e.text,o=0;if(n)for(var l,s,a,u,c,h,f,d=i.length,p=0,g=1,v="",m=0;;){if(m==p){a=u=c=h=s="",f=null,m=1/0;for(var y=[],b=void 0,w=0;w<n.length;++w){var x=n[w],C=x.marker;"bookmark"==C.type&&x.from==p&&C.widgetNode?y.push(C):x.from<=p&&(null==x.to||x.to>p||C.collapsed&&x.to==p&&x.from==p)?(null!=x.to&&x.to!=p&&m>x.to&&(m=x.to,u=""),C.className&&(a+=" "+C.className),C.css&&(s=(s?s+";":"")+C.css),C.startStyle&&x.from==p&&(c+=" "+C.startStyle),C.endStyle&&x.to==m&&(b||(b=[])).push(C.endStyle,x.to),C.title&&!h&&(h=C.title),C.collapsed&&(!f||Pe(f.marker,C)<0)&&(f=x)):x.from>p&&m>x.from&&(m=x.from)}if(b)for(var S=0;S<b.length;S+=2)b[S+1]==m&&(u+=" "+b[S]);if(!f||f.from==p)for(var L=0;L<y.length;++L)Jt(t,0,y[L]);if(f&&(f.from||0)==p){if(Jt(t,(null==f.to?d+1:f.to)-p,f.marker,null==f.from),null==f.to)return;f.to==p&&(f=!1)}}if(p>=d)break;for(var k=Math.min(d,m);;){if(v){var T=p+v.length;if(!f){var M=T>k?v.slice(0,k-p):v;t.addToken(t,M,l?l+a:a,c,p+M.length==m?u:"",h,s)}if(T>=k){v=v.slice(k-p),p=k;break}p=T,c=""}v=i.slice(o,o=r[g++]),l=_t(r[g++],t.cm.options)}}else for(var N=1;N<r.length;N+=2)t.addToken(t,i.slice(o,o=r[N]),_t(r[N+1],t.cm.options))}function tr(e,t,r){this.line=t,this.rest=function(e){for(var t,r;t=Ie(e);)e=t.find(1,!0).line,(r||(r=[])).push(e);return r}(t),this.size=this.rest?he(q(this.rest))-r+1:1,this.node=this.text=null,this.hidden=Ve(e,t)}function rr(e,t,r){for(var n,i=[],o=t;o<r;o=n){var l=new tr(e.doc,se(e.doc,o),o);n=o+l.size,i.push(l)}return i}var nr=null;var ir=null;function or(e,t){var r=et(e,t);if(r.length){var n,i=Array.prototype.slice.call(arguments,2);nr?n=nr.delayedCallbacks:ir?n=ir:(n=ir=[],setTimeout(lr,0));for(var o=function(e){n.push(function(){return r[e].apply(null,i)})},l=0;l<r.length;++l)o(l)}}function lr(){var e=ir;ir=null;for(var t=0;t<e.length;++t)e[t]()}function sr(e,t,r,n){for(var i=0;i<t.changes.length;i++){var o=t.changes[i];"text"==o?cr(e,t):"gutter"==o?fr(e,t,r,n):"class"==o?hr(e,t):"widget"==o&&dr(e,t,n)}t.changes=null}function ar(e){return e.node==e.text&&(e.node=O("div",null,null,"position: relative"),e.text.parentNode&&e.text.parentNode.replaceChild(e.node,e.text),e.node.appendChild(e.text),l&&s<8&&(e.node.style.zIndex=2)),e.node}function ur(e,t){var r=e.display.externalMeasured;return r&&r.line==t.line?(e.display.externalMeasured=null,t.measure=r.measure,r.built):qt(e,t)}function cr(e,t){var r=t.text.className,n=ur(e,t);t.text==t.node&&(t.node=n.pre),t.text.parentNode.replaceChild(n.pre,t.text),t.text=n.pre,n.bgClass!=t.bgClass||n.textClass!=t.textClass?(t.bgClass=n.bgClass,t.textClass=n.textClass,hr(e,t)):r&&(t.text.className=r)}function hr(e,t){!function(e,t){var r=t.bgClass?t.bgClass+" "+(t.line.bgClass||""):t.line.bgClass;if(r&&(r+=" CodeMirror-linebackground"),t.background)r?t.background.className=r:(t.background.parentNode.removeChild(t.background),t.background=null);else if(r){var n=ar(t);t.background=n.insertBefore(O("div",null,r),n.firstChild),e.display.input.setUneditable(t.background)}}(e,t),t.line.wrapClass?ar(t).className=t.line.wrapClass:t.node!=t.text&&(t.node.className="");var r=t.textClass?t.textClass+" "+(t.line.textClass||""):t.line.textClass;t.text.className=r||""}function fr(e,t,r,n){if(t.gutter&&(t.node.removeChild(t.gutter),t.gutter=null),t.gutterBackground&&(t.node.removeChild(t.gutterBackground),t.gutterBackground=null),t.line.gutterClass){var i=ar(t);t.gutterBackground=O("div",null,"CodeMirror-gutter-background "+t.line.gutterClass,"left: "+(e.options.fixedGutter?n.fixedPos:-n.gutterTotalWidth)+"px; width: "+n.gutterTotalWidth+"px"),e.display.input.setUneditable(t.gutterBackground),i.insertBefore(t.gutterBackground,t.text)}var o=t.line.gutterMarkers;if(e.options.lineNumbers||o){var l=ar(t),s=t.gutter=O("div",null,"CodeMirror-gutter-wrapper","left: "+(e.options.fixedGutter?n.fixedPos:-n.gutterTotalWidth)+"px");if(e.display.input.setUneditable(s),l.insertBefore(s,t.text),t.line.gutterClass&&(s.className+=" "+t.line.gutterClass),!e.options.lineNumbers||o&&o["CodeMirror-linenumbers"]||(t.lineNumber=s.appendChild(O("div",pe(e.options,r),"CodeMirror-linenumber CodeMirror-gutter-elt","left: "+n.gutterLeft["CodeMirror-linenumbers"]+"px; width: "+e.display.lineNumInnerWidth+"px"))),o)for(var a=0;a<e.options.gutters.length;++a){var u=e.options.gutters[a],c=o.hasOwnProperty(u)&&o[u];c&&s.appendChild(O("div",[c],"CodeMirror-gutter-elt","left: "+n.gutterLeft[u]+"px; width: "+n.gutterWidth[u]+"px"))}}}function dr(e,t,r){t.alignable&&(t.alignable=null);for(var n=t.node.firstChild,i=void 0;n;n=i)i=n.nextSibling,"CodeMirror-linewidget"==n.className&&t.node.removeChild(n);pr(e,t,r)}function pr(e,t,r){if(gr(e,t.line,t,r,!0),t.rest)for(var n=0;n<t.rest.length;n++)gr(e,t.rest[n],t,r,!1)}function gr(e,t,r,n,i){if(t.widgets)for(var o=ar(r),l=0,s=t.widgets;l<s.length;++l){var a=s[l],u=O("div",[a.node],"CodeMirror-linewidget");a.handleMouseEvents||u.setAttribute("cm-ignore-events","true"),vr(a,u,r,n),e.display.input.setUneditable(u),i&&a.above?o.insertBefore(u,r.gutter||r.text):o.appendChild(u),or(a,"redraw")}}function vr(e,t,r,n){if(e.noHScroll){(r.alignable||(r.alignable=[])).push(t);var i=n.wrapperWidth;t.style.left=n.fixedPos+"px",e.coverGutter||(i-=n.gutterTotalWidth,t.style.paddingLeft=n.gutterTotalWidth+"px"),t.style.width=i+"px"}e.coverGutter&&(t.style.zIndex=5,t.style.position="relative",e.noHScroll||(t.style.marginLeft=-n.gutterTotalWidth+"px"))}function mr(e){if(null!=e.height)return e.height;var t=e.doc.cm;if(!t)return 0;if(!D(document.body,e.node)){var r="position: relative;";e.coverGutter&&(r+="margin-left: -"+t.display.gutters.offsetWidth+"px;"),e.noHScroll&&(r+="width: "+t.display.wrapper.clientWidth+"px;"),N(t.display.measure,O("div",[e.node],null,r))}return e.height=e.node.parentNode.offsetHeight}function yr(e,t){for(var r=ht(t);r!=e.wrapper;r=r.parentNode)if(!r||1==r.nodeType&&"true"==r.getAttribute("cm-ignore-events")||r.parentNode==e.sizer&&r!=e.mover)return!0}function br(e){return e.lineSpace.offsetTop}function wr(e){return e.mover.offsetHeight-e.lineSpace.offsetHeight}function xr(e){if(e.cachedPaddingH)return e.cachedPaddingH;var t=N(e.measure,O("pre","x")),r=window.getComputedStyle?window.getComputedStyle(t):t.currentStyle,n={left:parseInt(r.paddingLeft),right:parseInt(r.paddingRight)};return isNaN(n.left)||isNaN(n.right)||(e.cachedPaddingH=n),n}function Cr(e){return G-e.display.nativeBarWidth}function Sr(e){return e.display.scroller.clientWidth-Cr(e)-e.display.barWidth}function Lr(e){return e.display.scroller.clientHeight-Cr(e)-e.display.barHeight}function kr(e,t,r){if(e.line==t)return{map:e.measure.map,cache:e.measure.cache};for(var n=0;n<e.rest.length;n++)if(e.rest[n]==t)return{map:e.measure.maps[n],cache:e.measure.caches[n]};for(var i=0;i<e.rest.length;i++)if(he(e.rest[i])>r)return{map:e.measure.maps[i],cache:e.measure.caches[i],before:!0}}function Tr(e,t,r,n){return Or(e,Nr(e,t),r,n)}function Mr(e,t){if(t>=e.display.viewFrom&&t<e.display.viewTo)return e.display.view[on(e,t)];var r=e.display.externalMeasured;return r&&t>=r.lineN&&t<r.lineN+r.size?r:void 0}function Nr(e,t){var r=he(t),n=Mr(e,r);n&&!n.text?n=null:n&&n.changes&&(sr(e,n,r,Jr(e)),e.curOp.forceUpdate=!0),n||(n=function(e,t){var r=he(t=Be(t)),n=e.display.externalMeasured=new tr(e.doc,t,r);n.lineN=r;var i=n.built=qt(e,n);return n.text=i.pre,N(e.display.lineMeasure,i.pre),n}(e,t));var i=kr(n,t,r);return{line:t,view:n,rect:null,map:i.map,cache:i.cache,before:i.before,hasHeights:!1}}function Or(e,t,r,n,i){t.before&&(r=-1);var o,a=r+(n||"");return t.cache.hasOwnProperty(a)?o=t.cache[a]:(t.rect||(t.rect=t.view.text.getBoundingClientRect()),t.hasHeights||(!function(e,t,r){var n=e.options.lineWrapping,i=n&&Sr(e);if(!t.measure.heights||n&&t.measure.width!=i){var o=t.measure.heights=[];if(n){t.measure.width=i;for(var l=t.text.firstChild.getClientRects(),s=0;s<l.length-1;s++){var a=l[s],u=l[s+1];Math.abs(a.bottom-u.bottom)>2&&o.push((a.bottom+u.top)/2-r.top)}}o.push(r.bottom-r.top)}}(e,t.view,t.rect),t.hasHeights=!0),(o=function(e,t,r,n){var i,o=Wr(t.map,r,n),a=o.node,u=o.start,c=o.end,h=o.collapse;if(3==a.nodeType){for(var f=0;f<4;f++){for(;u&&ie(t.line.text.charAt(o.coverStart+u));)--u;for(;o.coverStart+c<o.coverEnd&&ie(t.line.text.charAt(o.coverStart+c));)++c;if((i=l&&s<9&&0==u&&c==o.coverEnd-o.coverStart?a.parentNode.getBoundingClientRect():Hr(k(a,u,c).getClientRects(),n)).left||i.right||0==u)break;c=u,u-=1,h="right"}l&&s<11&&(i=function(e,t){if(!window.screen||null==screen.logicalXDPI||screen.logicalXDPI==screen.deviceXDPI||!function(e){if(null!=Ct)return Ct;var t=N(e,O("span","x")),r=t.getBoundingClientRect(),n=k(t,0,1).getBoundingClientRect();return Ct=Math.abs(r.left-n.left)>1}(e))return t;var r=screen.logicalXDPI/screen.deviceXDPI,n=screen.logicalYDPI/screen.deviceYDPI;return{left:t.left*r,right:t.right*r,top:t.top*n,bottom:t.bottom*n}}(e.display.measure,i))}else{var d;u>0&&(h=n="right"),i=e.options.lineWrapping&&(d=a.getClientRects()).length>1?d["right"==n?d.length-1:0]:a.getBoundingClientRect()}if(l&&s<9&&!u&&(!i||!i.left&&!i.right)){var p=a.parentNode.getClientRects()[0];i=p?{left:p.left,right:p.left+Qr(e.display),top:p.top,bottom:p.bottom}:Dr}for(var g=i.top-t.rect.top,v=i.bottom-t.rect.top,m=(g+v)/2,y=t.view.measure.heights,b=0;b<y.length-1&&!(m<y[b]);b++);var w=b?y[b-1]:0,x=y[b],C={left:("right"==h?i.right:i.left)-t.rect.left,right:("left"==h?i.left:i.right)-t.rect.left,top:w,bottom:x};i.left||i.right||(C.bogus=!0);e.options.singleCursorHeightPerLine||(C.rtop=g,C.rbottom=v);return C}(e,t,r,n)).bogus||(t.cache[a]=o)),{left:o.left,right:o.right,top:i?o.rtop:o.top,bottom:i?o.rbottom:o.bottom}}var Ar,Dr={left:0,right:0,top:0,bottom:0};function Wr(e,t,r){for(var n,i,o,l,s,a,u=0;u<e.length;u+=3)if(s=e[u],a=e[u+1],t<s?(i=0,o=1,l="left"):t<a?o=(i=t-s)+1:(u==e.length-3||t==a&&e[u+3]>t)&&(i=(o=a-s)-1,t>=a&&(l="right")),null!=i){if(n=e[u+2],s==a&&r==(n.insertLeft?"left":"right")&&(l=r),"left"==r&&0==i)for(;u&&e[u-2]==e[u-3]&&e[u-1].insertLeft;)n=e[2+(u-=3)],l="left";if("right"==r&&i==a-s)for(;u<e.length-3&&e[u+3]==e[u+4]&&!e[u+5].insertLeft;)n=e[(u+=3)+2],l="right";break}return{node:n,start:i,end:o,collapse:l,coverStart:s,coverEnd:a}}function Hr(e,t){var r=Dr;if("left"==t)for(var n=0;n<e.length&&(r=e[n]).left==r.right;n++);else for(var i=e.length-1;i>=0&&(r=e[i]).left==r.right;i--);return r}function Fr(e){if(e.measure&&(e.measure.cache={},e.measure.heights=null,e.rest))for(var t=0;t<e.rest.length;t++)e.measure.caches[t]={}}function Pr(e){e.display.externalMeasure=null,M(e.display.lineMeasure);for(var t=0;t<e.display.view.length;t++)Fr(e.display.view[t])}function Er(e){Pr(e),e.display.cachedCharWidth=e.display.cachedTextHeight=e.display.cachedPaddingH=null,e.options.lineWrapping||(e.display.maxLineChanged=!0),e.display.lineNumChars=null}function zr(){return c&&v?-(document.body.getBoundingClientRect().left-parseInt(getComputedStyle(document.body).marginLeft)):window.pageXOffset||(document.documentElement||document.body).scrollLeft}function Ir(){return c&&v?-(document.body.getBoundingClientRect().top-parseInt(getComputedStyle(document.body).marginTop)):window.pageYOffset||(document.documentElement||document.body).scrollTop}function Rr(e){var t=0;if(e.widgets)for(var r=0;r<e.widgets.length;++r)e.widgets[r].above&&(t+=mr(e.widgets[r]));return t}function Br(e,t,r,n,i){if(!i){var o=Rr(t);r.top+=o,r.bottom+=o}if("line"==n)return r;n||(n="local");var l=je(t);if("local"==n?l+=br(e.display):l-=e.display.viewOffset,"page"==n||"window"==n){var s=e.display.lineSpace.getBoundingClientRect();l+=s.top+("window"==n?0:Ir());var a=s.left+("window"==n?0:zr());r.left+=a,r.right+=a}return r.top+=l,r.bottom+=l,r}function Gr(e,t,r){if("div"==r)return t;var n=t.left,i=t.top;if("page"==r)n-=zr(),i-=Ir();else if("local"==r||!r){var o=e.display.sizer.getBoundingClientRect();n+=o.left,i+=o.top}var l=e.display.lineSpace.getBoundingClientRect();return{left:n-l.left,top:i-l.top}}function Ur(e,t,r,n,i){return n||(n=se(e.doc,t.line)),Br(e,n,Tr(e,n,t.ch,i),r)}function Vr(e,t,r,n,i,o){function l(t,l){var s=Or(e,i,t,l?"right":"left",o);return l?s.left=s.right:s.right=s.left,Br(e,n,s,r)}n=n||se(e.doc,t.line),i||(i=Nr(e,n));var s=Ze(n,e.doc.direction),a=t.ch,u=t.sticky;if(a>=n.text.length?(a=n.text.length,u="before"):a<=0&&(a=0,u="after"),!s)return l("before"==u?a-1:a,"before"==u);function c(e,t,r){return l(r?e-1:e,1==s[t].level!=r)}var h=qe(s,a,u),f=_e,d=c(a,h,"before"==u);return null!=f&&(d.other=c(a,f,"before"!=u)),d}function Kr(e,t){var r=0;t=Ce(e.doc,t),e.options.lineWrapping||(r=Qr(e.display)*t.ch);var n=se(e.doc,t.line),i=je(n)+br(e.display);return{left:r,right:r,top:i,bottom:i+n.height}}function jr(e,t,r,n,i){var o=ge(e,t,r);return o.xRel=i,n&&(o.outside=!0),o}function Xr(e,t,r){var n=e.doc;if((r+=e.display.viewOffset)<0)return jr(n.first,0,null,!0,-1);var i=fe(n,r),o=n.first+n.size-1;if(i>o)return jr(n.first+n.size-1,se(n,o).text.length,null,!0,1);t<0&&(t=0);for(var l=se(n,i);;){var s=$r(e,l,i,t,r),a=Ie(l),u=a&&a.find(0,!0);if(!a||!(s.ch>u.from.ch||s.ch==u.from.ch&&s.xRel>0))return s;i=he(l=u.to.line)}}function Yr(e,t,r,n){n-=Rr(t);var i=t.text.length,o=le(function(t){return Or(e,r,t-1).bottom<=n},i,0);return{begin:o,end:i=le(function(t){return Or(e,r,t).top>n},o,i)}}function _r(e,t,r,n){return r||(r=Nr(e,t)),Yr(e,t,r,Br(e,t,Or(e,r,n),"line").top)}function qr(e,t,r,n){return!(e.bottom<=r)&&(e.top>r||(n?e.left:e.right)>t)}function $r(e,t,r,n,i){i-=je(t);var o=Nr(e,t),l=Rr(t),s=0,a=t.text.length,u=!0,c=Ze(t,e.doc.direction);if(c){var h=(e.options.lineWrapping?function(e,t,r,n,i,o,l){var s=Yr(e,t,n,l),a=s.begin,u=s.end;/\s/.test(t.text.charAt(u-1))&&u--;for(var c=null,h=null,f=0;f<i.length;f++){var d=i[f];if(!(d.from>=u||d.to<=a)){var p=1!=d.level,g=Or(e,n,p?Math.min(u,d.to)-1:Math.max(a,d.from)).right,v=g<o?o-g+1e9:g-o;(!c||h>v)&&(c=d,h=v)}}c||(c=i[i.length-1]);c.from<a&&(c={from:a,to:c.to,level:c.level});c.to>u&&(c={from:c.from,to:u,level:c.level});return c}:function(e,t,r,n,i,o,l){var s=le(function(s){var a=i[s],u=1!=a.level;return qr(Vr(e,ge(r,u?a.to:a.from,u?"before":"after"),"line",t,n),o,l,!0)},0,i.length-1),a=i[s];if(s>0){var u=1!=a.level,c=Vr(e,ge(r,u?a.from:a.to,u?"after":"before"),"line",t,n);qr(c,o,l,!0)&&c.top>l&&(a=i[s-1])}return a})(e,t,r,o,c,n,i);s=(u=1!=h.level)?h.from:h.to-1,a=u?h.to:h.from-1}var f,d,p=null,g=null,v=le(function(t){var r=Or(e,o,t);return r.top+=l,r.bottom+=l,!!qr(r,n,i,!1)&&(r.top<=i&&r.left<=n&&(p=t,g=r),!0)},s,a),m=!1;if(g){var y=n-g.left<g.right-n,b=y==u;v=p+(b?0:1),d=b?"after":"before",f=y?g.left:g.right}else{u||v!=a&&v!=s||v++,d=0==v?"after":v==t.text.length?"before":Or(e,o,v-(u?1:0)).bottom+l<=i==u?"after":"before";var w=Vr(e,ge(r,v,d),"line",t,o);f=w.left,m=i<w.top||i>=w.bottom}return jr(r,v=oe(t.text,v,1),d,m,n-f)}function Zr(e){if(null!=e.cachedTextHeight)return e.cachedTextHeight;if(null==Ar){Ar=O("pre");for(var t=0;t<49;++t)Ar.appendChild(document.createTextNode("x")),Ar.appendChild(O("br"));Ar.appendChild(document.createTextNode("x"))}N(e.measure,Ar);var r=Ar.offsetHeight/50;return r>3&&(e.cachedTextHeight=r),M(e.measure),r||1}function Qr(e){if(null!=e.cachedCharWidth)return e.cachedCharWidth;var t=O("span","xxxxxxxxxx"),r=O("pre",[t]);N(e.measure,r);var n=t.getBoundingClientRect(),i=(n.right-n.left)/10;return i>2&&(e.cachedCharWidth=i),i||10}function Jr(e){for(var t=e.display,r={},n={},i=t.gutters.clientLeft,o=t.gutters.firstChild,l=0;o;o=o.nextSibling,++l)r[e.options.gutters[l]]=o.offsetLeft+o.clientLeft+i,n[e.options.gutters[l]]=o.clientWidth;return{fixedPos:en(t),gutterTotalWidth:t.gutters.offsetWidth,gutterLeft:r,gutterWidth:n,wrapperWidth:t.wrapper.clientWidth}}function en(e){return e.scroller.getBoundingClientRect().left-e.sizer.getBoundingClientRect().left}function tn(e){var t=Zr(e.display),r=e.options.lineWrapping,n=r&&Math.max(5,e.display.scroller.clientWidth/Qr(e.display)-3);return function(i){if(Ve(e.doc,i))return 0;var o=0;if(i.widgets)for(var l=0;l<i.widgets.length;l++)i.widgets[l].height&&(o+=i.widgets[l].height);return r?o+(Math.ceil(i.text.length/n)||1)*t:o+t}}function rn(e){var t=e.doc,r=tn(e);t.iter(function(e){var t=r(e);t!=e.height&&ce(e,t)})}function nn(e,t,r,n){var i=e.display;if(!r&&"true"==ht(t).getAttribute("cm-not-content"))return null;var o,l,s=i.lineSpace.getBoundingClientRect();try{o=t.clientX-s.left,l=t.clientY-s.top}catch(t){return null}var a,u=Xr(e,o,l);if(n&&1==u.xRel&&(a=se(e.doc,u.line).text).length==u.ch){var c=I(a,a.length,e.options.tabSize)-a.length;u=ge(u.line,Math.max(0,Math.round((o-xr(e.display).left)/Qr(e.display))-c))}return u}function on(e,t){if(t>=e.display.viewTo)return null;if((t-=e.display.viewFrom)<0)return null;for(var r=e.display.view,n=0;n<r.length;n++)if((t-=r[n].size)<0)return n}function ln(e){e.display.input.showSelection(e.display.input.prepareSelection())}function sn(e,t){void 0===t&&(t=!0);for(var r=e.doc,n={},i=n.cursors=document.createDocumentFragment(),o=n.selection=document.createDocumentFragment(),l=0;l<r.sel.ranges.length;l++)if(t||l!=r.sel.primIndex){var s=r.sel.ranges[l];if(!(s.from().line>=e.display.viewTo||s.to().line<e.display.viewFrom)){var a=s.empty();(a||e.options.showCursorWhenSelecting)&&an(e,s.head,i),a||cn(e,s,o)}}return n}function an(e,t,r){var n=Vr(e,t,"div",null,null,!e.options.singleCursorHeightPerLine),i=r.appendChild(O("div"," ","CodeMirror-cursor"));if(i.style.left=n.left+"px",i.style.top=n.top+"px",i.style.height=Math.max(0,n.bottom-n.top)*e.options.cursorHeight+"px",n.other){var o=r.appendChild(O("div"," ","CodeMirror-cursor CodeMirror-secondarycursor"));o.style.display="",o.style.left=n.other.left+"px",o.style.top=n.other.top+"px",o.style.height=.85*(n.other.bottom-n.other.top)+"px"}}function un(e,t){return e.top-t.top||e.left-t.left}function cn(e,t,r){var n=e.display,i=e.doc,o=document.createDocumentFragment(),l=xr(e.display),s=l.left,a=Math.max(n.sizerWidth,Sr(e)-n.sizer.offsetLeft)-l.right,u="ltr"==i.direction;function c(e,t,r,n){t<0&&(t=0),t=Math.round(t),n=Math.round(n),o.appendChild(O("div",null,"CodeMirror-selected","position: absolute; left: "+e+"px;\n top: "+t+"px; width: "+(null==r?a-e:r)+"px;\n height: "+(n-t)+"px"))}function h(t,r,n){var o,l,h=se(i,t),f=h.text.length;function d(r,n){return Ur(e,ge(t,r),"div",h,n)}function p(t,r,n){var i=_r(e,h,null,t),o="ltr"==r==("after"==n)?"left":"right";return d("after"==n?i.begin:i.end-(/\s/.test(h.text.charAt(i.end-1))?2:1),o)[o]}var g=Ze(h,i.direction);return function(e,t,r,n){if(!e)return n(t,r,"ltr",0);for(var i=!1,o=0;o<e.length;++o){var l=e[o];(l.from<r&&l.to>t||t==r&&l.to==t)&&(n(Math.max(l.from,t),Math.min(l.to,r),1==l.level?"rtl":"ltr",o),i=!0)}i||n(t,r,"ltr")}(g,r||0,null==n?f:n,function(e,t,i,h){var v="ltr"==i,m=d(e,v?"left":"right"),y=d(t-1,v?"right":"left"),b=null==r&&0==e,w=null==n&&t==f,x=0==h,C=!g||h==g.length-1;if(y.top-m.top<=3){var S=(u?w:b)&&C,L=(u?b:w)&&x?s:(v?m:y).left,k=S?a:(v?y:m).right;c(L,m.top,k-L,m.bottom)}else{var T,M,N,O;v?(T=u&&b&&x?s:m.left,M=u?a:p(e,i,"before"),N=u?s:p(t,i,"after"),O=u&&w&&C?a:y.right):(T=u?p(e,i,"before"):s,M=!u&&b&&x?a:m.right,N=!u&&w&&C?s:y.left,O=u?p(t,i,"after"):a),c(T,m.top,M-T,m.bottom),m.bottom<y.top&&c(s,m.bottom,null,y.top),c(N,y.top,O-N,y.bottom)}(!o||un(m,o)<0)&&(o=m),un(y,o)<0&&(o=y),(!l||un(m,l)<0)&&(l=m),un(y,l)<0&&(l=y)}),{start:o,end:l}}var f=t.from(),d=t.to();if(f.line==d.line)h(f.line,f.ch,d.ch);else{var p=se(i,f.line),g=se(i,d.line),v=Be(p)==Be(g),m=h(f.line,f.ch,v?p.text.length+1:null).end,y=h(d.line,v?0:null,d.ch).start;v&&(m.top<y.top-2?(c(m.right,m.top,null,m.bottom),c(s,y.top,y.left,y.bottom)):c(m.right,m.top,y.left-m.right,m.bottom)),m.bottom<y.top&&c(s,m.bottom,null,y.top)}r.appendChild(o)}function hn(e){if(e.state.focused){var t=e.display;clearInterval(t.blinker);var r=!0;t.cursorDiv.style.visibility="",e.options.cursorBlinkRate>0?t.blinker=setInterval(function(){return t.cursorDiv.style.visibility=(r=!r)?"":"hidden"},e.options.cursorBlinkRate):e.options.cursorBlinkRate<0&&(t.cursorDiv.style.visibility="hidden")}}function fn(e){e.state.focused||(e.display.input.focus(),pn(e))}function dn(e){e.state.delayingBlurEvent=!0,setTimeout(function(){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1,gn(e))},100)}function pn(e,t){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1),"nocursor"!=e.options.readOnly&&(e.state.focused||(rt(e,"focus",e,t),e.state.focused=!0,H(e.display.wrapper,"CodeMirror-focused"),e.curOp||e.display.selForContextMenu==e.doc.sel||(e.display.input.reset(),a&&setTimeout(function(){return e.display.input.reset(!0)},20)),e.display.input.receivedFocus()),hn(e))}function gn(e,t){e.state.delayingBlurEvent||(e.state.focused&&(rt(e,"blur",e,t),e.state.focused=!1,T(e.display.wrapper,"CodeMirror-focused")),clearInterval(e.display.blinker),setTimeout(function(){e.state.focused||(e.display.shift=!1)},150))}function vn(e){for(var t=e.display,r=t.lineDiv.offsetTop,n=0;n<t.view.length;n++){var i=t.view[n],o=void 0;if(!i.hidden){if(l&&s<8){var a=i.node.offsetTop+i.node.offsetHeight;o=a-r,r=a}else{var u=i.node.getBoundingClientRect();o=u.bottom-u.top}var c=i.line.height-o;if(o<2&&(o=Zr(t)),(c>.005||c<-.005)&&(ce(i.line,o),mn(i.line),i.rest))for(var h=0;h<i.rest.length;h++)mn(i.rest[h])}}}function mn(e){if(e.widgets)for(var t=0;t<e.widgets.length;++t){var r=e.widgets[t],n=r.node.parentNode;n&&(r.height=n.offsetHeight)}}function yn(e,t,r){var n=r&&null!=r.top?Math.max(0,r.top):e.scroller.scrollTop;n=Math.floor(n-br(e));var i=r&&null!=r.bottom?r.bottom:n+e.wrapper.clientHeight,o=fe(t,n),l=fe(t,i);if(r&&r.ensure){var s=r.ensure.from.line,a=r.ensure.to.line;s<o?(o=s,l=fe(t,je(se(t,s))+e.wrapper.clientHeight)):Math.min(a,t.lastLine())>=l&&(o=fe(t,je(se(t,a))-e.wrapper.clientHeight),l=a)}return{from:o,to:Math.max(l,o+1)}}function bn(e){var t=e.display,r=t.view;if(t.alignWidgets||t.gutters.firstChild&&e.options.fixedGutter){for(var n=en(t)-t.scroller.scrollLeft+e.doc.scrollLeft,i=t.gutters.offsetWidth,o=n+"px",l=0;l<r.length;l++)if(!r[l].hidden){e.options.fixedGutter&&(r[l].gutter&&(r[l].gutter.style.left=o),r[l].gutterBackground&&(r[l].gutterBackground.style.left=o));var s=r[l].alignable;if(s)for(var a=0;a<s.length;a++)s[a].style.left=o}e.options.fixedGutter&&(t.gutters.style.left=n+i+"px")}}function wn(e){if(!e.options.lineNumbers)return!1;var t=e.doc,r=pe(e.options,t.first+t.size-1),n=e.display;if(r.length!=n.lineNumChars){var i=n.measure.appendChild(O("div",[O("div",r)],"CodeMirror-linenumber CodeMirror-gutter-elt")),o=i.firstChild.offsetWidth,l=i.offsetWidth-o;return n.lineGutter.style.width="",n.lineNumInnerWidth=Math.max(o,n.lineGutter.offsetWidth-l)+1,n.lineNumWidth=n.lineNumInnerWidth+l,n.lineNumChars=n.lineNumInnerWidth?r.length:-1,n.lineGutter.style.width=n.lineNumWidth+"px",oi(e),!0}return!1}function xn(e,t){var r=e.display,n=Zr(e.display);t.top<0&&(t.top=0);var i=e.curOp&&null!=e.curOp.scrollTop?e.curOp.scrollTop:r.scroller.scrollTop,o=Lr(e),l={};t.bottom-t.top>o&&(t.bottom=t.top+o);var s=e.doc.height+wr(r),a=t.top<n,u=t.bottom>s-n;if(t.top<i)l.scrollTop=a?0:t.top;else if(t.bottom>i+o){var c=Math.min(t.top,(u?s:t.bottom)-o);c!=i&&(l.scrollTop=c)}var h=e.curOp&&null!=e.curOp.scrollLeft?e.curOp.scrollLeft:r.scroller.scrollLeft,f=Sr(e)-(e.options.fixedGutter?r.gutters.offsetWidth:0),d=t.right-t.left>f;return d&&(t.right=t.left+f),t.left<10?l.scrollLeft=0:t.left<h?l.scrollLeft=Math.max(0,t.left-(d?0:10)):t.right>f+h-3&&(l.scrollLeft=t.right+(d?0:10)-f),l}function Cn(e,t){null!=t&&(kn(e),e.curOp.scrollTop=(null==e.curOp.scrollTop?e.doc.scrollTop:e.curOp.scrollTop)+t)}function Sn(e){kn(e);var t=e.getCursor();e.curOp.scrollToPos={from:t,to:t,margin:e.options.cursorScrollMargin}}function Ln(e,t,r){null==t&&null==r||kn(e),null!=t&&(e.curOp.scrollLeft=t),null!=r&&(e.curOp.scrollTop=r)}function kn(e){var t=e.curOp.scrollToPos;t&&(e.curOp.scrollToPos=null,Tn(e,Kr(e,t.from),Kr(e,t.to),t.margin))}function Tn(e,t,r,n){var i=xn(e,{left:Math.min(t.left,r.left),top:Math.min(t.top,r.top)-n,right:Math.max(t.right,r.right),bottom:Math.max(t.bottom,r.bottom)+n});Ln(e,i.scrollLeft,i.scrollTop)}function Mn(e,t){Math.abs(e.doc.scrollTop-t)<2||(r||ii(e,{top:t}),Nn(e,t,!0),r&&ii(e),Jn(e,100))}function Nn(e,t,r){t=Math.min(e.display.scroller.scrollHeight-e.display.scroller.clientHeight,t),(e.display.scroller.scrollTop!=t||r)&&(e.doc.scrollTop=t,e.display.scrollbars.setScrollTop(t),e.display.scroller.scrollTop!=t&&(e.display.scroller.scrollTop=t))}function On(e,t,r,n){t=Math.min(t,e.display.scroller.scrollWidth-e.display.scroller.clientWidth),(r?t==e.doc.scrollLeft:Math.abs(e.doc.scrollLeft-t)<2)&&!n||(e.doc.scrollLeft=t,bn(e),e.display.scroller.scrollLeft!=t&&(e.display.scroller.scrollLeft=t),e.display.scrollbars.setScrollLeft(t))}function An(e){var t=e.display,r=t.gutters.offsetWidth,n=Math.round(e.doc.height+wr(e.display));return{clientHeight:t.scroller.clientHeight,viewHeight:t.wrapper.clientHeight,scrollWidth:t.scroller.scrollWidth,clientWidth:t.scroller.clientWidth,viewWidth:t.wrapper.clientWidth,barLeft:e.options.fixedGutter?r:0,docHeight:n,scrollHeight:n+Cr(e)+t.barHeight,nativeBarWidth:t.nativeBarWidth,gutterWidth:r}}var Dn=function(e,t,r){this.cm=r;var n=this.vert=O("div",[O("div",null,null,"min-width: 1px")],"CodeMirror-vscrollbar"),i=this.horiz=O("div",[O("div",null,null,"height: 100%; min-height: 1px")],"CodeMirror-hscrollbar");e(n),e(i),Je(n,"scroll",function(){n.clientHeight&&t(n.scrollTop,"vertical")}),Je(i,"scroll",function(){i.clientWidth&&t(i.scrollLeft,"horizontal")}),this.checkedZeroWidth=!1,l&&s<8&&(this.horiz.style.minHeight=this.vert.style.minWidth="18px")};Dn.prototype.update=function(e){var t=e.scrollWidth>e.clientWidth+1,r=e.scrollHeight>e.clientHeight+1,n=e.nativeBarWidth;if(r){this.vert.style.display="block",this.vert.style.bottom=t?n+"px":"0";var i=e.viewHeight-(t?n:0);this.vert.firstChild.style.height=Math.max(0,e.scrollHeight-e.clientHeight+i)+"px"}else this.vert.style.display="",this.vert.firstChild.style.height="0";if(t){this.horiz.style.display="block",this.horiz.style.right=r?n+"px":"0",this.horiz.style.left=e.barLeft+"px";var o=e.viewWidth-e.barLeft-(r?n:0);this.horiz.firstChild.style.width=Math.max(0,e.scrollWidth-e.clientWidth+o)+"px"}else this.horiz.style.display="",this.horiz.firstChild.style.width="0";return!this.checkedZeroWidth&&e.clientHeight>0&&(0==n&&this.zeroWidthHack(),this.checkedZeroWidth=!0),{right:r?n:0,bottom:t?n:0}},Dn.prototype.setScrollLeft=function(e){this.horiz.scrollLeft!=e&&(this.horiz.scrollLeft=e),this.disableHoriz&&this.enableZeroWidthBar(this.horiz,this.disableHoriz,"horiz")},Dn.prototype.setScrollTop=function(e){this.vert.scrollTop!=e&&(this.vert.scrollTop=e),this.disableVert&&this.enableZeroWidthBar(this.vert,this.disableVert,"vert")},Dn.prototype.zeroWidthHack=function(){var e=y&&!d?"12px":"18px";this.horiz.style.height=this.vert.style.width=e,this.horiz.style.pointerEvents=this.vert.style.pointerEvents="none",this.disableHoriz=new R,this.disableVert=new R},Dn.prototype.enableZeroWidthBar=function(e,t,r){e.style.pointerEvents="auto",t.set(1e3,function n(){var i=e.getBoundingClientRect();("vert"==r?document.elementFromPoint(i.right-1,(i.top+i.bottom)/2):document.elementFromPoint((i.right+i.left)/2,i.bottom-1))!=e?e.style.pointerEvents="none":t.set(1e3,n)})},Dn.prototype.clear=function(){var e=this.horiz.parentNode;e.removeChild(this.horiz),e.removeChild(this.vert)};var Wn=function(){};function Hn(e,t){t||(t=An(e));var r=e.display.barWidth,n=e.display.barHeight;Fn(e,t);for(var i=0;i<4&&r!=e.display.barWidth||n!=e.display.barHeight;i++)r!=e.display.barWidth&&e.options.lineWrapping&&vn(e),Fn(e,An(e)),r=e.display.barWidth,n=e.display.barHeight}function Fn(e,t){var r=e.display,n=r.scrollbars.update(t);r.sizer.style.paddingRight=(r.barWidth=n.right)+"px",r.sizer.style.paddingBottom=(r.barHeight=n.bottom)+"px",r.heightForcer.style.borderBottom=n.bottom+"px solid transparent",n.right&&n.bottom?(r.scrollbarFiller.style.display="block",r.scrollbarFiller.style.height=n.bottom+"px",r.scrollbarFiller.style.width=n.right+"px"):r.scrollbarFiller.style.display="",n.bottom&&e.options.coverGutterNextToScrollbar&&e.options.fixedGutter?(r.gutterFiller.style.display="block",r.gutterFiller.style.height=n.bottom+"px",r.gutterFiller.style.width=t.gutterWidth+"px"):r.gutterFiller.style.display=""}Wn.prototype.update=function(){return{bottom:0,right:0}},Wn.prototype.setScrollLeft=function(){},Wn.prototype.setScrollTop=function(){},Wn.prototype.clear=function(){};var Pn={native:Dn,null:Wn};function En(e){e.display.scrollbars&&(e.display.scrollbars.clear(),e.display.scrollbars.addClass&&T(e.display.wrapper,e.display.scrollbars.addClass)),e.display.scrollbars=new Pn[e.options.scrollbarStyle](function(t){e.display.wrapper.insertBefore(t,e.display.scrollbarFiller),Je(t,"mousedown",function(){e.state.focused&&setTimeout(function(){return e.display.input.focus()},0)}),t.setAttribute("cm-not-content","true")},function(t,r){"horizontal"==r?On(e,t):Mn(e,t)},e),e.display.scrollbars.addClass&&H(e.display.wrapper,e.display.scrollbars.addClass)}var zn=0;function In(e){var t;e.curOp={cm:e,viewChanged:!1,startHeight:e.doc.height,forceUpdate:!1,updateInput:null,typing:!1,changeObjs:null,cursorActivityHandlers:null,cursorActivityCalled:0,selectionChanged:!1,updateMaxLine:!1,scrollLeft:null,scrollTop:null,scrollToPos:null,focus:!1,id:++zn},t=e.curOp,nr?nr.ops.push(t):t.ownsGroup=nr={ops:[t],delayedCallbacks:[]}}function Rn(e){!function(e,t){var r=e.ownsGroup;if(r)try{!function(e){var t=e.delayedCallbacks,r=0;do{for(;r<t.length;r++)t[r].call(null);for(var n=0;n<e.ops.length;n++){var i=e.ops[n];if(i.cursorActivityHandlers)for(;i.cursorActivityCalled<i.cursorActivityHandlers.length;)i.cursorActivityHandlers[i.cursorActivityCalled++].call(null,i.cm)}}while(r<t.length)}(r)}finally{nr=null,t(r)}}(e.curOp,function(e){for(var t=0;t<e.ops.length;t++)e.ops[t].cm.curOp=null;!function(e){for(var t=e.ops,r=0;r<t.length;r++)Bn(t[r]);for(var n=0;n<t.length;n++)(i=t[n]).updatedDisplay=i.mustUpdate&&ri(i.cm,i.update);var i;for(var o=0;o<t.length;o++)Gn(t[o]);for(var l=0;l<t.length;l++)Un(t[l]);for(var s=0;s<t.length;s++)Vn(t[s])}(e)})}function Bn(e){var t,r,n=e.cm,i=n.display;!(r=(t=n).display).scrollbarsClipped&&r.scroller.offsetWidth&&(r.nativeBarWidth=r.scroller.offsetWidth-r.scroller.clientWidth,r.heightForcer.style.height=Cr(t)+"px",r.sizer.style.marginBottom=-r.nativeBarWidth+"px",r.sizer.style.borderRightWidth=Cr(t)+"px",r.scrollbarsClipped=!0),e.updateMaxLine&&Ye(n),e.mustUpdate=e.viewChanged||e.forceUpdate||null!=e.scrollTop||e.scrollToPos&&(e.scrollToPos.from.line<i.viewFrom||e.scrollToPos.to.line>=i.viewTo)||i.maxLineChanged&&n.options.lineWrapping,e.update=e.mustUpdate&&new ti(n,e.mustUpdate&&{top:e.scrollTop,ensure:e.scrollToPos},e.forceUpdate)}function Gn(e){var t=e.cm,r=t.display;e.updatedDisplay&&vn(t),e.barMeasure=An(t),r.maxLineChanged&&!t.options.lineWrapping&&(e.adjustWidthTo=Tr(t,r.maxLine,r.maxLine.text.length).left+3,t.display.sizerWidth=e.adjustWidthTo,e.barMeasure.scrollWidth=Math.max(r.scroller.clientWidth,r.sizer.offsetLeft+e.adjustWidthTo+Cr(t)+t.display.barWidth),e.maxScrollLeft=Math.max(0,r.sizer.offsetLeft+e.adjustWidthTo-Sr(t))),(e.updatedDisplay||e.selectionChanged)&&(e.preparedSelection=r.input.prepareSelection())}function Un(e){var t=e.cm;null!=e.adjustWidthTo&&(t.display.sizer.style.minWidth=e.adjustWidthTo+"px",e.maxScrollLeft<t.doc.scrollLeft&&On(t,Math.min(t.display.scroller.scrollLeft,e.maxScrollLeft),!0),t.display.maxLineChanged=!1);var r=e.focus&&e.focus==W();e.preparedSelection&&t.display.input.showSelection(e.preparedSelection,r),(e.updatedDisplay||e.startHeight!=t.doc.height)&&Hn(t,e.barMeasure),e.updatedDisplay&&li(t,e.barMeasure),e.selectionChanged&&hn(t),t.state.focused&&e.updateInput&&t.display.input.reset(e.typing),r&&fn(e.cm)}function Vn(e){var t=e.cm,r=t.display,n=t.doc;(e.updatedDisplay&&ni(t,e.update),null==r.wheelStartX||null==e.scrollTop&&null==e.scrollLeft&&!e.scrollToPos||(r.wheelStartX=r.wheelStartY=null),null!=e.scrollTop&&Nn(t,e.scrollTop,e.forceScroll),null!=e.scrollLeft&&On(t,e.scrollLeft,!0,!0),e.scrollToPos)&&function(e,t){if(!nt(e,"scrollCursorIntoView")){var r=e.display,n=r.sizer.getBoundingClientRect(),i=null;if(t.top+n.top<0?i=!0:t.bottom+n.top>(window.innerHeight||document.documentElement.clientHeight)&&(i=!1),null!=i&&!p){var o=O("div","​",null,"position: absolute;\n top: "+(t.top-r.viewOffset-br(e.display))+"px;\n height: "+(t.bottom-t.top+Cr(e)+r.barHeight)+"px;\n left: "+t.left+"px; width: "+Math.max(2,t.right-t.left)+"px;");e.display.lineSpace.appendChild(o),o.scrollIntoView(i),e.display.lineSpace.removeChild(o)}}}(t,function(e,t,r,n){var i;null==n&&(n=0),e.options.lineWrapping||t!=r||(r="before"==(t=t.ch?ge(t.line,"before"==t.sticky?t.ch-1:t.ch,"after"):t).sticky?ge(t.line,t.ch+1,"before"):t);for(var o=0;o<5;o++){var l=!1,s=Vr(e,t),a=r&&r!=t?Vr(e,r):s,u=xn(e,i={left:Math.min(s.left,a.left),top:Math.min(s.top,a.top)-n,right:Math.max(s.left,a.left),bottom:Math.max(s.bottom,a.bottom)+n}),c=e.doc.scrollTop,h=e.doc.scrollLeft;if(null!=u.scrollTop&&(Mn(e,u.scrollTop),Math.abs(e.doc.scrollTop-c)>1&&(l=!0)),null!=u.scrollLeft&&(On(e,u.scrollLeft),Math.abs(e.doc.scrollLeft-h)>1&&(l=!0)),!l)break}return i}(t,Ce(n,e.scrollToPos.from),Ce(n,e.scrollToPos.to),e.scrollToPos.margin));var i=e.maybeHiddenMarkers,o=e.maybeUnhiddenMarkers;if(i)for(var l=0;l<i.length;++l)i[l].lines.length||rt(i[l],"hide");if(o)for(var s=0;s<o.length;++s)o[s].lines.length&&rt(o[s],"unhide");r.wrapper.offsetHeight&&(n.scrollTop=t.display.scroller.scrollTop),e.changeObjs&&rt(t,"changes",t,e.changeObjs),e.update&&e.update.finish()}function Kn(e,t){if(e.curOp)return t();In(e);try{return t()}finally{Rn(e)}}function jn(e,t){return function(){if(e.curOp)return t.apply(e,arguments);In(e);try{return t.apply(e,arguments)}finally{Rn(e)}}}function Xn(e){return function(){if(this.curOp)return e.apply(this,arguments);In(this);try{return e.apply(this,arguments)}finally{Rn(this)}}}function Yn(e){return function(){var t=this.cm;if(!t||t.curOp)return e.apply(this,arguments);In(t);try{return e.apply(this,arguments)}finally{Rn(t)}}}function _n(e,t,r,n){null==t&&(t=e.doc.first),null==r&&(r=e.doc.first+e.doc.size),n||(n=0);var i=e.display;if(n&&r<i.viewTo&&(null==i.updateLineNumbers||i.updateLineNumbers>t)&&(i.updateLineNumbers=t),e.curOp.viewChanged=!0,t>=i.viewTo)ke&&Ge(e.doc,t)<i.viewTo&&$n(e);else if(r<=i.viewFrom)ke&&Ue(e.doc,r+n)>i.viewFrom?$n(e):(i.viewFrom+=n,i.viewTo+=n);else if(t<=i.viewFrom&&r>=i.viewTo)$n(e);else if(t<=i.viewFrom){var o=Zn(e,r,r+n,1);o?(i.view=i.view.slice(o.index),i.viewFrom=o.lineN,i.viewTo+=n):$n(e)}else if(r>=i.viewTo){var l=Zn(e,t,t,-1);l?(i.view=i.view.slice(0,l.index),i.viewTo=l.lineN):$n(e)}else{var s=Zn(e,t,t,-1),a=Zn(e,r,r+n,1);s&&a?(i.view=i.view.slice(0,s.index).concat(rr(e,s.lineN,a.lineN)).concat(i.view.slice(a.index)),i.viewTo+=n):$n(e)}var u=i.externalMeasured;u&&(r<u.lineN?u.lineN+=n:t<u.lineN+u.size&&(i.externalMeasured=null))}function qn(e,t,r){e.curOp.viewChanged=!0;var n=e.display,i=e.display.externalMeasured;if(i&&t>=i.lineN&&t<i.lineN+i.size&&(n.externalMeasured=null),!(t<n.viewFrom||t>=n.viewTo)){var o=n.view[on(e,t)];if(null!=o.node){var l=o.changes||(o.changes=[]);-1==B(l,r)&&l.push(r)}}}function $n(e){e.display.viewFrom=e.display.viewTo=e.doc.first,e.display.view=[],e.display.viewOffset=0}function Zn(e,t,r,n){var i,o=on(e,t),l=e.display.view;if(!ke||r==e.doc.first+e.doc.size)return{index:o,lineN:r};for(var s=e.display.viewFrom,a=0;a<o;a++)s+=l[a].size;if(s!=t){if(n>0){if(o==l.length-1)return null;i=s+l[o].size-t,o++}else i=s-t;t+=i,r+=i}for(;Ge(e.doc,r)!=r;){if(o==(n<0?0:l.length-1))return null;r+=n*l[o-(n<0?1:0)].size,o+=n}return{index:o,lineN:r}}function Qn(e){for(var t=e.display.view,r=0,n=0;n<t.length;n++){var i=t[n];i.hidden||i.node&&!i.changes||++r}return r}function Jn(e,t){e.doc.highlightFrontier<e.display.viewTo&&e.state.highlight.set(t,E(ei,e))}function ei(e){var t=e.doc;if(!(t.highlightFrontier>=e.display.viewTo)){var r=+new Date+e.options.workTime,n=zt(e,t.highlightFrontier),i=[];t.iter(n.line,Math.min(t.first+t.size,e.display.viewTo+500),function(o){if(n.line>=e.display.viewFrom){var l=o.styles,s=o.text.length>e.options.maxHighlightLength?Ot(t.mode,n.state):null,a=Pt(e,o,n,!0);s&&(n.state=s),o.styles=a.styles;var u=o.styleClasses,c=a.classes;c?o.styleClasses=c:u&&(o.styleClasses=null);for(var h=!l||l.length!=o.styles.length||u!=c&&(!u||!c||u.bgClass!=c.bgClass||u.textClass!=c.textClass),f=0;!h&&f<l.length;++f)h=l[f]!=o.styles[f];h&&i.push(n.line),o.stateAfter=n.save(),n.nextLine()}else o.text.length<=e.options.maxHighlightLength&&It(e,o.text,n),o.stateAfter=n.line%5==0?n.save():null,n.nextLine();if(+new Date>r)return Jn(e,e.options.workDelay),!0}),t.highlightFrontier=n.line,t.modeFrontier=Math.max(t.modeFrontier,n.line),i.length&&Kn(e,function(){for(var t=0;t<i.length;t++)qn(e,i[t],"text")})}}var ti=function(e,t,r){var n=e.display;this.viewport=t,this.visible=yn(n,e.doc,t),this.editorIsHidden=!n.wrapper.offsetWidth,this.wrapperHeight=n.wrapper.clientHeight,this.wrapperWidth=n.wrapper.clientWidth,this.oldDisplayWidth=Sr(e),this.force=r,this.dims=Jr(e),this.events=[]};function ri(e,t){var r=e.display,n=e.doc;if(t.editorIsHidden)return $n(e),!1;if(!t.force&&t.visible.from>=r.viewFrom&&t.visible.to<=r.viewTo&&(null==r.updateLineNumbers||r.updateLineNumbers>=r.viewTo)&&r.renderedView==r.view&&0==Qn(e))return!1;wn(e)&&($n(e),t.dims=Jr(e));var i=n.first+n.size,o=Math.max(t.visible.from-e.options.viewportMargin,n.first),l=Math.min(i,t.visible.to+e.options.viewportMargin);r.viewFrom<o&&o-r.viewFrom<20&&(o=Math.max(n.first,r.viewFrom)),r.viewTo>l&&r.viewTo-l<20&&(l=Math.min(i,r.viewTo)),ke&&(o=Ge(e.doc,o),l=Ue(e.doc,l));var s,u,c,h,f=o!=r.viewFrom||l!=r.viewTo||r.lastWrapHeight!=t.wrapperHeight||r.lastWrapWidth!=t.wrapperWidth;u=o,c=l,0==(h=(s=e).display).view.length||u>=h.viewTo||c<=h.viewFrom?(h.view=rr(s,u,c),h.viewFrom=u):(h.viewFrom>u?h.view=rr(s,u,h.viewFrom).concat(h.view):h.viewFrom<u&&(h.view=h.view.slice(on(s,u))),h.viewFrom=u,h.viewTo<c?h.view=h.view.concat(rr(s,h.viewTo,c)):h.viewTo>c&&(h.view=h.view.slice(0,on(s,c)))),h.viewTo=c,r.viewOffset=je(se(e.doc,r.viewFrom)),e.display.mover.style.top=r.viewOffset+"px";var d=Qn(e);if(!f&&0==d&&!t.force&&r.renderedView==r.view&&(null==r.updateLineNumbers||r.updateLineNumbers>=r.viewTo))return!1;var p=function(e){if(e.hasFocus())return null;var t=W();if(!t||!D(e.display.lineDiv,t))return null;var r={activeElt:t};if(window.getSelection){var n=window.getSelection();n.anchorNode&&n.extend&&D(e.display.lineDiv,n.anchorNode)&&(r.anchorNode=n.anchorNode,r.anchorOffset=n.anchorOffset,r.focusNode=n.focusNode,r.focusOffset=n.focusOffset)}return r}(e);return d>4&&(r.lineDiv.style.display="none"),function(e,t,r){var n=e.display,i=e.options.lineNumbers,o=n.lineDiv,l=o.firstChild;function s(t){var r=t.nextSibling;return a&&y&&e.display.currentWheelTarget==t?t.style.display="none":t.parentNode.removeChild(t),r}for(var u=n.view,c=n.viewFrom,h=0;h<u.length;h++){var f=u[h];if(f.hidden);else if(f.node&&f.node.parentNode==o){for(;l!=f.node;)l=s(l);var d=i&&null!=t&&t<=c&&f.lineNumber;f.changes&&(B(f.changes,"gutter")>-1&&(d=!1),sr(e,f,c,r)),d&&(M(f.lineNumber),f.lineNumber.appendChild(document.createTextNode(pe(e.options,c)))),l=f.node.nextSibling}else{var p=(m=c,b=r,void 0,w=ur(g=e,v=f),v.text=v.node=w.pre,w.bgClass&&(v.bgClass=w.bgClass),w.textClass&&(v.textClass=w.textClass),hr(g,v),fr(g,v,m,b),pr(g,v,b),v.node);o.insertBefore(p,l)}c+=f.size}var g,v,m,b,w;for(;l;)l=s(l)}(e,r.updateLineNumbers,t.dims),d>4&&(r.lineDiv.style.display=""),r.renderedView=r.view,function(e){if(e&&e.activeElt&&e.activeElt!=W()&&(e.activeElt.focus(),e.anchorNode&&D(document.body,e.anchorNode)&&D(document.body,e.focusNode))){var t=window.getSelection(),r=document.createRange();r.setEnd(e.anchorNode,e.anchorOffset),r.collapse(!1),t.removeAllRanges(),t.addRange(r),t.extend(e.focusNode,e.focusOffset)}}(p),M(r.cursorDiv),M(r.selectionDiv),r.gutters.style.height=r.sizer.style.minHeight=0,f&&(r.lastWrapHeight=t.wrapperHeight,r.lastWrapWidth=t.wrapperWidth,Jn(e,400)),r.updateLineNumbers=null,!0}function ni(e,t){for(var r=t.viewport,n=!0;(n&&e.options.lineWrapping&&t.oldDisplayWidth!=Sr(e)||(r&&null!=r.top&&(r={top:Math.min(e.doc.height+wr(e.display)-Lr(e),r.top)}),t.visible=yn(e.display,e.doc,r),!(t.visible.from>=e.display.viewFrom&&t.visible.to<=e.display.viewTo)))&&ri(e,t);n=!1){vn(e);var i=An(e);ln(e),Hn(e,i),li(e,i),t.force=!1}t.signal(e,"update",e),e.display.viewFrom==e.display.reportedViewFrom&&e.display.viewTo==e.display.reportedViewTo||(t.signal(e,"viewportChange",e,e.display.viewFrom,e.display.viewTo),e.display.reportedViewFrom=e.display.viewFrom,e.display.reportedViewTo=e.display.viewTo)}function ii(e,t){var r=new ti(e,t);if(ri(e,r)){vn(e),ni(e,r);var n=An(e);ln(e),Hn(e,n),li(e,n),r.finish()}}function oi(e){var t=e.display.gutters.offsetWidth;e.display.sizer.style.marginLeft=t+"px"}function li(e,t){e.display.sizer.style.minHeight=t.docHeight+"px",e.display.heightForcer.style.top=t.docHeight+"px",e.display.gutters.style.height=t.docHeight+e.display.barHeight+Cr(e)+"px"}function si(e){var t=e.display.gutters,r=e.options.gutters;M(t);for(var n=0;n<r.length;++n){var i=r[n],o=t.appendChild(O("div",null,"CodeMirror-gutter "+i));"CodeMirror-linenumbers"==i&&(e.display.lineGutter=o,o.style.width=(e.display.lineNumWidth||1)+"px")}t.style.display=n?"":"none",oi(e)}function ai(e){var t=B(e.gutters,"CodeMirror-linenumbers");-1==t&&e.lineNumbers?e.gutters=e.gutters.concat(["CodeMirror-linenumbers"]):t>-1&&!e.lineNumbers&&(e.gutters=e.gutters.slice(0),e.gutters.splice(t,1))}ti.prototype.signal=function(e,t){ot(e,t)&&this.events.push(arguments)},ti.prototype.finish=function(){for(var e=0;e<this.events.length;e++)rt.apply(null,this.events[e])};var ui=0,ci=null;function hi(e){var t=e.wheelDeltaX,r=e.wheelDeltaY;return null==t&&e.detail&&e.axis==e.HORIZONTAL_AXIS&&(t=e.detail),null==r&&e.detail&&e.axis==e.VERTICAL_AXIS?r=e.detail:null==r&&(r=e.wheelDelta),{x:t,y:r}}function fi(e){var t=hi(e);return t.x*=ci,t.y*=ci,t}function di(e,t){var n=hi(t),i=n.x,o=n.y,l=e.display,s=l.scroller,u=s.scrollWidth>s.clientWidth,c=s.scrollHeight>s.clientHeight;if(i&&u||o&&c){if(o&&y&&a)e:for(var f=t.target,d=l.view;f!=s;f=f.parentNode)for(var p=0;p<d.length;p++)if(d[p].node==f){e.display.currentWheelTarget=f;break e}if(i&&!r&&!h&&null!=ci)return o&&c&&Mn(e,Math.max(0,s.scrollTop+o*ci)),On(e,Math.max(0,s.scrollLeft+i*ci)),(!o||o&&c)&&st(t),void(l.wheelStartX=null);if(o&&null!=ci){var g=o*ci,v=e.doc.scrollTop,m=v+l.wrapper.clientHeight;g<0?v=Math.max(0,v+g-50):m=Math.min(e.doc.height,m+g+50),ii(e,{top:v,bottom:m})}ui<20&&(null==l.wheelStartX?(l.wheelStartX=s.scrollLeft,l.wheelStartY=s.scrollTop,l.wheelDX=i,l.wheelDY=o,setTimeout(function(){if(null!=l.wheelStartX){var e=s.scrollLeft-l.wheelStartX,t=s.scrollTop-l.wheelStartY,r=t&&l.wheelDY&&t/l.wheelDY||e&&l.wheelDX&&e/l.wheelDX;l.wheelStartX=l.wheelStartY=null,r&&(ci=(ci*ui+r)/(ui+1),++ui)}},200)):(l.wheelDX+=i,l.wheelDY+=o))}}l?ci=-.53:r?ci=15:c?ci=-.7:f&&(ci=-1/3);var pi=function(e,t){this.ranges=e,this.primIndex=t};pi.prototype.primary=function(){return this.ranges[this.primIndex]},pi.prototype.equals=function(e){if(e==this)return!0;if(e.primIndex!=this.primIndex||e.ranges.length!=this.ranges.length)return!1;for(var t=0;t<this.ranges.length;t++){var r=this.ranges[t],n=e.ranges[t];if(!me(r.anchor,n.anchor)||!me(r.head,n.head))return!1}return!0},pi.prototype.deepCopy=function(){for(var e=[],t=0;t<this.ranges.length;t++)e[t]=new gi(ye(this.ranges[t].anchor),ye(this.ranges[t].head));return new pi(e,this.primIndex)},pi.prototype.somethingSelected=function(){for(var e=0;e<this.ranges.length;e++)if(!this.ranges[e].empty())return!0;return!1},pi.prototype.contains=function(e,t){t||(t=e);for(var r=0;r<this.ranges.length;r++){var n=this.ranges[r];if(ve(t,n.from())>=0&&ve(e,n.to())<=0)return r}return-1};var gi=function(e,t){this.anchor=e,this.head=t};function vi(e,t){var r=e[t];e.sort(function(e,t){return ve(e.from(),t.from())}),t=B(e,r);for(var n=1;n<e.length;n++){var i=e[n],o=e[n-1];if(ve(o.to(),i.from())>=0){var l=we(o.from(),i.from()),s=be(o.to(),i.to()),a=o.empty()?i.from()==i.head:o.from()==o.head;n<=t&&--t,e.splice(--n,2,new gi(a?s:l,a?l:s))}}return new pi(e,t)}function mi(e,t){return new pi([new gi(e,t||e)],0)}function yi(e){return e.text?ge(e.from.line+e.text.length-1,q(e.text).length+(1==e.text.length?e.from.ch:0)):e.to}function bi(e,t){if(ve(e,t.from)<0)return e;if(ve(e,t.to)<=0)return yi(t);var r=e.line+t.text.length-(t.to.line-t.from.line)-1,n=e.ch;return e.line==t.to.line&&(n+=yi(t).ch-t.to.ch),ge(r,n)}function wi(e,t){for(var r=[],n=0;n<e.sel.ranges.length;n++){var i=e.sel.ranges[n];r.push(new gi(bi(i.anchor,t),bi(i.head,t)))}return vi(r,e.sel.primIndex)}function xi(e,t,r){return e.line==t.line?ge(r.line,e.ch-t.ch+r.ch):ge(r.line+(e.line-t.line),e.ch)}function Ci(e){e.doc.mode=Tt(e.options,e.doc.modeOption),Si(e)}function Si(e){e.doc.iter(function(e){e.stateAfter&&(e.stateAfter=null),e.styles&&(e.styles=null)}),e.doc.modeFrontier=e.doc.highlightFrontier=e.doc.first,Jn(e,100),e.state.modeGen++,e.curOp&&_n(e)}function Li(e,t){return 0==t.from.ch&&0==t.to.ch&&""==q(t.text)&&(!e.cm||e.cm.options.wholeLineUpdateBefore)}function ki(e,t,r,n){function i(e){return r?r[e]:null}function o(e,r,i){!function(e,t,r,n){e.text=t,e.stateAfter&&(e.stateAfter=null),e.styles&&(e.styles=null),null!=e.order&&(e.order=null),De(e),We(e,r);var i=n?n(e):1;i!=e.height&&ce(e,i)}(e,r,i,n),or(e,"change",e,t)}function l(e,t){for(var r=[],o=e;o<t;++o)r.push(new jt(u[o],i(o),n));return r}var s=t.from,a=t.to,u=t.text,c=se(e,s.line),h=se(e,a.line),f=q(u),d=i(u.length-1),p=a.line-s.line;if(t.full)e.insert(0,l(0,u.length)),e.remove(u.length,e.size-u.length);else if(Li(e,t)){var g=l(0,u.length-1);o(h,h.text,d),p&&e.remove(s.line,p),g.length&&e.insert(s.line,g)}else if(c==h)if(1==u.length)o(c,c.text.slice(0,s.ch)+f+c.text.slice(a.ch),d);else{var v=l(1,u.length-1);v.push(new jt(f+c.text.slice(a.ch),d,n)),o(c,c.text.slice(0,s.ch)+u[0],i(0)),e.insert(s.line+1,v)}else if(1==u.length)o(c,c.text.slice(0,s.ch)+u[0]+h.text.slice(a.ch),i(0)),e.remove(s.line+1,p);else{o(c,c.text.slice(0,s.ch)+u[0],i(0)),o(h,f+h.text.slice(a.ch),d);var m=l(1,u.length-1);p>1&&e.remove(s.line+1,p-1),e.insert(s.line+1,m)}or(e,"change",e,t)}function Ti(e,t,r){!function e(n,i,o){if(n.linked)for(var l=0;l<n.linked.length;++l){var s=n.linked[l];if(s.doc!=i){var a=o&&s.sharedHist;r&&!a||(t(s.doc,a),e(s.doc,n,a))}}}(e,null,!0)}function Mi(e,t){if(t.cm)throw new Error("This document is already in use.");e.doc=t,t.cm=e,rn(e),Ci(e),Ni(e),e.options.lineWrapping||Ye(e),e.options.mode=t.modeOption,_n(e)}function Ni(e){("rtl"==e.doc.direction?H:T)(e.display.lineDiv,"CodeMirror-rtl")}function Oi(e){this.done=[],this.undone=[],this.undoDepth=1/0,this.lastModTime=this.lastSelTime=0,this.lastOp=this.lastSelOp=null,this.lastOrigin=this.lastSelOrigin=null,this.generation=this.maxGeneration=e||1}function Ai(e,t){var r={from:ye(t.from),to:yi(t),text:ae(e,t.from,t.to)};return Pi(e,r,t.from.line,t.to.line+1),Ti(e,function(e){return Pi(e,r,t.from.line,t.to.line+1)},!0),r}function Di(e){for(;e.length;){if(!q(e).ranges)break;e.pop()}}function Wi(e,t,r,n){var i=e.history;i.undone.length=0;var o,l,s,a=+new Date;if((i.lastOp==n||i.lastOrigin==t.origin&&t.origin&&("+"==t.origin.charAt(0)&&i.lastModTime>a-(e.cm?e.cm.options.historyEventDelay:500)||"*"==t.origin.charAt(0)))&&(s=i,o=i.lastOp==n?(Di(s.done),q(s.done)):s.done.length&&!q(s.done).ranges?q(s.done):s.done.length>1&&!s.done[s.done.length-2].ranges?(s.done.pop(),q(s.done)):void 0))l=q(o.changes),0==ve(t.from,t.to)&&0==ve(t.from,l.to)?l.to=yi(t):o.changes.push(Ai(e,t));else{var u=q(i.done);for(u&&u.ranges||Fi(e.sel,i.done),o={changes:[Ai(e,t)],generation:i.generation},i.done.push(o);i.done.length>i.undoDepth;)i.done.shift(),i.done[0].ranges||i.done.shift()}i.done.push(r),i.generation=++i.maxGeneration,i.lastModTime=i.lastSelTime=a,i.lastOp=i.lastSelOp=n,i.lastOrigin=i.lastSelOrigin=t.origin,l||rt(e,"historyAdded")}function Hi(e,t,r,n){var i,o,l,s,a,u=e.history,c=n&&n.origin;r==u.lastSelOp||c&&u.lastSelOrigin==c&&(u.lastModTime==u.lastSelTime&&u.lastOrigin==c||(i=e,o=c,l=q(u.done),s=t,"*"==(a=o.charAt(0))||"+"==a&&l.ranges.length==s.ranges.length&&l.somethingSelected()==s.somethingSelected()&&new Date-i.history.lastSelTime<=(i.cm?i.cm.options.historyEventDelay:500)))?u.done[u.done.length-1]=t:Fi(t,u.done),u.lastSelTime=+new Date,u.lastSelOrigin=c,u.lastSelOp=r,n&&!1!==n.clearRedo&&Di(u.undone)}function Fi(e,t){var r=q(t);r&&r.ranges&&r.equals(e)||t.push(e)}function Pi(e,t,r,n){var i=t["spans_"+e.id],o=0;e.iter(Math.max(e.first,r),Math.min(e.first+e.size,n),function(r){r.markedSpans&&((i||(i=t["spans_"+e.id]={}))[o]=r.markedSpans),++o})}function Ei(e){if(!e)return null;for(var t,r=0;r<e.length;++r)e[r].marker.explicitlyCleared?t||(t=e.slice(0,r)):t&&t.push(e[r]);return t?t.length?t:null:e}function zi(e,t){var r=function(e,t){var r=t["spans_"+e.id];if(!r)return null;for(var n=[],i=0;i<t.text.length;++i)n.push(Ei(r[i]));return n}(e,t),n=Oe(e,t);if(!r)return n;if(!n)return r;for(var i=0;i<r.length;++i){var o=r[i],l=n[i];if(o&&l)e:for(var s=0;s<l.length;++s){for(var a=l[s],u=0;u<o.length;++u)if(o[u].marker==a.marker)continue e;o.push(a)}else l&&(r[i]=l)}return r}function Ii(e,t,r){for(var n=[],i=0;i<e.length;++i){var o=e[i];if(o.ranges)n.push(r?pi.prototype.deepCopy.call(o):o);else{var l=o.changes,s=[];n.push({changes:s});for(var a=0;a<l.length;++a){var u=l[a],c=void 0;if(s.push({from:u.from,to:u.to,text:u.text}),t)for(var h in u)(c=h.match(/^spans_(\d+)$/))&&B(t,Number(c[1]))>-1&&(q(s)[h]=u[h],delete u[h])}}}return n}function Ri(e,t,r,n){if(n){var i=e.anchor;if(r){var o=ve(t,i)<0;o!=ve(r,i)<0?(i=t,t=r):o!=ve(t,r)<0&&(t=r)}return new gi(i,t)}return new gi(r||t,t)}function Bi(e,t,r,n,i){null==i&&(i=e.cm&&(e.cm.display.shift||e.extend)),ji(e,new pi([Ri(e.sel.primary(),t,r,i)],0),n)}function Gi(e,t,r){for(var n=[],i=e.cm&&(e.cm.display.shift||e.extend),o=0;o<e.sel.ranges.length;o++)n[o]=Ri(e.sel.ranges[o],t[o],null,i);ji(e,vi(n,e.sel.primIndex),r)}function Ui(e,t,r,n){var i=e.sel.ranges.slice(0);i[t]=r,ji(e,vi(i,e.sel.primIndex),n)}function Vi(e,t,r,n){ji(e,mi(t,r),n)}function Ki(e,t,r){var n=e.history.done,i=q(n);i&&i.ranges?(n[n.length-1]=t,Xi(e,t,r)):ji(e,t,r)}function ji(e,t,r){Xi(e,t,r),Hi(e,e.sel,e.cm?e.cm.curOp.id:NaN,r)}function Xi(e,t,r){var n,i,o,l;(ot(e,"beforeSelectionChange")||e.cm&&ot(e.cm,"beforeSelectionChange"))&&(n=e,o=r,l={ranges:(i=t).ranges,update:function(e){this.ranges=[];for(var t=0;t<e.length;t++)this.ranges[t]=new gi(Ce(n,e[t].anchor),Ce(n,e[t].head))},origin:o&&o.origin},rt(n,"beforeSelectionChange",n,l),n.cm&&rt(n.cm,"beforeSelectionChange",n.cm,l),t=l.ranges!=i.ranges?vi(l.ranges,l.ranges.length-1):i),Yi(e,qi(e,t,r&&r.bias||(ve(t.primary().head,e.sel.primary().head)<0?-1:1),!0)),r&&!1===r.scroll||!e.cm||Sn(e.cm)}function Yi(e,t){t.equals(e.sel)||(e.sel=t,e.cm&&(e.cm.curOp.updateInput=e.cm.curOp.selectionChanged=!0,it(e.cm)),or(e,"cursorActivity",e))}function _i(e){Yi(e,qi(e,e.sel,null,!1))}function qi(e,t,r,n){for(var i,o=0;o<t.ranges.length;o++){var l=t.ranges[o],s=t.ranges.length==e.sel.ranges.length&&e.sel.ranges[o],a=Zi(e,l.anchor,s&&s.anchor,r,n),u=Zi(e,l.head,s&&s.head,r,n);(i||a!=l.anchor||u!=l.head)&&(i||(i=t.ranges.slice(0,o)),i[o]=new gi(a,u))}return i?vi(i,t.primIndex):t}function $i(e,t,r,n,i){var o=se(e,t.line);if(o.markedSpans)for(var l=0;l<o.markedSpans.length;++l){var s=o.markedSpans[l],a=s.marker;if((null==s.from||(a.inclusiveLeft?s.from<=t.ch:s.from<t.ch))&&(null==s.to||(a.inclusiveRight?s.to>=t.ch:s.to>t.ch))){if(i&&(rt(a,"beforeCursorEnter"),a.explicitlyCleared)){if(o.markedSpans){--l;continue}break}if(!a.atomic)continue;if(r){var u=a.find(n<0?1:-1),c=void 0;if((n<0?a.inclusiveRight:a.inclusiveLeft)&&(u=Qi(e,u,-n,u&&u.line==t.line?o:null)),u&&u.line==t.line&&(c=ve(u,r))&&(n<0?c<0:c>0))return $i(e,u,t,n,i)}var h=a.find(n<0?-1:1);return(n<0?a.inclusiveLeft:a.inclusiveRight)&&(h=Qi(e,h,n,h.line==t.line?o:null)),h?$i(e,h,t,n,i):null}}return t}function Zi(e,t,r,n,i){var o=n||1,l=$i(e,t,r,o,i)||!i&&$i(e,t,r,o,!0)||$i(e,t,r,-o,i)||!i&&$i(e,t,r,-o,!0);return l||(e.cantEdit=!0,ge(e.first,0))}function Qi(e,t,r,n){return r<0&&0==t.ch?t.line>e.first?Ce(e,ge(t.line-1)):null:r>0&&t.ch==(n||se(e,t.line)).text.length?t.line<e.first+e.size-1?ge(t.line+1,0):null:new ge(t.line,t.ch+r)}function Ji(e){e.setSelection(ge(e.firstLine(),0),ge(e.lastLine()),V)}function eo(e,t,r){var n={canceled:!1,from:t.from,to:t.to,text:t.text,origin:t.origin,cancel:function(){return n.canceled=!0}};return r&&(n.update=function(t,r,i,o){t&&(n.from=Ce(e,t)),r&&(n.to=Ce(e,r)),i&&(n.text=i),void 0!==o&&(n.origin=o)}),rt(e,"beforeChange",e,n),e.cm&&rt(e.cm,"beforeChange",e.cm,n),n.canceled?null:{from:n.from,to:n.to,text:n.text,origin:n.origin}}function to(e,t,r){if(e.cm){if(!e.cm.curOp)return jn(e.cm,to)(e,t,r);if(e.cm.state.suppressEdits)return}if(!(ot(e,"beforeChange")||e.cm&&ot(e.cm,"beforeChange"))||(t=eo(e,t,!0))){var n=Le&&!r&&function(e,t,r){var n=null;if(e.iter(t.line,r.line+1,function(e){if(e.markedSpans)for(var t=0;t<e.markedSpans.length;++t){var r=e.markedSpans[t].marker;!r.readOnly||n&&-1!=B(n,r)||(n||(n=[])).push(r)}}),!n)return null;for(var i=[{from:t,to:r}],o=0;o<n.length;++o)for(var l=n[o],s=l.find(0),a=0;a<i.length;++a){var u=i[a];if(!(ve(u.to,s.from)<0||ve(u.from,s.to)>0)){var c=[a,1],h=ve(u.from,s.from),f=ve(u.to,s.to);(h<0||!l.inclusiveLeft&&!h)&&c.push({from:u.from,to:s.from}),(f>0||!l.inclusiveRight&&!f)&&c.push({from:s.to,to:u.to}),i.splice.apply(i,c),a+=c.length-3}}return i}(e,t.from,t.to);if(n)for(var i=n.length-1;i>=0;--i)ro(e,{from:n[i].from,to:n[i].to,text:i?[""]:t.text,origin:t.origin});else ro(e,t)}}function ro(e,t){if(1!=t.text.length||""!=t.text[0]||0!=ve(t.from,t.to)){var r=wi(e,t);Wi(e,t,r,e.cm?e.cm.curOp.id:NaN),oo(e,t,r,Oe(e,t));var n=[];Ti(e,function(e,r){r||-1!=B(n,e.history)||(uo(e.history,t),n.push(e.history)),oo(e,t,null,Oe(e,t))})}}function no(e,t,r){var n=e.cm&&e.cm.state.suppressEdits;if(!n||r){for(var i,o=e.history,l=e.sel,s="undo"==t?o.done:o.undone,a="undo"==t?o.undone:o.done,u=0;u<s.length&&(i=s[u],r?!i.ranges||i.equals(e.sel):i.ranges);u++);if(u!=s.length){for(o.lastOrigin=o.lastSelOrigin=null;;){if(!(i=s.pop()).ranges){if(n)return void s.push(i);break}if(Fi(i,a),r&&!i.equals(e.sel))return void ji(e,i,{clearRedo:!1});l=i}var c=[];Fi(l,a),a.push({changes:c,generation:o.generation}),o.generation=i.generation||++o.maxGeneration;for(var h=ot(e,"beforeChange")||e.cm&&ot(e.cm,"beforeChange"),f=function(r){var n=i.changes[r];if(n.origin=t,h&&!eo(e,n,!1))return s.length=0,{};c.push(Ai(e,n));var o=r?wi(e,n):q(s);oo(e,n,o,zi(e,n)),!r&&e.cm&&e.cm.scrollIntoView({from:n.from,to:yi(n)});var l=[];Ti(e,function(e,t){t||-1!=B(l,e.history)||(uo(e.history,n),l.push(e.history)),oo(e,n,null,zi(e,n))})},d=i.changes.length-1;d>=0;--d){var p=f(d);if(p)return p.v}}}}function io(e,t){if(0!=t&&(e.first+=t,e.sel=new pi($(e.sel.ranges,function(e){return new gi(ge(e.anchor.line+t,e.anchor.ch),ge(e.head.line+t,e.head.ch))}),e.sel.primIndex),e.cm)){_n(e.cm,e.first,e.first-t,t);for(var r=e.cm.display,n=r.viewFrom;n<r.viewTo;n++)qn(e.cm,n,"gutter")}}function oo(e,t,r,n){if(e.cm&&!e.cm.curOp)return jn(e.cm,oo)(e,t,r,n);if(t.to.line<e.first)io(e,t.text.length-1-(t.to.line-t.from.line));else if(!(t.from.line>e.lastLine())){if(t.from.line<e.first){var i=t.text.length-1-(e.first-t.from.line);io(e,i),t={from:ge(e.first,0),to:ge(t.to.line+i,t.to.ch),text:[q(t.text)],origin:t.origin}}var o=e.lastLine();t.to.line>o&&(t={from:t.from,to:ge(o,se(e,o).text.length),text:[t.text[0]],origin:t.origin}),t.removed=ae(e,t.from,t.to),r||(r=wi(e,t)),e.cm?function(e,t,r){var n=e.doc,i=e.display,o=t.from,l=t.to,s=!1,a=o.line;e.options.lineWrapping||(a=he(Be(se(n,o.line))),n.iter(a,l.line+1,function(e){if(e==i.maxLine)return s=!0,!0}));n.sel.contains(t.from,t.to)>-1&&it(e);ki(n,t,r,tn(e)),e.options.lineWrapping||(n.iter(a,o.line+t.text.length,function(e){var t=Xe(e);t>i.maxLineLength&&(i.maxLine=e,i.maxLineLength=t,i.maxLineChanged=!0,s=!1)}),s&&(e.curOp.updateMaxLine=!0));(function(e,t){if(e.modeFrontier=Math.min(e.modeFrontier,t),!(e.highlightFrontier<t-10)){for(var r=e.first,n=t-1;n>r;n--){var i=se(e,n).stateAfter;if(i&&(!(i instanceof Ht)||n+i.lookAhead<t)){r=n+1;break}}e.highlightFrontier=Math.min(e.highlightFrontier,r)}})(n,o.line),Jn(e,400);var u=t.text.length-(l.line-o.line)-1;t.full?_n(e):o.line!=l.line||1!=t.text.length||Li(e.doc,t)?_n(e,o.line,l.line+1,u):qn(e,o.line,"text");var c=ot(e,"changes"),h=ot(e,"change");if(h||c){var f={from:o,to:l,text:t.text,removed:t.removed,origin:t.origin};h&&or(e,"change",e,f),c&&(e.curOp.changeObjs||(e.curOp.changeObjs=[])).push(f)}e.display.selForContextMenu=null}(e.cm,t,n):ki(e,t,n),Xi(e,r,V)}}function lo(e,t,r,n,i){var o;(n||(n=r),ve(n,r)<0)&&(r=(o=[n,r])[0],n=o[1]);"string"==typeof t&&(t=e.splitLines(t)),to(e,{from:r,to:n,text:t,origin:i})}function so(e,t,r,n){r<e.line?e.line+=n:t<e.line&&(e.line=t,e.ch=0)}function ao(e,t,r,n){for(var i=0;i<e.length;++i){var o=e[i],l=!0;if(o.ranges){o.copied||((o=e[i]=o.deepCopy()).copied=!0);for(var s=0;s<o.ranges.length;s++)so(o.ranges[s].anchor,t,r,n),so(o.ranges[s].head,t,r,n)}else{for(var a=0;a<o.changes.length;++a){var u=o.changes[a];if(r<u.from.line)u.from=ge(u.from.line+n,u.from.ch),u.to=ge(u.to.line+n,u.to.ch);else if(t<=u.to.line){l=!1;break}}l||(e.splice(0,i+1),i=0)}}}function uo(e,t){var r=t.from.line,n=t.to.line,i=t.text.length-(n-r)-1;ao(e.done,r,n,i),ao(e.undone,r,n,i)}function co(e,t,r,n){var i=t,o=t;return"number"==typeof t?o=se(e,xe(e,t)):i=he(t),null==i?null:(n(o,i)&&e.cm&&qn(e.cm,i,r),o)}function ho(e){this.lines=e,this.parent=null;for(var t=0,r=0;r<e.length;++r)e[r].parent=this,t+=e[r].height;this.height=t}function fo(e){this.children=e;for(var t=0,r=0,n=0;n<e.length;++n){var i=e[n];t+=i.chunkSize(),r+=i.height,i.parent=this}this.size=t,this.height=r,this.parent=null}gi.prototype.from=function(){return we(this.anchor,this.head)},gi.prototype.to=function(){return be(this.anchor,this.head)},gi.prototype.empty=function(){return this.head.line==this.anchor.line&&this.head.ch==this.anchor.ch},ho.prototype={chunkSize:function(){return this.lines.length},removeInner:function(e,t){for(var r,n=e,i=e+t;n<i;++n){var o=this.lines[n];this.height-=o.height,(r=o).parent=null,De(r),or(o,"delete")}this.lines.splice(e,t)},collapse:function(e){e.push.apply(e,this.lines)},insertInner:function(e,t,r){this.height+=r,this.lines=this.lines.slice(0,e).concat(t).concat(this.lines.slice(e));for(var n=0;n<t.length;++n)t[n].parent=this},iterN:function(e,t,r){for(var n=e+t;e<n;++e)if(r(this.lines[e]))return!0}},fo.prototype={chunkSize:function(){return this.size},removeInner:function(e,t){this.size-=t;for(var r=0;r<this.children.length;++r){var n=this.children[r],i=n.chunkSize();if(e<i){var o=Math.min(t,i-e),l=n.height;if(n.removeInner(e,o),this.height-=l-n.height,i==o&&(this.children.splice(r--,1),n.parent=null),0==(t-=o))break;e=0}else e-=i}if(this.size-t<25&&(this.children.length>1||!(this.children[0]instanceof ho))){var s=[];this.collapse(s),this.children=[new ho(s)],this.children[0].parent=this}},collapse:function(e){for(var t=0;t<this.children.length;++t)this.children[t].collapse(e)},insertInner:function(e,t,r){this.size+=t.length,this.height+=r;for(var n=0;n<this.children.length;++n){var i=this.children[n],o=i.chunkSize();if(e<=o){if(i.insertInner(e,t,r),i.lines&&i.lines.length>50){for(var l=i.lines.length%25+25,s=l;s<i.lines.length;){var a=new ho(i.lines.slice(s,s+=25));i.height-=a.height,this.children.splice(++n,0,a),a.parent=this}i.lines=i.lines.slice(0,l),this.maybeSpill()}break}e-=o}},maybeSpill:function(){if(!(this.children.length<=10)){var e=this;do{var t=new fo(e.children.splice(e.children.length-5,5));if(e.parent){e.size-=t.size,e.height-=t.height;var r=B(e.parent.children,e);e.parent.children.splice(r+1,0,t)}else{var n=new fo(e.children);n.parent=e,e.children=[n,t],e=n}t.parent=e.parent}while(e.children.length>10);e.parent.maybeSpill()}},iterN:function(e,t,r){for(var n=0;n<this.children.length;++n){var i=this.children[n],o=i.chunkSize();if(e<o){var l=Math.min(t,o-e);if(i.iterN(e,l,r))return!0;if(0==(t-=l))break;e=0}else e-=o}}};var po=function(e,t,r){if(r)for(var n in r)r.hasOwnProperty(n)&&(this[n]=r[n]);this.doc=e,this.node=t};function go(e,t,r){je(t)<(e.curOp&&e.curOp.scrollTop||e.doc.scrollTop)&&Cn(e,r)}po.prototype.clear=function(){var e=this.doc.cm,t=this.line.widgets,r=this.line,n=he(r);if(null!=n&&t){for(var i=0;i<t.length;++i)t[i]==this&&t.splice(i--,1);t.length||(r.widgets=null);var o=mr(this);ce(r,Math.max(0,r.height-o)),e&&(Kn(e,function(){go(e,r,-o),qn(e,n,"widget")}),or(e,"lineWidgetCleared",e,this,n))}},po.prototype.changed=function(){var e=this,t=this.height,r=this.doc.cm,n=this.line;this.height=null;var i=mr(this)-t;i&&(ce(n,n.height+i),r&&Kn(r,function(){r.curOp.forceUpdate=!0,go(r,n,i),or(r,"lineWidgetChanged",r,e,he(n))}))},lt(po);var vo=0,mo=function(e,t){this.lines=[],this.type=t,this.doc=e,this.id=++vo};function yo(e,t,r,n,i){if(n&&n.shared)return function(e,t,r,n,i){(n=z(n)).shared=!1;var o=[yo(e,t,r,n,i)],l=o[0],s=n.widgetNode;return Ti(e,function(e){s&&(n.widgetNode=s.cloneNode(!0)),o.push(yo(e,Ce(e,t),Ce(e,r),n,i));for(var a=0;a<e.linked.length;++a)if(e.linked[a].isParent)return;l=q(o)}),new bo(o,l)}(e,t,r,n,i);if(e.cm&&!e.cm.curOp)return jn(e.cm,yo)(e,t,r,n,i);var o=new mo(e,i),l=ve(t,r);if(n&&z(n,o,!1),l>0||0==l&&!1!==o.clearWhenEmpty)return o;if(o.replacedWith&&(o.collapsed=!0,o.widgetNode=A("span",[o.replacedWith],"CodeMirror-widget"),n.handleMouseEvents||o.widgetNode.setAttribute("cm-ignore-events","true"),n.insertLeft&&(o.widgetNode.insertLeft=!0)),o.collapsed){if(Re(e,t.line,t,r,o)||t.line!=r.line&&Re(e,r.line,t,r,o))throw new Error("Inserting collapsed marker partially overlapping an existing one");ke=!0}o.addToHistory&&Wi(e,{from:t,to:r,origin:"markText"},e.sel,NaN);var s,a=t.line,u=e.cm;if(e.iter(a,r.line+1,function(e){var n,i;u&&o.collapsed&&!u.options.lineWrapping&&Be(e)==u.display.maxLine&&(s=!0),o.collapsed&&a!=t.line&&ce(e,0),n=e,i=new Te(o,a==t.line?t.ch:null,a==r.line?r.ch:null),n.markedSpans=n.markedSpans?n.markedSpans.concat([i]):[i],i.marker.attachLine(n),++a}),o.collapsed&&e.iter(t.line,r.line+1,function(t){Ve(e,t)&&ce(t,0)}),o.clearOnEnter&&Je(o,"beforeCursorEnter",function(){return o.clear()}),o.readOnly&&(Le=!0,(e.history.done.length||e.history.undone.length)&&e.clearHistory()),o.collapsed&&(o.id=++vo,o.atomic=!0),u){if(s&&(u.curOp.updateMaxLine=!0),o.collapsed)_n(u,t.line,r.line+1);else if(o.className||o.title||o.startStyle||o.endStyle||o.css)for(var c=t.line;c<=r.line;c++)qn(u,c,"text");o.atomic&&_i(u.doc),or(u,"markerAdded",u,o)}return o}mo.prototype.clear=function(){var e=this;if(!this.explicitlyCleared){var t=this.doc.cm,r=t&&!t.curOp;if(r&&In(t),ot(this,"clear")){var n=this.find();n&&or(this,"clear",n.from,n.to)}for(var i=null,o=null,l=0;l<this.lines.length;++l){var s=e.lines[l],a=Me(s.markedSpans,e);t&&!e.collapsed?qn(t,he(s),"text"):t&&(null!=a.to&&(o=he(s)),null!=a.from&&(i=he(s))),s.markedSpans=Ne(s.markedSpans,a),null==a.from&&e.collapsed&&!Ve(e.doc,s)&&t&&ce(s,Zr(t.display))}if(t&&this.collapsed&&!t.options.lineWrapping)for(var u=0;u<this.lines.length;++u){var c=Be(e.lines[u]),h=Xe(c);h>t.display.maxLineLength&&(t.display.maxLine=c,t.display.maxLineLength=h,t.display.maxLineChanged=!0)}null!=i&&t&&this.collapsed&&_n(t,i,o+1),this.lines.length=0,this.explicitlyCleared=!0,this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,t&&_i(t.doc)),t&&or(t,"markerCleared",t,this,i,o),r&&Rn(t),this.parent&&this.parent.clear()}},mo.prototype.find=function(e,t){var r,n;null==e&&"bookmark"==this.type&&(e=1);for(var i=0;i<this.lines.length;++i){var o=this.lines[i],l=Me(o.markedSpans,this);if(null!=l.from&&(r=ge(t?o:he(o),l.from),-1==e))return r;if(null!=l.to&&(n=ge(t?o:he(o),l.to),1==e))return n}return r&&{from:r,to:n}},mo.prototype.changed=function(){var e=this,t=this.find(-1,!0),r=this,n=this.doc.cm;t&&n&&Kn(n,function(){var i=t.line,o=he(t.line),l=Mr(n,o);if(l&&(Fr(l),n.curOp.selectionChanged=n.curOp.forceUpdate=!0),n.curOp.updateMaxLine=!0,!Ve(r.doc,i)&&null!=r.height){var s=r.height;r.height=null;var a=mr(r)-s;a&&ce(i,i.height+a)}or(n,"markerChanged",n,e)})},mo.prototype.attachLine=function(e){if(!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp;t.maybeHiddenMarkers&&-1!=B(t.maybeHiddenMarkers,this)||(t.maybeUnhiddenMarkers||(t.maybeUnhiddenMarkers=[])).push(this)}this.lines.push(e)},mo.prototype.detachLine=function(e){if(this.lines.splice(B(this.lines,e),1),!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp;(t.maybeHiddenMarkers||(t.maybeHiddenMarkers=[])).push(this)}},lt(mo);var bo=function(e,t){this.markers=e,this.primary=t;for(var r=0;r<e.length;++r)e[r].parent=this};function wo(e){return e.findMarks(ge(e.first,0),e.clipPos(ge(e.lastLine())),function(e){return e.parent})}function xo(e){for(var t=function(t){var r=e[t],n=[r.primary.doc];Ti(r.primary.doc,function(e){return n.push(e)});for(var i=0;i<r.markers.length;i++){var o=r.markers[i];-1==B(n,o.doc)&&(o.parent=null,r.markers.splice(i--,1))}},r=0;r<e.length;r++)t(r)}bo.prototype.clear=function(){if(!this.explicitlyCleared){this.explicitlyCleared=!0;for(var e=0;e<this.markers.length;++e)this.markers[e].clear();or(this,"clear")}},bo.prototype.find=function(e,t){return this.primary.find(e,t)},lt(bo);var Co=0,So=function(e,t,r,n,i){if(!(this instanceof So))return new So(e,t,r,n,i);null==r&&(r=0),fo.call(this,[new ho([new jt("",null)])]),this.first=r,this.scrollTop=this.scrollLeft=0,this.cantEdit=!1,this.cleanGeneration=1,this.modeFrontier=this.highlightFrontier=r;var o=ge(r,0);this.sel=mi(o),this.history=new Oi(null),this.id=++Co,this.modeOption=t,this.lineSep=n,this.direction="rtl"==i?"rtl":"ltr",this.extend=!1,"string"==typeof e&&(e=this.splitLines(e)),ki(this,{from:o,to:o,text:e}),ji(this,mi(o),V)};So.prototype=Q(fo.prototype,{constructor:So,iter:function(e,t,r){r?this.iterN(e-this.first,t-e,r):this.iterN(this.first,this.first+this.size,e)},insert:function(e,t){for(var r=0,n=0;n<t.length;++n)r+=t[n].height;this.insertInner(e-this.first,t,r)},remove:function(e,t){this.removeInner(e-this.first,t)},getValue:function(e){var t=ue(this,this.first,this.first+this.size);return!1===e?t:t.join(e||this.lineSeparator())},setValue:Yn(function(e){var t=ge(this.first,0),r=this.first+this.size-1;to(this,{from:t,to:ge(r,se(this,r).text.length),text:this.splitLines(e),origin:"setValue",full:!0},!0),this.cm&&Ln(this.cm,0,0),ji(this,mi(t),V)}),replaceRange:function(e,t,r,n){lo(this,e,t=Ce(this,t),r=r?Ce(this,r):t,n)},getRange:function(e,t,r){var n=ae(this,Ce(this,e),Ce(this,t));return!1===r?n:n.join(r||this.lineSeparator())},getLine:function(e){var t=this.getLineHandle(e);return t&&t.text},getLineHandle:function(e){if(de(this,e))return se(this,e)},getLineNumber:function(e){return he(e)},getLineHandleVisualStart:function(e){return"number"==typeof e&&(e=se(this,e)),Be(e)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(e){return Ce(this,e)},getCursor:function(e){var t=this.sel.primary();return null==e||"head"==e?t.head:"anchor"==e?t.anchor:"end"==e||"to"==e||!1===e?t.to():t.from()},listSelections:function(){return this.sel.ranges},somethingSelected:function(){return this.sel.somethingSelected()},setCursor:Yn(function(e,t,r){Vi(this,Ce(this,"number"==typeof e?ge(e,t||0):e),null,r)}),setSelection:Yn(function(e,t,r){Vi(this,Ce(this,e),Ce(this,t||e),r)}),extendSelection:Yn(function(e,t,r){Bi(this,Ce(this,e),t&&Ce(this,t),r)}),extendSelections:Yn(function(e,t){Gi(this,Se(this,e),t)}),extendSelectionsBy:Yn(function(e,t){Gi(this,Se(this,$(this.sel.ranges,e)),t)}),setSelections:Yn(function(e,t,r){if(e.length){for(var n=[],i=0;i<e.length;i++)n[i]=new gi(Ce(this,e[i].anchor),Ce(this,e[i].head));null==t&&(t=Math.min(e.length-1,this.sel.primIndex)),ji(this,vi(n,t),r)}}),addSelection:Yn(function(e,t,r){var n=this.sel.ranges.slice(0);n.push(new gi(Ce(this,e),Ce(this,t||e))),ji(this,vi(n,n.length-1),r)}),getSelection:function(e){for(var t,r=this.sel.ranges,n=0;n<r.length;n++){var i=ae(this,r[n].from(),r[n].to());t=t?t.concat(i):i}return!1===e?t:t.join(e||this.lineSeparator())},getSelections:function(e){for(var t=[],r=this.sel.ranges,n=0;n<r.length;n++){var i=ae(this,r[n].from(),r[n].to());!1!==e&&(i=i.join(e||this.lineSeparator())),t[n]=i}return t},replaceSelection:function(e,t,r){for(var n=[],i=0;i<this.sel.ranges.length;i++)n[i]=e;this.replaceSelections(n,t,r||"+input")},replaceSelections:Yn(function(e,t,r){for(var n=[],i=this.sel,o=0;o<i.ranges.length;o++){var l=i.ranges[o];n[o]={from:l.from(),to:l.to(),text:this.splitLines(e[o]),origin:r}}for(var s=t&&"end"!=t&&function(e,t,r){for(var n=[],i=ge(e.first,0),o=i,l=0;l<t.length;l++){var s=t[l],a=xi(s.from,i,o),u=xi(yi(s),i,o);if(i=s.to,o=u,"around"==r){var c=e.sel.ranges[l],h=ve(c.head,c.anchor)<0;n[l]=new gi(h?u:a,h?a:u)}else n[l]=new gi(a,a)}return new pi(n,e.sel.primIndex)}(this,n,t),a=n.length-1;a>=0;a--)to(this,n[a]);s?Ki(this,s):this.cm&&Sn(this.cm)}),undo:Yn(function(){no(this,"undo")}),redo:Yn(function(){no(this,"redo")}),undoSelection:Yn(function(){no(this,"undo",!0)}),redoSelection:Yn(function(){no(this,"redo",!0)}),setExtending:function(e){this.extend=e},getExtending:function(){return this.extend},historySize:function(){for(var e=this.history,t=0,r=0,n=0;n<e.done.length;n++)e.done[n].ranges||++t;for(var i=0;i<e.undone.length;i++)e.undone[i].ranges||++r;return{undo:t,redo:r}},clearHistory:function(){this.history=new Oi(this.history.maxGeneration)},markClean:function(){this.cleanGeneration=this.changeGeneration(!0)},changeGeneration:function(e){return e&&(this.history.lastOp=this.history.lastSelOp=this.history.lastOrigin=null),this.history.generation},isClean:function(e){return this.history.generation==(e||this.cleanGeneration)},getHistory:function(){return{done:Ii(this.history.done),undone:Ii(this.history.undone)}},setHistory:function(e){var t=this.history=new Oi(this.history.maxGeneration);t.done=Ii(e.done.slice(0),null,!0),t.undone=Ii(e.undone.slice(0),null,!0)},setGutterMarker:Yn(function(e,t,r){return co(this,e,"gutter",function(e){var n=e.gutterMarkers||(e.gutterMarkers={});return n[t]=r,!r&&re(n)&&(e.gutterMarkers=null),!0})}),clearGutter:Yn(function(e){var t=this;this.iter(function(r){r.gutterMarkers&&r.gutterMarkers[e]&&co(t,r,"gutter",function(){return r.gutterMarkers[e]=null,re(r.gutterMarkers)&&(r.gutterMarkers=null),!0})})}),lineInfo:function(e){var t;if("number"==typeof e){if(!de(this,e))return null;if(t=e,!(e=se(this,e)))return null}else if(null==(t=he(e)))return null;return{line:t,handle:e,text:e.text,gutterMarkers:e.gutterMarkers,textClass:e.textClass,bgClass:e.bgClass,wrapClass:e.wrapClass,widgets:e.widgets}},addLineClass:Yn(function(e,t,r){return co(this,e,"gutter"==t?"gutter":"class",function(e){var n="text"==t?"textClass":"background"==t?"bgClass":"gutter"==t?"gutterClass":"wrapClass";if(e[n]){if(L(r).test(e[n]))return!1;e[n]+=" "+r}else e[n]=r;return!0})}),removeLineClass:Yn(function(e,t,r){return co(this,e,"gutter"==t?"gutter":"class",function(e){var n="text"==t?"textClass":"background"==t?"bgClass":"gutter"==t?"gutterClass":"wrapClass",i=e[n];if(!i)return!1;if(null==r)e[n]=null;else{var o=i.match(L(r));if(!o)return!1;var l=o.index+o[0].length;e[n]=i.slice(0,o.index)+(o.index&&l!=i.length?" ":"")+i.slice(l)||null}return!0})}),addLineWidget:Yn(function(e,t,r){return i=e,o=new po(n=this,t,r),(l=n.cm)&&o.noHScroll&&(l.display.alignWidgets=!0),co(n,i,"widget",function(e){var t=e.widgets||(e.widgets=[]);if(null==o.insertAt?t.push(o):t.splice(Math.min(t.length-1,Math.max(0,o.insertAt)),0,o),o.line=e,l&&!Ve(n,e)){var r=je(e)<n.scrollTop;ce(e,e.height+mr(o)),r&&Cn(l,o.height),l.curOp.forceUpdate=!0}return!0}),l&&or(l,"lineWidgetAdded",l,o,"number"==typeof i?i:he(i)),o;var n,i,o,l}),removeLineWidget:function(e){e.clear()},markText:function(e,t,r){return yo(this,Ce(this,e),Ce(this,t),r,r&&r.type||"range")},setBookmark:function(e,t){var r={replacedWith:t&&(null==t.nodeType?t.widget:t),insertLeft:t&&t.insertLeft,clearWhenEmpty:!1,shared:t&&t.shared,handleMouseEvents:t&&t.handleMouseEvents};return yo(this,e=Ce(this,e),e,r,"bookmark")},findMarksAt:function(e){var t=[],r=se(this,(e=Ce(this,e)).line).markedSpans;if(r)for(var n=0;n<r.length;++n){var i=r[n];(null==i.from||i.from<=e.ch)&&(null==i.to||i.to>=e.ch)&&t.push(i.marker.parent||i.marker)}return t},findMarks:function(e,t,r){e=Ce(this,e),t=Ce(this,t);var n=[],i=e.line;return this.iter(e.line,t.line+1,function(o){var l=o.markedSpans;if(l)for(var s=0;s<l.length;s++){var a=l[s];null!=a.to&&i==e.line&&e.ch>=a.to||null==a.from&&i!=e.line||null!=a.from&&i==t.line&&a.from>=t.ch||r&&!r(a.marker)||n.push(a.marker.parent||a.marker)}++i}),n},getAllMarks:function(){var e=[];return this.iter(function(t){var r=t.markedSpans;if(r)for(var n=0;n<r.length;++n)null!=r[n].from&&e.push(r[n].marker)}),e},posFromIndex:function(e){var t,r=this.first,n=this.lineSeparator().length;return this.iter(function(i){var o=i.text.length+n;if(o>e)return t=e,!0;e-=o,++r}),Ce(this,ge(r,t))},indexFromPos:function(e){var t=(e=Ce(this,e)).ch;if(e.line<this.first||e.ch<0)return 0;var r=this.lineSeparator().length;return this.iter(this.first,e.line,function(e){t+=e.text.length+r}),t},copy:function(e){var t=new So(ue(this,this.first,this.first+this.size),this.modeOption,this.first,this.lineSep,this.direction);return t.scrollTop=this.scrollTop,t.scrollLeft=this.scrollLeft,t.sel=this.sel,t.extend=!1,e&&(t.history.undoDepth=this.history.undoDepth,t.setHistory(this.getHistory())),t},linkedDoc:function(e){e||(e={});var t=this.first,r=this.first+this.size;null!=e.from&&e.from>t&&(t=e.from),null!=e.to&&e.to<r&&(r=e.to);var n=new So(ue(this,t,r),e.mode||this.modeOption,t,this.lineSep,this.direction);return e.sharedHist&&(n.history=this.history),(this.linked||(this.linked=[])).push({doc:n,sharedHist:e.sharedHist}),n.linked=[{doc:this,isParent:!0,sharedHist:e.sharedHist}],function(e,t){for(var r=0;r<t.length;r++){var n=t[r],i=n.find(),o=e.clipPos(i.from),l=e.clipPos(i.to);if(ve(o,l)){var s=yo(e,o,l,n.primary,n.primary.type);n.markers.push(s),s.parent=n}}}(n,wo(this)),n},unlinkDoc:function(e){if(e instanceof wl&&(e=e.doc),this.linked)for(var t=0;t<this.linked.length;++t){if(this.linked[t].doc==e){this.linked.splice(t,1),e.unlinkDoc(this),xo(wo(this));break}}if(e.history==this.history){var r=[e.id];Ti(e,function(e){return r.push(e.id)},!0),e.history=new Oi(null),e.history.done=Ii(this.history.done,r),e.history.undone=Ii(this.history.undone,r)}},iterLinkedDocs:function(e){Ti(this,e)},getMode:function(){return this.mode},getEditor:function(){return this.cm},splitLines:function(e){return this.lineSep?e.split(this.lineSep):bt(e)},lineSeparator:function(){return this.lineSep||"\n"},setDirection:Yn(function(e){var t;("rtl"!=e&&(e="ltr"),e!=this.direction)&&(this.direction=e,this.iter(function(e){return e.order=null}),this.cm&&Kn(t=this.cm,function(){Ni(t),_n(t)}))})}),So.prototype.eachLine=So.prototype.iter;var Lo=0;function ko(e){var t=this;if(To(t),!nt(t,e)&&!yr(t.display,e)){st(e),l&&(Lo=+new Date);var r=nn(t,e,!0),n=e.dataTransfer.files;if(r&&!t.isReadOnly())if(n&&n.length&&window.FileReader&&window.File)for(var i=n.length,o=Array(i),s=0,a=function(e,n){if(!t.options.allowDropFileTypes||-1!=B(t.options.allowDropFileTypes,e.type)){var l=new FileReader;l.onload=jn(t,function(){var e=l.result;if(/[\x00-\x08\x0e-\x1f]{2}/.test(e)&&(e=""),o[n]=e,++s==i){var a={from:r=Ce(t.doc,r),to:r,text:t.doc.splitLines(o.join(t.doc.lineSeparator())),origin:"paste"};to(t.doc,a),Ki(t.doc,mi(r,yi(a)))}}),l.readAsText(e)}},u=0;u<i;++u)a(n[u],u);else{if(t.state.draggingText&&t.doc.sel.contains(r)>-1)return t.state.draggingText(e),void setTimeout(function(){return t.display.input.focus()},20);try{var c=e.dataTransfer.getData("Text");if(c){var h;if(t.state.draggingText&&!t.state.draggingText.copy&&(h=t.listSelections()),Xi(t.doc,mi(r,r)),h)for(var f=0;f<h.length;++f)lo(t.doc,"",h[f].anchor,h[f].head,"drag");t.replaceSelection(c,"around","paste"),t.display.input.focus()}}catch(e){}}}}function To(e){e.display.dragCursor&&(e.display.lineSpace.removeChild(e.display.dragCursor),e.display.dragCursor=null)}function Mo(e){if(document.getElementsByClassName)for(var t=document.getElementsByClassName("CodeMirror"),r=0;r<t.length;r++){var n=t[r].CodeMirror;n&&e(n)}}var No=!1;function Oo(){var e;No||(Je(window,"resize",function(){null==e&&(e=setTimeout(function(){e=null,Mo(Ao)},100))}),Je(window,"blur",function(){return Mo(gn)}),No=!0)}function Ao(e){var t=e.display;t.lastWrapHeight==t.wrapper.clientHeight&&t.lastWrapWidth==t.wrapper.clientWidth||(t.cachedCharWidth=t.cachedTextHeight=t.cachedPaddingH=null,t.scrollbarsClipped=!1,e.setSize())}for(var Do={3:"Pause",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",61:"=",91:"Mod",92:"Mod",93:"Mod",106:"*",107:"=",109:"-",110:".",111:"/",127:"Delete",145:"ScrollLock",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",63232:"Up",63233:"Down",63234:"Left",63235:"Right",63272:"Delete",63273:"Home",63275:"End",63276:"PageUp",63277:"PageDown",63302:"Insert"},Wo=0;Wo<10;Wo++)Do[Wo+48]=Do[Wo+96]=String(Wo);for(var Ho=65;Ho<=90;Ho++)Do[Ho]=String.fromCharCode(Ho);for(var Fo=1;Fo<=12;Fo++)Do[Fo+111]=Do[Fo+63235]="F"+Fo;var Po={};function Eo(e){var t,r,n,i,o=e.split(/-(?!$)/);e=o[o.length-1];for(var l=0;l<o.length-1;l++){var s=o[l];if(/^(cmd|meta|m)$/i.test(s))i=!0;else if(/^a(lt)?$/i.test(s))t=!0;else if(/^(c|ctrl|control)$/i.test(s))r=!0;else{if(!/^s(hift)?$/i.test(s))throw new Error("Unrecognized modifier name: "+s);n=!0}}return t&&(e="Alt-"+e),r&&(e="Ctrl-"+e),i&&(e="Cmd-"+e),n&&(e="Shift-"+e),e}function zo(e){var t={};for(var r in e)if(e.hasOwnProperty(r)){var n=e[r];if(/^(name|fallthrough|(de|at)tach)$/.test(r))continue;if("..."==n){delete e[r];continue}for(var i=$(r.split(" "),Eo),o=0;o<i.length;o++){var l=void 0,s=void 0;o==i.length-1?(s=i.join(" "),l=n):(s=i.slice(0,o+1).join(" "),l="...");var a=t[s];if(a){if(a!=l)throw new Error("Inconsistent bindings for "+s)}else t[s]=l}delete e[r]}for(var u in t)e[u]=t[u];return e}function Io(e,t,r,n){var i=(t=Uo(t)).call?t.call(e,n):t[e];if(!1===i)return"nothing";if("..."===i)return"multi";if(null!=i&&r(i))return"handled";if(t.fallthrough){if("[object Array]"!=Object.prototype.toString.call(t.fallthrough))return Io(e,t.fallthrough,r,n);for(var o=0;o<t.fallthrough.length;o++){var l=Io(e,t.fallthrough[o],r,n);if(l)return l}}}function Ro(e){var t="string"==typeof e?e:Do[e.keyCode];return"Ctrl"==t||"Alt"==t||"Shift"==t||"Mod"==t}function Bo(e,t,r){var n=e;return t.altKey&&"Alt"!=n&&(e="Alt-"+e),(C?t.metaKey:t.ctrlKey)&&"Ctrl"!=n&&(e="Ctrl-"+e),(C?t.ctrlKey:t.metaKey)&&"Cmd"!=n&&(e="Cmd-"+e),!r&&t.shiftKey&&"Shift"!=n&&(e="Shift-"+e),e}function Go(e,t){if(h&&34==e.keyCode&&e.char)return!1;var r=Do[e.keyCode];return null!=r&&!e.altGraphKey&&(3==e.keyCode&&e.code&&(r=e.code),Bo(r,e,t))}function Uo(e){return"string"==typeof e?Po[e]:e}function Vo(e,t){for(var r=e.doc.sel.ranges,n=[],i=0;i<r.length;i++){for(var o=t(r[i]);n.length&&ve(o.from,q(n).to)<=0;){var l=n.pop();if(ve(l.from,o.from)<0){o.from=l.from;break}}n.push(o)}Kn(e,function(){for(var t=n.length-1;t>=0;t--)lo(e.doc,"",n[t].from,n[t].to,"+delete");Sn(e)})}function Ko(e,t,r){var n=oe(e.text,t+r,r);return n<0||n>e.text.length?null:n}function jo(e,t,r){var n=Ko(e,t.ch,r);return null==n?null:new ge(t.line,n,r<0?"after":"before")}function Xo(e,t,r,n,i){if(e){var o=Ze(r,t.doc.direction);if(o){var l,s=i<0?q(o):o[0],a=i<0==(1==s.level)?"after":"before";if(s.level>0||"rtl"==t.doc.direction){var u=Nr(t,r);l=i<0?r.text.length-1:0;var c=Or(t,u,l).top;l=le(function(e){return Or(t,u,e).top==c},i<0==(1==s.level)?s.from:s.to-1,l),"before"==a&&(l=Ko(r,l,1))}else l=i<0?s.to:s.from;return new ge(n,l,a)}}return new ge(n,i<0?r.text.length:0,i<0?"before":"after")}Po.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore","Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite",Esc:"singleSelection"},Po.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Up":"goLineUp","Ctrl-Down":"goLineDown","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore","Ctrl-U":"undoSelection","Shift-Ctrl-U":"redoSelection","Alt-U":"redoSelection",fallthrough:"basic"},Po.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-D":"delWordAfter","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars","Ctrl-O":"openLine"},Po.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Home":"goDocStart","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineLeft","Cmd-Right":"goLineRight","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter","Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delWrappedLineLeft","Cmd-Delete":"delWrappedLineRight","Cmd-U":"undoSelection","Shift-Cmd-U":"redoSelection","Ctrl-Up":"goDocStart","Ctrl-Down":"goDocEnd",fallthrough:["basic","emacsy"]},Po.default=y?Po.macDefault:Po.pcDefault;var Yo={selectAll:Ji,singleSelection:function(e){return e.setSelection(e.getCursor("anchor"),e.getCursor("head"),V)},killLine:function(e){return Vo(e,function(t){if(t.empty()){var r=se(e.doc,t.head.line).text.length;return t.head.ch==r&&t.head.line<e.lastLine()?{from:t.head,to:ge(t.head.line+1,0)}:{from:t.head,to:ge(t.head.line,r)}}return{from:t.from(),to:t.to()}})},deleteLine:function(e){return Vo(e,function(t){return{from:ge(t.from().line,0),to:Ce(e.doc,ge(t.to().line+1,0))}})},delLineLeft:function(e){return Vo(e,function(e){return{from:ge(e.from().line,0),to:e.from()}})},delWrappedLineLeft:function(e){return Vo(e,function(t){var r=e.charCoords(t.head,"div").top+5;return{from:e.coordsChar({left:0,top:r},"div"),to:t.from()}})},delWrappedLineRight:function(e){return Vo(e,function(t){var r=e.charCoords(t.head,"div").top+5,n=e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:r},"div");return{from:t.from(),to:n}})},undo:function(e){return e.undo()},redo:function(e){return e.redo()},undoSelection:function(e){return e.undoSelection()},redoSelection:function(e){return e.redoSelection()},goDocStart:function(e){return e.extendSelection(ge(e.firstLine(),0))},goDocEnd:function(e){return e.extendSelection(ge(e.lastLine()))},goLineStart:function(e){return e.extendSelectionsBy(function(t){return _o(e,t.head.line)},{origin:"+move",bias:1})},goLineStartSmart:function(e){return e.extendSelectionsBy(function(t){return qo(e,t.head)},{origin:"+move",bias:1})},goLineEnd:function(e){return e.extendSelectionsBy(function(t){return function(e,t){var r=se(e.doc,t),n=function(e){for(var t;t=Ie(e);)e=t.find(1,!0).line;return e}(r);n!=r&&(t=he(n));return Xo(!0,e,r,t,-1)}(e,t.head.line)},{origin:"+move",bias:-1})},goLineRight:function(e){return e.extendSelectionsBy(function(t){var r=e.cursorCoords(t.head,"div").top+5;return e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:r},"div")},j)},goLineLeft:function(e){return e.extendSelectionsBy(function(t){var r=e.cursorCoords(t.head,"div").top+5;return e.coordsChar({left:0,top:r},"div")},j)},goLineLeftSmart:function(e){return e.extendSelectionsBy(function(t){var r=e.cursorCoords(t.head,"div").top+5,n=e.coordsChar({left:0,top:r},"div");return n.ch<e.getLine(n.line).search(/\S/)?qo(e,t.head):n},j)},goLineUp:function(e){return e.moveV(-1,"line")},goLineDown:function(e){return e.moveV(1,"line")},goPageUp:function(e){return e.moveV(-1,"page")},goPageDown:function(e){return e.moveV(1,"page")},goCharLeft:function(e){return e.moveH(-1,"char")},goCharRight:function(e){return e.moveH(1,"char")},goColumnLeft:function(e){return e.moveH(-1,"column")},goColumnRight:function(e){return e.moveH(1,"column")},goWordLeft:function(e){return e.moveH(-1,"word")},goGroupRight:function(e){return e.moveH(1,"group")},goGroupLeft:function(e){return e.moveH(-1,"group")},goWordRight:function(e){return e.moveH(1,"word")},delCharBefore:function(e){return e.deleteH(-1,"char")},delCharAfter:function(e){return e.deleteH(1,"char")},delWordBefore:function(e){return e.deleteH(-1,"word")},delWordAfter:function(e){return e.deleteH(1,"word")},delGroupBefore:function(e){return e.deleteH(-1,"group")},delGroupAfter:function(e){return e.deleteH(1,"group")},indentAuto:function(e){return e.indentSelection("smart")},indentMore:function(e){return e.indentSelection("add")},indentLess:function(e){return e.indentSelection("subtract")},insertTab:function(e){return e.replaceSelection("\t")},insertSoftTab:function(e){for(var t=[],r=e.listSelections(),n=e.options.tabSize,i=0;i<r.length;i++){var o=r[i].from(),l=I(e.getLine(o.line),o.ch,n);t.push(_(n-l%n))}e.replaceSelections(t)},defaultTab:function(e){e.somethingSelected()?e.indentSelection("add"):e.execCommand("insertTab")},transposeChars:function(e){return Kn(e,function(){for(var t=e.listSelections(),r=[],n=0;n<t.length;n++)if(t[n].empty()){var i=t[n].head,o=se(e.doc,i.line).text;if(o)if(i.ch==o.length&&(i=new ge(i.line,i.ch-1)),i.ch>0)i=new ge(i.line,i.ch+1),e.replaceRange(o.charAt(i.ch-1)+o.charAt(i.ch-2),ge(i.line,i.ch-2),i,"+transpose");else if(i.line>e.doc.first){var l=se(e.doc,i.line-1).text;l&&(i=new ge(i.line,1),e.replaceRange(o.charAt(0)+e.doc.lineSeparator()+l.charAt(l.length-1),ge(i.line-1,l.length-1),i,"+transpose"))}r.push(new gi(i,i))}e.setSelections(r)})},newlineAndIndent:function(e){return Kn(e,function(){for(var t=e.listSelections(),r=t.length-1;r>=0;r--)e.replaceRange(e.doc.lineSeparator(),t[r].anchor,t[r].head,"+input");t=e.listSelections();for(var n=0;n<t.length;n++)e.indentLine(t[n].from().line,null,!0);Sn(e)})},openLine:function(e){return e.replaceSelection("\n","start")},toggleOverwrite:function(e){return e.toggleOverwrite()}};function _o(e,t){var r=se(e.doc,t),n=Be(r);return n!=r&&(t=he(n)),Xo(!0,e,n,t,1)}function qo(e,t){var r=_o(e,t.line),n=se(e.doc,r.line),i=Ze(n,e.doc.direction);if(!i||0==i[0].level){var o=Math.max(0,n.text.search(/\S/)),l=t.line==r.line&&t.ch<=o&&t.ch;return ge(r.line,l?0:o,r.sticky)}return r}function $o(e,t,r){if("string"==typeof t&&!(t=Yo[t]))return!1;e.display.input.ensurePolled();var n=e.display.shift,i=!1;try{e.isReadOnly()&&(e.state.suppressEdits=!0),r&&(e.display.shift=!1),i=t(e)!=U}finally{e.display.shift=n,e.state.suppressEdits=!1}return i}var Zo=new R;function Qo(e,t,r,n){var i=e.state.keySeq;if(i){if(Ro(t))return"handled";if(/\'$/.test(t)?e.state.keySeq=null:Zo.set(50,function(){e.state.keySeq==i&&(e.state.keySeq=null,e.display.input.reset())}),Jo(e,i+" "+t,r,n))return!0}return Jo(e,t,r,n)}function Jo(e,t,r,n){var i=function(e,t,r){for(var n=0;n<e.state.keyMaps.length;n++){var i=Io(t,e.state.keyMaps[n],r,e);if(i)return i}return e.options.extraKeys&&Io(t,e.options.extraKeys,r,e)||Io(t,e.options.keyMap,r,e)}(e,t,n);return"multi"==i&&(e.state.keySeq=t),"handled"==i&&or(e,"keyHandled",e,t,r),"handled"!=i&&"multi"!=i||(st(r),hn(e)),!!i}function el(e,t){var r=Go(t,!0);return!!r&&(t.shiftKey&&!e.state.keySeq?Qo(e,"Shift-"+r,t,function(t){return $o(e,t,!0)})||Qo(e,r,t,function(t){if("string"==typeof t?/^go[A-Z]/.test(t):t.motion)return $o(e,t)}):Qo(e,r,t,function(t){return $o(e,t)}))}var tl=null;function rl(e){var t=this;if(t.curOp.focus=W(),!nt(t,e)){l&&s<11&&27==e.keyCode&&(e.returnValue=!1);var r=e.keyCode;t.display.shift=16==r||e.shiftKey;var n=el(t,e);h&&(tl=n?r:null,!n&&88==r&&!xt&&(y?e.metaKey:e.ctrlKey)&&t.replaceSelection("",null,"cut")),18!=r||/\bCodeMirror-crosshair\b/.test(t.display.lineDiv.className)||function(e){var t=e.display.lineDiv;function r(e){18!=e.keyCode&&e.altKey||(T(t,"CodeMirror-crosshair"),tt(document,"keyup",r),tt(document,"mouseover",r))}H(t,"CodeMirror-crosshair"),Je(document,"keyup",r),Je(document,"mouseover",r)}(t)}}function nl(e){16==e.keyCode&&(this.doc.sel.shift=!1),nt(this,e)}function il(e){var t=this;if(!(yr(t.display,e)||nt(t,e)||e.ctrlKey&&!e.altKey||y&&e.metaKey)){var r=e.keyCode,n=e.charCode;if(h&&r==tl)return tl=null,void st(e);if(!h||e.which&&!(e.which<10)||!el(t,e)){var i,o=String.fromCharCode(null==n?r:n);if("\b"!=o)if(!Qo(i=t,"'"+o+"'",e,function(e){return $o(i,e,!0)}))t.display.input.onKeyPress(e)}}}var ol,ll,sl=function(e,t,r){this.time=e,this.pos=t,this.button=r};function al(e){var t=this,r=t.display;if(!(nt(t,e)||r.activeTouch&&r.input.supportsTouch()))if(r.input.ensurePolled(),r.shift=e.shiftKey,yr(r,e))a||(r.scroller.draggable=!1,setTimeout(function(){return r.scroller.draggable=!0},100));else if(!hl(t,e)){var n,i,o,u=nn(t,e),c=ft(e),h=u?(n=u,i=c,o=+new Date,ll&&ll.compare(o,n,i)?(ol=ll=null,"triple"):ol&&ol.compare(o,n,i)?(ll=new sl(o,n,i),ol=null,"double"):(ol=new sl(o,n,i),ll=null,"single")):"single";window.focus(),1==c&&t.state.selectingText&&t.state.selectingText(e),u&&function(e,t,r,n,i){var o="Click";"double"==n?o="Double"+o:"triple"==n&&(o="Triple"+o);return Qo(e,Bo(o=(1==t?"Left":2==t?"Middle":"Right")+o,i),i,function(t){if("string"==typeof t&&(t=Yo[t]),!t)return!1;var n=!1;try{e.isReadOnly()&&(e.state.suppressEdits=!0),n=t(e,r)!=U}finally{e.state.suppressEdits=!1}return n})}(t,c,u,h,e)||(1==c?u?function(e,t,r,n){l?setTimeout(E(fn,e),0):e.curOp.focus=W();var i,o=function(e,t,r){var n=e.getOption("configureMouse"),i=n?n(e,t,r):{};if(null==i.unit){var o=b?r.shiftKey&&r.metaKey:r.altKey;i.unit=o?"rectangle":"single"==t?"char":"double"==t?"word":"line"}(null==i.extend||e.doc.extend)&&(i.extend=e.doc.extend||r.shiftKey);null==i.addNew&&(i.addNew=y?r.metaKey:r.ctrlKey);null==i.moveOnDrag&&(i.moveOnDrag=!(y?r.altKey:r.ctrlKey));return i}(e,r,n),u=e.doc.sel;e.options.dragDrop&>&&!e.isReadOnly()&&"single"==r&&(i=u.contains(t))>-1&&(ve((i=u.ranges[i]).from(),t)<0||t.xRel>0)&&(ve(i.to(),t)>0||t.xRel<0)?function(e,t,r,n){var i=e.display,o=!1,u=jn(e,function(t){a&&(i.scroller.draggable=!1),e.state.draggingText=!1,tt(i.wrapper.ownerDocument,"mouseup",u),tt(i.wrapper.ownerDocument,"mousemove",c),tt(i.scroller,"dragstart",h),tt(i.scroller,"drop",u),o||(st(t),n.addNew||Bi(e.doc,r,null,null,n.extend),a||l&&9==s?setTimeout(function(){i.wrapper.ownerDocument.body.focus(),i.input.focus()},20):i.input.focus())}),c=function(e){o=o||Math.abs(t.clientX-e.clientX)+Math.abs(t.clientY-e.clientY)>=10},h=function(){return o=!0};a&&(i.scroller.draggable=!0);e.state.draggingText=u,u.copy=!n.moveOnDrag,i.scroller.dragDrop&&i.scroller.dragDrop();Je(i.wrapper.ownerDocument,"mouseup",u),Je(i.wrapper.ownerDocument,"mousemove",c),Je(i.scroller,"dragstart",h),Je(i.scroller,"drop",u),dn(e),setTimeout(function(){return i.input.focus()},20)}(e,n,t,o):function(e,t,r,n){var i=e.display,o=e.doc;st(t);var l,s,a=o.sel,u=a.ranges;n.addNew&&!n.extend?(s=o.sel.contains(r),l=s>-1?u[s]:new gi(r,r)):(l=o.sel.primary(),s=o.sel.primIndex);if("rectangle"==n.unit)n.addNew||(l=new gi(r,r)),r=nn(e,t,!0,!0),s=-1;else{var c=ul(e,r,n.unit);l=n.extend?Ri(l,c.anchor,c.head,n.extend):c}n.addNew?-1==s?(s=u.length,ji(o,vi(u.concat([l]),s),{scroll:!1,origin:"*mouse"})):u.length>1&&u[s].empty()&&"char"==n.unit&&!n.extend?(ji(o,vi(u.slice(0,s).concat(u.slice(s+1)),0),{scroll:!1,origin:"*mouse"}),a=o.sel):Ui(o,s,l,K):(s=0,ji(o,new pi([l],0),K),a=o.sel);var h=r;function f(t){if(0!=ve(h,t))if(h=t,"rectangle"==n.unit){for(var i=[],u=e.options.tabSize,c=I(se(o,r.line).text,r.ch,u),f=I(se(o,t.line).text,t.ch,u),d=Math.min(c,f),p=Math.max(c,f),g=Math.min(r.line,t.line),v=Math.min(e.lastLine(),Math.max(r.line,t.line));g<=v;g++){var m=se(o,g).text,y=X(m,d,u);d==p?i.push(new gi(ge(g,y),ge(g,y))):m.length>y&&i.push(new gi(ge(g,y),ge(g,X(m,p,u))))}i.length||i.push(new gi(r,r)),ji(o,vi(a.ranges.slice(0,s).concat(i),s),{origin:"*mouse",scroll:!1}),e.scrollIntoView(t)}else{var b,w=l,x=ul(e,t,n.unit),C=w.anchor;ve(x.anchor,C)>0?(b=x.head,C=we(w.from(),x.anchor)):(b=x.anchor,C=be(w.to(),x.head));var S=a.ranges.slice(0);S[s]=function(e,t){var r=t.anchor,n=t.head,i=se(e.doc,r.line);if(0==ve(r,n)&&r.sticky==n.sticky)return t;var o=Ze(i);if(!o)return t;var l=qe(o,r.ch,r.sticky),s=o[l];if(s.from!=r.ch&&s.to!=r.ch)return t;var a,u=l+(s.from==r.ch==(1!=s.level)?0:1);if(0==u||u==o.length)return t;if(n.line!=r.line)a=(n.line-r.line)*("ltr"==e.doc.direction?1:-1)>0;else{var c=qe(o,n.ch,n.sticky),h=c-l||(n.ch-r.ch)*(1==s.level?-1:1);a=c==u-1||c==u?h<0:h>0}var f=o[u+(a?-1:0)],d=a==(1==f.level),p=d?f.from:f.to,g=d?"after":"before";return r.ch==p&&r.sticky==g?t:new gi(new ge(r.line,p,g),n)}(e,new gi(Ce(o,C),b)),ji(o,vi(S,s),K)}}var d=i.wrapper.getBoundingClientRect(),p=0;function g(t){e.state.selectingText=!1,p=1/0,st(t),i.input.focus(),tt(i.wrapper.ownerDocument,"mousemove",v),tt(i.wrapper.ownerDocument,"mouseup",m),o.history.lastSelOrigin=null}var v=jn(e,function(t){ft(t)?function t(r){var l=++p;var s=nn(e,r,!0,"rectangle"==n.unit);if(!s)return;if(0!=ve(s,h)){e.curOp.focus=W(),f(s);var a=yn(i,o);(s.line>=a.to||s.line<a.from)&&setTimeout(jn(e,function(){p==l&&t(r)}),150)}else{var u=r.clientY<d.top?-20:r.clientY>d.bottom?20:0;u&&setTimeout(jn(e,function(){p==l&&(i.scroller.scrollTop+=u,t(r))}),50)}}(t):g(t)}),m=jn(e,g);e.state.selectingText=m,Je(i.wrapper.ownerDocument,"mousemove",v),Je(i.wrapper.ownerDocument,"mouseup",m)}(e,n,t,o)}(t,u,h,e):ht(e)==r.scroller&&st(e):2==c?(u&&Bi(t.doc,u),setTimeout(function(){return r.input.focus()},20)):3==c&&(S?fl(t,e):dn(t)))}}function ul(e,t,r){if("char"==r)return new gi(t,t);if("word"==r)return e.findWordAt(t);if("line"==r)return new gi(ge(t.line,0),Ce(e.doc,ge(t.line+1,0)));var n=r(e,t);return new gi(n.from,n.to)}function cl(e,t,r,n){var i,o;if(t.touches)i=t.touches[0].clientX,o=t.touches[0].clientY;else try{i=t.clientX,o=t.clientY}catch(t){return!1}if(i>=Math.floor(e.display.gutters.getBoundingClientRect().right))return!1;n&&st(t);var l=e.display,s=l.lineDiv.getBoundingClientRect();if(o>s.bottom||!ot(e,r))return ut(t);o-=s.top-l.viewOffset;for(var a=0;a<e.options.gutters.length;++a){var u=l.gutters.childNodes[a];if(u&&u.getBoundingClientRect().right>=i)return rt(e,r,e,fe(e.doc,o),e.options.gutters[a],t),ut(t)}}function hl(e,t){return cl(e,t,"gutterClick",!0)}function fl(e,t){yr(e.display,t)||function(e,t){if(!ot(e,"gutterContextMenu"))return!1;return cl(e,t,"gutterContextMenu",!1)}(e,t)||nt(e,t,"contextmenu")||e.display.input.onContextMenu(t)}function dl(e){e.display.wrapper.className=e.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+e.options.theme.replace(/(^|\s)\s*/g," cm-s-"),Er(e)}sl.prototype.compare=function(e,t,r){return this.time+400>e&&0==ve(t,this.pos)&&r==this.button};var pl={toString:function(){return"CodeMirror.Init"}},gl={},vl={};function ml(e){si(e),_n(e),bn(e)}function yl(e,t,r){if(!t!=!(r&&r!=pl)){var n=e.display.dragFunctions,i=t?Je:tt;i(e.display.scroller,"dragstart",n.start),i(e.display.scroller,"dragenter",n.enter),i(e.display.scroller,"dragover",n.over),i(e.display.scroller,"dragleave",n.leave),i(e.display.scroller,"drop",n.drop)}}function bl(e){e.options.lineWrapping?(H(e.display.wrapper,"CodeMirror-wrap"),e.display.sizer.style.minWidth="",e.display.sizerWidth=null):(T(e.display.wrapper,"CodeMirror-wrap"),Ye(e)),rn(e),_n(e),Er(e),setTimeout(function(){return Hn(e)},100)}function wl(e,t){var n=this;if(!(this instanceof wl))return new wl(e,t);this.options=t=t?z(t):{},z(gl,t,!1),ai(t);var i=t.value;"string"==typeof i&&(i=new So(i,t.mode,null,t.lineSeparator,t.direction)),this.doc=i;var o=new wl.inputStyles[t.inputStyle](this),u=this.display=new function(e,t,n){var i=this;this.input=n,i.scrollbarFiller=O("div",null,"CodeMirror-scrollbar-filler"),i.scrollbarFiller.setAttribute("cm-not-content","true"),i.gutterFiller=O("div",null,"CodeMirror-gutter-filler"),i.gutterFiller.setAttribute("cm-not-content","true"),i.lineDiv=A("div",null,"CodeMirror-code"),i.selectionDiv=O("div",null,null,"position: relative; z-index: 1"),i.cursorDiv=O("div",null,"CodeMirror-cursors"),i.measure=O("div",null,"CodeMirror-measure"),i.lineMeasure=O("div",null,"CodeMirror-measure"),i.lineSpace=A("div",[i.measure,i.lineMeasure,i.selectionDiv,i.cursorDiv,i.lineDiv],null,"position: relative; outline: none");var o=A("div",[i.lineSpace],"CodeMirror-lines");i.mover=O("div",[o],null,"position: relative"),i.sizer=O("div",[i.mover],"CodeMirror-sizer"),i.sizerWidth=null,i.heightForcer=O("div",null,null,"position: absolute; height: "+G+"px; width: 1px;"),i.gutters=O("div",null,"CodeMirror-gutters"),i.lineGutter=null,i.scroller=O("div",[i.sizer,i.heightForcer,i.gutters],"CodeMirror-scroll"),i.scroller.setAttribute("tabIndex","-1"),i.wrapper=O("div",[i.scrollbarFiller,i.gutterFiller,i.scroller],"CodeMirror"),l&&s<8&&(i.gutters.style.zIndex=-1,i.scroller.style.paddingRight=0),a||r&&m||(i.scroller.draggable=!0),e&&(e.appendChild?e.appendChild(i.wrapper):e(i.wrapper)),i.viewFrom=i.viewTo=t.first,i.reportedViewFrom=i.reportedViewTo=t.first,i.view=[],i.renderedView=null,i.externalMeasured=null,i.viewOffset=0,i.lastWrapHeight=i.lastWrapWidth=0,i.updateLineNumbers=null,i.nativeBarWidth=i.barHeight=i.barWidth=0,i.scrollbarsClipped=!1,i.lineNumWidth=i.lineNumInnerWidth=i.lineNumChars=null,i.alignWidgets=!1,i.cachedCharWidth=i.cachedTextHeight=i.cachedPaddingH=null,i.maxLine=null,i.maxLineLength=0,i.maxLineChanged=!1,i.wheelDX=i.wheelDY=i.wheelStartX=i.wheelStartY=null,i.shift=!1,i.selForContextMenu=null,i.activeTouch=null,n.init(i)}(e,i,o);for(var c in u.wrapper.CodeMirror=this,si(this),dl(this),t.lineWrapping&&(this.display.wrapper.className+=" CodeMirror-wrap"),En(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,delayingBlurEvent:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,cutIncoming:!1,selectingText:!1,draggingText:!1,highlight:new R,keySeq:null,specialChars:null},t.autofocus&&!m&&u.input.focus(),l&&s<11&&setTimeout(function(){return n.display.input.reset(!0)},20),function(e){var t=e.display;Je(t.scroller,"mousedown",jn(e,al)),Je(t.scroller,"dblclick",l&&s<11?jn(e,function(t){if(!nt(e,t)){var r=nn(e,t);if(r&&!hl(e,t)&&!yr(e.display,t)){st(t);var n=e.findWordAt(r);Bi(e.doc,n.anchor,n.head)}}}):function(t){return nt(e,t)||st(t)});S||Je(t.scroller,"contextmenu",function(t){return fl(e,t)});var r,n={end:0};function i(){t.activeTouch&&(r=setTimeout(function(){return t.activeTouch=null},1e3),(n=t.activeTouch).end=+new Date)}function o(e,t){if(null==t.left)return!0;var r=t.left-e.left,n=t.top-e.top;return r*r+n*n>400}Je(t.scroller,"touchstart",function(i){if(!nt(e,i)&&!function(e){if(1!=e.touches.length)return!1;var t=e.touches[0];return t.radiusX<=1&&t.radiusY<=1}(i)&&!hl(e,i)){t.input.ensurePolled(),clearTimeout(r);var o=+new Date;t.activeTouch={start:o,moved:!1,prev:o-n.end<=300?n:null},1==i.touches.length&&(t.activeTouch.left=i.touches[0].pageX,t.activeTouch.top=i.touches[0].pageY)}}),Je(t.scroller,"touchmove",function(){t.activeTouch&&(t.activeTouch.moved=!0)}),Je(t.scroller,"touchend",function(r){var n=t.activeTouch;if(n&&!yr(t,r)&&null!=n.left&&!n.moved&&new Date-n.start<300){var l,s=e.coordsChar(t.activeTouch,"page");l=!n.prev||o(n,n.prev)?new gi(s,s):!n.prev.prev||o(n,n.prev.prev)?e.findWordAt(s):new gi(ge(s.line,0),Ce(e.doc,ge(s.line+1,0))),e.setSelection(l.anchor,l.head),e.focus(),st(r)}i()}),Je(t.scroller,"touchcancel",i),Je(t.scroller,"scroll",function(){t.scroller.clientHeight&&(Mn(e,t.scroller.scrollTop),On(e,t.scroller.scrollLeft,!0),rt(e,"scroll",e))}),Je(t.scroller,"mousewheel",function(t){return di(e,t)}),Je(t.scroller,"DOMMouseScroll",function(t){return di(e,t)}),Je(t.wrapper,"scroll",function(){return t.wrapper.scrollTop=t.wrapper.scrollLeft=0}),t.dragFunctions={enter:function(t){nt(e,t)||ct(t)},over:function(t){nt(e,t)||(!function(e,t){var r=nn(e,t);if(r){var n=document.createDocumentFragment();an(e,r,n),e.display.dragCursor||(e.display.dragCursor=O("div",null,"CodeMirror-cursors CodeMirror-dragcursors"),e.display.lineSpace.insertBefore(e.display.dragCursor,e.display.cursorDiv)),N(e.display.dragCursor,n)}}(e,t),ct(t))},start:function(t){return function(e,t){if(t.preventDefault&&t.preventDefault(),l&&(!e.state.draggingText||+new Date-Lo<100))ct(t);else if(!nt(e,t)&&!yr(e.display,t)&&(t.dataTransfer.setData("Text",e.getSelection()),t.dataTransfer.effectAllowed="copyMove",t.dataTransfer.setDragImage&&!f)){var r=O("img",null,null,"position: fixed; left: 0; top: 0;");r.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",h&&(r.width=r.height=1,e.display.wrapper.appendChild(r),r._top=r.offsetTop),t.dataTransfer.setDragImage(r,0,0),h&&r.parentNode.removeChild(r)}}(e,t)},drop:jn(e,ko),leave:function(t){nt(e,t)||To(e)}};var a=t.input.getField();Je(a,"keyup",function(t){return nl.call(e,t)}),Je(a,"keydown",jn(e,rl)),Je(a,"keypress",jn(e,il)),Je(a,"focus",function(t){return pn(e,t)}),Je(a,"blur",function(t){return gn(e,t)})}(this),Oo(),In(this),this.curOp.forceUpdate=!0,Mi(this,i),t.autofocus&&!m||this.hasFocus()?setTimeout(E(pn,this),20):gn(this),vl)vl.hasOwnProperty(c)&&vl[c](n,t[c],pl);wn(this),t.finishInit&&t.finishInit(this);for(var d=0;d<xl.length;++d)xl[d](n);Rn(this),a&&t.lineWrapping&&"optimizelegibility"==getComputedStyle(u.lineDiv).textRendering&&(u.lineDiv.style.textRendering="auto")}wl.defaults=gl,wl.optionHandlers=vl;var xl=[];function Cl(e,t,r,n){var i,o=e.doc;null==r&&(r="add"),"smart"==r&&(o.mode.indent?i=zt(e,t).state:r="prev");var l=e.options.tabSize,s=se(o,t),a=I(s.text,null,l);s.stateAfter&&(s.stateAfter=null);var u,c=s.text.match(/^\s*/)[0];if(n||/\S/.test(s.text)){if("smart"==r&&((u=o.mode.indent(i,s.text.slice(c.length),s.text))==U||u>150)){if(!n)return;r="prev"}}else u=0,r="not";"prev"==r?u=t>o.first?I(se(o,t-1).text,null,l):0:"add"==r?u=a+e.options.indentUnit:"subtract"==r?u=a-e.options.indentUnit:"number"==typeof r&&(u=a+r),u=Math.max(0,u);var h="",f=0;if(e.options.indentWithTabs)for(var d=Math.floor(u/l);d;--d)f+=l,h+="\t";if(f<u&&(h+=_(u-f)),h!=c)return lo(o,h,ge(t,0),ge(t,c.length),"+input"),s.stateAfter=null,!0;for(var p=0;p<o.sel.ranges.length;p++){var g=o.sel.ranges[p];if(g.head.line==t&&g.head.ch<c.length){var v=ge(t,c.length);Ui(o,p,new gi(v,v));break}}}wl.defineInitHook=function(e){return xl.push(e)};var Sl=null;function Ll(e){Sl=e}function kl(e,t,r,n,i){var o=e.doc;e.display.shift=!1,n||(n=o.sel);var l,s=e.state.pasteIncoming||"paste"==i,a=bt(t),u=null;if(s&&n.ranges.length>1)if(Sl&&Sl.text.join("\n")==t){if(n.ranges.length%Sl.text.length==0){u=[];for(var c=0;c<Sl.text.length;c++)u.push(o.splitLines(Sl.text[c]))}}else a.length==n.ranges.length&&e.options.pasteLinesPerSelection&&(u=$(a,function(e){return[e]}));for(var h=n.ranges.length-1;h>=0;h--){var f=n.ranges[h],d=f.from(),p=f.to();f.empty()&&(r&&r>0?d=ge(d.line,d.ch-r):e.state.overwrite&&!s?p=ge(p.line,Math.min(se(o,p.line).text.length,p.ch+q(a).length)):Sl&&Sl.lineWise&&Sl.text.join("\n")==t&&(d=p=ge(d.line,0))),l=e.curOp.updateInput;var g={from:d,to:p,text:u?u[h%u.length]:a,origin:i||(s?"paste":e.state.cutIncoming?"cut":"+input")};to(e.doc,g),or(e,"inputRead",e,g)}t&&!s&&Ml(e,t),Sn(e),e.curOp.updateInput=l,e.curOp.typing=!0,e.state.pasteIncoming=e.state.cutIncoming=!1}function Tl(e,t){var r=e.clipboardData&&e.clipboardData.getData("Text");if(r)return e.preventDefault(),t.isReadOnly()||t.options.disableInput||Kn(t,function(){return kl(t,r,0,null,"paste")}),!0}function Ml(e,t){if(e.options.electricChars&&e.options.smartIndent)for(var r=e.doc.sel,n=r.ranges.length-1;n>=0;n--){var i=r.ranges[n];if(!(i.head.ch>100||n&&r.ranges[n-1].head.line==i.head.line)){var o=e.getModeAt(i.head),l=!1;if(o.electricChars){for(var s=0;s<o.electricChars.length;s++)if(t.indexOf(o.electricChars.charAt(s))>-1){l=Cl(e,i.head.line,"smart");break}}else o.electricInput&&o.electricInput.test(se(e.doc,i.head.line).text.slice(0,i.head.ch))&&(l=Cl(e,i.head.line,"smart"));l&&or(e,"electricInput",e,i.head.line)}}}function Nl(e){for(var t=[],r=[],n=0;n<e.doc.sel.ranges.length;n++){var i=e.doc.sel.ranges[n].head.line,o={anchor:ge(i,0),head:ge(i+1,0)};r.push(o),t.push(e.getRange(o.anchor,o.head))}return{text:t,ranges:r}}function Ol(e,t){e.setAttribute("autocorrect","off"),e.setAttribute("autocapitalize","off"),e.setAttribute("spellcheck",!!t)}function Al(){var e=O("textarea",null,null,"position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none"),t=O("div",[e],null,"overflow: hidden; position: relative; width: 3px; height: 0px;");return a?e.style.width="1000px":e.setAttribute("wrap","off"),g&&(e.style.border="1px solid black"),Ol(e),t}function Dl(e,t,r,n,i){var o=t,l=r,s=se(e,t.line);function a(n){var o,l;if(null==(o=i?function(e,t,r,n){var i=Ze(t,e.doc.direction);if(!i)return jo(t,r,n);r.ch>=t.text.length?(r.ch=t.text.length,r.sticky="before"):r.ch<=0&&(r.ch=0,r.sticky="after");var o=qe(i,r.ch,r.sticky),l=i[o];if("ltr"==e.doc.direction&&l.level%2==0&&(n>0?l.to>r.ch:l.from<r.ch))return jo(t,r,n);var s,a=function(e,r){return Ko(t,e instanceof ge?e.ch:e,r)},u=function(r){return e.options.lineWrapping?(s=s||Nr(e,t),_r(e,t,s,r)):{begin:0,end:t.text.length}},c=u("before"==r.sticky?a(r,-1):r.ch);if("rtl"==e.doc.direction||1==l.level){var h=1==l.level==n<0,f=a(r,h?1:-1);if(null!=f&&(h?f<=l.to&&f<=c.end:f>=l.from&&f>=c.begin)){var d=h?"before":"after";return new ge(r.line,f,d)}}var p=function(e,t,n){for(var o=function(e,t){return t?new ge(r.line,a(e,1),"before"):new ge(r.line,e,"after")};e>=0&&e<i.length;e+=t){var l=i[e],s=t>0==(1!=l.level),u=s?n.begin:a(n.end,-1);if(l.from<=u&&u<l.to)return o(u,s);if(u=s?l.from:a(l.to,-1),n.begin<=u&&u<n.end)return o(u,s)}},g=p(o+n,n,c);if(g)return g;var v=n>0?c.end:a(c.begin,-1);return null==v||n>0&&v==t.text.length||!(g=p(n>0?0:i.length-1,n,u(v)))?null:g}(e.cm,s,t,r):jo(s,t,r))){if(n||(l=t.line+r)<e.first||l>=e.first+e.size||(t=new ge(l,t.ch,t.sticky),!(s=se(e,l))))return!1;t=Xo(i,e.cm,s,t.line,r)}else t=o;return!0}if("char"==n)a();else if("column"==n)a(!0);else if("word"==n||"group"==n)for(var u=null,c="group"==n,h=e.cm&&e.cm.getHelper(t,"wordChars"),f=!0;!(r<0)||a(!f);f=!1){var d=s.text.charAt(t.ch)||"\n",p=te(d,h)?"w":c&&"\n"==d?"n":!c||/\s/.test(d)?null:"p";if(!c||f||p||(p="s"),u&&u!=p){r<0&&(r=1,a(),t.sticky="after");break}if(p&&(u=p),r>0&&!a(!f))break}var g=Zi(e,t,o,l,!0);return me(o,g)&&(g.hitSide=!0),g}function Wl(e,t,r,n){var i,o,l=e.doc,s=t.left;if("page"==n){var a=Math.min(e.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight),u=Math.max(a-.5*Zr(e.display),3);i=(r>0?t.bottom:t.top)+r*u}else"line"==n&&(i=r>0?t.bottom+3:t.top-3);for(;(o=Xr(e,s,i)).outside;){if(r<0?i<=0:i>=l.height){o.hitSide=!0;break}i+=5*r}return o}var Hl=function(e){this.cm=e,this.lastAnchorNode=this.lastAnchorOffset=this.lastFocusNode=this.lastFocusOffset=null,this.polling=new R,this.composing=null,this.gracePeriod=!1,this.readDOMTimeout=null};function Fl(e,t){var r=Mr(e,t.line);if(!r||r.hidden)return null;var n=se(e.doc,t.line),i=kr(r,n,t.line),o=Ze(n,e.doc.direction),l="left";o&&(l=qe(o,t.ch)%2?"right":"left");var s=Wr(i.map,t.ch,l);return s.offset="right"==s.collapse?s.end:s.start,s}function Pl(e,t){return t&&(e.bad=!0),e}function El(e,t,r){var n;if(t==e.display.lineDiv){if(!(n=e.display.lineDiv.childNodes[r]))return Pl(e.clipPos(ge(e.display.viewTo-1)),!0);t=null,r=0}else for(n=t;;n=n.parentNode){if(!n||n==e.display.lineDiv)return null;if(n.parentNode&&n.parentNode==e.display.lineDiv)break}for(var i=0;i<e.display.view.length;i++){var o=e.display.view[i];if(o.node==n)return zl(o,t,r)}}function zl(e,t,r){var n=e.text.firstChild,i=!1;if(!t||!D(n,t))return Pl(ge(he(e.line),0),!0);if(t==n&&(i=!0,t=n.childNodes[r],r=0,!t)){var o=e.rest?q(e.rest):e.line;return Pl(ge(he(o),o.text.length),i)}var l=3==t.nodeType?t:null,s=t;for(l||1!=t.childNodes.length||3!=t.firstChild.nodeType||(l=t.firstChild,r&&(r=l.nodeValue.length));s.parentNode!=n;)s=s.parentNode;var a=e.measure,u=a.maps;function c(t,r,n){for(var i=-1;i<(u?u.length:0);i++)for(var o=i<0?a.map:u[i],l=0;l<o.length;l+=3){var s=o[l+2];if(s==t||s==r){var c=he(i<0?e.line:e.rest[i]),h=o[l]+n;return(n<0||s!=t)&&(h=o[l+(n?1:0)]),ge(c,h)}}}var h=c(l,s,r);if(h)return Pl(h,i);for(var f=s.nextSibling,d=l?l.nodeValue.length-r:0;f;f=f.nextSibling){if(h=c(f,f.firstChild,0))return Pl(ge(h.line,h.ch-d),i);d+=f.textContent.length}for(var p=s.previousSibling,g=r;p;p=p.previousSibling){if(h=c(p,p.firstChild,-1))return Pl(ge(h.line,h.ch+g),i);g+=p.textContent.length}}Hl.prototype.init=function(e){var t=this,r=this,n=r.cm,i=r.div=e.lineDiv;function o(e){if(!nt(n,e)){if(n.somethingSelected())Ll({lineWise:!1,text:n.getSelections()}),"cut"==e.type&&n.replaceSelection("",null,"cut");else{if(!n.options.lineWiseCopyCut)return;var t=Nl(n);Ll({lineWise:!0,text:t.text}),"cut"==e.type&&n.operation(function(){n.setSelections(t.ranges,0,V),n.replaceSelection("",null,"cut")})}if(e.clipboardData){e.clipboardData.clearData();var o=Sl.text.join("\n");if(e.clipboardData.setData("Text",o),e.clipboardData.getData("Text")==o)return void e.preventDefault()}var l=Al(),s=l.firstChild;n.display.lineSpace.insertBefore(l,n.display.lineSpace.firstChild),s.value=Sl.text.join("\n");var a=document.activeElement;P(s),setTimeout(function(){n.display.lineSpace.removeChild(l),a.focus(),a==i&&r.showPrimarySelection()},50)}}Ol(i,n.options.spellcheck),Je(i,"paste",function(e){nt(n,e)||Tl(e,n)||s<=11&&setTimeout(jn(n,function(){return t.updateFromDOM()}),20)}),Je(i,"compositionstart",function(e){t.composing={data:e.data,done:!1}}),Je(i,"compositionupdate",function(e){t.composing||(t.composing={data:e.data,done:!1})}),Je(i,"compositionend",function(e){t.composing&&(e.data!=t.composing.data&&t.readFromDOMSoon(),t.composing.done=!0)}),Je(i,"touchstart",function(){return r.forceCompositionEnd()}),Je(i,"input",function(){t.composing||t.readFromDOMSoon()}),Je(i,"copy",o),Je(i,"cut",o)},Hl.prototype.prepareSelection=function(){var e=sn(this.cm,!1);return e.focus=this.cm.state.focused,e},Hl.prototype.showSelection=function(e,t){e&&this.cm.display.view.length&&((e.focus||t)&&this.showPrimarySelection(),this.showMultipleSelections(e))},Hl.prototype.showPrimarySelection=function(){var e=window.getSelection(),t=this.cm,n=t.doc.sel.primary(),i=n.from(),o=n.to();if(t.display.viewTo==t.display.viewFrom||i.line>=t.display.viewTo||o.line<t.display.viewFrom)e.removeAllRanges();else{var l=El(t,e.anchorNode,e.anchorOffset),s=El(t,e.focusNode,e.focusOffset);if(!l||l.bad||!s||s.bad||0!=ve(we(l,s),i)||0!=ve(be(l,s),o)){var a=t.display.view,u=i.line>=t.display.viewFrom&&Fl(t,i)||{node:a[0].measure.map[2],offset:0},c=o.line<t.display.viewTo&&Fl(t,o);if(!c){var h=a[a.length-1].measure,f=h.maps?h.maps[h.maps.length-1]:h.map;c={node:f[f.length-1],offset:f[f.length-2]-f[f.length-3]}}if(u&&c){var d,p=e.rangeCount&&e.getRangeAt(0);try{d=k(u.node,u.offset,c.offset,c.node)}catch(e){}d&&(!r&&t.state.focused?(e.collapse(u.node,u.offset),d.collapsed||(e.removeAllRanges(),e.addRange(d))):(e.removeAllRanges(),e.addRange(d)),p&&null==e.anchorNode?e.addRange(p):r&&this.startGracePeriod()),this.rememberSelection()}else e.removeAllRanges()}}},Hl.prototype.startGracePeriod=function(){var e=this;clearTimeout(this.gracePeriod),this.gracePeriod=setTimeout(function(){e.gracePeriod=!1,e.selectionChanged()&&e.cm.operation(function(){return e.cm.curOp.selectionChanged=!0})},20)},Hl.prototype.showMultipleSelections=function(e){N(this.cm.display.cursorDiv,e.cursors),N(this.cm.display.selectionDiv,e.selection)},Hl.prototype.rememberSelection=function(){var e=window.getSelection();this.lastAnchorNode=e.anchorNode,this.lastAnchorOffset=e.anchorOffset,this.lastFocusNode=e.focusNode,this.lastFocusOffset=e.focusOffset},Hl.prototype.selectionInEditor=function(){var e=window.getSelection();if(!e.rangeCount)return!1;var t=e.getRangeAt(0).commonAncestorContainer;return D(this.div,t)},Hl.prototype.focus=function(){"nocursor"!=this.cm.options.readOnly&&(this.selectionInEditor()||this.showSelection(this.prepareSelection(),!0),this.div.focus())},Hl.prototype.blur=function(){this.div.blur()},Hl.prototype.getField=function(){return this.div},Hl.prototype.supportsTouch=function(){return!0},Hl.prototype.receivedFocus=function(){var e=this;this.selectionInEditor()?this.pollSelection():Kn(this.cm,function(){return e.cm.curOp.selectionChanged=!0}),this.polling.set(this.cm.options.pollInterval,function t(){e.cm.state.focused&&(e.pollSelection(),e.polling.set(e.cm.options.pollInterval,t))})},Hl.prototype.selectionChanged=function(){var e=window.getSelection();return e.anchorNode!=this.lastAnchorNode||e.anchorOffset!=this.lastAnchorOffset||e.focusNode!=this.lastFocusNode||e.focusOffset!=this.lastFocusOffset},Hl.prototype.pollSelection=function(){if(null==this.readDOMTimeout&&!this.gracePeriod&&this.selectionChanged()){var e=window.getSelection(),t=this.cm;if(v&&c&&this.cm.options.gutters.length&&function(e){for(var t=e;t;t=t.parentNode)if(/CodeMirror-gutter-wrapper/.test(t.className))return!0;return!1}(e.anchorNode))return this.cm.triggerOnKeyDown({type:"keydown",keyCode:8,preventDefault:Math.abs}),this.blur(),void this.focus();if(!this.composing){this.rememberSelection();var r=El(t,e.anchorNode,e.anchorOffset),n=El(t,e.focusNode,e.focusOffset);r&&n&&Kn(t,function(){ji(t.doc,mi(r,n),V),(r.bad||n.bad)&&(t.curOp.selectionChanged=!0)})}}},Hl.prototype.pollContent=function(){null!=this.readDOMTimeout&&(clearTimeout(this.readDOMTimeout),this.readDOMTimeout=null);var e,t,r,n=this.cm,i=n.display,o=n.doc.sel.primary(),l=o.from(),s=o.to();if(0==l.ch&&l.line>n.firstLine()&&(l=ge(l.line-1,se(n.doc,l.line-1).length)),s.ch==se(n.doc,s.line).text.length&&s.line<n.lastLine()&&(s=ge(s.line+1,0)),l.line<i.viewFrom||s.line>i.viewTo-1)return!1;l.line==i.viewFrom||0==(e=on(n,l.line))?(t=he(i.view[0].line),r=i.view[0].node):(t=he(i.view[e].line),r=i.view[e-1].node.nextSibling);var a,u,c=on(n,s.line);if(c==i.view.length-1?(a=i.viewTo-1,u=i.lineDiv.lastChild):(a=he(i.view[c+1].line)-1,u=i.view[c+1].node.previousSibling),!r)return!1;for(var h=n.doc.splitLines(function(e,t,r,n,i){var o="",l=!1,s=e.doc.lineSeparator();function a(){l&&(o+=s,l=!1)}function u(e){e&&(a(),o+=e)}function c(t){if(1==t.nodeType){var r=t.getAttribute("cm-text");if(null!=r)return void u(r||t.textContent.replace(/\u200b/g,""));var o,h=t.getAttribute("cm-marker");if(h){var f=e.findMarks(ge(n,0),ge(i+1,0),(g=+h,function(e){return e.id==g}));return void(f.length&&(o=f[0].find(0))&&u(ae(e.doc,o.from,o.to).join(s)))}if("false"==t.getAttribute("contenteditable"))return;var d=/^(pre|div|p)$/i.test(t.nodeName);d&&a();for(var p=0;p<t.childNodes.length;p++)c(t.childNodes[p]);d&&(l=!0)}else 3==t.nodeType&&u(t.nodeValue);var g}for(;c(t),t!=r;)t=t.nextSibling;return o}(n,r,u,t,a)),f=ae(n.doc,ge(t,0),ge(a,se(n.doc,a).text.length));h.length>1&&f.length>1;)if(q(h)==q(f))h.pop(),f.pop(),a--;else{if(h[0]!=f[0])break;h.shift(),f.shift(),t++}for(var d=0,p=0,g=h[0],v=f[0],m=Math.min(g.length,v.length);d<m&&g.charCodeAt(d)==v.charCodeAt(d);)++d;for(var y=q(h),b=q(f),w=Math.min(y.length-(1==h.length?d:0),b.length-(1==f.length?d:0));p<w&&y.charCodeAt(y.length-p-1)==b.charCodeAt(b.length-p-1);)++p;if(1==h.length&&1==f.length&&t==l.line)for(;d&&d>l.ch&&y.charCodeAt(y.length-p-1)==b.charCodeAt(b.length-p-1);)d--,p++;h[h.length-1]=y.slice(0,y.length-p).replace(/^\u200b+/,""),h[0]=h[0].slice(d).replace(/\u200b+$/,"");var x=ge(t,d),C=ge(a,f.length?q(f).length-p:0);return h.length>1||h[0]||ve(x,C)?(lo(n.doc,h,x,C,"+input"),!0):void 0},Hl.prototype.ensurePolled=function(){this.forceCompositionEnd()},Hl.prototype.reset=function(){this.forceCompositionEnd()},Hl.prototype.forceCompositionEnd=function(){this.composing&&(clearTimeout(this.readDOMTimeout),this.composing=null,this.updateFromDOM(),this.div.blur(),this.div.focus())},Hl.prototype.readFromDOMSoon=function(){var e=this;null==this.readDOMTimeout&&(this.readDOMTimeout=setTimeout(function(){if(e.readDOMTimeout=null,e.composing){if(!e.composing.done)return;e.composing=null}e.updateFromDOM()},80))},Hl.prototype.updateFromDOM=function(){var e=this;!this.cm.isReadOnly()&&this.pollContent()||Kn(this.cm,function(){return _n(e.cm)})},Hl.prototype.setUneditable=function(e){e.contentEditable="false"},Hl.prototype.onKeyPress=function(e){0==e.charCode||this.composing||(e.preventDefault(),this.cm.isReadOnly()||jn(this.cm,kl)(this.cm,String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),0))},Hl.prototype.readOnlyChanged=function(e){this.div.contentEditable=String("nocursor"!=e)},Hl.prototype.onContextMenu=function(){},Hl.prototype.resetPosition=function(){},Hl.prototype.needsContentAttribute=!0;var Il,Rl,Bl,Gl=function(e){this.cm=e,this.prevInput="",this.pollingFast=!1,this.polling=new R,this.hasSelection=!1,this.composing=null};Gl.prototype.init=function(e){var t=this,r=this,n=this.cm;this.createField(e);var i=this.textarea;function o(e){if(!nt(n,e)){if(n.somethingSelected())Ll({lineWise:!1,text:n.getSelections()});else{if(!n.options.lineWiseCopyCut)return;var t=Nl(n);Ll({lineWise:!0,text:t.text}),"cut"==e.type?n.setSelections(t.ranges,null,V):(r.prevInput="",i.value=t.text.join("\n"),P(i))}"cut"==e.type&&(n.state.cutIncoming=!0)}}e.wrapper.insertBefore(this.wrapper,e.wrapper.firstChild),g&&(i.style.width="0px"),Je(i,"input",function(){l&&s>=9&&t.hasSelection&&(t.hasSelection=null),r.poll()}),Je(i,"paste",function(e){nt(n,e)||Tl(e,n)||(n.state.pasteIncoming=!0,r.fastPoll())}),Je(i,"cut",o),Je(i,"copy",o),Je(e.scroller,"paste",function(t){yr(e,t)||nt(n,t)||(n.state.pasteIncoming=!0,r.focus())}),Je(e.lineSpace,"selectstart",function(t){yr(e,t)||st(t)}),Je(i,"compositionstart",function(){var e=n.getCursor("from");r.composing&&r.composing.range.clear(),r.composing={start:e,range:n.markText(e,n.getCursor("to"),{className:"CodeMirror-composing"})}}),Je(i,"compositionend",function(){r.composing&&(r.poll(),r.composing.range.clear(),r.composing=null)})},Gl.prototype.createField=function(e){this.wrapper=Al(),this.textarea=this.wrapper.firstChild},Gl.prototype.prepareSelection=function(){var e=this.cm,t=e.display,r=e.doc,n=sn(e);if(e.options.moveInputWithCursor){var i=Vr(e,r.sel.primary().head,"div"),o=t.wrapper.getBoundingClientRect(),l=t.lineDiv.getBoundingClientRect();n.teTop=Math.max(0,Math.min(t.wrapper.clientHeight-10,i.top+l.top-o.top)),n.teLeft=Math.max(0,Math.min(t.wrapper.clientWidth-10,i.left+l.left-o.left))}return n},Gl.prototype.showSelection=function(e){var t=this.cm.display;N(t.cursorDiv,e.cursors),N(t.selectionDiv,e.selection),null!=e.teTop&&(this.wrapper.style.top=e.teTop+"px",this.wrapper.style.left=e.teLeft+"px")},Gl.prototype.reset=function(e){if(!this.contextMenuPending&&!this.composing){var t=this.cm;if(t.somethingSelected()){this.prevInput="";var r=t.getSelection();this.textarea.value=r,t.state.focused&&P(this.textarea),l&&s>=9&&(this.hasSelection=r)}else e||(this.prevInput=this.textarea.value="",l&&s>=9&&(this.hasSelection=null))}},Gl.prototype.getField=function(){return this.textarea},Gl.prototype.supportsTouch=function(){return!1},Gl.prototype.focus=function(){if("nocursor"!=this.cm.options.readOnly&&(!m||W()!=this.textarea))try{this.textarea.focus()}catch(e){}},Gl.prototype.blur=function(){this.textarea.blur()},Gl.prototype.resetPosition=function(){this.wrapper.style.top=this.wrapper.style.left=0},Gl.prototype.receivedFocus=function(){this.slowPoll()},Gl.prototype.slowPoll=function(){var e=this;this.pollingFast||this.polling.set(this.cm.options.pollInterval,function(){e.poll(),e.cm.state.focused&&e.slowPoll()})},Gl.prototype.fastPoll=function(){var e=!1,t=this;t.pollingFast=!0,t.polling.set(20,function r(){t.poll()||e?(t.pollingFast=!1,t.slowPoll()):(e=!0,t.polling.set(60,r))})},Gl.prototype.poll=function(){var e=this,t=this.cm,r=this.textarea,n=this.prevInput;if(this.contextMenuPending||!t.state.focused||wt(r)&&!n&&!this.composing||t.isReadOnly()||t.options.disableInput||t.state.keySeq)return!1;var i=r.value;if(i==n&&!t.somethingSelected())return!1;if(l&&s>=9&&this.hasSelection===i||y&&/[\uf700-\uf7ff]/.test(i))return t.display.input.reset(),!1;if(t.doc.sel==t.display.selForContextMenu){var o=i.charCodeAt(0);if(8203!=o||n||(n="​"),8666==o)return this.reset(),this.cm.execCommand("undo")}for(var a=0,u=Math.min(n.length,i.length);a<u&&n.charCodeAt(a)==i.charCodeAt(a);)++a;return Kn(t,function(){kl(t,i.slice(a),n.length-a,null,e.composing?"*compose":null),i.length>1e3||i.indexOf("\n")>-1?r.value=e.prevInput="":e.prevInput=i,e.composing&&(e.composing.range.clear(),e.composing.range=t.markText(e.composing.start,t.getCursor("to"),{className:"CodeMirror-composing"}))}),!0},Gl.prototype.ensurePolled=function(){this.pollingFast&&this.poll()&&(this.pollingFast=!1)},Gl.prototype.onKeyPress=function(){l&&s>=9&&(this.hasSelection=null),this.fastPoll()},Gl.prototype.onContextMenu=function(e){var t=this,r=t.cm,n=r.display,i=t.textarea,o=nn(r,e),u=n.scroller.scrollTop;if(o&&!h){r.options.resetSelectionOnContextMenu&&-1==r.doc.sel.contains(o)&&jn(r,ji)(r.doc,mi(o),V);var c=i.style.cssText,f=t.wrapper.style.cssText;t.wrapper.style.cssText="position: absolute";var d,p=t.wrapper.getBoundingClientRect();if(i.style.cssText="position: absolute; width: 30px; height: 30px;\n top: "+(e.clientY-p.top-5)+"px; left: "+(e.clientX-p.left-5)+"px;\n z-index: 1000; background: "+(l?"rgba(255, 255, 255, .05)":"transparent")+";\n outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);",a&&(d=window.scrollY),n.input.focus(),a&&window.scrollTo(null,d),n.input.reset(),r.somethingSelected()||(i.value=t.prevInput=" "),t.contextMenuPending=!0,n.selForContextMenu=r.doc.sel,clearTimeout(n.detectingSelectAll),l&&s>=9&&v(),S){ct(e);var g=function(){tt(window,"mouseup",g),setTimeout(m,20)};Je(window,"mouseup",g)}else setTimeout(m,50)}function v(){if(null!=i.selectionStart){var e=r.somethingSelected(),o="​"+(e?i.value:"");i.value="⇚",i.value=o,t.prevInput=e?"":"​",i.selectionStart=1,i.selectionEnd=o.length,n.selForContextMenu=r.doc.sel}}function m(){if(t.contextMenuPending=!1,t.wrapper.style.cssText=f,i.style.cssText=c,l&&s<9&&n.scrollbars.setScrollTop(n.scroller.scrollTop=u),null!=i.selectionStart){(!l||l&&s<9)&&v();var e=0,o=function(){n.selForContextMenu==r.doc.sel&&0==i.selectionStart&&i.selectionEnd>0&&"​"==t.prevInput?jn(r,Ji)(r):e++<10?n.detectingSelectAll=setTimeout(o,500):(n.selForContextMenu=null,n.input.reset())};n.detectingSelectAll=setTimeout(o,200)}}},Gl.prototype.readOnlyChanged=function(e){e||this.reset(),this.textarea.disabled="nocursor"==e},Gl.prototype.setUneditable=function(){},Gl.prototype.needsContentAttribute=!1,function(e){var t=e.optionHandlers;function r(r,n,i,o){e.defaults[r]=n,i&&(t[r]=o?function(e,t,r){r!=pl&&i(e,t,r)}:i)}e.defineOption=r,e.Init=pl,r("value","",function(e,t){return e.setValue(t)},!0),r("mode",null,function(e,t){e.doc.modeOption=t,Ci(e)},!0),r("indentUnit",2,Ci,!0),r("indentWithTabs",!1),r("smartIndent",!0),r("tabSize",4,function(e){Si(e),Er(e),_n(e)},!0),r("lineSeparator",null,function(e,t){if(e.doc.lineSep=t,t){var r=[],n=e.doc.first;e.doc.iter(function(e){for(var i=0;;){var o=e.text.indexOf(t,i);if(-1==o)break;i=o+t.length,r.push(ge(n,o))}n++});for(var i=r.length-1;i>=0;i--)lo(e.doc,t,r[i],ge(r[i].line,r[i].ch+t.length))}}),r("specialChars",/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g,function(e,t,r){e.state.specialChars=new RegExp(t.source+(t.test("\t")?"":"|\t"),"g"),r!=pl&&e.refresh()}),r("specialCharPlaceholder",$t,function(e){return e.refresh()},!0),r("electricChars",!0),r("inputStyle",m?"contenteditable":"textarea",function(){throw new Error("inputStyle can not (yet) be changed in a running editor")},!0),r("spellcheck",!1,function(e,t){return e.getInputField().spellcheck=t},!0),r("rtlMoveVisually",!w),r("wholeLineUpdateBefore",!0),r("theme","default",function(e){dl(e),ml(e)},!0),r("keyMap","default",function(e,t,r){var n=Uo(t),i=r!=pl&&Uo(r);i&&i.detach&&i.detach(e,n),n.attach&&n.attach(e,i||null)}),r("extraKeys",null),r("configureMouse",null),r("lineWrapping",!1,bl,!0),r("gutters",[],function(e){ai(e.options),ml(e)},!0),r("fixedGutter",!0,function(e,t){e.display.gutters.style.left=t?en(e.display)+"px":"0",e.refresh()},!0),r("coverGutterNextToScrollbar",!1,function(e){return Hn(e)},!0),r("scrollbarStyle","native",function(e){En(e),Hn(e),e.display.scrollbars.setScrollTop(e.doc.scrollTop),e.display.scrollbars.setScrollLeft(e.doc.scrollLeft)},!0),r("lineNumbers",!1,function(e){ai(e.options),ml(e)},!0),r("firstLineNumber",1,ml,!0),r("lineNumberFormatter",function(e){return e},ml,!0),r("showCursorWhenSelecting",!1,ln,!0),r("resetSelectionOnContextMenu",!0),r("lineWiseCopyCut",!0),r("pasteLinesPerSelection",!0),r("readOnly",!1,function(e,t){"nocursor"==t&&(gn(e),e.display.input.blur()),e.display.input.readOnlyChanged(t)}),r("disableInput",!1,function(e,t){t||e.display.input.reset()},!0),r("dragDrop",!0,yl),r("allowDropFileTypes",null),r("cursorBlinkRate",530),r("cursorScrollMargin",0),r("cursorHeight",1,ln,!0),r("singleCursorHeightPerLine",!0,ln,!0),r("workTime",100),r("workDelay",100),r("flattenSpans",!0,Si,!0),r("addModeClass",!1,Si,!0),r("pollInterval",100),r("undoDepth",200,function(e,t){return e.doc.history.undoDepth=t}),r("historyEventDelay",1250),r("viewportMargin",10,function(e){return e.refresh()},!0),r("maxHighlightLength",1e4,Si,!0),r("moveInputWithCursor",!0,function(e,t){t||e.display.input.resetPosition()}),r("tabindex",null,function(e,t){return e.display.input.getField().tabIndex=t||""}),r("autofocus",null),r("direction","ltr",function(e,t){return e.doc.setDirection(t)},!0)}(wl),Rl=(Il=wl).optionHandlers,Bl=Il.helpers={},Il.prototype={constructor:Il,focus:function(){window.focus(),this.display.input.focus()},setOption:function(e,t){var r=this.options,n=r[e];r[e]==t&&"mode"!=e||(r[e]=t,Rl.hasOwnProperty(e)&&jn(this,Rl[e])(this,t,n),rt(this,"optionChange",this,e))},getOption:function(e){return this.options[e]},getDoc:function(){return this.doc},addKeyMap:function(e,t){this.state.keyMaps[t?"push":"unshift"](Uo(e))},removeKeyMap:function(e){for(var t=this.state.keyMaps,r=0;r<t.length;++r)if(t[r]==e||t[r].name==e)return t.splice(r,1),!0},addOverlay:Xn(function(e,t){var r=e.token?e:Il.getMode(this.options,e);if(r.startState)throw new Error("Overlays may not be stateful.");!function(e,t,r){for(var n=0,i=r(t);n<e.length&&r(e[n])<=i;)n++;e.splice(n,0,t)}(this.state.overlays,{mode:r,modeSpec:e,opaque:t&&t.opaque,priority:t&&t.priority||0},function(e){return e.priority}),this.state.modeGen++,_n(this)}),removeOverlay:Xn(function(e){for(var t=this.state.overlays,r=0;r<t.length;++r){var n=t[r].modeSpec;if(n==e||"string"==typeof e&&n.name==e)return t.splice(r,1),this.state.modeGen++,void _n(this)}}),indentLine:Xn(function(e,t,r){"string"!=typeof t&&"number"!=typeof t&&(t=null==t?this.options.smartIndent?"smart":"prev":t?"add":"subtract"),de(this.doc,e)&&Cl(this,e,t,r)}),indentSelection:Xn(function(e){for(var t=this,r=this.doc.sel.ranges,n=-1,i=0;i<r.length;i++){var o=r[i];if(o.empty())o.head.line>n&&(Cl(t,o.head.line,e,!0),n=o.head.line,i==t.doc.sel.primIndex&&Sn(t));else{var l=o.from(),s=o.to(),a=Math.max(n,l.line);n=Math.min(t.lastLine(),s.line-(s.ch?0:1))+1;for(var u=a;u<n;++u)Cl(t,u,e);var c=t.doc.sel.ranges;0==l.ch&&r.length==c.length&&c[i].from().ch>0&&Ui(t.doc,i,new gi(l,c[i].to()),V)}}}),getTokenAt:function(e,t){return Ut(this,e,t)},getLineTokens:function(e,t){return Ut(this,ge(e),t,!0)},getTokenTypeAt:function(e){e=Ce(this.doc,e);var t,r=Et(this,se(this.doc,e.line)),n=0,i=(r.length-1)/2,o=e.ch;if(0==o)t=r[2];else for(;;){var l=n+i>>1;if((l?r[2*l-1]:0)>=o)i=l;else{if(!(r[2*l+1]<o)){t=r[2*l+2];break}n=l+1}}var s=t?t.indexOf("overlay "):-1;return s<0?t:0==s?null:t.slice(0,s-1)},getModeAt:function(e){var t=this.doc.mode;return t.innerMode?Il.innerMode(t,this.getTokenAt(e).state).mode:t},getHelper:function(e,t){return this.getHelpers(e,t)[0]},getHelpers:function(e,t){var r=[];if(!Bl.hasOwnProperty(t))return r;var n=Bl[t],i=this.getModeAt(e);if("string"==typeof i[t])n[i[t]]&&r.push(n[i[t]]);else if(i[t])for(var o=0;o<i[t].length;o++){var l=n[i[t][o]];l&&r.push(l)}else i.helperType&&n[i.helperType]?r.push(n[i.helperType]):n[i.name]&&r.push(n[i.name]);for(var s=0;s<n._global.length;s++){var a=n._global[s];a.pred(i,this)&&-1==B(r,a.val)&&r.push(a.val)}return r},getStateAfter:function(e,t){var r=this.doc;return zt(this,(e=xe(r,null==e?r.first+r.size-1:e))+1,t).state},cursorCoords:function(e,t){var r=this.doc.sel.primary();return Vr(this,null==e?r.head:"object"==typeof e?Ce(this.doc,e):e?r.from():r.to(),t||"page")},charCoords:function(e,t){return Ur(this,Ce(this.doc,e),t||"page")},coordsChar:function(e,t){return Xr(this,(e=Gr(this,e,t||"page")).left,e.top)},lineAtHeight:function(e,t){return e=Gr(this,{top:e,left:0},t||"page").top,fe(this.doc,e+this.display.viewOffset)},heightAtLine:function(e,t,r){var n,i=!1;if("number"==typeof e){var o=this.doc.first+this.doc.size-1;e<this.doc.first?e=this.doc.first:e>o&&(e=o,i=!0),n=se(this.doc,e)}else n=e;return Br(this,n,{top:0,left:0},t||"page",r||i).top+(i?this.doc.height-je(n):0)},defaultTextHeight:function(){return Zr(this.display)},defaultCharWidth:function(){return Qr(this.display)},getViewport:function(){return{from:this.display.viewFrom,to:this.display.viewTo}},addWidget:function(e,t,r,n,i){var o,l,s,a=this.display,u=(e=Vr(this,Ce(this.doc,e))).bottom,c=e.left;if(t.style.position="absolute",t.setAttribute("cm-ignore-events","true"),this.display.input.setUneditable(t),a.sizer.appendChild(t),"over"==n)u=e.top;else if("above"==n||"near"==n){var h=Math.max(a.wrapper.clientHeight,this.doc.height),f=Math.max(a.sizer.clientWidth,a.lineSpace.clientWidth);("above"==n||e.bottom+t.offsetHeight>h)&&e.top>t.offsetHeight?u=e.top-t.offsetHeight:e.bottom+t.offsetHeight<=h&&(u=e.bottom),c+t.offsetWidth>f&&(c=f-t.offsetWidth)}t.style.top=u+"px",t.style.left=t.style.right="","right"==i?(c=a.sizer.clientWidth-t.offsetWidth,t.style.right="0px"):("left"==i?c=0:"middle"==i&&(c=(a.sizer.clientWidth-t.offsetWidth)/2),t.style.left=c+"px"),r&&(o=this,l={left:c,top:u,right:c+t.offsetWidth,bottom:u+t.offsetHeight},null!=(s=xn(o,l)).scrollTop&&Mn(o,s.scrollTop),null!=s.scrollLeft&&On(o,s.scrollLeft))},triggerOnKeyDown:Xn(rl),triggerOnKeyPress:Xn(il),triggerOnKeyUp:nl,triggerOnMouseDown:Xn(al),execCommand:function(e){if(Yo.hasOwnProperty(e))return Yo[e].call(null,this)},triggerElectric:Xn(function(e){Ml(this,e)}),findPosH:function(e,t,r,n){var i=1;t<0&&(i=-1,t=-t);for(var o=Ce(this.doc,e),l=0;l<t&&!(o=Dl(this.doc,o,i,r,n)).hitSide;++l);return o},moveH:Xn(function(e,t){var r=this;this.extendSelectionsBy(function(n){return r.display.shift||r.doc.extend||n.empty()?Dl(r.doc,n.head,e,t,r.options.rtlMoveVisually):e<0?n.from():n.to()},j)}),deleteH:Xn(function(e,t){var r=this.doc.sel,n=this.doc;r.somethingSelected()?n.replaceSelection("",null,"+delete"):Vo(this,function(r){var i=Dl(n,r.head,e,t,!1);return e<0?{from:i,to:r.head}:{from:r.head,to:i}})}),findPosV:function(e,t,r,n){var i=1,o=n;t<0&&(i=-1,t=-t);for(var l=Ce(this.doc,e),s=0;s<t;++s){var a=Vr(this,l,"div");if(null==o?o=a.left:a.left=o,(l=Wl(this,a,i,r)).hitSide)break}return l},moveV:Xn(function(e,t){var r=this,n=this.doc,i=[],o=!this.display.shift&&!n.extend&&n.sel.somethingSelected();if(n.extendSelectionsBy(function(l){if(o)return e<0?l.from():l.to();var s=Vr(r,l.head,"div");null!=l.goalColumn&&(s.left=l.goalColumn),i.push(s.left);var a=Wl(r,s,e,t);return"page"==t&&l==n.sel.primary()&&Cn(r,Ur(r,a,"div").top-s.top),a},j),i.length)for(var l=0;l<n.sel.ranges.length;l++)n.sel.ranges[l].goalColumn=i[l]}),findWordAt:function(e){var t=se(this.doc,e.line).text,r=e.ch,n=e.ch;if(t){var i=this.getHelper(e,"wordChars");"before"!=e.sticky&&n!=t.length||!r?++n:--r;for(var o=t.charAt(r),l=te(o,i)?function(e){return te(e,i)}:/\s/.test(o)?function(e){return/\s/.test(e)}:function(e){return!/\s/.test(e)&&!te(e)};r>0&&l(t.charAt(r-1));)--r;for(;n<t.length&&l(t.charAt(n));)++n}return new gi(ge(e.line,r),ge(e.line,n))},toggleOverwrite:function(e){null!=e&&e==this.state.overwrite||((this.state.overwrite=!this.state.overwrite)?H(this.display.cursorDiv,"CodeMirror-overwrite"):T(this.display.cursorDiv,"CodeMirror-overwrite"),rt(this,"overwriteToggle",this,this.state.overwrite))},hasFocus:function(){return this.display.input.getField()==W()},isReadOnly:function(){return!(!this.options.readOnly&&!this.doc.cantEdit)},scrollTo:Xn(function(e,t){Ln(this,e,t)}),getScrollInfo:function(){var e=this.display.scroller;return{left:e.scrollLeft,top:e.scrollTop,height:e.scrollHeight-Cr(this)-this.display.barHeight,width:e.scrollWidth-Cr(this)-this.display.barWidth,clientHeight:Lr(this),clientWidth:Sr(this)}},scrollIntoView:Xn(function(e,t){var r,n;null==e?(e={from:this.doc.sel.primary().head,to:null},null==t&&(t=this.options.cursorScrollMargin)):"number"==typeof e?e={from:ge(e,0),to:null}:null==e.from&&(e={from:e,to:null}),e.to||(e.to=e.from),e.margin=t||0,null!=e.from.line?(n=e,kn(r=this),r.curOp.scrollToPos=n):Tn(this,e.from,e.to,e.margin)}),setSize:Xn(function(e,t){var r=this,n=function(e){return"number"==typeof e||/^\d+$/.test(String(e))?e+"px":e};null!=e&&(this.display.wrapper.style.width=n(e)),null!=t&&(this.display.wrapper.style.height=n(t)),this.options.lineWrapping&&Pr(this);var i=this.display.viewFrom;this.doc.iter(i,this.display.viewTo,function(e){if(e.widgets)for(var t=0;t<e.widgets.length;t++)if(e.widgets[t].noHScroll){qn(r,i,"widget");break}++i}),this.curOp.forceUpdate=!0,rt(this,"refresh",this)}),operation:function(e){return Kn(this,e)},startOperation:function(){return In(this)},endOperation:function(){return Rn(this)},refresh:Xn(function(){var e=this.display.cachedTextHeight;_n(this),this.curOp.forceUpdate=!0,Er(this),Ln(this,this.doc.scrollLeft,this.doc.scrollTop),oi(this),(null==e||Math.abs(e-Zr(this.display))>.5)&&rn(this),rt(this,"refresh",this)}),swapDoc:Xn(function(e){var t=this.doc;return t.cm=null,Mi(this,e),Er(this),this.display.input.reset(),Ln(this,e.scrollLeft,e.scrollTop),this.curOp.forceScroll=!0,or(this,"swapDoc",this,t),t}),getInputField:function(){return this.display.input.getField()},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}},lt(Il),Il.registerHelper=function(e,t,r){Bl.hasOwnProperty(e)||(Bl[e]=Il[e]={_global:[]}),Bl[e][t]=r},Il.registerGlobalHelper=function(e,t,r,n){Il.registerHelper(e,t,n),Bl[e]._global.push({pred:r,val:n})};var Ul,Vl="iter insert remove copy getEditor constructor".split(" ");for(var Kl in So.prototype)So.prototype.hasOwnProperty(Kl)&&B(Vl,Kl)<0&&(wl.prototype[Kl]=function(e){return function(){return e.apply(this.doc,arguments)}}(So.prototype[Kl]));return lt(So),wl.inputStyles={textarea:Gl,contenteditable:Hl},wl.defineMode=function(e){wl.defaults.mode||"null"==e||(wl.defaults.mode=e),function(e,t){arguments.length>2&&(t.dependencies=Array.prototype.slice.call(arguments,2)),St[e]=t}.apply(this,arguments)},wl.defineMIME=function(e,t){Lt[e]=t},wl.defineMode("null",function(){return{token:function(e){return e.skipToEnd()}}}),wl.defineMIME("text/plain","null"),wl.defineExtension=function(e,t){wl.prototype[e]=t},wl.defineDocExtension=function(e,t){So.prototype[e]=t},wl.fromTextArea=function(e,t){if((t=t?z(t):{}).value=e.value,!t.tabindex&&e.tabIndex&&(t.tabindex=e.tabIndex),!t.placeholder&&e.placeholder&&(t.placeholder=e.placeholder),null==t.autofocus){var r=W();t.autofocus=r==e||null!=e.getAttribute("autofocus")&&r==document.body}function n(){e.value=s.getValue()}var i;if(e.form&&(Je(e.form,"submit",n),!t.leaveSubmitMethodAlone)){var o=e.form;i=o.submit;try{var l=o.submit=function(){n(),o.submit=i,o.submit(),o.submit=l}}catch(e){}}t.finishInit=function(t){t.save=n,t.getTextArea=function(){return e},t.toTextArea=function(){t.toTextArea=isNaN,n(),e.parentNode.removeChild(t.getWrapperElement()),e.style.display="",e.form&&(tt(e.form,"submit",n),"function"==typeof e.form.submit&&(e.form.submit=i))}},e.style.display="none";var s=wl(function(t){return e.parentNode.insertBefore(t,e.nextSibling)},t);return s},(Ul=wl).off=tt,Ul.on=Je,Ul.wheelEventPixels=fi,Ul.Doc=So,Ul.splitLines=bt,Ul.countColumn=I,Ul.findColumn=X,Ul.isWordChar=ee,Ul.Pass=U,Ul.signal=rt,Ul.Line=jt,Ul.changeEnd=yi,Ul.scrollbarModel=Pn,Ul.Pos=ge,Ul.cmpPos=ve,Ul.modes=St,Ul.mimeModes=Lt,Ul.resolveMode=kt,Ul.getMode=Tt,Ul.modeExtensions=Mt,Ul.extendMode=Nt,Ul.copyState=Ot,Ul.startState=Dt,Ul.innerMode=At,Ul.commands=Yo,Ul.keyMap=Po,Ul.keyName=Go,Ul.isModifierKey=Ro,Ul.lookupKey=Io,Ul.normalizeKeyMap=zo,Ul.StringStream=Wt,Ul.SharedTextMarker=bo,Ul.TextMarker=mo,Ul.LineWidget=po,Ul.e_preventDefault=st,Ul.e_stopPropagation=at,Ul.e_stop=ct,Ul.addClass=H,Ul.contains=D,Ul.rmClass=T,Ul.keyNames=Do,wl.version="5.37.1",wl}); diff --git a/plugins/tiddlywiki/codemirror/files/keymap/emacs.js b/plugins/tiddlywiki/codemirror/files/keymap/emacs.js deleted file mode 100755 index 3eec1e576..000000000 --- a/plugins/tiddlywiki/codemirror/files/keymap/emacs.js +++ /dev/null @@ -1,412 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - "use strict"; - - var Pos = CodeMirror.Pos; - function posEq(a, b) { return a.line == b.line && a.ch == b.ch; } - - // Kill 'ring' - - var killRing = []; - function addToRing(str) { - killRing.push(str); - if (killRing.length > 50) killRing.shift(); - } - function growRingTop(str) { - if (!killRing.length) return addToRing(str); - killRing[killRing.length - 1] += str; - } - function getFromRing(n) { return killRing[killRing.length - (n ? Math.min(n, 1) : 1)] || ""; } - function popFromRing() { if (killRing.length > 1) killRing.pop(); return getFromRing(); } - - var lastKill = null; - - function kill(cm, from, to, mayGrow, text) { - if (text == null) text = cm.getRange(from, to); - - if (mayGrow && lastKill && lastKill.cm == cm && posEq(from, lastKill.pos) && cm.isClean(lastKill.gen)) - growRingTop(text); - else - addToRing(text); - cm.replaceRange("", from, to, "+delete"); - - if (mayGrow) lastKill = {cm: cm, pos: from, gen: cm.changeGeneration()}; - else lastKill = null; - } - - // Boundaries of various units - - function byChar(cm, pos, dir) { - return cm.findPosH(pos, dir, "char", true); - } - - function byWord(cm, pos, dir) { - return cm.findPosH(pos, dir, "word", true); - } - - function byLine(cm, pos, dir) { - return cm.findPosV(pos, dir, "line", cm.doc.sel.goalColumn); - } - - function byPage(cm, pos, dir) { - return cm.findPosV(pos, dir, "page", cm.doc.sel.goalColumn); - } - - function byParagraph(cm, pos, dir) { - var no = pos.line, line = cm.getLine(no); - var sawText = /\S/.test(dir < 0 ? line.slice(0, pos.ch) : line.slice(pos.ch)); - var fst = cm.firstLine(), lst = cm.lastLine(); - for (;;) { - no += dir; - if (no < fst || no > lst) - return cm.clipPos(Pos(no - dir, dir < 0 ? 0 : null)); - line = cm.getLine(no); - var hasText = /\S/.test(line); - if (hasText) sawText = true; - else if (sawText) return Pos(no, 0); - } - } - - function bySentence(cm, pos, dir) { - var line = pos.line, ch = pos.ch; - var text = cm.getLine(pos.line), sawWord = false; - for (;;) { - var next = text.charAt(ch + (dir < 0 ? -1 : 0)); - if (!next) { // End/beginning of line reached - if (line == (dir < 0 ? cm.firstLine() : cm.lastLine())) return Pos(line, ch); - text = cm.getLine(line + dir); - if (!/\S/.test(text)) return Pos(line, ch); - line += dir; - ch = dir < 0 ? text.length : 0; - continue; - } - if (sawWord && /[!?.]/.test(next)) return Pos(line, ch + (dir > 0 ? 1 : 0)); - if (!sawWord) sawWord = /\w/.test(next); - ch += dir; - } - } - - function byExpr(cm, pos, dir) { - var wrap; - if (cm.findMatchingBracket && (wrap = cm.findMatchingBracket(pos, true)) - && wrap.match && (wrap.forward ? 1 : -1) == dir) - return dir > 0 ? Pos(wrap.to.line, wrap.to.ch + 1) : wrap.to; - - for (var first = true;; first = false) { - var token = cm.getTokenAt(pos); - var after = Pos(pos.line, dir < 0 ? token.start : token.end); - if (first && dir > 0 && token.end == pos.ch || !/\w/.test(token.string)) { - var newPos = cm.findPosH(after, dir, "char"); - if (posEq(after, newPos)) return pos; - else pos = newPos; - } else { - return after; - } - } - } - - // Prefixes (only crudely supported) - - function getPrefix(cm, precise) { - var digits = cm.state.emacsPrefix; - if (!digits) return precise ? null : 1; - clearPrefix(cm); - return digits == "-" ? -1 : Number(digits); - } - - function repeated(cmd) { - var f = typeof cmd == "string" ? function(cm) { cm.execCommand(cmd); } : cmd; - return function(cm) { - var prefix = getPrefix(cm); - f(cm); - for (var i = 1; i < prefix; ++i) f(cm); - }; - } - - function findEnd(cm, pos, by, dir) { - var prefix = getPrefix(cm); - if (prefix < 0) { dir = -dir; prefix = -prefix; } - for (var i = 0; i < prefix; ++i) { - var newPos = by(cm, pos, dir); - if (posEq(newPos, pos)) break; - pos = newPos; - } - return pos; - } - - function move(by, dir) { - var f = function(cm) { - cm.extendSelection(findEnd(cm, cm.getCursor(), by, dir)); - }; - f.motion = true; - return f; - } - - function killTo(cm, by, dir) { - var selections = cm.listSelections(), cursor; - var i = selections.length; - while (i--) { - cursor = selections[i].head; - kill(cm, cursor, findEnd(cm, cursor, by, dir), true); - } - } - - function killRegion(cm) { - if (cm.somethingSelected()) { - var selections = cm.listSelections(), selection; - var i = selections.length; - while (i--) { - selection = selections[i]; - kill(cm, selection.anchor, selection.head); - } - return true; - } - } - - function addPrefix(cm, digit) { - if (cm.state.emacsPrefix) { - if (digit != "-") cm.state.emacsPrefix += digit; - return; - } - // Not active yet - cm.state.emacsPrefix = digit; - cm.on("keyHandled", maybeClearPrefix); - cm.on("inputRead", maybeDuplicateInput); - } - - var prefixPreservingKeys = {"Alt-G": true, "Ctrl-X": true, "Ctrl-Q": true, "Ctrl-U": true}; - - function maybeClearPrefix(cm, arg) { - if (!cm.state.emacsPrefixMap && !prefixPreservingKeys.hasOwnProperty(arg)) - clearPrefix(cm); - } - - function clearPrefix(cm) { - cm.state.emacsPrefix = null; - cm.off("keyHandled", maybeClearPrefix); - cm.off("inputRead", maybeDuplicateInput); - } - - function maybeDuplicateInput(cm, event) { - var dup = getPrefix(cm); - if (dup > 1 && event.origin == "+input") { - var one = event.text.join("\n"), txt = ""; - for (var i = 1; i < dup; ++i) txt += one; - cm.replaceSelection(txt); - } - } - - function addPrefixMap(cm) { - cm.state.emacsPrefixMap = true; - cm.addKeyMap(prefixMap); - cm.on("keyHandled", maybeRemovePrefixMap); - cm.on("inputRead", maybeRemovePrefixMap); - } - - function maybeRemovePrefixMap(cm, arg) { - if (typeof arg == "string" && (/^\d$/.test(arg) || arg == "Ctrl-U")) return; - cm.removeKeyMap(prefixMap); - cm.state.emacsPrefixMap = false; - cm.off("keyHandled", maybeRemovePrefixMap); - cm.off("inputRead", maybeRemovePrefixMap); - } - - // Utilities - - function setMark(cm) { - cm.setCursor(cm.getCursor()); - cm.setExtending(!cm.getExtending()); - cm.on("change", function() { cm.setExtending(false); }); - } - - function clearMark(cm) { - cm.setExtending(false); - cm.setCursor(cm.getCursor()); - } - - function getInput(cm, msg, f) { - if (cm.openDialog) - cm.openDialog(msg + ": <input type=\"text\" style=\"width: 10em\"/>", f, {bottom: true}); - else - f(prompt(msg, "")); - } - - function operateOnWord(cm, op) { - var start = cm.getCursor(), end = cm.findPosH(start, 1, "word"); - cm.replaceRange(op(cm.getRange(start, end)), start, end); - cm.setCursor(end); - } - - function toEnclosingExpr(cm) { - var pos = cm.getCursor(), line = pos.line, ch = pos.ch; - var stack = []; - while (line >= cm.firstLine()) { - var text = cm.getLine(line); - for (var i = ch == null ? text.length : ch; i > 0;) { - var ch = text.charAt(--i); - if (ch == ")") - stack.push("("); - else if (ch == "]") - stack.push("["); - else if (ch == "}") - stack.push("{"); - else if (/[\(\{\[]/.test(ch) && (!stack.length || stack.pop() != ch)) - return cm.extendSelection(Pos(line, i)); - } - --line; ch = null; - } - } - - function quit(cm) { - cm.execCommand("clearSearch"); - clearMark(cm); - } - - // Actual keymap - - var keyMap = CodeMirror.keyMap.emacs = CodeMirror.normalizeKeyMap({ - "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"));}, - "Ctrl-K": repeated(function(cm) { - var start = cm.getCursor(), end = cm.clipPos(Pos(start.line)); - var text = cm.getRange(start, end); - if (!/\S/.test(text)) { - text += "\n"; - end = Pos(start.line + 1, 0); - } - kill(cm, start, end, true, text); - }), - "Alt-W": function(cm) { - addToRing(cm.getSelection()); - clearMark(cm); - }, - "Ctrl-Y": function(cm) { - var start = cm.getCursor(); - cm.replaceRange(getFromRing(getPrefix(cm)), start, start, "paste"); - cm.setSelection(start, cm.getCursor()); - }, - "Alt-Y": function(cm) {cm.replaceSelection(popFromRing(), "around", "paste");}, - - "Ctrl-Space": setMark, "Ctrl-Shift-2": setMark, - - "Ctrl-F": move(byChar, 1), "Ctrl-B": move(byChar, -1), - "Right": move(byChar, 1), "Left": move(byChar, -1), - "Ctrl-D": function(cm) { killTo(cm, byChar, 1); }, - "Delete": function(cm) { killRegion(cm) || killTo(cm, byChar, 1); }, - "Ctrl-H": function(cm) { killTo(cm, byChar, -1); }, - "Backspace": function(cm) { killRegion(cm) || killTo(cm, byChar, -1); }, - - "Alt-F": move(byWord, 1), "Alt-B": move(byWord, -1), - "Alt-D": function(cm) { killTo(cm, byWord, 1); }, - "Alt-Backspace": function(cm) { killTo(cm, byWord, -1); }, - - "Ctrl-N": move(byLine, 1), "Ctrl-P": move(byLine, -1), - "Down": move(byLine, 1), "Up": move(byLine, -1), - "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd", - "End": "goLineEnd", "Home": "goLineStart", - - "Alt-V": move(byPage, -1), "Ctrl-V": move(byPage, 1), - "PageUp": move(byPage, -1), "PageDown": move(byPage, 1), - - "Ctrl-Up": move(byParagraph, -1), "Ctrl-Down": move(byParagraph, 1), - - "Alt-A": move(bySentence, -1), "Alt-E": move(bySentence, 1), - "Alt-K": function(cm) { killTo(cm, bySentence, 1); }, - - "Ctrl-Alt-K": function(cm) { killTo(cm, byExpr, 1); }, - "Ctrl-Alt-Backspace": function(cm) { killTo(cm, byExpr, -1); }, - "Ctrl-Alt-F": move(byExpr, 1), "Ctrl-Alt-B": move(byExpr, -1), - - "Shift-Ctrl-Alt-2": function(cm) { - var cursor = cm.getCursor(); - cm.setSelection(findEnd(cm, cursor, byExpr, 1), cursor); - }, - "Ctrl-Alt-T": function(cm) { - var leftStart = byExpr(cm, cm.getCursor(), -1), leftEnd = byExpr(cm, leftStart, 1); - var rightEnd = byExpr(cm, leftEnd, 1), rightStart = byExpr(cm, rightEnd, -1); - cm.replaceRange(cm.getRange(rightStart, rightEnd) + cm.getRange(leftEnd, rightStart) + - cm.getRange(leftStart, leftEnd), leftStart, rightEnd); - }, - "Ctrl-Alt-U": repeated(toEnclosingExpr), - - "Alt-Space": function(cm) { - var pos = cm.getCursor(), from = pos.ch, to = pos.ch, text = cm.getLine(pos.line); - while (from && /\s/.test(text.charAt(from - 1))) --from; - while (to < text.length && /\s/.test(text.charAt(to))) ++to; - cm.replaceRange(" ", Pos(pos.line, from), Pos(pos.line, to)); - }, - "Ctrl-O": repeated(function(cm) { cm.replaceSelection("\n", "start"); }), - "Ctrl-T": repeated(function(cm) { - cm.execCommand("transposeChars"); - }), - - "Alt-C": repeated(function(cm) { - operateOnWord(cm, function(w) { - var letter = w.search(/\w/); - if (letter == -1) return w; - return w.slice(0, letter) + w.charAt(letter).toUpperCase() + w.slice(letter + 1).toLowerCase(); - }); - }), - "Alt-U": repeated(function(cm) { - operateOnWord(cm, function(w) { return w.toUpperCase(); }); - }), - "Alt-L": repeated(function(cm) { - operateOnWord(cm, function(w) { return w.toLowerCase(); }); - }), - - "Alt-;": "toggleComment", - - "Ctrl-/": repeated("undo"), "Shift-Ctrl--": repeated("undo"), - "Ctrl-Z": repeated("undo"), "Cmd-Z": repeated("undo"), - "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd", - "Ctrl-S": "findNext", "Ctrl-R": "findPrev", "Ctrl-G": quit, "Shift-Alt-5": "replace", - "Alt-/": "autocomplete", - "Ctrl-J": "newlineAndIndent", "Enter": false, "Tab": "indentAuto", - - "Alt-G G": function(cm) { - var prefix = getPrefix(cm, true); - if (prefix != null && prefix > 0) return cm.setCursor(prefix - 1); - - getInput(cm, "Goto line", function(str) { - var num; - if (str && !isNaN(num = Number(str)) && num == (num|0) && num > 0) - cm.setCursor(num - 1); - }); - }, - - "Ctrl-X Tab": function(cm) { - cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit")); - }, - "Ctrl-X Ctrl-X": function(cm) { - cm.setSelection(cm.getCursor("head"), cm.getCursor("anchor")); - }, - "Ctrl-X Ctrl-S": "save", - "Ctrl-X Ctrl-W": "save", - "Ctrl-X S": "saveAll", - "Ctrl-X F": "open", - "Ctrl-X U": repeated("undo"), - "Ctrl-X K": "close", - "Ctrl-X Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), true); }, - "Ctrl-X H": "selectAll", - - "Ctrl-Q Tab": repeated("insertTab"), - "Ctrl-U": addPrefixMap - }); - - var prefixMap = {"Ctrl-G": clearPrefix}; - function regPrefix(d) { - prefixMap[d] = function(cm) { addPrefix(cm, d); }; - keyMap["Ctrl-" + d] = function(cm) { addPrefix(cm, d); }; - prefixPreservingKeys["Ctrl-" + d] = true; - } - for (var i = 0; i < 10; ++i) regPrefix(String(i)); - regPrefix("-"); -}); diff --git a/plugins/tiddlywiki/codemirror/files/keymap/sublime.js b/plugins/tiddlywiki/codemirror/files/keymap/sublime.js deleted file mode 100755 index 49db3b871..000000000 --- a/plugins/tiddlywiki/codemirror/files/keymap/sublime.js +++ /dev/null @@ -1,569 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -// A rough approximation of Sublime Text's keybindings -// Depends on addon/search/searchcursor.js and optionally addon/dialog/dialogs.js - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/edit/matchbrackets")); - else if (typeof define == "function" && define.amd) // AMD - define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/edit/matchbrackets"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - "use strict"; - - var map = CodeMirror.keyMap.sublime = {fallthrough: "default"}; - var cmds = CodeMirror.commands; - var Pos = CodeMirror.Pos; - var mac = CodeMirror.keyMap["default"] == CodeMirror.keyMap.macDefault; - var ctrl = mac ? "Cmd-" : "Ctrl-"; - - // This is not exactly Sublime's algorithm. I couldn't make heads or tails of that. - function findPosSubword(doc, start, dir) { - if (dir < 0 && start.ch == 0) return doc.clipPos(Pos(start.line - 1)); - var line = doc.getLine(start.line); - if (dir > 0 && start.ch >= line.length) return doc.clipPos(Pos(start.line + 1, 0)); - var state = "start", type; - for (var pos = start.ch, e = dir < 0 ? 0 : line.length, i = 0; pos != e; pos += dir, i++) { - var next = line.charAt(dir < 0 ? pos - 1 : pos); - var cat = next != "_" && CodeMirror.isWordChar(next) ? "w" : "o"; - if (cat == "w" && next.toUpperCase() == next) cat = "W"; - if (state == "start") { - if (cat != "o") { state = "in"; type = cat; } - } else if (state == "in") { - if (type != cat) { - if (type == "w" && cat == "W" && dir < 0) pos--; - if (type == "W" && cat == "w" && dir > 0) { type = "w"; continue; } - break; - } - } - } - return Pos(start.line, pos); - } - - function moveSubword(cm, dir) { - cm.extendSelectionsBy(function(range) { - if (cm.display.shift || cm.doc.extend || range.empty()) - return findPosSubword(cm.doc, range.head, dir); - else - return dir < 0 ? range.from() : range.to(); - }); - } - - cmds[map["Alt-Left"] = "goSubwordLeft"] = function(cm) { moveSubword(cm, -1); }; - cmds[map["Alt-Right"] = "goSubwordRight"] = function(cm) { moveSubword(cm, 1); }; - - var scrollLineCombo = mac ? "Ctrl-Alt-" : "Ctrl-"; - - cmds[map[scrollLineCombo + "Up"] = "scrollLineUp"] = function(cm) { - var info = cm.getScrollInfo(); - if (!cm.somethingSelected()) { - var visibleBottomLine = cm.lineAtHeight(info.top + info.clientHeight, "local"); - if (cm.getCursor().line >= visibleBottomLine) - cm.execCommand("goLineUp"); - } - cm.scrollTo(null, info.top - cm.defaultTextHeight()); - }; - cmds[map[scrollLineCombo + "Down"] = "scrollLineDown"] = function(cm) { - var info = cm.getScrollInfo(); - if (!cm.somethingSelected()) { - var visibleTopLine = cm.lineAtHeight(info.top, "local")+1; - if (cm.getCursor().line <= visibleTopLine) - cm.execCommand("goLineDown"); - } - cm.scrollTo(null, info.top + cm.defaultTextHeight()); - }; - - cmds[map["Shift-" + ctrl + "L"] = "splitSelectionByLine"] = function(cm) { - var ranges = cm.listSelections(), lineRanges = []; - for (var i = 0; i < ranges.length; i++) { - var from = ranges[i].from(), to = ranges[i].to(); - for (var line = from.line; line <= to.line; ++line) - if (!(to.line > from.line && line == to.line && to.ch == 0)) - lineRanges.push({anchor: line == from.line ? from : Pos(line, 0), - head: line == to.line ? to : Pos(line)}); - } - cm.setSelections(lineRanges, 0); - }; - - map["Shift-Tab"] = "indentLess"; - - cmds[map["Esc"] = "singleSelectionTop"] = function(cm) { - var range = cm.listSelections()[0]; - cm.setSelection(range.anchor, range.head, {scroll: false}); - }; - - cmds[map[ctrl + "L"] = "selectLine"] = function(cm) { - var ranges = cm.listSelections(), extended = []; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i]; - extended.push({anchor: Pos(range.from().line, 0), - head: Pos(range.to().line + 1, 0)}); - } - cm.setSelections(extended); - }; - - map["Shift-Ctrl-K"] = "deleteLine"; - - function insertLine(cm, above) { - if (cm.isReadOnly()) return CodeMirror.Pass - cm.operation(function() { - var len = cm.listSelections().length, newSelection = [], last = -1; - for (var i = 0; i < len; i++) { - var head = cm.listSelections()[i].head; - if (head.line <= last) continue; - var at = Pos(head.line + (above ? 0 : 1), 0); - cm.replaceRange("\n", at, null, "+insertLine"); - cm.indentLine(at.line, null, true); - newSelection.push({head: at, anchor: at}); - last = head.line + 1; - } - cm.setSelections(newSelection); - }); - } - - cmds[map[ctrl + "Enter"] = "insertLineAfter"] = function(cm) { return insertLine(cm, false); }; - - cmds[map["Shift-" + ctrl + "Enter"] = "insertLineBefore"] = function(cm) { return insertLine(cm, true); }; - - function wordAt(cm, pos) { - var start = pos.ch, end = start, line = cm.getLine(pos.line); - while (start && CodeMirror.isWordChar(line.charAt(start - 1))) --start; - while (end < line.length && CodeMirror.isWordChar(line.charAt(end))) ++end; - return {from: Pos(pos.line, start), to: Pos(pos.line, end), word: line.slice(start, end)}; - } - - cmds[map[ctrl + "D"] = "selectNextOccurrence"] = function(cm) { - var from = cm.getCursor("from"), to = cm.getCursor("to"); - var fullWord = cm.state.sublimeFindFullWord == cm.doc.sel; - if (CodeMirror.cmpPos(from, to) == 0) { - var word = wordAt(cm, from); - if (!word.word) return; - cm.setSelection(word.from, word.to); - fullWord = true; - } else { - var text = cm.getRange(from, to); - var query = fullWord ? new RegExp("\\b" + text + "\\b") : text; - var cur = cm.getSearchCursor(query, to); - if (cur.findNext()) { - cm.addSelection(cur.from(), cur.to()); - } else { - cur = cm.getSearchCursor(query, Pos(cm.firstLine(), 0)); - if (cur.findNext()) - cm.addSelection(cur.from(), cur.to()); - } - } - if (fullWord) - cm.state.sublimeFindFullWord = cm.doc.sel; - }; - - var mirror = "(){}[]"; - function selectBetweenBrackets(cm) { - var pos = cm.getCursor(), opening = cm.scanForBracket(pos, -1); - if (!opening) return; - for (;;) { - var closing = cm.scanForBracket(pos, 1); - if (!closing) return; - if (closing.ch == mirror.charAt(mirror.indexOf(opening.ch) + 1)) { - cm.setSelection(Pos(opening.pos.line, opening.pos.ch + 1), closing.pos, false); - return true; - } - pos = Pos(closing.pos.line, closing.pos.ch + 1); - } - } - - cmds[map["Shift-" + ctrl + "Space"] = "selectScope"] = function(cm) { - selectBetweenBrackets(cm) || cm.execCommand("selectAll"); - }; - cmds[map["Shift-" + ctrl + "M"] = "selectBetweenBrackets"] = function(cm) { - if (!selectBetweenBrackets(cm)) return CodeMirror.Pass; - }; - - cmds[map[ctrl + "M"] = "goToBracket"] = function(cm) { - cm.extendSelectionsBy(function(range) { - var next = cm.scanForBracket(range.head, 1); - if (next && CodeMirror.cmpPos(next.pos, range.head) != 0) return next.pos; - var prev = cm.scanForBracket(range.head, -1); - return prev && Pos(prev.pos.line, prev.pos.ch + 1) || range.head; - }); - }; - - var swapLineCombo = mac ? "Cmd-Ctrl-" : "Shift-Ctrl-"; - - cmds[map[swapLineCombo + "Up"] = "swapLineUp"] = function(cm) { - if (cm.isReadOnly()) return CodeMirror.Pass - var ranges = cm.listSelections(), linesToMove = [], at = cm.firstLine() - 1, newSels = []; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i], from = range.from().line - 1, to = range.to().line; - newSels.push({anchor: Pos(range.anchor.line - 1, range.anchor.ch), - head: Pos(range.head.line - 1, range.head.ch)}); - if (range.to().ch == 0 && !range.empty()) --to; - if (from > at) linesToMove.push(from, to); - else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to; - at = to; - } - cm.operation(function() { - for (var i = 0; i < linesToMove.length; i += 2) { - var from = linesToMove[i], to = linesToMove[i + 1]; - var line = cm.getLine(from); - cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine"); - if (to > cm.lastLine()) - cm.replaceRange("\n" + line, Pos(cm.lastLine()), null, "+swapLine"); - else - cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine"); - } - cm.setSelections(newSels); - cm.scrollIntoView(); - }); - }; - - cmds[map[swapLineCombo + "Down"] = "swapLineDown"] = function(cm) { - if (cm.isReadOnly()) return CodeMirror.Pass - var ranges = cm.listSelections(), linesToMove = [], at = cm.lastLine() + 1; - for (var i = ranges.length - 1; i >= 0; i--) { - var range = ranges[i], from = range.to().line + 1, to = range.from().line; - if (range.to().ch == 0 && !range.empty()) from--; - if (from < at) linesToMove.push(from, to); - else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to; - at = to; - } - cm.operation(function() { - for (var i = linesToMove.length - 2; i >= 0; i -= 2) { - var from = linesToMove[i], to = linesToMove[i + 1]; - var line = cm.getLine(from); - if (from == cm.lastLine()) - cm.replaceRange("", Pos(from - 1), Pos(from), "+swapLine"); - else - cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine"); - cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine"); - } - cm.scrollIntoView(); - }); - }; - - cmds[map[ctrl + "/"] = "toggleCommentIndented"] = function(cm) { - cm.toggleComment({ indent: true }); - } - - cmds[map[ctrl + "J"] = "joinLines"] = function(cm) { - var ranges = cm.listSelections(), joined = []; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i], from = range.from(); - var start = from.line, end = range.to().line; - while (i < ranges.length - 1 && ranges[i + 1].from().line == end) - end = ranges[++i].to().line; - joined.push({start: start, end: end, anchor: !range.empty() && from}); - } - cm.operation(function() { - var offset = 0, ranges = []; - for (var i = 0; i < joined.length; i++) { - var obj = joined[i]; - var anchor = obj.anchor && Pos(obj.anchor.line - offset, obj.anchor.ch), head; - for (var line = obj.start; line <= obj.end; line++) { - var actual = line - offset; - if (line == obj.end) head = Pos(actual, cm.getLine(actual).length + 1); - if (actual < cm.lastLine()) { - cm.replaceRange(" ", Pos(actual), Pos(actual + 1, /^\s*/.exec(cm.getLine(actual + 1))[0].length)); - ++offset; - } - } - ranges.push({anchor: anchor || head, head: head}); - } - cm.setSelections(ranges, 0); - }); - }; - - cmds[map["Shift-" + ctrl + "D"] = "duplicateLine"] = function(cm) { - cm.operation(function() { - var rangeCount = cm.listSelections().length; - for (var i = 0; i < rangeCount; i++) { - var range = cm.listSelections()[i]; - if (range.empty()) - cm.replaceRange(cm.getLine(range.head.line) + "\n", Pos(range.head.line, 0)); - else - cm.replaceRange(cm.getRange(range.from(), range.to()), range.from()); - } - cm.scrollIntoView(); - }); - }; - - map[ctrl + "T"] = "transposeChars"; - - function sortLines(cm, caseSensitive) { - if (cm.isReadOnly()) return CodeMirror.Pass - var ranges = cm.listSelections(), toSort = [], selected; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i]; - if (range.empty()) continue; - var from = range.from().line, to = range.to().line; - while (i < ranges.length - 1 && ranges[i + 1].from().line == to) - to = range[++i].to().line; - toSort.push(from, to); - } - if (toSort.length) selected = true; - else toSort.push(cm.firstLine(), cm.lastLine()); - - cm.operation(function() { - var ranges = []; - for (var i = 0; i < toSort.length; i += 2) { - var from = toSort[i], to = toSort[i + 1]; - var start = Pos(from, 0), end = Pos(to); - var lines = cm.getRange(start, end, false); - if (caseSensitive) - lines.sort(); - else - lines.sort(function(a, b) { - var au = a.toUpperCase(), bu = b.toUpperCase(); - if (au != bu) { a = au; b = bu; } - return a < b ? -1 : a == b ? 0 : 1; - }); - cm.replaceRange(lines, start, end); - if (selected) ranges.push({anchor: start, head: end}); - } - if (selected) cm.setSelections(ranges, 0); - }); - } - - cmds[map["F9"] = "sortLines"] = function(cm) { sortLines(cm, true); }; - cmds[map[ctrl + "F9"] = "sortLinesInsensitive"] = function(cm) { sortLines(cm, false); }; - - cmds[map["F2"] = "nextBookmark"] = function(cm) { - var marks = cm.state.sublimeBookmarks; - if (marks) while (marks.length) { - var current = marks.shift(); - var found = current.find(); - if (found) { - marks.push(current); - return cm.setSelection(found.from, found.to); - } - } - }; - - cmds[map["Shift-F2"] = "prevBookmark"] = function(cm) { - var marks = cm.state.sublimeBookmarks; - if (marks) while (marks.length) { - marks.unshift(marks.pop()); - var found = marks[marks.length - 1].find(); - if (!found) - marks.pop(); - else - return cm.setSelection(found.from, found.to); - } - }; - - cmds[map[ctrl + "F2"] = "toggleBookmark"] = function(cm) { - var ranges = cm.listSelections(); - var marks = cm.state.sublimeBookmarks || (cm.state.sublimeBookmarks = []); - for (var i = 0; i < ranges.length; i++) { - var from = ranges[i].from(), to = ranges[i].to(); - var found = cm.findMarks(from, to); - for (var j = 0; j < found.length; j++) { - if (found[j].sublimeBookmark) { - found[j].clear(); - for (var k = 0; k < marks.length; k++) - if (marks[k] == found[j]) - marks.splice(k--, 1); - break; - } - } - if (j == found.length) - marks.push(cm.markText(from, to, {sublimeBookmark: true, clearWhenEmpty: false})); - } - }; - - cmds[map["Shift-" + ctrl + "F2"] = "clearBookmarks"] = function(cm) { - var marks = cm.state.sublimeBookmarks; - if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear(); - marks.length = 0; - }; - - cmds[map["Alt-F2"] = "selectBookmarks"] = function(cm) { - var marks = cm.state.sublimeBookmarks, ranges = []; - if (marks) for (var i = 0; i < marks.length; i++) { - var found = marks[i].find(); - if (!found) - marks.splice(i--, 0); - else - ranges.push({anchor: found.from, head: found.to}); - } - if (ranges.length) - cm.setSelections(ranges, 0); - }; - - map["Alt-Q"] = "wrapLines"; - - var cK = ctrl + "K "; - - function modifyWordOrSelection(cm, mod) { - cm.operation(function() { - var ranges = cm.listSelections(), indices = [], replacements = []; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i]; - if (range.empty()) { indices.push(i); replacements.push(""); } - else replacements.push(mod(cm.getRange(range.from(), range.to()))); - } - cm.replaceSelections(replacements, "around", "case"); - for (var i = indices.length - 1, at; i >= 0; i--) { - var range = ranges[indices[i]]; - if (at && CodeMirror.cmpPos(range.head, at) > 0) continue; - var word = wordAt(cm, range.head); - at = word.from; - cm.replaceRange(mod(word.word), word.from, word.to); - } - }); - } - - map[cK + ctrl + "Backspace"] = "delLineLeft"; - - cmds[map["Backspace"] = "smartBackspace"] = function(cm) { - if (cm.somethingSelected()) return CodeMirror.Pass; - - var cursor = cm.getCursor(); - var toStartOfLine = cm.getRange({line: cursor.line, ch: 0}, cursor); - var column = CodeMirror.countColumn(toStartOfLine, null, cm.getOption("tabSize")); - var indentUnit = cm.getOption("indentUnit"); - - if (toStartOfLine && !/\S/.test(toStartOfLine) && column % indentUnit == 0) { - var prevIndent = new Pos(cursor.line, - CodeMirror.findColumn(toStartOfLine, column - indentUnit, indentUnit)); - - // If no smart delete is happening (due to tab sizing) just do a regular delete - if (prevIndent.ch == cursor.ch) return CodeMirror.Pass; - - return cm.replaceRange("", prevIndent, cursor, "+delete"); - } else { - return CodeMirror.Pass; - } - }; - - cmds[map[cK + ctrl + "K"] = "delLineRight"] = function(cm) { - cm.operation(function() { - var ranges = cm.listSelections(); - for (var i = ranges.length - 1; i >= 0; i--) - cm.replaceRange("", ranges[i].anchor, Pos(ranges[i].to().line), "+delete"); - cm.scrollIntoView(); - }); - }; - - cmds[map[cK + ctrl + "U"] = "upcaseAtCursor"] = function(cm) { - modifyWordOrSelection(cm, function(str) { return str.toUpperCase(); }); - }; - cmds[map[cK + ctrl + "L"] = "downcaseAtCursor"] = function(cm) { - modifyWordOrSelection(cm, function(str) { return str.toLowerCase(); }); - }; - - cmds[map[cK + ctrl + "Space"] = "setSublimeMark"] = function(cm) { - if (cm.state.sublimeMark) cm.state.sublimeMark.clear(); - cm.state.sublimeMark = cm.setBookmark(cm.getCursor()); - }; - cmds[map[cK + ctrl + "A"] = "selectToSublimeMark"] = function(cm) { - var found = cm.state.sublimeMark && cm.state.sublimeMark.find(); - if (found) cm.setSelection(cm.getCursor(), found); - }; - cmds[map[cK + ctrl + "W"] = "deleteToSublimeMark"] = function(cm) { - var found = cm.state.sublimeMark && cm.state.sublimeMark.find(); - if (found) { - var from = cm.getCursor(), to = found; - if (CodeMirror.cmpPos(from, to) > 0) { var tmp = to; to = from; from = tmp; } - cm.state.sublimeKilled = cm.getRange(from, to); - cm.replaceRange("", from, to); - } - }; - cmds[map[cK + ctrl + "X"] = "swapWithSublimeMark"] = function(cm) { - var found = cm.state.sublimeMark && cm.state.sublimeMark.find(); - if (found) { - cm.state.sublimeMark.clear(); - cm.state.sublimeMark = cm.setBookmark(cm.getCursor()); - cm.setCursor(found); - } - }; - cmds[map[cK + ctrl + "Y"] = "sublimeYank"] = function(cm) { - if (cm.state.sublimeKilled != null) - cm.replaceSelection(cm.state.sublimeKilled, null, "paste"); - }; - - map[cK + ctrl + "G"] = "clearBookmarks"; - cmds[map[cK + ctrl + "C"] = "showInCenter"] = function(cm) { - var pos = cm.cursorCoords(null, "local"); - cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2); - }; - - cmds[map["Shift-Alt-Up"] = "selectLinesUpward"] = function(cm) { - cm.operation(function() { - var ranges = cm.listSelections(); - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i]; - if (range.head.line > cm.firstLine()) - cm.addSelection(Pos(range.head.line - 1, range.head.ch)); - } - }); - }; - cmds[map["Shift-Alt-Down"] = "selectLinesDownward"] = function(cm) { - cm.operation(function() { - var ranges = cm.listSelections(); - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i]; - if (range.head.line < cm.lastLine()) - cm.addSelection(Pos(range.head.line + 1, range.head.ch)); - } - }); - }; - - function getTarget(cm) { - var from = cm.getCursor("from"), to = cm.getCursor("to"); - if (CodeMirror.cmpPos(from, to) == 0) { - var word = wordAt(cm, from); - if (!word.word) return; - from = word.from; - to = word.to; - } - return {from: from, to: to, query: cm.getRange(from, to), word: word}; - } - - function findAndGoTo(cm, forward) { - var target = getTarget(cm); - if (!target) return; - var query = target.query; - var cur = cm.getSearchCursor(query, forward ? target.to : target.from); - - if (forward ? cur.findNext() : cur.findPrevious()) { - cm.setSelection(cur.from(), cur.to()); - } else { - cur = cm.getSearchCursor(query, forward ? Pos(cm.firstLine(), 0) - : cm.clipPos(Pos(cm.lastLine()))); - if (forward ? cur.findNext() : cur.findPrevious()) - cm.setSelection(cur.from(), cur.to()); - else if (target.word) - cm.setSelection(target.from, target.to); - } - }; - cmds[map[ctrl + "F3"] = "findUnder"] = function(cm) { findAndGoTo(cm, true); }; - cmds[map["Shift-" + ctrl + "F3"] = "findUnderPrevious"] = function(cm) { findAndGoTo(cm,false); }; - cmds[map["Alt-F3"] = "findAllUnder"] = function(cm) { - var target = getTarget(cm); - if (!target) return; - var cur = cm.getSearchCursor(target.query); - var matches = []; - var primaryIndex = -1; - while (cur.findNext()) { - matches.push({anchor: cur.from(), head: cur.to()}); - if (cur.from().line <= target.from.line && cur.from().ch <= target.from.ch) - primaryIndex++; - } - cm.setSelections(matches, primaryIndex); - }; - - map["Shift-" + ctrl + "["] = "fold"; - map["Shift-" + ctrl + "]"] = "unfold"; - map[cK + ctrl + "0"] = map[cK + ctrl + "j"] = "unfoldAll"; - - map[ctrl + "I"] = "findIncremental"; - map["Shift-" + ctrl + "I"] = "findIncrementalReverse"; - map[ctrl + "H"] = "replace"; - map["F3"] = "findNext"; - map["Shift-F3"] = "findPrev"; - - CodeMirror.normalizeKeyMap(map); -}); diff --git a/plugins/tiddlywiki/codemirror/files/keymap/vim.js b/plugins/tiddlywiki/codemirror/files/keymap/vim.js deleted file mode 100755 index 5ed2d9bf7..000000000 --- a/plugins/tiddlywiki/codemirror/files/keymap/vim.js +++ /dev/null @@ -1,5066 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/** - * Supported keybindings: - * Too many to list. Refer to defaultKeyMap below. - * - * Supported Ex commands: - * Refer to defaultExCommandMap below. - * - * Registers: unnamed, -, a-z, A-Z, 0-9 - * (Does not respect the special case for number registers when delete - * operator is made with these commands: %, (, ), , /, ?, n, N, {, } ) - * TODO: Implement the remaining registers. - * - * Marks: a-z, A-Z, and 0-9 - * TODO: Implement the remaining special marks. They have more complex - * behavior. - * - * Events: - * 'vim-mode-change' - raised on the editor anytime the current mode changes, - * Event object: {mode: "visual", subMode: "linewise"} - * - * Code structure: - * 1. Default keymap - * 2. Variable declarations and short basic helpers - * 3. Instance (External API) implementation - * 4. Internal state tracking objects (input state, counter) implementation - * and instanstiation - * 5. Key handler (the main command dispatcher) implementation - * 6. Motion, operator, and action implementations - * 7. Helper functions for the key handler, motions, operators, and actions - * 8. Set up Vim to work as a keymap for CodeMirror. - * 9. Ex command implementations. - */ - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/dialog/dialog"), require("../addon/edit/matchbrackets.js")); - else if (typeof define == "function" && define.amd) // AMD - define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/dialog/dialog", "../addon/edit/matchbrackets"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - 'use strict'; - - var defaultKeymap = [ - // Key to key mapping. This goes first to make it possible to override - // existing mappings. - { keys: '<Left>', type: 'keyToKey', toKeys: 'h' }, - { keys: '<Right>', type: 'keyToKey', toKeys: 'l' }, - { keys: '<Up>', type: 'keyToKey', toKeys: 'k' }, - { keys: '<Down>', type: 'keyToKey', toKeys: 'j' }, - { keys: '<Space>', type: 'keyToKey', toKeys: 'l' }, - { keys: '<BS>', type: 'keyToKey', toKeys: 'h', context: 'normal'}, - { keys: '<C-Space>', type: 'keyToKey', toKeys: 'W' }, - { keys: '<C-BS>', type: 'keyToKey', toKeys: 'B', context: 'normal' }, - { keys: '<S-Space>', type: 'keyToKey', toKeys: 'w' }, - { keys: '<S-BS>', type: 'keyToKey', toKeys: 'b', context: 'normal' }, - { keys: '<C-n>', type: 'keyToKey', toKeys: 'j' }, - { keys: '<C-p>', type: 'keyToKey', toKeys: 'k' }, - { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>' }, - { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>' }, - { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' }, - { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' }, - { keys: 's', type: 'keyToKey', toKeys: 'cl', context: 'normal' }, - { keys: 's', type: 'keyToKey', toKeys: 'c', context: 'visual'}, - { keys: 'S', type: 'keyToKey', toKeys: 'cc', context: 'normal' }, - { keys: 'S', type: 'keyToKey', toKeys: 'VdO', context: 'visual' }, - { keys: '<Home>', type: 'keyToKey', toKeys: '0' }, - { keys: '<End>', type: 'keyToKey', toKeys: '$' }, - { keys: '<PageUp>', type: 'keyToKey', toKeys: '<C-b>' }, - { keys: '<PageDown>', type: 'keyToKey', toKeys: '<C-f>' }, - { keys: '<CR>', type: 'keyToKey', toKeys: 'j^', context: 'normal' }, - // Motions - { keys: 'H', type: 'motion', motion: 'moveToTopLine', motionArgs: { linewise: true, toJumplist: true }}, - { keys: 'M', type: 'motion', motion: 'moveToMiddleLine', motionArgs: { linewise: true, toJumplist: true }}, - { keys: 'L', type: 'motion', motion: 'moveToBottomLine', motionArgs: { linewise: true, toJumplist: true }}, - { keys: 'h', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: false }}, - { keys: 'l', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: true }}, - { keys: 'j', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, linewise: true }}, - { keys: 'k', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, linewise: true }}, - { keys: 'gj', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: true }}, - { keys: 'gk', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: false }}, - { keys: 'w', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false }}, - { keys: 'W', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false, bigWord: true }}, - { keys: 'e', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, inclusive: true }}, - { keys: 'E', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, bigWord: true, inclusive: true }}, - { keys: 'b', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }}, - { keys: 'B', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false, bigWord: true }}, - { keys: 'ge', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, inclusive: true }}, - { keys: 'gE', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, bigWord: true, inclusive: true }}, - { keys: '{', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: false, toJumplist: true }}, - { keys: '}', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: true, toJumplist: true }}, - { keys: '<C-f>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: true }}, - { keys: '<C-b>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: false }}, - { keys: '<C-d>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: true, explicitRepeat: true }}, - { keys: '<C-u>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: false, explicitRepeat: true }}, - { keys: 'gg', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }}, - { keys: 'G', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }}, - { keys: '0', type: 'motion', motion: 'moveToStartOfLine' }, - { keys: '^', type: 'motion', motion: 'moveToFirstNonWhiteSpaceCharacter' }, - { keys: '+', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true }}, - { keys: '-', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, toFirstChar:true }}, - { keys: '_', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true, repeatOffset:-1 }}, - { keys: '$', type: 'motion', motion: 'moveToEol', motionArgs: { inclusive: true }}, - { keys: '%', type: 'motion', motion: 'moveToMatchedSymbol', motionArgs: { inclusive: true, toJumplist: true }}, - { keys: 'f<character>', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: true , inclusive: true }}, - { keys: 'F<character>', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: false }}, - { keys: 't<character>', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: true, inclusive: true }}, - { keys: 'T<character>', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: false }}, - { keys: ';', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: true }}, - { keys: ',', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: false }}, - { keys: '\'<character>', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true, linewise: true}}, - { keys: '`<character>', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true}}, - { keys: ']`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } }, - { keys: '[`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } }, - { keys: ']\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } }, - { keys: '[\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } }, - // the next two aren't motions but must come before more general motion declarations - { keys: ']p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true, matchIndent: true}}, - { keys: '[p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true, matchIndent: true}}, - { keys: ']<character>', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: true, toJumplist: true}}, - { keys: '[<character>', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: false, toJumplist: true}}, - { keys: '|', type: 'motion', motion: 'moveToColumn'}, - { keys: 'o', type: 'motion', motion: 'moveToOtherHighlightedEnd', context:'visual'}, - { keys: 'O', type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: {sameLine: true}, context:'visual'}, - // Operators - { keys: 'd', type: 'operator', operator: 'delete' }, - { keys: 'y', type: 'operator', operator: 'yank' }, - { keys: 'c', type: 'operator', operator: 'change' }, - { keys: '>', type: 'operator', operator: 'indent', operatorArgs: { indentRight: true }}, - { keys: '<', type: 'operator', operator: 'indent', operatorArgs: { indentRight: false }}, - { keys: 'g~', type: 'operator', operator: 'changeCase' }, - { keys: 'gu', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, isEdit: true }, - { keys: 'gU', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, isEdit: true }, - { keys: 'n', type: 'motion', motion: 'findNext', motionArgs: { forward: true, toJumplist: true }}, - { keys: 'N', type: 'motion', motion: 'findNext', motionArgs: { forward: false, toJumplist: true }}, - // Operator-Motion dual commands - { keys: 'x', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorMotionArgs: { visualLine: false }}, - { keys: 'X', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: false }, operatorMotionArgs: { visualLine: true }}, - { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'}, - { keys: 'D', type: 'operator', operator: 'delete', operatorArgs: { linewise: true }, context: 'visual'}, - { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'}, - { keys: 'Y', type: 'operator', operator: 'yank', operatorArgs: { linewise: true }, context: 'visual'}, - { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'}, - { keys: 'C', type: 'operator', operator: 'change', operatorArgs: { linewise: true }, context: 'visual'}, - { keys: '~', type: 'operatorMotion', operator: 'changeCase', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorArgs: { shouldMoveCursor: true }, context: 'normal'}, - { keys: '~', type: 'operator', operator: 'changeCase', context: 'visual'}, - { keys: '<C-w>', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' }, - // Actions - { keys: '<C-i>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }}, - { keys: '<C-o>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: false }}, - { keys: '<C-e>', type: 'action', action: 'scroll', actionArgs: { forward: true, linewise: true }}, - { keys: '<C-y>', type: 'action', action: 'scroll', actionArgs: { forward: false, linewise: true }}, - { keys: 'a', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'charAfter' }, context: 'normal' }, - { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }, context: 'normal' }, - { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' }, - { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }, context: 'normal' }, - { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank'}, context: 'normal' }, - { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'startOfSelectedArea' }, context: 'visual' }, - { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }, context: 'normal' }, - { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }, context: 'normal' }, - { keys: 'v', type: 'action', action: 'toggleVisualMode' }, - { keys: 'V', type: 'action', action: 'toggleVisualMode', actionArgs: { linewise: true }}, - { keys: '<C-v>', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }}, - { keys: '<C-q>', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }}, - { keys: 'gv', type: 'action', action: 'reselectLastSelection' }, - { keys: 'J', type: 'action', action: 'joinLines', isEdit: true }, - { keys: 'p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true }}, - { keys: 'P', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true }}, - { keys: 'r<character>', type: 'action', action: 'replace', isEdit: true }, - { keys: '@<character>', type: 'action', action: 'replayMacro' }, - { keys: 'q<character>', type: 'action', action: 'enterMacroRecordMode' }, - // Handle Replace-mode as a special case of insert mode. - { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }}, - { keys: 'u', type: 'action', action: 'undo', context: 'normal' }, - { keys: 'u', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, context: 'visual', isEdit: true }, - { keys: 'U', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, context: 'visual', isEdit: true }, - { keys: '<C-r>', type: 'action', action: 'redo' }, - { keys: 'm<character>', type: 'action', action: 'setMark' }, - { keys: '"<character>', type: 'action', action: 'setRegister' }, - { keys: 'zz', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }}, - { keys: 'z.', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }, motion: 'moveToFirstNonWhiteSpaceCharacter' }, - { keys: 'zt', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }}, - { keys: 'z<CR>', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }, motion: 'moveToFirstNonWhiteSpaceCharacter' }, - { keys: 'z-', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }}, - { keys: 'zb', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }, motion: 'moveToFirstNonWhiteSpaceCharacter' }, - { keys: '.', type: 'action', action: 'repeatLastEdit' }, - { keys: '<C-a>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: true, backtrack: false}}, - { keys: '<C-x>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: false, backtrack: false}}, - // Text object motions - { keys: 'a<character>', type: 'motion', motion: 'textObjectManipulation' }, - { keys: 'i<character>', type: 'motion', motion: 'textObjectManipulation', motionArgs: { textObjectInner: true }}, - // Search - { keys: '/', type: 'search', searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }}, - { keys: '?', type: 'search', searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }}, - { keys: '*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }}, - { keys: '#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }}, - { keys: 'g*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }}, - { keys: 'g#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }}, - // Ex command - { keys: ':', type: 'ex' } - ]; - - /** - * Ex commands - * Care must be taken when adding to the default Ex command map. For any - * pair of commands that have a shared prefix, at least one of their - * shortNames must not match the prefix of the other command. - */ - var defaultExCommandMap = [ - { name: 'colorscheme', shortName: 'colo' }, - { name: 'map' }, - { name: 'imap', shortName: 'im' }, - { name: 'nmap', shortName: 'nm' }, - { name: 'vmap', shortName: 'vm' }, - { name: 'unmap' }, - { name: 'write', shortName: 'w' }, - { name: 'undo', shortName: 'u' }, - { name: 'redo', shortName: 'red' }, - { name: 'set', shortName: 'se' }, - { name: 'set', shortName: 'se' }, - { name: 'setlocal', shortName: 'setl' }, - { name: 'setglobal', shortName: 'setg' }, - { name: 'sort', shortName: 'sor' }, - { name: 'substitute', shortName: 's', possiblyAsync: true }, - { name: 'nohlsearch', shortName: 'noh' }, - { name: 'delmarks', shortName: 'delm' }, - { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true }, - { name: 'global', shortName: 'g' } - ]; - - var Pos = CodeMirror.Pos; - - var Vim = function() { - function enterVimMode(cm) { - cm.setOption('disableInput', true); - cm.setOption('showCursorWhenSelecting', false); - CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"}); - cm.on('cursorActivity', onCursorActivity); - maybeInitVimState(cm); - CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm)); - } - - function leaveVimMode(cm) { - cm.setOption('disableInput', false); - cm.off('cursorActivity', onCursorActivity); - CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm)); - cm.state.vim = null; - } - - function detachVimMap(cm, next) { - if (this == CodeMirror.keyMap.vim) - CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor"); - - if (!next || next.attach != attachVimMap) - leaveVimMode(cm, false); - } - function attachVimMap(cm, prev) { - if (this == CodeMirror.keyMap.vim) - CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor"); - - if (!prev || prev.attach != attachVimMap) - enterVimMode(cm); - } - - // Deprecated, simply setting the keymap works again. - CodeMirror.defineOption('vimMode', false, function(cm, val, prev) { - if (val && cm.getOption("keyMap") != "vim") - cm.setOption("keyMap", "vim"); - else if (!val && prev != CodeMirror.Init && /^vim/.test(cm.getOption("keyMap"))) - cm.setOption("keyMap", "default"); - }); - - function cmKey(key, cm) { - if (!cm) { return undefined; } - var vimKey = cmKeyToVimKey(key); - if (!vimKey) { - return false; - } - var cmd = CodeMirror.Vim.findKey(cm, vimKey); - if (typeof cmd == 'function') { - CodeMirror.signal(cm, 'vim-keypress', vimKey); - } - return cmd; - } - - var modifiers = {'Shift': 'S', 'Ctrl': 'C', 'Alt': 'A', 'Cmd': 'D', 'Mod': 'A'}; - var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del'}; - function cmKeyToVimKey(key) { - if (key.charAt(0) == '\'') { - // Keypress character binding of format "'a'" - return key.charAt(1); - } - var pieces = key.split(/-(?!$)/); - var lastPiece = pieces[pieces.length - 1]; - if (pieces.length == 1 && pieces[0].length == 1) { - // No-modifier bindings use literal character bindings above. Skip. - return false; - } else if (pieces.length == 2 && pieces[0] == 'Shift' && lastPiece.length == 1) { - // Ignore Shift+char bindings as they should be handled by literal character. - return false; - } - var hasCharacter = false; - for (var i = 0; i < pieces.length; i++) { - var piece = pieces[i]; - if (piece in modifiers) { pieces[i] = modifiers[piece]; } - else { hasCharacter = true; } - if (piece in specialKeys) { pieces[i] = specialKeys[piece]; } - } - if (!hasCharacter) { - // Vim does not support modifier only keys. - return false; - } - // TODO: Current bindings expect the character to be lower case, but - // it looks like vim key notation uses upper case. - if (isUpperCase(lastPiece)) { - pieces[pieces.length - 1] = lastPiece.toLowerCase(); - } - return '<' + pieces.join('-') + '>'; - } - - function getOnPasteFn(cm) { - var vim = cm.state.vim; - if (!vim.onPasteFn) { - vim.onPasteFn = function() { - if (!vim.insertMode) { - cm.setCursor(offsetCursor(cm.getCursor(), 0, 1)); - actions.enterInsertMode(cm, {}, vim); - } - }; - } - return vim.onPasteFn; - } - - var numberRegex = /[\d]/; - var wordCharTest = [CodeMirror.isWordChar, function(ch) { - return ch && !CodeMirror.isWordChar(ch) && !/\s/.test(ch); - }], bigWordCharTest = [function(ch) { - return /\S/.test(ch); - }]; - function makeKeyRange(start, size) { - var keys = []; - for (var i = start; i < start + size; i++) { - keys.push(String.fromCharCode(i)); - } - return keys; - } - var upperCaseAlphabet = makeKeyRange(65, 26); - var lowerCaseAlphabet = makeKeyRange(97, 26); - var numbers = makeKeyRange(48, 10); - var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']); - var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '/']); - - function isLine(cm, line) { - return line >= cm.firstLine() && line <= cm.lastLine(); - } - function isLowerCase(k) { - return (/^[a-z]$/).test(k); - } - function isMatchableSymbol(k) { - return '()[]{}'.indexOf(k) != -1; - } - function isNumber(k) { - return numberRegex.test(k); - } - function isUpperCase(k) { - return (/^[A-Z]$/).test(k); - } - function isWhiteSpaceString(k) { - return (/^\s*$/).test(k); - } - function inArray(val, arr) { - for (var i = 0; i < arr.length; i++) { - if (arr[i] == val) { - return true; - } - } - return false; - } - - var options = {}; - function defineOption(name, defaultValue, type, aliases, callback) { - if (defaultValue === undefined && !callback) { - throw Error('defaultValue is required unless callback is provided'); - } - if (!type) { type = 'string'; } - options[name] = { - type: type, - defaultValue: defaultValue, - callback: callback - }; - if (aliases) { - for (var i = 0; i < aliases.length; i++) { - options[aliases[i]] = options[name]; - } - } - if (defaultValue) { - setOption(name, defaultValue); - } - } - - function setOption(name, value, cm, cfg) { - var option = options[name]; - cfg = cfg || {}; - var scope = cfg.scope; - if (!option) { - throw Error('Unknown option: ' + name); - } - if (option.type == 'boolean') { - if (value && value !== true) { - throw Error('Invalid argument: ' + name + '=' + value); - } else if (value !== false) { - // Boolean options are set to true if value is not defined. - value = true; - } - } - if (option.callback) { - if (scope !== 'local') { - option.callback(value, undefined); - } - if (scope !== 'global' && cm) { - option.callback(value, cm); - } - } else { - if (scope !== 'local') { - option.value = option.type == 'boolean' ? !!value : value; - } - if (scope !== 'global' && cm) { - cm.state.vim.options[name] = {value: value}; - } - } - } - - function getOption(name, cm, cfg) { - var option = options[name]; - cfg = cfg || {}; - var scope = cfg.scope; - if (!option) { - throw Error('Unknown option: ' + name); - } - if (option.callback) { - var local = cm && option.callback(undefined, cm); - if (scope !== 'global' && local !== undefined) { - return local; - } - if (scope !== 'local') { - return option.callback(); - } - return; - } else { - var local = (scope !== 'global') && (cm && cm.state.vim.options[name]); - return (local || (scope !== 'local') && option || {}).value; - } - } - - defineOption('filetype', undefined, 'string', ['ft'], function(name, cm) { - // Option is local. Do nothing for global. - if (cm === undefined) { - return; - } - // The 'filetype' option proxies to the CodeMirror 'mode' option. - if (name === undefined) { - var mode = cm.getOption('mode'); - return mode == 'null' ? '' : mode; - } else { - var mode = name == '' ? 'null' : name; - cm.setOption('mode', mode); - } - }); - - var createCircularJumpList = function() { - var size = 100; - var pointer = -1; - var head = 0; - var tail = 0; - var buffer = new Array(size); - function add(cm, oldCur, newCur) { - var current = pointer % size; - var curMark = buffer[current]; - function useNextSlot(cursor) { - var next = ++pointer % size; - var trashMark = buffer[next]; - if (trashMark) { - trashMark.clear(); - } - buffer[next] = cm.setBookmark(cursor); - } - if (curMark) { - var markPos = curMark.find(); - // avoid recording redundant cursor position - if (markPos && !cursorEqual(markPos, oldCur)) { - useNextSlot(oldCur); - } - } else { - useNextSlot(oldCur); - } - useNextSlot(newCur); - head = pointer; - tail = pointer - size + 1; - if (tail < 0) { - tail = 0; - } - } - function move(cm, offset) { - pointer += offset; - if (pointer > head) { - pointer = head; - } else if (pointer < tail) { - pointer = tail; - } - var mark = buffer[(size + pointer) % size]; - // skip marks that are temporarily removed from text buffer - if (mark && !mark.find()) { - var inc = offset > 0 ? 1 : -1; - var newCur; - var oldCur = cm.getCursor(); - do { - pointer += inc; - mark = buffer[(size + pointer) % size]; - // skip marks that are the same as current position - if (mark && - (newCur = mark.find()) && - !cursorEqual(oldCur, newCur)) { - break; - } - } while (pointer < head && pointer > tail); - } - return mark; - } - return { - cachedCursor: undefined, //used for # and * jumps - add: add, - move: move - }; - }; - - // Returns an object to track the changes associated insert mode. It - // clones the object that is passed in, or creates an empty object one if - // none is provided. - var createInsertModeChanges = function(c) { - if (c) { - // Copy construction - return { - changes: c.changes, - expectCursorActivityForChange: c.expectCursorActivityForChange - }; - } - return { - // Change list - changes: [], - // Set to true on change, false on cursorActivity. - expectCursorActivityForChange: false - }; - }; - - function MacroModeState() { - this.latestRegister = undefined; - this.isPlaying = false; - this.isRecording = false; - this.replaySearchQueries = []; - this.onRecordingDone = undefined; - this.lastInsertModeChanges = createInsertModeChanges(); - } - MacroModeState.prototype = { - exitMacroRecordMode: function() { - var macroModeState = vimGlobalState.macroModeState; - if (macroModeState.onRecordingDone) { - macroModeState.onRecordingDone(); // close dialog - } - macroModeState.onRecordingDone = undefined; - macroModeState.isRecording = false; - }, - enterMacroRecordMode: function(cm, registerName) { - var register = - vimGlobalState.registerController.getRegister(registerName); - if (register) { - register.clear(); - this.latestRegister = registerName; - if (cm.openDialog) { - this.onRecordingDone = cm.openDialog( - '(recording)['+registerName+']', null, {bottom:true}); - } - this.isRecording = true; - } - } - }; - - function maybeInitVimState(cm) { - if (!cm.state.vim) { - // Store instance state in the CodeMirror object. - cm.state.vim = { - inputState: new InputState(), - // Vim's input state that triggered the last edit, used to repeat - // motions and operators with '.'. - lastEditInputState: undefined, - // Vim's action command before the last edit, used to repeat actions - // with '.' and insert mode repeat. - lastEditActionCommand: undefined, - // When using jk for navigation, if you move from a longer line to a - // shorter line, the cursor may clip to the end of the shorter line. - // If j is pressed again and cursor goes to the next line, the - // cursor should go back to its horizontal position on the longer - // line if it can. This is to keep track of the horizontal position. - lastHPos: -1, - // Doing the same with screen-position for gj/gk - lastHSPos: -1, - // The last motion command run. Cleared if a non-motion command gets - // executed in between. - lastMotion: null, - marks: {}, - // Mark for rendering fake cursor for visual mode. - fakeCursor: null, - insertMode: false, - // Repeat count for changes made in insert mode, triggered by key - // sequences like 3,i. Only exists when insertMode is true. - insertModeRepeat: undefined, - visualMode: false, - // If we are in visual line mode. No effect if visualMode is false. - visualLine: false, - visualBlock: false, - lastSelection: null, - lastPastedText: null, - sel: {}, - // Buffer-local/window-local values of vim options. - options: {} - }; - } - return cm.state.vim; - } - var vimGlobalState; - function resetVimGlobalState() { - vimGlobalState = { - // The current search query. - searchQuery: null, - // Whether we are searching backwards. - searchIsReversed: false, - // Replace part of the last substituted pattern - lastSubstituteReplacePart: undefined, - jumpList: createCircularJumpList(), - macroModeState: new MacroModeState, - // Recording latest f, t, F or T motion command. - lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''}, - registerController: new RegisterController({}), - // search history buffer - searchHistoryController: new HistoryController({}), - // ex Command history buffer - exCommandHistoryController : new HistoryController({}) - }; - for (var optionName in options) { - var option = options[optionName]; - option.value = option.defaultValue; - } - } - - var lastInsertModeKeyTimer; - var vimApi= { - buildKeyMap: function() { - // TODO: Convert keymap into dictionary format for fast lookup. - }, - // Testing hook, though it might be useful to expose the register - // controller anyways. - getRegisterController: function() { - return vimGlobalState.registerController; - }, - // Testing hook. - resetVimGlobalState_: resetVimGlobalState, - - // Testing hook. - getVimGlobalState_: function() { - return vimGlobalState; - }, - - // Testing hook. - maybeInitVimState_: maybeInitVimState, - - suppressErrorLogging: false, - - InsertModeKey: InsertModeKey, - map: function(lhs, rhs, ctx) { - // Add user defined key bindings. - exCommandDispatcher.map(lhs, rhs, ctx); - }, - unmap: function(lhs, ctx) { - exCommandDispatcher.unmap(lhs, ctx); - }, - // TODO: Expose setOption and getOption as instance methods. Need to decide how to namespace - // them, or somehow make them work with the existing CodeMirror setOption/getOption API. - setOption: setOption, - getOption: getOption, - defineOption: defineOption, - defineEx: function(name, prefix, func){ - if (!prefix) { - prefix = name; - } else if (name.indexOf(prefix) !== 0) { - throw new Error('(Vim.defineEx) "'+prefix+'" is not a prefix of "'+name+'", command not registered'); - } - exCommands[name]=func; - exCommandDispatcher.commandMap_[prefix]={name:name, shortName:prefix, type:'api'}; - }, - handleKey: function (cm, key, origin) { - var command = this.findKey(cm, key, origin); - if (typeof command === 'function') { - return command(); - } - }, - /** - * This is the outermost function called by CodeMirror, after keys have - * been mapped to their Vim equivalents. - * - * Finds a command based on the key (and cached keys if there is a - * multi-key sequence). Returns `undefined` if no key is matched, a noop - * function if a partial match is found (multi-key), and a function to - * execute the bound command if a a key is matched. The function always - * returns true. - */ - findKey: function(cm, key, origin) { - var vim = maybeInitVimState(cm); - function handleMacroRecording() { - var macroModeState = vimGlobalState.macroModeState; - if (macroModeState.isRecording) { - if (key == 'q') { - macroModeState.exitMacroRecordMode(); - clearInputState(cm); - return true; - } - if (origin != 'mapping') { - logKey(macroModeState, key); - } - } - } - function handleEsc() { - if (key == '<Esc>') { - // Clear input state and get back to normal mode. - clearInputState(cm); - if (vim.visualMode) { - exitVisualMode(cm); - } else if (vim.insertMode) { - exitInsertMode(cm); - } - return true; - } - } - function doKeyToKey(keys) { - // TODO: prevent infinite recursion. - var match; - while (keys) { - // Pull off one command key, which is either a single character - // or a special sequence wrapped in '<' and '>', e.g. '<Space>'. - match = (/<\w+-.+?>|<\w+>|./).exec(keys); - key = match[0]; - keys = keys.substring(match.index + key.length); - CodeMirror.Vim.handleKey(cm, key, 'mapping'); - } - } - - function handleKeyInsertMode() { - if (handleEsc()) { return true; } - var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key; - var keysAreChars = key.length == 1; - var match = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert'); - // Need to check all key substrings in insert mode. - while (keys.length > 1 && match.type != 'full') { - var keys = vim.inputState.keyBuffer = keys.slice(1); - var thisMatch = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert'); - if (thisMatch.type != 'none') { match = thisMatch; } - } - if (match.type == 'none') { clearInputState(cm); return false; } - else if (match.type == 'partial') { - if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); } - lastInsertModeKeyTimer = window.setTimeout( - function() { if (vim.insertMode && vim.inputState.keyBuffer) { clearInputState(cm); } }, - getOption('insertModeEscKeysTimeout')); - return !keysAreChars; - } - - if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); } - if (keysAreChars) { - var here = cm.getCursor(); - cm.replaceRange('', offsetCursor(here, 0, -(keys.length - 1)), here, '+input'); - } - clearInputState(cm); - return match.command; - } - - function handleKeyNonInsertMode() { - if (handleMacroRecording() || handleEsc()) { return true; }; - - var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key; - if (/^[1-9]\d*$/.test(keys)) { return true; } - - var keysMatcher = /^(\d*)(.*)$/.exec(keys); - if (!keysMatcher) { clearInputState(cm); return false; } - var context = vim.visualMode ? 'visual' : - 'normal'; - var match = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim.inputState, context); - if (match.type == 'none') { clearInputState(cm); return false; } - else if (match.type == 'partial') { return true; } - - vim.inputState.keyBuffer = ''; - var keysMatcher = /^(\d*)(.*)$/.exec(keys); - if (keysMatcher[1] && keysMatcher[1] != '0') { - vim.inputState.pushRepeatDigit(keysMatcher[1]); - } - return match.command; - } - - var command; - if (vim.insertMode) { command = handleKeyInsertMode(); } - else { command = handleKeyNonInsertMode(); } - if (command === false) { - return undefined; - } else if (command === true) { - // TODO: Look into using CodeMirror's multi-key handling. - // Return no-op since we are caching the key. Counts as handled, but - // don't want act on it just yet. - return function() {}; - } else { - return function() { - return cm.operation(function() { - cm.curOp.isVimOp = true; - try { - if (command.type == 'keyToKey') { - doKeyToKey(command.toKeys); - } else { - commandDispatcher.processCommand(cm, vim, command); - } - } catch (e) { - // clear VIM state in case it's in a bad state. - cm.state.vim = undefined; - maybeInitVimState(cm); - if (!CodeMirror.Vim.suppressErrorLogging) { - console['log'](e); - } - throw e; - } - return true; - }); - }; - } - }, - handleEx: function(cm, input) { - exCommandDispatcher.processCommand(cm, input); - }, - - defineMotion: defineMotion, - defineAction: defineAction, - defineOperator: defineOperator, - mapCommand: mapCommand, - _mapCommand: _mapCommand, - - defineRegister: defineRegister, - - exitVisualMode: exitVisualMode, - exitInsertMode: exitInsertMode - }; - - // Represents the current input state. - function InputState() { - this.prefixRepeat = []; - this.motionRepeat = []; - - this.operator = null; - this.operatorArgs = null; - this.motion = null; - this.motionArgs = null; - this.keyBuffer = []; // For matching multi-key commands. - this.registerName = null; // Defaults to the unnamed register. - } - InputState.prototype.pushRepeatDigit = function(n) { - if (!this.operator) { - this.prefixRepeat = this.prefixRepeat.concat(n); - } else { - this.motionRepeat = this.motionRepeat.concat(n); - } - }; - InputState.prototype.getRepeat = function() { - var repeat = 0; - if (this.prefixRepeat.length > 0 || this.motionRepeat.length > 0) { - repeat = 1; - if (this.prefixRepeat.length > 0) { - repeat *= parseInt(this.prefixRepeat.join(''), 10); - } - if (this.motionRepeat.length > 0) { - repeat *= parseInt(this.motionRepeat.join(''), 10); - } - } - return repeat; - }; - - function clearInputState(cm, reason) { - cm.state.vim.inputState = new InputState(); - CodeMirror.signal(cm, 'vim-command-done', reason); - } - - /* - * Register stores information about copy and paste registers. Besides - * text, a register must store whether it is linewise (i.e., when it is - * pasted, should it insert itself into a new line, or should the text be - * inserted at the cursor position.) - */ - function Register(text, linewise, blockwise) { - this.clear(); - this.keyBuffer = [text || '']; - this.insertModeChanges = []; - this.searchQueries = []; - this.linewise = !!linewise; - this.blockwise = !!blockwise; - } - Register.prototype = { - setText: function(text, linewise, blockwise) { - this.keyBuffer = [text || '']; - this.linewise = !!linewise; - this.blockwise = !!blockwise; - }, - pushText: function(text, linewise) { - // if this register has ever been set to linewise, use linewise. - if (linewise) { - if (!this.linewise) { - this.keyBuffer.push('\n'); - } - this.linewise = true; - } - this.keyBuffer.push(text); - }, - pushInsertModeChanges: function(changes) { - this.insertModeChanges.push(createInsertModeChanges(changes)); - }, - pushSearchQuery: function(query) { - this.searchQueries.push(query); - }, - clear: function() { - this.keyBuffer = []; - this.insertModeChanges = []; - this.searchQueries = []; - this.linewise = false; - }, - toString: function() { - return this.keyBuffer.join(''); - } - }; - - /** - * Defines an external register. - * - * The name should be a single character that will be used to reference the register. - * The register should support setText, pushText, clear, and toString(). See Register - * for a reference implementation. - */ - function defineRegister(name, register) { - var registers = vimGlobalState.registerController.registers[name]; - if (!name || name.length != 1) { - throw Error('Register name must be 1 character'); - } - if (registers[name]) { - throw Error('Register already defined ' + name); - } - registers[name] = register; - validRegisters.push(name); - } - - /* - * vim registers allow you to keep many independent copy and paste buffers. - * See http://usevim.com/2012/04/13/registers/ for an introduction. - * - * RegisterController keeps the state of all the registers. An initial - * state may be passed in. The unnamed register '"' will always be - * overridden. - */ - function RegisterController(registers) { - this.registers = registers; - this.unnamedRegister = registers['"'] = new Register(); - registers['.'] = new Register(); - registers[':'] = new Register(); - registers['/'] = new Register(); - } - RegisterController.prototype = { - pushText: function(registerName, operator, text, linewise, blockwise) { - if (linewise && text.charAt(0) == '\n') { - text = text.slice(1) + '\n'; - } - if (linewise && text.charAt(text.length - 1) !== '\n'){ - text += '\n'; - } - // Lowercase and uppercase registers refer to the same register. - // Uppercase just means append. - var register = this.isValidRegister(registerName) ? - this.getRegister(registerName) : null; - // if no register/an invalid register was specified, things go to the - // default registers - if (!register) { - switch (operator) { - case 'yank': - // The 0 register contains the text from the most recent yank. - this.registers['0'] = new Register(text, linewise, blockwise); - break; - case 'delete': - case 'change': - if (text.indexOf('\n') == -1) { - // Delete less than 1 line. Update the small delete register. - this.registers['-'] = new Register(text, linewise); - } else { - // Shift down the contents of the numbered registers and put the - // deleted text into register 1. - this.shiftNumericRegisters_(); - this.registers['1'] = new Register(text, linewise); - } - break; - } - // Make sure the unnamed register is set to what just happened - this.unnamedRegister.setText(text, linewise, blockwise); - return; - } - - // If we've gotten to this point, we've actually specified a register - var append = isUpperCase(registerName); - if (append) { - register.pushText(text, linewise); - } else { - register.setText(text, linewise, blockwise); - } - // The unnamed register always has the same value as the last used - // register. - this.unnamedRegister.setText(register.toString(), linewise); - }, - // Gets the register named @name. If one of @name doesn't already exist, - // create it. If @name is invalid, return the unnamedRegister. - getRegister: function(name) { - if (!this.isValidRegister(name)) { - return this.unnamedRegister; - } - name = name.toLowerCase(); - if (!this.registers[name]) { - this.registers[name] = new Register(); - } - return this.registers[name]; - }, - isValidRegister: function(name) { - return name && inArray(name, validRegisters); - }, - shiftNumericRegisters_: function() { - for (var i = 9; i >= 2; i--) { - this.registers[i] = this.getRegister('' + (i - 1)); - } - } - }; - function HistoryController() { - this.historyBuffer = []; - this.iterator; - this.initialPrefix = null; - } - HistoryController.prototype = { - // the input argument here acts a user entered prefix for a small time - // until we start autocompletion in which case it is the autocompleted. - nextMatch: function (input, up) { - var historyBuffer = this.historyBuffer; - var dir = up ? -1 : 1; - if (this.initialPrefix === null) this.initialPrefix = input; - for (var i = this.iterator + dir; up ? i >= 0 : i < historyBuffer.length; i+= dir) { - var element = historyBuffer[i]; - for (var j = 0; j <= element.length; j++) { - if (this.initialPrefix == element.substring(0, j)) { - this.iterator = i; - return element; - } - } - } - // should return the user input in case we reach the end of buffer. - if (i >= historyBuffer.length) { - this.iterator = historyBuffer.length; - return this.initialPrefix; - } - // return the last autocompleted query or exCommand as it is. - if (i < 0 ) return input; - }, - pushInput: function(input) { - var index = this.historyBuffer.indexOf(input); - if (index > -1) this.historyBuffer.splice(index, 1); - if (input.length) this.historyBuffer.push(input); - }, - reset: function() { - this.initialPrefix = null; - this.iterator = this.historyBuffer.length; - } - }; - var commandDispatcher = { - matchCommand: function(keys, keyMap, inputState, context) { - var matches = commandMatches(keys, keyMap, context, inputState); - if (!matches.full && !matches.partial) { - return {type: 'none'}; - } else if (!matches.full && matches.partial) { - return {type: 'partial'}; - } - - var bestMatch; - for (var i = 0; i < matches.full.length; i++) { - var match = matches.full[i]; - if (!bestMatch) { - bestMatch = match; - } - } - if (bestMatch.keys.slice(-11) == '<character>') { - inputState.selectedCharacter = lastChar(keys); - } - return {type: 'full', command: bestMatch}; - }, - processCommand: function(cm, vim, command) { - vim.inputState.repeatOverride = command.repeatOverride; - switch (command.type) { - case 'motion': - this.processMotion(cm, vim, command); - break; - case 'operator': - this.processOperator(cm, vim, command); - break; - case 'operatorMotion': - this.processOperatorMotion(cm, vim, command); - break; - case 'action': - this.processAction(cm, vim, command); - break; - case 'search': - this.processSearch(cm, vim, command); - break; - case 'ex': - case 'keyToEx': - this.processEx(cm, vim, command); - break; - default: - break; - } - }, - processMotion: function(cm, vim, command) { - vim.inputState.motion = command.motion; - vim.inputState.motionArgs = copyArgs(command.motionArgs); - this.evalInput(cm, vim); - }, - processOperator: function(cm, vim, command) { - var inputState = vim.inputState; - if (inputState.operator) { - if (inputState.operator == command.operator) { - // Typing an operator twice like 'dd' makes the operator operate - // linewise - inputState.motion = 'expandToLine'; - inputState.motionArgs = { linewise: true }; - this.evalInput(cm, vim); - return; - } else { - // 2 different operators in a row doesn't make sense. - clearInputState(cm); - } - } - inputState.operator = command.operator; - inputState.operatorArgs = copyArgs(command.operatorArgs); - if (vim.visualMode) { - // Operating on a selection in visual mode. We don't need a motion. - this.evalInput(cm, vim); - } - }, - processOperatorMotion: function(cm, vim, command) { - var visualMode = vim.visualMode; - var operatorMotionArgs = copyArgs(command.operatorMotionArgs); - if (operatorMotionArgs) { - // Operator motions may have special behavior in visual mode. - if (visualMode && operatorMotionArgs.visualLine) { - vim.visualLine = true; - } - } - this.processOperator(cm, vim, command); - if (!visualMode) { - this.processMotion(cm, vim, command); - } - }, - processAction: function(cm, vim, command) { - var inputState = vim.inputState; - var repeat = inputState.getRepeat(); - var repeatIsExplicit = !!repeat; - var actionArgs = copyArgs(command.actionArgs) || {}; - if (inputState.selectedCharacter) { - actionArgs.selectedCharacter = inputState.selectedCharacter; - } - // Actions may or may not have motions and operators. Do these first. - if (command.operator) { - this.processOperator(cm, vim, command); - } - if (command.motion) { - this.processMotion(cm, vim, command); - } - if (command.motion || command.operator) { - this.evalInput(cm, vim); - } - actionArgs.repeat = repeat || 1; - actionArgs.repeatIsExplicit = repeatIsExplicit; - actionArgs.registerName = inputState.registerName; - clearInputState(cm); - vim.lastMotion = null; - if (command.isEdit) { - this.recordLastEdit(vim, inputState, command); - } - actions[command.action](cm, actionArgs, vim); - }, - processSearch: function(cm, vim, command) { - if (!cm.getSearchCursor) { - // Search depends on SearchCursor. - return; - } - var forward = command.searchArgs.forward; - var wholeWordOnly = command.searchArgs.wholeWordOnly; - getSearchState(cm).setReversed(!forward); - var promptPrefix = (forward) ? '/' : '?'; - var originalQuery = getSearchState(cm).getQuery(); - var originalScrollPos = cm.getScrollInfo(); - function handleQuery(query, ignoreCase, smartCase) { - vimGlobalState.searchHistoryController.pushInput(query); - vimGlobalState.searchHistoryController.reset(); - try { - updateSearchQuery(cm, query, ignoreCase, smartCase); - } catch (e) { - showConfirm(cm, 'Invalid regex: ' + query); - clearInputState(cm); - return; - } - commandDispatcher.processMotion(cm, vim, { - type: 'motion', - motion: 'findNext', - motionArgs: { forward: true, toJumplist: command.searchArgs.toJumplist } - }); - } - function onPromptClose(query) { - cm.scrollTo(originalScrollPos.left, originalScrollPos.top); - handleQuery(query, true /** ignoreCase */, true /** smartCase */); - var macroModeState = vimGlobalState.macroModeState; - if (macroModeState.isRecording) { - logSearchQuery(macroModeState, query); - } - } - function onPromptKeyUp(e, query, close) { - var keyName = CodeMirror.keyName(e), up; - if (keyName == 'Up' || keyName == 'Down') { - up = keyName == 'Up' ? true : false; - query = vimGlobalState.searchHistoryController.nextMatch(query, up) || ''; - close(query); - } else { - if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift') - vimGlobalState.searchHistoryController.reset(); - } - var parsedQuery; - try { - parsedQuery = updateSearchQuery(cm, query, - true /** ignoreCase */, true /** smartCase */); - } catch (e) { - // Swallow bad regexes for incremental search. - } - if (parsedQuery) { - cm.scrollIntoView(findNext(cm, !forward, parsedQuery), 30); - } else { - clearSearchHighlight(cm); - cm.scrollTo(originalScrollPos.left, originalScrollPos.top); - } - } - function onPromptKeyDown(e, query, close) { - var keyName = CodeMirror.keyName(e); - if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' || - (keyName == 'Backspace' && query == '')) { - vimGlobalState.searchHistoryController.pushInput(query); - vimGlobalState.searchHistoryController.reset(); - updateSearchQuery(cm, originalQuery); - clearSearchHighlight(cm); - cm.scrollTo(originalScrollPos.left, originalScrollPos.top); - CodeMirror.e_stop(e); - clearInputState(cm); - close(); - cm.focus(); - } else if (keyName == 'Ctrl-U') { - // Ctrl-U clears input. - CodeMirror.e_stop(e); - close(''); - } - } - switch (command.searchArgs.querySrc) { - case 'prompt': - var macroModeState = vimGlobalState.macroModeState; - if (macroModeState.isPlaying) { - var query = macroModeState.replaySearchQueries.shift(); - handleQuery(query, true /** ignoreCase */, false /** smartCase */); - } else { - showPrompt(cm, { - onClose: onPromptClose, - prefix: promptPrefix, - desc: searchPromptDesc, - onKeyUp: onPromptKeyUp, - onKeyDown: onPromptKeyDown - }); - } - break; - case 'wordUnderCursor': - var word = expandWordUnderCursor(cm, false /** inclusive */, - true /** forward */, false /** bigWord */, - true /** noSymbol */); - var isKeyword = true; - if (!word) { - word = expandWordUnderCursor(cm, false /** inclusive */, - true /** forward */, false /** bigWord */, - false /** noSymbol */); - isKeyword = false; - } - if (!word) { - return; - } - var query = cm.getLine(word.start.line).substring(word.start.ch, - word.end.ch); - if (isKeyword && wholeWordOnly) { - query = '\\b' + query + '\\b'; - } else { - query = escapeRegex(query); - } - - // cachedCursor is used to save the old position of the cursor - // when * or # causes vim to seek for the nearest word and shift - // the cursor before entering the motion. - vimGlobalState.jumpList.cachedCursor = cm.getCursor(); - cm.setCursor(word.start); - - handleQuery(query, true /** ignoreCase */, false /** smartCase */); - break; - } - }, - processEx: function(cm, vim, command) { - function onPromptClose(input) { - // Give the prompt some time to close so that if processCommand shows - // an error, the elements don't overlap. - vimGlobalState.exCommandHistoryController.pushInput(input); - vimGlobalState.exCommandHistoryController.reset(); - exCommandDispatcher.processCommand(cm, input); - } - function onPromptKeyDown(e, input, close) { - var keyName = CodeMirror.keyName(e), up; - if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' || - (keyName == 'Backspace' && input == '')) { - vimGlobalState.exCommandHistoryController.pushInput(input); - vimGlobalState.exCommandHistoryController.reset(); - CodeMirror.e_stop(e); - clearInputState(cm); - close(); - cm.focus(); - } - if (keyName == 'Up' || keyName == 'Down') { - up = keyName == 'Up' ? true : false; - input = vimGlobalState.exCommandHistoryController.nextMatch(input, up) || ''; - close(input); - } else if (keyName == 'Ctrl-U') { - // Ctrl-U clears input. - CodeMirror.e_stop(e); - close(''); - } else { - if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift') - vimGlobalState.exCommandHistoryController.reset(); - } - } - if (command.type == 'keyToEx') { - // Handle user defined Ex to Ex mappings - exCommandDispatcher.processCommand(cm, command.exArgs.input); - } else { - if (vim.visualMode) { - showPrompt(cm, { onClose: onPromptClose, prefix: ':', value: '\'<,\'>', - onKeyDown: onPromptKeyDown}); - } else { - showPrompt(cm, { onClose: onPromptClose, prefix: ':', - onKeyDown: onPromptKeyDown}); - } - } - }, - evalInput: function(cm, vim) { - // If the motion comand is set, execute both the operator and motion. - // Otherwise return. - var inputState = vim.inputState; - var motion = inputState.motion; - var motionArgs = inputState.motionArgs || {}; - var operator = inputState.operator; - var operatorArgs = inputState.operatorArgs || {}; - var registerName = inputState.registerName; - var sel = vim.sel; - // TODO: Make sure cm and vim selections are identical outside visual mode. - var origHead = copyCursor(vim.visualMode ? clipCursorToContent(cm, sel.head): cm.getCursor('head')); - var origAnchor = copyCursor(vim.visualMode ? clipCursorToContent(cm, sel.anchor) : cm.getCursor('anchor')); - var oldHead = copyCursor(origHead); - var oldAnchor = copyCursor(origAnchor); - var newHead, newAnchor; - var repeat; - if (operator) { - this.recordLastEdit(vim, inputState); - } - if (inputState.repeatOverride !== undefined) { - // If repeatOverride is specified, that takes precedence over the - // input state's repeat. Used by Ex mode and can be user defined. - repeat = inputState.repeatOverride; - } else { - repeat = inputState.getRepeat(); - } - if (repeat > 0 && motionArgs.explicitRepeat) { - motionArgs.repeatIsExplicit = true; - } else if (motionArgs.noRepeat || - (!motionArgs.explicitRepeat && repeat === 0)) { - repeat = 1; - motionArgs.repeatIsExplicit = false; - } - if (inputState.selectedCharacter) { - // If there is a character input, stick it in all of the arg arrays. - motionArgs.selectedCharacter = operatorArgs.selectedCharacter = - inputState.selectedCharacter; - } - motionArgs.repeat = repeat; - clearInputState(cm); - if (motion) { - var motionResult = motions[motion](cm, origHead, motionArgs, vim); - vim.lastMotion = motions[motion]; - if (!motionResult) { - return; - } - if (motionArgs.toJumplist) { - var jumpList = vimGlobalState.jumpList; - // if the current motion is # or *, use cachedCursor - var cachedCursor = jumpList.cachedCursor; - if (cachedCursor) { - recordJumpPosition(cm, cachedCursor, motionResult); - delete jumpList.cachedCursor; - } else { - recordJumpPosition(cm, origHead, motionResult); - } - } - if (motionResult instanceof Array) { - newAnchor = motionResult[0]; - newHead = motionResult[1]; - } else { - newHead = motionResult; - } - // TODO: Handle null returns from motion commands better. - if (!newHead) { - newHead = copyCursor(origHead); - } - if (vim.visualMode) { - if (!(vim.visualBlock && newHead.ch === Infinity)) { - newHead = clipCursorToContent(cm, newHead, vim.visualBlock); - } - if (newAnchor) { - newAnchor = clipCursorToContent(cm, newAnchor, true); - } - newAnchor = newAnchor || oldAnchor; - sel.anchor = newAnchor; - sel.head = newHead; - updateCmSelection(cm); - updateMark(cm, vim, '<', - cursorIsBefore(newAnchor, newHead) ? newAnchor - : newHead); - updateMark(cm, vim, '>', - cursorIsBefore(newAnchor, newHead) ? newHead - : newAnchor); - } else if (!operator) { - newHead = clipCursorToContent(cm, newHead); - cm.setCursor(newHead.line, newHead.ch); - } - } - if (operator) { - if (operatorArgs.lastSel) { - // Replaying a visual mode operation - newAnchor = oldAnchor; - var lastSel = operatorArgs.lastSel; - var lineOffset = Math.abs(lastSel.head.line - lastSel.anchor.line); - var chOffset = Math.abs(lastSel.head.ch - lastSel.anchor.ch); - if (lastSel.visualLine) { - // Linewise Visual mode: The same number of lines. - newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch); - } else if (lastSel.visualBlock) { - // Blockwise Visual mode: The same number of lines and columns. - newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch + chOffset); - } else if (lastSel.head.line == lastSel.anchor.line) { - // Normal Visual mode within one line: The same number of characters. - newHead = Pos(oldAnchor.line, oldAnchor.ch + chOffset); - } else { - // Normal Visual mode with several lines: The same number of lines, in the - // last line the same number of characters as in the last line the last time. - newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch); - } - vim.visualMode = true; - vim.visualLine = lastSel.visualLine; - vim.visualBlock = lastSel.visualBlock; - sel = vim.sel = { - anchor: newAnchor, - head: newHead - }; - updateCmSelection(cm); - } else if (vim.visualMode) { - operatorArgs.lastSel = { - anchor: copyCursor(sel.anchor), - head: copyCursor(sel.head), - visualBlock: vim.visualBlock, - visualLine: vim.visualLine - }; - } - var curStart, curEnd, linewise, mode; - var cmSel; - if (vim.visualMode) { - // Init visual op - curStart = cursorMin(sel.head, sel.anchor); - curEnd = cursorMax(sel.head, sel.anchor); - linewise = vim.visualLine || operatorArgs.linewise; - mode = vim.visualBlock ? 'block' : - linewise ? 'line' : - 'char'; - cmSel = makeCmSelection(cm, { - anchor: curStart, - head: curEnd - }, mode); - if (linewise) { - var ranges = cmSel.ranges; - if (mode == 'block') { - // Linewise operators in visual block mode extend to end of line - for (var i = 0; i < ranges.length; i++) { - ranges[i].head.ch = lineLength(cm, ranges[i].head.line); - } - } else if (mode == 'line') { - ranges[0].head = Pos(ranges[0].head.line + 1, 0); - } - } - } else { - // Init motion op - curStart = copyCursor(newAnchor || oldAnchor); - curEnd = copyCursor(newHead || oldHead); - if (cursorIsBefore(curEnd, curStart)) { - var tmp = curStart; - curStart = curEnd; - curEnd = tmp; - } - linewise = motionArgs.linewise || operatorArgs.linewise; - if (linewise) { - // Expand selection to entire line. - expandSelectionToLine(cm, curStart, curEnd); - } else if (motionArgs.forward) { - // Clip to trailing newlines only if the motion goes forward. - clipToLine(cm, curStart, curEnd); - } - mode = 'char'; - var exclusive = !motionArgs.inclusive || linewise; - cmSel = makeCmSelection(cm, { - anchor: curStart, - head: curEnd - }, mode, exclusive); - } - cm.setSelections(cmSel.ranges, cmSel.primary); - vim.lastMotion = null; - operatorArgs.repeat = repeat; // For indent in visual mode. - operatorArgs.registerName = registerName; - // Keep track of linewise as it affects how paste and change behave. - operatorArgs.linewise = linewise; - var operatorMoveTo = operators[operator]( - cm, operatorArgs, cmSel.ranges, oldAnchor, newHead); - if (vim.visualMode) { - exitVisualMode(cm, operatorMoveTo != null); - } - if (operatorMoveTo) { - cm.setCursor(operatorMoveTo); - } - } - }, - recordLastEdit: function(vim, inputState, actionCommand) { - var macroModeState = vimGlobalState.macroModeState; - if (macroModeState.isPlaying) { return; } - vim.lastEditInputState = inputState; - vim.lastEditActionCommand = actionCommand; - macroModeState.lastInsertModeChanges.changes = []; - macroModeState.lastInsertModeChanges.expectCursorActivityForChange = false; - } - }; - - /** - * typedef {Object{line:number,ch:number}} Cursor An object containing the - * position of the cursor. - */ - // All of the functions below return Cursor objects. - var motions = { - moveToTopLine: function(cm, _head, motionArgs) { - var line = getUserVisibleLines(cm).top + motionArgs.repeat -1; - return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line))); - }, - moveToMiddleLine: function(cm) { - var range = getUserVisibleLines(cm); - var line = Math.floor((range.top + range.bottom) * 0.5); - return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line))); - }, - moveToBottomLine: function(cm, _head, motionArgs) { - var line = getUserVisibleLines(cm).bottom - motionArgs.repeat +1; - return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line))); - }, - expandToLine: function(_cm, head, motionArgs) { - // Expands forward to end of line, and then to next line if repeat is - // >1. Does not handle backward motion! - var cur = head; - return Pos(cur.line + motionArgs.repeat - 1, Infinity); - }, - findNext: function(cm, _head, motionArgs) { - var state = getSearchState(cm); - var query = state.getQuery(); - if (!query) { - return; - } - var prev = !motionArgs.forward; - // If search is initiated with ? instead of /, negate direction. - prev = (state.isReversed()) ? !prev : prev; - highlightSearchMatches(cm, query); - return findNext(cm, prev/** prev */, query, motionArgs.repeat); - }, - goToMark: function(cm, _head, motionArgs, vim) { - var mark = vim.marks[motionArgs.selectedCharacter]; - if (mark) { - var pos = mark.find(); - return motionArgs.linewise ? { line: pos.line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(pos.line)) } : pos; - } - return null; - }, - moveToOtherHighlightedEnd: function(cm, _head, motionArgs, vim) { - if (vim.visualBlock && motionArgs.sameLine) { - var sel = vim.sel; - return [ - clipCursorToContent(cm, Pos(sel.anchor.line, sel.head.ch)), - clipCursorToContent(cm, Pos(sel.head.line, sel.anchor.ch)) - ]; - } else { - return ([vim.sel.head, vim.sel.anchor]); - } - }, - jumpToMark: function(cm, head, motionArgs, vim) { - var best = head; - for (var i = 0; i < motionArgs.repeat; i++) { - var cursor = best; - for (var key in vim.marks) { - if (!isLowerCase(key)) { - continue; - } - var mark = vim.marks[key].find(); - var isWrongDirection = (motionArgs.forward) ? - cursorIsBefore(mark, cursor) : cursorIsBefore(cursor, mark); - - if (isWrongDirection) { - continue; - } - if (motionArgs.linewise && (mark.line == cursor.line)) { - continue; - } - - var equal = cursorEqual(cursor, best); - var between = (motionArgs.forward) ? - cursorIsBetween(cursor, mark, best) : - cursorIsBetween(best, mark, cursor); - - if (equal || between) { - best = mark; - } - } - } - - if (motionArgs.linewise) { - // Vim places the cursor on the first non-whitespace character of - // the line if there is one, else it places the cursor at the end - // of the line, regardless of whether a mark was found. - best = Pos(best.line, findFirstNonWhiteSpaceCharacter(cm.getLine(best.line))); - } - return best; - }, - moveByCharacters: function(_cm, head, motionArgs) { - var cur = head; - var repeat = motionArgs.repeat; - var ch = motionArgs.forward ? cur.ch + repeat : cur.ch - repeat; - return Pos(cur.line, ch); - }, - moveByLines: function(cm, head, motionArgs, vim) { - var cur = head; - var endCh = cur.ch; - // Depending what our last motion was, we may want to do different - // things. If our last motion was moving vertically, we want to - // preserve the HPos from our last horizontal move. If our last motion - // was going to the end of a line, moving vertically we should go to - // the end of the line, etc. - switch (vim.lastMotion) { - case this.moveByLines: - case this.moveByDisplayLines: - case this.moveByScroll: - case this.moveToColumn: - case this.moveToEol: - endCh = vim.lastHPos; - break; - default: - vim.lastHPos = endCh; - } - var repeat = motionArgs.repeat+(motionArgs.repeatOffset||0); - var line = motionArgs.forward ? cur.line + repeat : cur.line - repeat; - var first = cm.firstLine(); - var last = cm.lastLine(); - // Vim go to line begin or line end when cursor at first/last line and - // move to previous/next line is triggered. - if (line < first && cur.line == first){ - return this.moveToStartOfLine(cm, head, motionArgs, vim); - }else if (line > last && cur.line == last){ - return this.moveToEol(cm, head, motionArgs, vim); - } - if (motionArgs.toFirstChar){ - endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line)); - vim.lastHPos = endCh; - } - vim.lastHSPos = cm.charCoords(Pos(line, endCh),'div').left; - return Pos(line, endCh); - }, - moveByDisplayLines: function(cm, head, motionArgs, vim) { - var cur = head; - switch (vim.lastMotion) { - case this.moveByDisplayLines: - case this.moveByScroll: - case this.moveByLines: - case this.moveToColumn: - case this.moveToEol: - break; - default: - vim.lastHSPos = cm.charCoords(cur,'div').left; - } - var repeat = motionArgs.repeat; - var res=cm.findPosV(cur,(motionArgs.forward ? repeat : -repeat),'line',vim.lastHSPos); - if (res.hitSide) { - if (motionArgs.forward) { - var lastCharCoords = cm.charCoords(res, 'div'); - var goalCoords = { top: lastCharCoords.top + 8, left: vim.lastHSPos }; - var res = cm.coordsChar(goalCoords, 'div'); - } else { - var resCoords = cm.charCoords(Pos(cm.firstLine(), 0), 'div'); - resCoords.left = vim.lastHSPos; - res = cm.coordsChar(resCoords, 'div'); - } - } - vim.lastHPos = res.ch; - return res; - }, - moveByPage: function(cm, head, motionArgs) { - // CodeMirror only exposes functions that move the cursor page down, so - // doing this bad hack to move the cursor and move it back. evalInput - // will move the cursor to where it should be in the end. - var curStart = head; - var repeat = motionArgs.repeat; - return cm.findPosV(curStart, (motionArgs.forward ? repeat : -repeat), 'page'); - }, - moveByParagraph: function(cm, head, motionArgs) { - var dir = motionArgs.forward ? 1 : -1; - return findParagraph(cm, head, motionArgs.repeat, dir); - }, - moveByScroll: function(cm, head, motionArgs, vim) { - var scrollbox = cm.getScrollInfo(); - var curEnd = null; - var repeat = motionArgs.repeat; - if (!repeat) { - repeat = scrollbox.clientHeight / (2 * cm.defaultTextHeight()); - } - var orig = cm.charCoords(head, 'local'); - motionArgs.repeat = repeat; - var curEnd = motions.moveByDisplayLines(cm, head, motionArgs, vim); - if (!curEnd) { - return null; - } - var dest = cm.charCoords(curEnd, 'local'); - cm.scrollTo(null, scrollbox.top + dest.top - orig.top); - return curEnd; - }, - moveByWords: function(cm, head, motionArgs) { - return moveToWord(cm, head, motionArgs.repeat, !!motionArgs.forward, - !!motionArgs.wordEnd, !!motionArgs.bigWord); - }, - moveTillCharacter: function(cm, _head, motionArgs) { - var repeat = motionArgs.repeat; - var curEnd = moveToCharacter(cm, repeat, motionArgs.forward, - motionArgs.selectedCharacter); - var increment = motionArgs.forward ? -1 : 1; - recordLastCharacterSearch(increment, motionArgs); - if (!curEnd) return null; - curEnd.ch += increment; - return curEnd; - }, - moveToCharacter: function(cm, head, motionArgs) { - var repeat = motionArgs.repeat; - recordLastCharacterSearch(0, motionArgs); - return moveToCharacter(cm, repeat, motionArgs.forward, - motionArgs.selectedCharacter) || head; - }, - moveToSymbol: function(cm, head, motionArgs) { - var repeat = motionArgs.repeat; - return findSymbol(cm, repeat, motionArgs.forward, - motionArgs.selectedCharacter) || head; - }, - moveToColumn: function(cm, head, motionArgs, vim) { - var repeat = motionArgs.repeat; - // repeat is equivalent to which column we want to move to! - vim.lastHPos = repeat - 1; - vim.lastHSPos = cm.charCoords(head,'div').left; - return moveToColumn(cm, repeat); - }, - moveToEol: function(cm, head, motionArgs, vim) { - var cur = head; - vim.lastHPos = Infinity; - var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity); - var end=cm.clipPos(retval); - end.ch--; - vim.lastHSPos = cm.charCoords(end,'div').left; - return retval; - }, - moveToFirstNonWhiteSpaceCharacter: function(cm, head) { - // Go to the start of the line where the text begins, or the end for - // whitespace-only lines - var cursor = head; - return Pos(cursor.line, - findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line))); - }, - moveToMatchedSymbol: function(cm, head) { - var cursor = head; - var line = cursor.line; - var ch = cursor.ch; - var lineText = cm.getLine(line); - var symbol; - do { - symbol = lineText.charAt(ch++); - if (symbol && isMatchableSymbol(symbol)) { - var style = cm.getTokenTypeAt(Pos(line, ch)); - if (style !== "string" && style !== "comment") { - break; - } - } - } while (symbol); - if (symbol) { - var matched = cm.findMatchingBracket(Pos(line, ch)); - return matched.to; - } else { - return cursor; - } - }, - moveToStartOfLine: function(_cm, head) { - return Pos(head.line, 0); - }, - moveToLineOrEdgeOfDocument: function(cm, _head, motionArgs) { - var lineNum = motionArgs.forward ? cm.lastLine() : cm.firstLine(); - if (motionArgs.repeatIsExplicit) { - lineNum = motionArgs.repeat - cm.getOption('firstLineNumber'); - } - return Pos(lineNum, - findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum))); - }, - textObjectManipulation: function(cm, head, motionArgs, vim) { - // TODO: lots of possible exceptions that can be thrown here. Try da( - // outside of a () block. - - // TODO: adding <> >< to this map doesn't work, presumably because - // they're operators - var mirroredPairs = {'(': ')', ')': '(', - '{': '}', '}': '{', - '[': ']', ']': '['}; - var selfPaired = {'\'': true, '"': true}; - - var character = motionArgs.selectedCharacter; - // 'b' refers to '()' block. - // 'B' refers to '{}' block. - if (character == 'b') { - character = '('; - } else if (character == 'B') { - character = '{'; - } - - // Inclusive is the difference between a and i - // TODO: Instead of using the additional text object map to perform text - // object operations, merge the map into the defaultKeyMap and use - // motionArgs to define behavior. Define separate entries for 'aw', - // 'iw', 'a[', 'i[', etc. - var inclusive = !motionArgs.textObjectInner; - - var tmp; - if (mirroredPairs[character]) { - tmp = selectCompanionObject(cm, head, character, inclusive); - } else if (selfPaired[character]) { - tmp = findBeginningAndEnd(cm, head, character, inclusive); - } else if (character === 'W') { - tmp = expandWordUnderCursor(cm, inclusive, true /** forward */, - true /** bigWord */); - } else if (character === 'w') { - tmp = expandWordUnderCursor(cm, inclusive, true /** forward */, - false /** bigWord */); - } else if (character === 'p') { - tmp = findParagraph(cm, head, motionArgs.repeat, 0, inclusive); - motionArgs.linewise = true; - if (vim.visualMode) { - if (!vim.visualLine) { vim.visualLine = true; } - } else { - var operatorArgs = vim.inputState.operatorArgs; - if (operatorArgs) { operatorArgs.linewise = true; } - tmp.end.line--; - } - } else { - // No text object defined for this, don't move. - return null; - } - - if (!cm.state.vim.visualMode) { - return [tmp.start, tmp.end]; - } else { - return expandSelection(cm, tmp.start, tmp.end); - } - }, - - repeatLastCharacterSearch: function(cm, head, motionArgs) { - var lastSearch = vimGlobalState.lastChararacterSearch; - var repeat = motionArgs.repeat; - var forward = motionArgs.forward === lastSearch.forward; - var increment = (lastSearch.increment ? 1 : 0) * (forward ? -1 : 1); - cm.moveH(-increment, 'char'); - motionArgs.inclusive = forward ? true : false; - var curEnd = moveToCharacter(cm, repeat, forward, lastSearch.selectedCharacter); - if (!curEnd) { - cm.moveH(increment, 'char'); - return head; - } - curEnd.ch += increment; - return curEnd; - } - }; - - function defineMotion(name, fn) { - motions[name] = fn; - } - - function fillArray(val, times) { - var arr = []; - for (var i = 0; i < times; i++) { - arr.push(val); - } - return arr; - } - /** - * An operator acts on a text selection. It receives the list of selections - * as input. The corresponding CodeMirror selection is guaranteed to - * match the input selection. - */ - var operators = { - change: function(cm, args, ranges) { - var finalHead, text; - var vim = cm.state.vim; - vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock = vim.visualBlock; - if (!vim.visualMode) { - var anchor = ranges[0].anchor, - head = ranges[0].head; - text = cm.getRange(anchor, head); - var lastState = vim.lastEditInputState || {}; - if (lastState.motion == "moveByWords" && !isWhiteSpaceString(text)) { - // Exclude trailing whitespace if the range is not all whitespace. - var match = (/\s+$/).exec(text); - if (match && lastState.motionArgs && lastState.motionArgs.forward) { - head = offsetCursor(head, 0, - match[0].length); - text = text.slice(0, - match[0].length); - } - } - var prevLineEnd = new Pos(anchor.line - 1, Number.MAX_VALUE); - var wasLastLine = cm.firstLine() == cm.lastLine(); - if (head.line > cm.lastLine() && args.linewise && !wasLastLine) { - cm.replaceRange('', prevLineEnd, head); - } else { - cm.replaceRange('', anchor, head); - } - if (args.linewise) { - // Push the next line back down, if there is a next line. - if (!wasLastLine) { - cm.setCursor(prevLineEnd); - CodeMirror.commands.newlineAndIndent(cm); - } - // make sure cursor ends up at the end of the line. - anchor.ch = Number.MAX_VALUE; - } - finalHead = anchor; - } else { - text = cm.getSelection(); - var replacement = fillArray('', ranges.length); - cm.replaceSelections(replacement); - finalHead = cursorMin(ranges[0].head, ranges[0].anchor); - } - vimGlobalState.registerController.pushText( - args.registerName, 'change', text, - args.linewise, ranges.length > 1); - actions.enterInsertMode(cm, {head: finalHead}, cm.state.vim); - }, - // delete is a javascript keyword. - 'delete': function(cm, args, ranges) { - var finalHead, text; - var vim = cm.state.vim; - if (!vim.visualBlock) { - var anchor = ranges[0].anchor, - head = ranges[0].head; - if (args.linewise && - head.line != cm.firstLine() && - anchor.line == cm.lastLine() && - anchor.line == head.line - 1) { - // Special case for dd on last line (and first line). - if (anchor.line == cm.firstLine()) { - anchor.ch = 0; - } else { - anchor = Pos(anchor.line - 1, lineLength(cm, anchor.line - 1)); - } - } - text = cm.getRange(anchor, head); - cm.replaceRange('', anchor, head); - finalHead = anchor; - if (args.linewise) { - finalHead = motions.moveToFirstNonWhiteSpaceCharacter(cm, anchor); - } - } else { - text = cm.getSelection(); - var replacement = fillArray('', ranges.length); - cm.replaceSelections(replacement); - finalHead = ranges[0].anchor; - } - vimGlobalState.registerController.pushText( - args.registerName, 'delete', text, - args.linewise, vim.visualBlock); - return clipCursorToContent(cm, finalHead); - }, - indent: function(cm, args, ranges) { - var vim = cm.state.vim; - var startLine = ranges[0].anchor.line; - var endLine = vim.visualBlock ? - ranges[ranges.length - 1].anchor.line : - ranges[0].head.line; - // In visual mode, n> shifts the selection right n times, instead of - // shifting n lines right once. - var repeat = (vim.visualMode) ? args.repeat : 1; - if (args.linewise) { - // The only way to delete a newline is to delete until the start of - // the next line, so in linewise mode evalInput will include the next - // line. We don't want this in indent, so we go back a line. - endLine--; - } - for (var i = startLine; i <= endLine; i++) { - for (var j = 0; j < repeat; j++) { - cm.indentLine(i, args.indentRight); - } - } - return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor); - }, - changeCase: function(cm, args, ranges, oldAnchor, newHead) { - var selections = cm.getSelections(); - var swapped = []; - var toLower = args.toLower; - for (var j = 0; j < selections.length; j++) { - var toSwap = selections[j]; - var text = ''; - if (toLower === true) { - text = toSwap.toLowerCase(); - } else if (toLower === false) { - text = toSwap.toUpperCase(); - } else { - for (var i = 0; i < toSwap.length; i++) { - var character = toSwap.charAt(i); - text += isUpperCase(character) ? character.toLowerCase() : - character.toUpperCase(); - } - } - swapped.push(text); - } - cm.replaceSelections(swapped); - if (args.shouldMoveCursor){ - return newHead; - } else if (!cm.state.vim.visualMode && args.linewise && ranges[0].anchor.line + 1 == ranges[0].head.line) { - return motions.moveToFirstNonWhiteSpaceCharacter(cm, oldAnchor); - } else if (args.linewise){ - return oldAnchor; - } else { - return cursorMin(ranges[0].anchor, ranges[0].head); - } - }, - yank: function(cm, args, ranges, oldAnchor) { - var vim = cm.state.vim; - var text = cm.getSelection(); - var endPos = vim.visualMode - ? cursorMin(vim.sel.anchor, vim.sel.head, ranges[0].head, ranges[0].anchor) - : oldAnchor; - vimGlobalState.registerController.pushText( - args.registerName, 'yank', - text, args.linewise, vim.visualBlock); - return endPos; - } - }; - - function defineOperator(name, fn) { - operators[name] = fn; - } - - var actions = { - jumpListWalk: function(cm, actionArgs, vim) { - if (vim.visualMode) { - return; - } - var repeat = actionArgs.repeat; - var forward = actionArgs.forward; - var jumpList = vimGlobalState.jumpList; - - var mark = jumpList.move(cm, forward ? repeat : -repeat); - var markPos = mark ? mark.find() : undefined; - markPos = markPos ? markPos : cm.getCursor(); - cm.setCursor(markPos); - }, - scroll: function(cm, actionArgs, vim) { - if (vim.visualMode) { - return; - } - var repeat = actionArgs.repeat || 1; - var lineHeight = cm.defaultTextHeight(); - var top = cm.getScrollInfo().top; - var delta = lineHeight * repeat; - var newPos = actionArgs.forward ? top + delta : top - delta; - var cursor = copyCursor(cm.getCursor()); - var cursorCoords = cm.charCoords(cursor, 'local'); - if (actionArgs.forward) { - if (newPos > cursorCoords.top) { - cursor.line += (newPos - cursorCoords.top) / lineHeight; - cursor.line = Math.ceil(cursor.line); - cm.setCursor(cursor); - cursorCoords = cm.charCoords(cursor, 'local'); - cm.scrollTo(null, cursorCoords.top); - } else { - // Cursor stays within bounds. Just reposition the scroll window. - cm.scrollTo(null, newPos); - } - } else { - var newBottom = newPos + cm.getScrollInfo().clientHeight; - if (newBottom < cursorCoords.bottom) { - cursor.line -= (cursorCoords.bottom - newBottom) / lineHeight; - cursor.line = Math.floor(cursor.line); - cm.setCursor(cursor); - cursorCoords = cm.charCoords(cursor, 'local'); - cm.scrollTo( - null, cursorCoords.bottom - cm.getScrollInfo().clientHeight); - } else { - // Cursor stays within bounds. Just reposition the scroll window. - cm.scrollTo(null, newPos); - } - } - }, - scrollToCursor: function(cm, actionArgs) { - var lineNum = cm.getCursor().line; - var charCoords = cm.charCoords(Pos(lineNum, 0), 'local'); - var height = cm.getScrollInfo().clientHeight; - var y = charCoords.top; - var lineHeight = charCoords.bottom - y; - switch (actionArgs.position) { - case 'center': y = y - (height / 2) + lineHeight; - break; - case 'bottom': y = y - height + lineHeight; - break; - } - cm.scrollTo(null, y); - }, - replayMacro: function(cm, actionArgs, vim) { - var registerName = actionArgs.selectedCharacter; - var repeat = actionArgs.repeat; - var macroModeState = vimGlobalState.macroModeState; - if (registerName == '@') { - registerName = macroModeState.latestRegister; - } - while(repeat--){ - executeMacroRegister(cm, vim, macroModeState, registerName); - } - }, - enterMacroRecordMode: function(cm, actionArgs) { - var macroModeState = vimGlobalState.macroModeState; - var registerName = actionArgs.selectedCharacter; - macroModeState.enterMacroRecordMode(cm, registerName); - }, - enterInsertMode: function(cm, actionArgs, vim) { - if (cm.getOption('readOnly')) { return; } - vim.insertMode = true; - vim.insertModeRepeat = actionArgs && actionArgs.repeat || 1; - var insertAt = (actionArgs) ? actionArgs.insertAt : null; - var sel = vim.sel; - var head = actionArgs.head || cm.getCursor('head'); - var height = cm.listSelections().length; - if (insertAt == 'eol') { - head = Pos(head.line, lineLength(cm, head.line)); - } else if (insertAt == 'charAfter') { - head = offsetCursor(head, 0, 1); - } else if (insertAt == 'firstNonBlank') { - head = motions.moveToFirstNonWhiteSpaceCharacter(cm, head); - } else if (insertAt == 'startOfSelectedArea') { - if (!vim.visualBlock) { - if (sel.head.line < sel.anchor.line) { - head = sel.head; - } else { - head = Pos(sel.anchor.line, 0); - } - } else { - head = Pos( - Math.min(sel.head.line, sel.anchor.line), - Math.min(sel.head.ch, sel.anchor.ch)); - height = Math.abs(sel.head.line - sel.anchor.line) + 1; - } - } else if (insertAt == 'endOfSelectedArea') { - if (!vim.visualBlock) { - if (sel.head.line >= sel.anchor.line) { - head = offsetCursor(sel.head, 0, 1); - } else { - head = Pos(sel.anchor.line, 0); - } - } else { - head = Pos( - Math.min(sel.head.line, sel.anchor.line), - Math.max(sel.head.ch + 1, sel.anchor.ch)); - height = Math.abs(sel.head.line - sel.anchor.line) + 1; - } - } else if (insertAt == 'inplace') { - if (vim.visualMode){ - return; - } - } - cm.setOption('keyMap', 'vim-insert'); - cm.setOption('disableInput', false); - if (actionArgs && actionArgs.replace) { - // Handle Replace-mode as a special case of insert mode. - cm.toggleOverwrite(true); - cm.setOption('keyMap', 'vim-replace'); - CodeMirror.signal(cm, "vim-mode-change", {mode: "replace"}); - } else { - cm.setOption('keyMap', 'vim-insert'); - CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"}); - } - if (!vimGlobalState.macroModeState.isPlaying) { - // Only record if not replaying. - cm.on('change', onChange); - CodeMirror.on(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown); - } - if (vim.visualMode) { - exitVisualMode(cm); - } - selectForInsert(cm, head, height); - }, - toggleVisualMode: function(cm, actionArgs, vim) { - var repeat = actionArgs.repeat; - var anchor = cm.getCursor(); - var head; - // TODO: The repeat should actually select number of characters/lines - // equal to the repeat times the size of the previous visual - // operation. - if (!vim.visualMode) { - // Entering visual mode - vim.visualMode = true; - vim.visualLine = !!actionArgs.linewise; - vim.visualBlock = !!actionArgs.blockwise; - head = clipCursorToContent( - cm, Pos(anchor.line, anchor.ch + repeat - 1), - true /** includeLineBreak */); - vim.sel = { - anchor: anchor, - head: head - }; - CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""}); - updateCmSelection(cm); - updateMark(cm, vim, '<', cursorMin(anchor, head)); - updateMark(cm, vim, '>', cursorMax(anchor, head)); - } else if (vim.visualLine ^ actionArgs.linewise || - vim.visualBlock ^ actionArgs.blockwise) { - // Toggling between modes - vim.visualLine = !!actionArgs.linewise; - vim.visualBlock = !!actionArgs.blockwise; - CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""}); - updateCmSelection(cm); - } else { - exitVisualMode(cm); - } - }, - reselectLastSelection: function(cm, _actionArgs, vim) { - var lastSelection = vim.lastSelection; - if (vim.visualMode) { - updateLastSelection(cm, vim); - } - if (lastSelection) { - var anchor = lastSelection.anchorMark.find(); - var head = lastSelection.headMark.find(); - if (!anchor || !head) { - // If the marks have been destroyed due to edits, do nothing. - return; - } - vim.sel = { - anchor: anchor, - head: head - }; - vim.visualMode = true; - vim.visualLine = lastSelection.visualLine; - vim.visualBlock = lastSelection.visualBlock; - updateCmSelection(cm); - updateMark(cm, vim, '<', cursorMin(anchor, head)); - updateMark(cm, vim, '>', cursorMax(anchor, head)); - CodeMirror.signal(cm, 'vim-mode-change', { - mode: 'visual', - subMode: vim.visualLine ? 'linewise' : - vim.visualBlock ? 'blockwise' : ''}); - } - }, - joinLines: function(cm, actionArgs, vim) { - var curStart, curEnd; - if (vim.visualMode) { - curStart = cm.getCursor('anchor'); - curEnd = cm.getCursor('head'); - if (cursorIsBefore(curEnd, curStart)) { - var tmp = curEnd; - curEnd = curStart; - curStart = tmp; - } - curEnd.ch = lineLength(cm, curEnd.line) - 1; - } else { - // Repeat is the number of lines to join. Minimum 2 lines. - var repeat = Math.max(actionArgs.repeat, 2); - curStart = cm.getCursor(); - curEnd = clipCursorToContent(cm, Pos(curStart.line + repeat - 1, - Infinity)); - } - var finalCh = 0; - for (var i = curStart.line; i < curEnd.line; i++) { - finalCh = lineLength(cm, curStart.line); - var tmp = Pos(curStart.line + 1, - lineLength(cm, curStart.line + 1)); - var text = cm.getRange(curStart, tmp); - text = text.replace(/\n\s*/g, ' '); - cm.replaceRange(text, curStart, tmp); - } - var curFinalPos = Pos(curStart.line, finalCh); - if (vim.visualMode) { - exitVisualMode(cm, false); - } - cm.setCursor(curFinalPos); - }, - newLineAndEnterInsertMode: function(cm, actionArgs, vim) { - vim.insertMode = true; - var insertAt = copyCursor(cm.getCursor()); - if (insertAt.line === cm.firstLine() && !actionArgs.after) { - // Special case for inserting newline before start of document. - cm.replaceRange('\n', Pos(cm.firstLine(), 0)); - cm.setCursor(cm.firstLine(), 0); - } else { - insertAt.line = (actionArgs.after) ? insertAt.line : - insertAt.line - 1; - insertAt.ch = lineLength(cm, insertAt.line); - cm.setCursor(insertAt); - var newlineFn = CodeMirror.commands.newlineAndIndentContinueComment || - CodeMirror.commands.newlineAndIndent; - newlineFn(cm); - } - this.enterInsertMode(cm, { repeat: actionArgs.repeat }, vim); - }, - paste: function(cm, actionArgs, vim) { - var cur = copyCursor(cm.getCursor()); - var register = vimGlobalState.registerController.getRegister( - actionArgs.registerName); - var text = register.toString(); - if (!text) { - return; - } - if (actionArgs.matchIndent) { - var tabSize = cm.getOption("tabSize"); - // length that considers tabs and tabSize - var whitespaceLength = function(str) { - var tabs = (str.split("\t").length - 1); - var spaces = (str.split(" ").length - 1); - return tabs * tabSize + spaces * 1; - }; - var currentLine = cm.getLine(cm.getCursor().line); - var indent = whitespaceLength(currentLine.match(/^\s*/)[0]); - // chomp last newline b/c don't want it to match /^\s*/gm - var chompedText = text.replace(/\n$/, ''); - var wasChomped = text !== chompedText; - var firstIndent = whitespaceLength(text.match(/^\s*/)[0]); - var text = chompedText.replace(/^\s*/gm, function(wspace) { - var newIndent = indent + (whitespaceLength(wspace) - firstIndent); - if (newIndent < 0) { - return ""; - } - else if (cm.getOption("indentWithTabs")) { - var quotient = Math.floor(newIndent / tabSize); - return Array(quotient + 1).join('\t'); - } - else { - return Array(newIndent + 1).join(' '); - } - }); - text += wasChomped ? "\n" : ""; - } - if (actionArgs.repeat > 1) { - var text = Array(actionArgs.repeat + 1).join(text); - } - var linewise = register.linewise; - var blockwise = register.blockwise; - if (linewise) { - if(vim.visualMode) { - text = vim.visualLine ? text.slice(0, -1) : '\n' + text.slice(0, text.length - 1) + '\n'; - } else if (actionArgs.after) { - // Move the newline at the end to the start instead, and paste just - // before the newline character of the line we are on right now. - text = '\n' + text.slice(0, text.length - 1); - cur.ch = lineLength(cm, cur.line); - } else { - cur.ch = 0; - } - } else { - if (blockwise) { - text = text.split('\n'); - for (var i = 0; i < text.length; i++) { - text[i] = (text[i] == '') ? ' ' : text[i]; - } - } - cur.ch += actionArgs.after ? 1 : 0; - } - var curPosFinal; - var idx; - if (vim.visualMode) { - // save the pasted text for reselection if the need arises - vim.lastPastedText = text; - var lastSelectionCurEnd; - var selectedArea = getSelectedAreaRange(cm, vim); - var selectionStart = selectedArea[0]; - var selectionEnd = selectedArea[1]; - var selectedText = cm.getSelection(); - var selections = cm.listSelections(); - var emptyStrings = new Array(selections.length).join('1').split('1'); - // save the curEnd marker before it get cleared due to cm.replaceRange. - if (vim.lastSelection) { - lastSelectionCurEnd = vim.lastSelection.headMark.find(); - } - // push the previously selected text to unnamed register - vimGlobalState.registerController.unnamedRegister.setText(selectedText); - if (blockwise) { - // first delete the selected text - cm.replaceSelections(emptyStrings); - // Set new selections as per the block length of the yanked text - selectionEnd = Pos(selectionStart.line + text.length-1, selectionStart.ch); - cm.setCursor(selectionStart); - selectBlock(cm, selectionEnd); - cm.replaceSelections(text); - curPosFinal = selectionStart; - } else if (vim.visualBlock) { - cm.replaceSelections(emptyStrings); - cm.setCursor(selectionStart); - cm.replaceRange(text, selectionStart, selectionStart); - curPosFinal = selectionStart; - } else { - cm.replaceRange(text, selectionStart, selectionEnd); - curPosFinal = cm.posFromIndex(cm.indexFromPos(selectionStart) + text.length - 1); - } - // restore the the curEnd marker - if(lastSelectionCurEnd) { - vim.lastSelection.headMark = cm.setBookmark(lastSelectionCurEnd); - } - if (linewise) { - curPosFinal.ch=0; - } - } else { - if (blockwise) { - cm.setCursor(cur); - for (var i = 0; i < text.length; i++) { - var line = cur.line+i; - if (line > cm.lastLine()) { - cm.replaceRange('\n', Pos(line, 0)); - } - var lastCh = lineLength(cm, line); - if (lastCh < cur.ch) { - extendLineToColumn(cm, line, cur.ch); - } - } - cm.setCursor(cur); - selectBlock(cm, Pos(cur.line + text.length-1, cur.ch)); - cm.replaceSelections(text); - curPosFinal = cur; - } else { - cm.replaceRange(text, cur); - // Now fine tune the cursor to where we want it. - if (linewise && actionArgs.after) { - curPosFinal = Pos( - cur.line + 1, - findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1))); - } else if (linewise && !actionArgs.after) { - curPosFinal = Pos( - cur.line, - findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line))); - } else if (!linewise && actionArgs.after) { - idx = cm.indexFromPos(cur); - curPosFinal = cm.posFromIndex(idx + text.length - 1); - } else { - idx = cm.indexFromPos(cur); - curPosFinal = cm.posFromIndex(idx + text.length); - } - } - } - if (vim.visualMode) { - exitVisualMode(cm, false); - } - cm.setCursor(curPosFinal); - }, - undo: function(cm, actionArgs) { - cm.operation(function() { - repeatFn(cm, CodeMirror.commands.undo, actionArgs.repeat)(); - cm.setCursor(cm.getCursor('anchor')); - }); - }, - redo: function(cm, actionArgs) { - repeatFn(cm, CodeMirror.commands.redo, actionArgs.repeat)(); - }, - setRegister: function(_cm, actionArgs, vim) { - vim.inputState.registerName = actionArgs.selectedCharacter; - }, - setMark: function(cm, actionArgs, vim) { - var markName = actionArgs.selectedCharacter; - updateMark(cm, vim, markName, cm.getCursor()); - }, - replace: function(cm, actionArgs, vim) { - var replaceWith = actionArgs.selectedCharacter; - var curStart = cm.getCursor(); - var replaceTo; - var curEnd; - var selections = cm.listSelections(); - if (vim.visualMode) { - curStart = cm.getCursor('start'); - curEnd = cm.getCursor('end'); - } else { - var line = cm.getLine(curStart.line); - replaceTo = curStart.ch + actionArgs.repeat; - if (replaceTo > line.length) { - replaceTo=line.length; - } - curEnd = Pos(curStart.line, replaceTo); - } - if (replaceWith=='\n') { - if (!vim.visualMode) cm.replaceRange('', curStart, curEnd); - // special case, where vim help says to replace by just one line-break - (CodeMirror.commands.newlineAndIndentContinueComment || CodeMirror.commands.newlineAndIndent)(cm); - } else { - var replaceWithStr = cm.getRange(curStart, curEnd); - //replace all characters in range by selected, but keep linebreaks - replaceWithStr = replaceWithStr.replace(/[^\n]/g, replaceWith); - if (vim.visualBlock) { - // Tabs are split in visua block before replacing - var spaces = new Array(cm.getOption("tabSize")+1).join(' '); - replaceWithStr = cm.getSelection(); - replaceWithStr = replaceWithStr.replace(/\t/g, spaces).replace(/[^\n]/g, replaceWith).split('\n'); - cm.replaceSelections(replaceWithStr); - } else { - cm.replaceRange(replaceWithStr, curStart, curEnd); - } - if (vim.visualMode) { - curStart = cursorIsBefore(selections[0].anchor, selections[0].head) ? - selections[0].anchor : selections[0].head; - cm.setCursor(curStart); - exitVisualMode(cm, false); - } else { - cm.setCursor(offsetCursor(curEnd, 0, -1)); - } - } - }, - incrementNumberToken: function(cm, actionArgs) { - var cur = cm.getCursor(); - var lineStr = cm.getLine(cur.line); - var re = /-?\d+/g; - var match; - var start; - var end; - var numberStr; - var token; - while ((match = re.exec(lineStr)) !== null) { - token = match[0]; - start = match.index; - end = start + token.length; - if (cur.ch < end)break; - } - if (!actionArgs.backtrack && (end <= cur.ch))return; - if (token) { - var increment = actionArgs.increase ? 1 : -1; - var number = parseInt(token) + (increment * actionArgs.repeat); - var from = Pos(cur.line, start); - var to = Pos(cur.line, end); - numberStr = number.toString(); - cm.replaceRange(numberStr, from, to); - } else { - return; - } - cm.setCursor(Pos(cur.line, start + numberStr.length - 1)); - }, - repeatLastEdit: function(cm, actionArgs, vim) { - var lastEditInputState = vim.lastEditInputState; - if (!lastEditInputState) { return; } - var repeat = actionArgs.repeat; - if (repeat && actionArgs.repeatIsExplicit) { - vim.lastEditInputState.repeatOverride = repeat; - } else { - repeat = vim.lastEditInputState.repeatOverride || repeat; - } - repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */); - }, - exitInsertMode: exitInsertMode - }; - - function defineAction(name, fn) { - actions[name] = fn; - } - - /* - * Below are miscellaneous utility functions used by vim.js - */ - - /** - * Clips cursor to ensure that line is within the buffer's range - * If includeLineBreak is true, then allow cur.ch == lineLength. - */ - function clipCursorToContent(cm, cur, includeLineBreak) { - var line = Math.min(Math.max(cm.firstLine(), cur.line), cm.lastLine() ); - var maxCh = lineLength(cm, line) - 1; - maxCh = (includeLineBreak) ? maxCh + 1 : maxCh; - var ch = Math.min(Math.max(0, cur.ch), maxCh); - return Pos(line, ch); - } - function copyArgs(args) { - var ret = {}; - for (var prop in args) { - if (args.hasOwnProperty(prop)) { - ret[prop] = args[prop]; - } - } - return ret; - } - function offsetCursor(cur, offsetLine, offsetCh) { - if (typeof offsetLine === 'object') { - offsetCh = offsetLine.ch; - offsetLine = offsetLine.line; - } - return Pos(cur.line + offsetLine, cur.ch + offsetCh); - } - function getOffset(anchor, head) { - return { - line: head.line - anchor.line, - ch: head.line - anchor.line - }; - } - function commandMatches(keys, keyMap, context, inputState) { - // Partial matches are not applied. They inform the key handler - // that the current key sequence is a subsequence of a valid key - // sequence, so that the key buffer is not cleared. - var match, partial = [], full = []; - for (var i = 0; i < keyMap.length; i++) { - var command = keyMap[i]; - if (context == 'insert' && command.context != 'insert' || - command.context && command.context != context || - inputState.operator && command.type == 'action' || - !(match = commandMatch(keys, command.keys))) { continue; } - if (match == 'partial') { partial.push(command); } - if (match == 'full') { full.push(command); } - } - return { - partial: partial.length && partial, - full: full.length && full - }; - } - function commandMatch(pressed, mapped) { - if (mapped.slice(-11) == '<character>') { - // Last character matches anything. - var prefixLen = mapped.length - 11; - var pressedPrefix = pressed.slice(0, prefixLen); - var mappedPrefix = mapped.slice(0, prefixLen); - return pressedPrefix == mappedPrefix && pressed.length > prefixLen ? 'full' : - mappedPrefix.indexOf(pressedPrefix) == 0 ? 'partial' : false; - } else { - return pressed == mapped ? 'full' : - mapped.indexOf(pressed) == 0 ? 'partial' : false; - } - } - function lastChar(keys) { - var match = /^.*(<[\w\-]+>)$/.exec(keys); - var selectedCharacter = match ? match[1] : keys.slice(-1); - if (selectedCharacter.length > 1){ - switch(selectedCharacter){ - case '<CR>': - selectedCharacter='\n'; - break; - case '<Space>': - selectedCharacter=' '; - break; - default: - break; - } - } - return selectedCharacter; - } - function repeatFn(cm, fn, repeat) { - return function() { - for (var i = 0; i < repeat; i++) { - fn(cm); - } - }; - } - function copyCursor(cur) { - return Pos(cur.line, cur.ch); - } - function cursorEqual(cur1, cur2) { - return cur1.ch == cur2.ch && cur1.line == cur2.line; - } - function cursorIsBefore(cur1, cur2) { - if (cur1.line < cur2.line) { - return true; - } - if (cur1.line == cur2.line && cur1.ch < cur2.ch) { - return true; - } - return false; - } - function cursorMin(cur1, cur2) { - if (arguments.length > 2) { - cur2 = cursorMin.apply(undefined, Array.prototype.slice.call(arguments, 1)); - } - return cursorIsBefore(cur1, cur2) ? cur1 : cur2; - } - function cursorMax(cur1, cur2) { - if (arguments.length > 2) { - cur2 = cursorMax.apply(undefined, Array.prototype.slice.call(arguments, 1)); - } - return cursorIsBefore(cur1, cur2) ? cur2 : cur1; - } - function cursorIsBetween(cur1, cur2, cur3) { - // returns true if cur2 is between cur1 and cur3. - var cur1before2 = cursorIsBefore(cur1, cur2); - var cur2before3 = cursorIsBefore(cur2, cur3); - return cur1before2 && cur2before3; - } - function lineLength(cm, lineNum) { - return cm.getLine(lineNum).length; - } - function trim(s) { - if (s.trim) { - return s.trim(); - } - return s.replace(/^\s+|\s+$/g, ''); - } - function escapeRegex(s) { - return s.replace(/([.?*+$\[\]\/\\(){}|\-])/g, '\\$1'); - } - function extendLineToColumn(cm, lineNum, column) { - var endCh = lineLength(cm, lineNum); - var spaces = new Array(column-endCh+1).join(' '); - cm.setCursor(Pos(lineNum, endCh)); - cm.replaceRange(spaces, cm.getCursor()); - } - // This functions selects a rectangular block - // of text with selectionEnd as any of its corner - // Height of block: - // Difference in selectionEnd.line and first/last selection.line - // Width of the block: - // Distance between selectionEnd.ch and any(first considered here) selection.ch - function selectBlock(cm, selectionEnd) { - var selections = [], ranges = cm.listSelections(); - var head = copyCursor(cm.clipPos(selectionEnd)); - var isClipped = !cursorEqual(selectionEnd, head); - var curHead = cm.getCursor('head'); - var primIndex = getIndex(ranges, curHead); - var wasClipped = cursorEqual(ranges[primIndex].head, ranges[primIndex].anchor); - var max = ranges.length - 1; - var index = max - primIndex > primIndex ? max : 0; - var base = ranges[index].anchor; - - var firstLine = Math.min(base.line, head.line); - var lastLine = Math.max(base.line, head.line); - var baseCh = base.ch, headCh = head.ch; - - var dir = ranges[index].head.ch - baseCh; - var newDir = headCh - baseCh; - if (dir > 0 && newDir <= 0) { - baseCh++; - if (!isClipped) { headCh--; } - } else if (dir < 0 && newDir >= 0) { - baseCh--; - if (!wasClipped) { headCh++; } - } else if (dir < 0 && newDir == -1) { - baseCh--; - headCh++; - } - for (var line = firstLine; line <= lastLine; line++) { - var range = {anchor: new Pos(line, baseCh), head: new Pos(line, headCh)}; - selections.push(range); - } - primIndex = head.line == lastLine ? selections.length - 1 : 0; - cm.setSelections(selections); - selectionEnd.ch = headCh; - base.ch = baseCh; - return base; - } - function selectForInsert(cm, head, height) { - var sel = []; - for (var i = 0; i < height; i++) { - var lineHead = offsetCursor(head, i, 0); - sel.push({anchor: lineHead, head: lineHead}); - } - cm.setSelections(sel, 0); - } - // getIndex returns the index of the cursor in the selections. - function getIndex(ranges, cursor, end) { - for (var i = 0; i < ranges.length; i++) { - var atAnchor = end != 'head' && cursorEqual(ranges[i].anchor, cursor); - var atHead = end != 'anchor' && cursorEqual(ranges[i].head, cursor); - if (atAnchor || atHead) { - return i; - } - } - return -1; - } - function getSelectedAreaRange(cm, vim) { - var lastSelection = vim.lastSelection; - var getCurrentSelectedAreaRange = function() { - var selections = cm.listSelections(); - var start = selections[0]; - var end = selections[selections.length-1]; - var selectionStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head; - var selectionEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor; - return [selectionStart, selectionEnd]; - }; - var getLastSelectedAreaRange = function() { - var selectionStart = cm.getCursor(); - var selectionEnd = cm.getCursor(); - var block = lastSelection.visualBlock; - if (block) { - var width = block.width; - var height = block.height; - selectionEnd = Pos(selectionStart.line + height, selectionStart.ch + width); - var selections = []; - // selectBlock creates a 'proper' rectangular block. - // We do not want that in all cases, so we manually set selections. - for (var i = selectionStart.line; i < selectionEnd.line; i++) { - var anchor = Pos(i, selectionStart.ch); - var head = Pos(i, selectionEnd.ch); - var range = {anchor: anchor, head: head}; - selections.push(range); - } - cm.setSelections(selections); - } else { - var start = lastSelection.anchorMark.find(); - var end = lastSelection.headMark.find(); - var line = end.line - start.line; - var ch = end.ch - start.ch; - selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch}; - if (lastSelection.visualLine) { - selectionStart = Pos(selectionStart.line, 0); - selectionEnd = Pos(selectionEnd.line, lineLength(cm, selectionEnd.line)); - } - cm.setSelection(selectionStart, selectionEnd); - } - return [selectionStart, selectionEnd]; - }; - if (!vim.visualMode) { - // In case of replaying the action. - return getLastSelectedAreaRange(); - } else { - return getCurrentSelectedAreaRange(); - } - } - // Updates the previous selection with the current selection's values. This - // should only be called in visual mode. - function updateLastSelection(cm, vim) { - var anchor = vim.sel.anchor; - var head = vim.sel.head; - // To accommodate the effect of lastPastedText in the last selection - if (vim.lastPastedText) { - head = cm.posFromIndex(cm.indexFromPos(anchor) + vim.lastPastedText.length); - vim.lastPastedText = null; - } - vim.lastSelection = {'anchorMark': cm.setBookmark(anchor), - 'headMark': cm.setBookmark(head), - 'anchor': copyCursor(anchor), - 'head': copyCursor(head), - 'visualMode': vim.visualMode, - 'visualLine': vim.visualLine, - 'visualBlock': vim.visualBlock}; - } - function expandSelection(cm, start, end) { - var sel = cm.state.vim.sel; - var head = sel.head; - var anchor = sel.anchor; - var tmp; - if (cursorIsBefore(end, start)) { - tmp = end; - end = start; - start = tmp; - } - if (cursorIsBefore(head, anchor)) { - head = cursorMin(start, head); - anchor = cursorMax(anchor, end); - } else { - anchor = cursorMin(start, anchor); - head = cursorMax(head, end); - head = offsetCursor(head, 0, -1); - if (head.ch == -1 && head.line != cm.firstLine()) { - head = Pos(head.line - 1, lineLength(cm, head.line - 1)); - } - } - return [anchor, head]; - } - /** - * Updates the CodeMirror selection to match the provided vim selection. - * If no arguments are given, it uses the current vim selection state. - */ - function updateCmSelection(cm, sel, mode) { - var vim = cm.state.vim; - sel = sel || vim.sel; - var mode = mode || - vim.visualLine ? 'line' : vim.visualBlock ? 'block' : 'char'; - var cmSel = makeCmSelection(cm, sel, mode); - cm.setSelections(cmSel.ranges, cmSel.primary); - updateFakeCursor(cm); - } - function makeCmSelection(cm, sel, mode, exclusive) { - var head = copyCursor(sel.head); - var anchor = copyCursor(sel.anchor); - if (mode == 'char') { - var headOffset = !exclusive && !cursorIsBefore(sel.head, sel.anchor) ? 1 : 0; - var anchorOffset = cursorIsBefore(sel.head, sel.anchor) ? 1 : 0; - head = offsetCursor(sel.head, 0, headOffset); - anchor = offsetCursor(sel.anchor, 0, anchorOffset); - return { - ranges: [{anchor: anchor, head: head}], - primary: 0 - }; - } else if (mode == 'line') { - if (!cursorIsBefore(sel.head, sel.anchor)) { - anchor.ch = 0; - - var lastLine = cm.lastLine(); - if (head.line > lastLine) { - head.line = lastLine; - } - head.ch = lineLength(cm, head.line); - } else { - head.ch = 0; - anchor.ch = lineLength(cm, anchor.line); - } - return { - ranges: [{anchor: anchor, head: head}], - primary: 0 - }; - } else if (mode == 'block') { - var top = Math.min(anchor.line, head.line), - left = Math.min(anchor.ch, head.ch), - bottom = Math.max(anchor.line, head.line), - right = Math.max(anchor.ch, head.ch) + 1; - var height = bottom - top + 1; - var primary = head.line == top ? 0 : height - 1; - var ranges = []; - for (var i = 0; i < height; i++) { - ranges.push({ - anchor: Pos(top + i, left), - head: Pos(top + i, right) - }); - } - return { - ranges: ranges, - primary: primary - }; - } - } - function getHead(cm) { - var cur = cm.getCursor('head'); - if (cm.getSelection().length == 1) { - // Small corner case when only 1 character is selected. The "real" - // head is the left of head and anchor. - cur = cursorMin(cur, cm.getCursor('anchor')); - } - return cur; - } - - /** - * If moveHead is set to false, the CodeMirror selection will not be - * touched. The caller assumes the responsibility of putting the cursor - * in the right place. - */ - function exitVisualMode(cm, moveHead) { - var vim = cm.state.vim; - if (moveHead !== false) { - cm.setCursor(clipCursorToContent(cm, vim.sel.head)); - } - updateLastSelection(cm, vim); - vim.visualMode = false; - vim.visualLine = false; - vim.visualBlock = false; - CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"}); - if (vim.fakeCursor) { - vim.fakeCursor.clear(); - } - } - - // Remove any trailing newlines from the selection. For - // example, with the caret at the start of the last word on the line, - // 'dw' should word, but not the newline, while 'w' should advance the - // caret to the first character of the next line. - function clipToLine(cm, curStart, curEnd) { - var selection = cm.getRange(curStart, curEnd); - // Only clip if the selection ends with trailing newline + whitespace - if (/\n\s*$/.test(selection)) { - var lines = selection.split('\n'); - // We know this is all whitepsace. - lines.pop(); - - // Cases: - // 1. Last word is an empty line - do not clip the trailing '\n' - // 2. Last word is not an empty line - clip the trailing '\n' - var line; - // Find the line containing the last word, and clip all whitespace up - // to it. - for (var line = lines.pop(); lines.length > 0 && line && isWhiteSpaceString(line); line = lines.pop()) { - curEnd.line--; - curEnd.ch = 0; - } - // If the last word is not an empty line, clip an additional newline - if (line) { - curEnd.line--; - curEnd.ch = lineLength(cm, curEnd.line); - } else { - curEnd.ch = 0; - } - } - } - - // Expand the selection to line ends. - function expandSelectionToLine(_cm, curStart, curEnd) { - curStart.ch = 0; - curEnd.ch = 0; - curEnd.line++; - } - - function findFirstNonWhiteSpaceCharacter(text) { - if (!text) { - return 0; - } - var firstNonWS = text.search(/\S/); - return firstNonWS == -1 ? text.length : firstNonWS; - } - - function expandWordUnderCursor(cm, inclusive, _forward, bigWord, noSymbol) { - var cur = getHead(cm); - var line = cm.getLine(cur.line); - var idx = cur.ch; - - // Seek to first word or non-whitespace character, depending on if - // noSymbol is true. - var test = noSymbol ? wordCharTest[0] : bigWordCharTest [0]; - while (!test(line.charAt(idx))) { - idx++; - if (idx >= line.length) { return null; } - } - - if (bigWord) { - test = bigWordCharTest[0]; - } else { - test = wordCharTest[0]; - if (!test(line.charAt(idx))) { - test = wordCharTest[1]; - } - } - - var end = idx, start = idx; - while (test(line.charAt(end)) && end < line.length) { end++; } - while (test(line.charAt(start)) && start >= 0) { start--; } - start++; - - if (inclusive) { - // If present, include all whitespace after word. - // Otherwise, include all whitespace before word, except indentation. - var wordEnd = end; - while (/\s/.test(line.charAt(end)) && end < line.length) { end++; } - if (wordEnd == end) { - var wordStart = start; - while (/\s/.test(line.charAt(start - 1)) && start > 0) { start--; } - if (!start) { start = wordStart; } - } - } - return { start: Pos(cur.line, start), end: Pos(cur.line, end) }; - } - - function recordJumpPosition(cm, oldCur, newCur) { - if (!cursorEqual(oldCur, newCur)) { - vimGlobalState.jumpList.add(cm, oldCur, newCur); - } - } - - function recordLastCharacterSearch(increment, args) { - vimGlobalState.lastChararacterSearch.increment = increment; - vimGlobalState.lastChararacterSearch.forward = args.forward; - vimGlobalState.lastChararacterSearch.selectedCharacter = args.selectedCharacter; - } - - var symbolToMode = { - '(': 'bracket', ')': 'bracket', '{': 'bracket', '}': 'bracket', - '[': 'section', ']': 'section', - '*': 'comment', '/': 'comment', - 'm': 'method', 'M': 'method', - '#': 'preprocess' - }; - var findSymbolModes = { - bracket: { - isComplete: function(state) { - if (state.nextCh === state.symb) { - state.depth++; - if (state.depth >= 1)return true; - } else if (state.nextCh === state.reverseSymb) { - state.depth--; - } - return false; - } - }, - section: { - init: function(state) { - state.curMoveThrough = true; - state.symb = (state.forward ? ']' : '[') === state.symb ? '{' : '}'; - }, - isComplete: function(state) { - return state.index === 0 && state.nextCh === state.symb; - } - }, - comment: { - isComplete: function(state) { - var found = state.lastCh === '*' && state.nextCh === '/'; - state.lastCh = state.nextCh; - return found; - } - }, - // TODO: The original Vim implementation only operates on level 1 and 2. - // The current implementation doesn't check for code block level and - // therefore it operates on any levels. - method: { - init: function(state) { - state.symb = (state.symb === 'm' ? '{' : '}'); - state.reverseSymb = state.symb === '{' ? '}' : '{'; - }, - isComplete: function(state) { - if (state.nextCh === state.symb)return true; - return false; - } - }, - preprocess: { - init: function(state) { - state.index = 0; - }, - isComplete: function(state) { - if (state.nextCh === '#') { - var token = state.lineText.match(/#(\w+)/)[1]; - if (token === 'endif') { - if (state.forward && state.depth === 0) { - return true; - } - state.depth++; - } else if (token === 'if') { - if (!state.forward && state.depth === 0) { - return true; - } - state.depth--; - } - if (token === 'else' && state.depth === 0)return true; - } - return false; - } - } - }; - function findSymbol(cm, repeat, forward, symb) { - var cur = copyCursor(cm.getCursor()); - var increment = forward ? 1 : -1; - var endLine = forward ? cm.lineCount() : -1; - var curCh = cur.ch; - var line = cur.line; - var lineText = cm.getLine(line); - var state = { - lineText: lineText, - nextCh: lineText.charAt(curCh), - lastCh: null, - index: curCh, - symb: symb, - reverseSymb: (forward ? { ')': '(', '}': '{' } : { '(': ')', '{': '}' })[symb], - forward: forward, - depth: 0, - curMoveThrough: false - }; - var mode = symbolToMode[symb]; - if (!mode)return cur; - var init = findSymbolModes[mode].init; - var isComplete = findSymbolModes[mode].isComplete; - if (init) { init(state); } - while (line !== endLine && repeat) { - state.index += increment; - state.nextCh = state.lineText.charAt(state.index); - if (!state.nextCh) { - line += increment; - state.lineText = cm.getLine(line) || ''; - if (increment > 0) { - state.index = 0; - } else { - var lineLen = state.lineText.length; - state.index = (lineLen > 0) ? (lineLen-1) : 0; - } - state.nextCh = state.lineText.charAt(state.index); - } - if (isComplete(state)) { - cur.line = line; - cur.ch = state.index; - repeat--; - } - } - if (state.nextCh || state.curMoveThrough) { - return Pos(line, state.index); - } - return cur; - } - - /** - * Returns the boundaries of the next word. If the cursor in the middle of - * the word, then returns the boundaries of the current word, starting at - * the cursor. If the cursor is at the start/end of a word, and we are going - * forward/backward, respectively, find the boundaries of the next word. - * - * @param {CodeMirror} cm CodeMirror object. - * @param {Cursor} cur The cursor position. - * @param {boolean} forward True to search forward. False to search - * backward. - * @param {boolean} bigWord True if punctuation count as part of the word. - * False if only [a-zA-Z0-9] characters count as part of the word. - * @param {boolean} emptyLineIsWord True if empty lines should be treated - * as words. - * @return {Object{from:number, to:number, line: number}} The boundaries of - * the word, or null if there are no more words. - */ - function findWord(cm, cur, forward, bigWord, emptyLineIsWord) { - var lineNum = cur.line; - var pos = cur.ch; - var line = cm.getLine(lineNum); - var dir = forward ? 1 : -1; - var charTests = bigWord ? bigWordCharTest: wordCharTest; - - if (emptyLineIsWord && line == '') { - lineNum += dir; - line = cm.getLine(lineNum); - if (!isLine(cm, lineNum)) { - return null; - } - pos = (forward) ? 0 : line.length; - } - - while (true) { - if (emptyLineIsWord && line == '') { - return { from: 0, to: 0, line: lineNum }; - } - var stop = (dir > 0) ? line.length : -1; - var wordStart = stop, wordEnd = stop; - // Find bounds of next word. - while (pos != stop) { - var foundWord = false; - for (var i = 0; i < charTests.length && !foundWord; ++i) { - if (charTests[i](line.charAt(pos))) { - wordStart = pos; - // Advance to end of word. - while (pos != stop && charTests[i](line.charAt(pos))) { - pos += dir; - } - wordEnd = pos; - foundWord = wordStart != wordEnd; - if (wordStart == cur.ch && lineNum == cur.line && - wordEnd == wordStart + dir) { - // We started at the end of a word. Find the next one. - continue; - } else { - return { - from: Math.min(wordStart, wordEnd + 1), - to: Math.max(wordStart, wordEnd), - line: lineNum }; - } - } - } - if (!foundWord) { - pos += dir; - } - } - // Advance to next/prev line. - lineNum += dir; - if (!isLine(cm, lineNum)) { - return null; - } - line = cm.getLine(lineNum); - pos = (dir > 0) ? 0 : line.length; - } - // Should never get here. - throw new Error('The impossible happened.'); - } - - /** - * @param {CodeMirror} cm CodeMirror object. - * @param {Pos} cur The position to start from. - * @param {int} repeat Number of words to move past. - * @param {boolean} forward True to search forward. False to search - * backward. - * @param {boolean} wordEnd True to move to end of word. False to move to - * beginning of word. - * @param {boolean} bigWord True if punctuation count as part of the word. - * False if only alphabet characters count as part of the word. - * @return {Cursor} The position the cursor should move to. - */ - function moveToWord(cm, cur, repeat, forward, wordEnd, bigWord) { - var curStart = copyCursor(cur); - var words = []; - if (forward && !wordEnd || !forward && wordEnd) { - repeat++; - } - // For 'e', empty lines are not considered words, go figure. - var emptyLineIsWord = !(forward && wordEnd); - for (var i = 0; i < repeat; i++) { - var word = findWord(cm, cur, forward, bigWord, emptyLineIsWord); - if (!word) { - var eodCh = lineLength(cm, cm.lastLine()); - words.push(forward - ? {line: cm.lastLine(), from: eodCh, to: eodCh} - : {line: 0, from: 0, to: 0}); - break; - } - words.push(word); - cur = Pos(word.line, forward ? (word.to - 1) : word.from); - } - var shortCircuit = words.length != repeat; - var firstWord = words[0]; - var lastWord = words.pop(); - if (forward && !wordEnd) { - // w - if (!shortCircuit && (firstWord.from != curStart.ch || firstWord.line != curStart.line)) { - // We did not start in the middle of a word. Discard the extra word at the end. - lastWord = words.pop(); - } - return Pos(lastWord.line, lastWord.from); - } else if (forward && wordEnd) { - return Pos(lastWord.line, lastWord.to - 1); - } else if (!forward && wordEnd) { - // ge - if (!shortCircuit && (firstWord.to != curStart.ch || firstWord.line != curStart.line)) { - // We did not start in the middle of a word. Discard the extra word at the end. - lastWord = words.pop(); - } - return Pos(lastWord.line, lastWord.to); - } else { - // b - return Pos(lastWord.line, lastWord.from); - } - } - - function moveToCharacter(cm, repeat, forward, character) { - var cur = cm.getCursor(); - var start = cur.ch; - var idx; - for (var i = 0; i < repeat; i ++) { - var line = cm.getLine(cur.line); - idx = charIdxInLine(start, line, character, forward, true); - if (idx == -1) { - return null; - } - start = idx; - } - return Pos(cm.getCursor().line, idx); - } - - function moveToColumn(cm, repeat) { - // repeat is always >= 1, so repeat - 1 always corresponds - // to the column we want to go to. - var line = cm.getCursor().line; - return clipCursorToContent(cm, Pos(line, repeat - 1)); - } - - function updateMark(cm, vim, markName, pos) { - if (!inArray(markName, validMarks)) { - return; - } - if (vim.marks[markName]) { - vim.marks[markName].clear(); - } - vim.marks[markName] = cm.setBookmark(pos); - } - - function charIdxInLine(start, line, character, forward, includeChar) { - // Search for char in line. - // motion_options: {forward, includeChar} - // If includeChar = true, include it too. - // If forward = true, search forward, else search backwards. - // If char is not found on this line, do nothing - var idx; - if (forward) { - idx = line.indexOf(character, start + 1); - if (idx != -1 && !includeChar) { - idx -= 1; - } - } else { - idx = line.lastIndexOf(character, start - 1); - if (idx != -1 && !includeChar) { - idx += 1; - } - } - return idx; - } - - function findParagraph(cm, head, repeat, dir, inclusive) { - var line = head.line; - var min = cm.firstLine(); - var max = cm.lastLine(); - var start, end, i = line; - function isEmpty(i) { return !cm.getLine(i); } - function isBoundary(i, dir, any) { - if (any) { return isEmpty(i) != isEmpty(i + dir); } - return !isEmpty(i) && isEmpty(i + dir); - } - if (dir) { - while (min <= i && i <= max && repeat > 0) { - if (isBoundary(i, dir)) { repeat--; } - i += dir; - } - return new Pos(i, 0); - } - - var vim = cm.state.vim; - if (vim.visualLine && isBoundary(line, 1, true)) { - var anchor = vim.sel.anchor; - if (isBoundary(anchor.line, -1, true)) { - if (!inclusive || anchor.line != line) { - line += 1; - } - } - } - var startState = isEmpty(line); - for (i = line; i <= max && repeat; i++) { - if (isBoundary(i, 1, true)) { - if (!inclusive || isEmpty(i) != startState) { - repeat--; - } - } - } - end = new Pos(i, 0); - // select boundary before paragraph for the last one - if (i > max && !startState) { startState = true; } - else { inclusive = false; } - for (i = line; i > min; i--) { - if (!inclusive || isEmpty(i) == startState || i == line) { - if (isBoundary(i, -1, true)) { break; } - } - } - start = new Pos(i, 0); - return { start: start, end: end }; - } - - // TODO: perhaps this finagling of start and end positions belonds - // in codmirror/replaceRange? - function selectCompanionObject(cm, head, symb, inclusive) { - var cur = head, start, end; - - var bracketRegexp = ({ - '(': /[()]/, ')': /[()]/, - '[': /[[\]]/, ']': /[[\]]/, - '{': /[{}]/, '}': /[{}]/})[symb]; - var openSym = ({ - '(': '(', ')': '(', - '[': '[', ']': '[', - '{': '{', '}': '{'})[symb]; - var curChar = cm.getLine(cur.line).charAt(cur.ch); - // Due to the behavior of scanForBracket, we need to add an offset if the - // cursor is on a matching open bracket. - var offset = curChar === openSym ? 1 : 0; - - start = cm.scanForBracket(Pos(cur.line, cur.ch + offset), -1, null, {'bracketRegex': bracketRegexp}); - end = cm.scanForBracket(Pos(cur.line, cur.ch + offset), 1, null, {'bracketRegex': bracketRegexp}); - - if (!start || !end) { - return { start: cur, end: cur }; - } - - start = start.pos; - end = end.pos; - - if ((start.line == end.line && start.ch > end.ch) - || (start.line > end.line)) { - var tmp = start; - start = end; - end = tmp; - } - - if (inclusive) { - end.ch += 1; - } else { - start.ch += 1; - } - - return { start: start, end: end }; - } - - // Takes in a symbol and a cursor and tries to simulate text objects that - // have identical opening and closing symbols - // TODO support across multiple lines - function findBeginningAndEnd(cm, head, symb, inclusive) { - var cur = copyCursor(head); - var line = cm.getLine(cur.line); - var chars = line.split(''); - var start, end, i, len; - var firstIndex = chars.indexOf(symb); - - // the decision tree is to always look backwards for the beginning first, - // but if the cursor is in front of the first instance of the symb, - // then move the cursor forward - if (cur.ch < firstIndex) { - cur.ch = firstIndex; - // Why is this line even here??? - // cm.setCursor(cur.line, firstIndex+1); - } - // otherwise if the cursor is currently on the closing symbol - else if (firstIndex < cur.ch && chars[cur.ch] == symb) { - end = cur.ch; // assign end to the current cursor - --cur.ch; // make sure to look backwards - } - - // if we're currently on the symbol, we've got a start - if (chars[cur.ch] == symb && !end) { - start = cur.ch + 1; // assign start to ahead of the cursor - } else { - // go backwards to find the start - for (i = cur.ch; i > -1 && !start; i--) { - if (chars[i] == symb) { - start = i + 1; - } - } - } - - // look forwards for the end symbol - if (start && !end) { - for (i = start, len = chars.length; i < len && !end; i++) { - if (chars[i] == symb) { - end = i; - } - } - } - - // nothing found - if (!start || !end) { - return { start: cur, end: cur }; - } - - // include the symbols - if (inclusive) { - --start; ++end; - } - - return { - start: Pos(cur.line, start), - end: Pos(cur.line, end) - }; - } - - // Search functions - defineOption('pcre', true, 'boolean'); - function SearchState() {} - SearchState.prototype = { - getQuery: function() { - return vimGlobalState.query; - }, - setQuery: function(query) { - vimGlobalState.query = query; - }, - getOverlay: function() { - return this.searchOverlay; - }, - setOverlay: function(overlay) { - this.searchOverlay = overlay; - }, - isReversed: function() { - return vimGlobalState.isReversed; - }, - setReversed: function(reversed) { - vimGlobalState.isReversed = reversed; - }, - getScrollbarAnnotate: function() { - return this.annotate; - }, - setScrollbarAnnotate: function(annotate) { - this.annotate = annotate; - } - }; - function getSearchState(cm) { - var vim = cm.state.vim; - return vim.searchState_ || (vim.searchState_ = new SearchState()); - } - function dialog(cm, template, shortText, onClose, options) { - if (cm.openDialog) { - cm.openDialog(template, onClose, { bottom: true, value: options.value, - onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp, - selectValueOnOpen: false}); - } - else { - onClose(prompt(shortText, '')); - } - } - function splitBySlash(argString) { - var slashes = findUnescapedSlashes(argString) || []; - if (!slashes.length) return []; - var tokens = []; - // in case of strings like foo/bar - if (slashes[0] !== 0) return; - for (var i = 0; i < slashes.length; i++) { - if (typeof slashes[i] == 'number') - tokens.push(argString.substring(slashes[i] + 1, slashes[i+1])); - } - return tokens; - } - - function findUnescapedSlashes(str) { - var escapeNextChar = false; - var slashes = []; - for (var i = 0; i < str.length; i++) { - var c = str.charAt(i); - if (!escapeNextChar && c == '/') { - slashes.push(i); - } - escapeNextChar = !escapeNextChar && (c == '\\'); - } - return slashes; - } - - // Translates a search string from ex (vim) syntax into javascript form. - function translateRegex(str) { - // When these match, add a '\' if unescaped or remove one if escaped. - var specials = '|(){'; - // Remove, but never add, a '\' for these. - var unescape = '}'; - var escapeNextChar = false; - var out = []; - for (var i = -1; i < str.length; i++) { - var c = str.charAt(i) || ''; - var n = str.charAt(i+1) || ''; - var specialComesNext = (n && specials.indexOf(n) != -1); - if (escapeNextChar) { - if (c !== '\\' || !specialComesNext) { - out.push(c); - } - escapeNextChar = false; - } else { - if (c === '\\') { - escapeNextChar = true; - // Treat the unescape list as special for removing, but not adding '\'. - if (n && unescape.indexOf(n) != -1) { - specialComesNext = true; - } - // Not passing this test means removing a '\'. - if (!specialComesNext || n === '\\') { - out.push(c); - } - } else { - out.push(c); - if (specialComesNext && n !== '\\') { - out.push('\\'); - } - } - } - } - return out.join(''); - } - - // Translates the replace part of a search and replace from ex (vim) syntax into - // javascript form. Similar to translateRegex, but additionally fixes back references - // (translates '\[0..9]' to '$[0..9]') and follows different rules for escaping '$'. - var charUnescapes = {'\\n': '\n', '\\r': '\r', '\\t': '\t'}; - function translateRegexReplace(str) { - var escapeNextChar = false; - var out = []; - for (var i = -1; i < str.length; i++) { - var c = str.charAt(i) || ''; - var n = str.charAt(i+1) || ''; - if (charUnescapes[c + n]) { - out.push(charUnescapes[c+n]); - i++; - } else if (escapeNextChar) { - // At any point in the loop, escapeNextChar is true if the previous - // character was a '\' and was not escaped. - out.push(c); - escapeNextChar = false; - } else { - if (c === '\\') { - escapeNextChar = true; - if ((isNumber(n) || n === '$')) { - out.push('$'); - } else if (n !== '/' && n !== '\\') { - out.push('\\'); - } - } else { - if (c === '$') { - out.push('$'); - } - out.push(c); - if (n === '/') { - out.push('\\'); - } - } - } - } - return out.join(''); - } - - // Unescape \ and / in the replace part, for PCRE mode. - var unescapes = {'\\/': '/', '\\\\': '\\', '\\n': '\n', '\\r': '\r', '\\t': '\t'}; - function unescapeRegexReplace(str) { - var stream = new CodeMirror.StringStream(str); - var output = []; - while (!stream.eol()) { - // Search for \. - while (stream.peek() && stream.peek() != '\\') { - output.push(stream.next()); - } - var matched = false; - for (var matcher in unescapes) { - if (stream.match(matcher, true)) { - matched = true; - output.push(unescapes[matcher]); - break; - } - } - if (!matched) { - // Don't change anything - output.push(stream.next()); - } - } - return output.join(''); - } - - /** - * Extract the regular expression from the query and return a Regexp object. - * Returns null if the query is blank. - * If ignoreCase is passed in, the Regexp object will have the 'i' flag set. - * If smartCase is passed in, and the query contains upper case letters, - * then ignoreCase is overridden, and the 'i' flag will not be set. - * If the query contains the /i in the flag part of the regular expression, - * then both ignoreCase and smartCase are ignored, and 'i' will be passed - * through to the Regex object. - */ - function parseQuery(query, ignoreCase, smartCase) { - // First update the last search register - var lastSearchRegister = vimGlobalState.registerController.getRegister('/'); - lastSearchRegister.setText(query); - // Check if the query is already a regex. - if (query instanceof RegExp) { return query; } - // First try to extract regex + flags from the input. If no flags found, - // extract just the regex. IE does not accept flags directly defined in - // the regex string in the form /regex/flags - var slashes = findUnescapedSlashes(query); - var regexPart; - var forceIgnoreCase; - if (!slashes.length) { - // Query looks like 'regexp' - regexPart = query; - } else { - // Query looks like 'regexp/...' - regexPart = query.substring(0, slashes[0]); - var flagsPart = query.substring(slashes[0]); - forceIgnoreCase = (flagsPart.indexOf('i') != -1); - } - if (!regexPart) { - return null; - } - if (!getOption('pcre')) { - regexPart = translateRegex(regexPart); - } - if (smartCase) { - ignoreCase = (/^[^A-Z]*$/).test(regexPart); - } - var regexp = new RegExp(regexPart, - (ignoreCase || forceIgnoreCase) ? 'i' : undefined); - return regexp; - } - function showConfirm(cm, text) { - if (cm.openNotification) { - cm.openNotification('<span style="color: red">' + text + '</span>', - {bottom: true, duration: 5000}); - } else { - alert(text); - } - } - function makePrompt(prefix, desc) { - var raw = ''; - if (prefix) { - raw += '<span style="font-family: monospace">' + prefix + '</span>'; - } - raw += '<input type="text"/> ' + - '<span style="color: #888">'; - if (desc) { - raw += '<span style="color: #888">'; - raw += desc; - raw += '</span>'; - } - return raw; - } - var searchPromptDesc = '(Javascript regexp)'; - function showPrompt(cm, options) { - var shortText = (options.prefix || '') + ' ' + (options.desc || ''); - var prompt = makePrompt(options.prefix, options.desc); - dialog(cm, prompt, shortText, options.onClose, options); - } - function regexEqual(r1, r2) { - if (r1 instanceof RegExp && r2 instanceof RegExp) { - var props = ['global', 'multiline', 'ignoreCase', 'source']; - for (var i = 0; i < props.length; i++) { - var prop = props[i]; - if (r1[prop] !== r2[prop]) { - return false; - } - } - return true; - } - return false; - } - // Returns true if the query is valid. - function updateSearchQuery(cm, rawQuery, ignoreCase, smartCase) { - if (!rawQuery) { - return; - } - var state = getSearchState(cm); - var query = parseQuery(rawQuery, !!ignoreCase, !!smartCase); - if (!query) { - return; - } - highlightSearchMatches(cm, query); - if (regexEqual(query, state.getQuery())) { - return query; - } - state.setQuery(query); - return query; - } - function searchOverlay(query) { - if (query.source.charAt(0) == '^') { - var matchSol = true; - } - return { - token: function(stream) { - if (matchSol && !stream.sol()) { - stream.skipToEnd(); - return; - } - var match = stream.match(query, false); - if (match) { - if (match[0].length == 0) { - // Matched empty string, skip to next. - stream.next(); - return 'searching'; - } - if (!stream.sol()) { - // Backtrack 1 to match \b - stream.backUp(1); - if (!query.exec(stream.next() + match[0])) { - stream.next(); - return null; - } - } - stream.match(query); - return 'searching'; - } - while (!stream.eol()) { - stream.next(); - if (stream.match(query, false)) break; - } - }, - query: query - }; - } - function highlightSearchMatches(cm, query) { - var searchState = getSearchState(cm); - var overlay = searchState.getOverlay(); - if (!overlay || query != overlay.query) { - if (overlay) { - cm.removeOverlay(overlay); - } - overlay = searchOverlay(query); - cm.addOverlay(overlay); - if (cm.showMatchesOnScrollbar) { - if (searchState.getScrollbarAnnotate()) { - searchState.getScrollbarAnnotate().clear(); - } - searchState.setScrollbarAnnotate(cm.showMatchesOnScrollbar(query)); - } - searchState.setOverlay(overlay); - } - } - function findNext(cm, prev, query, repeat) { - if (repeat === undefined) { repeat = 1; } - return cm.operation(function() { - var pos = cm.getCursor(); - var cursor = cm.getSearchCursor(query, pos); - for (var i = 0; i < repeat; i++) { - var found = cursor.find(prev); - if (i == 0 && found && cursorEqual(cursor.from(), pos)) { found = cursor.find(prev); } - if (!found) { - // SearchCursor may have returned null because it hit EOF, wrap - // around and try again. - cursor = cm.getSearchCursor(query, - (prev) ? Pos(cm.lastLine()) : Pos(cm.firstLine(), 0) ); - if (!cursor.find(prev)) { - return; - } - } - } - return cursor.from(); - }); - } - function clearSearchHighlight(cm) { - var state = getSearchState(cm); - cm.removeOverlay(getSearchState(cm).getOverlay()); - state.setOverlay(null); - if (state.getScrollbarAnnotate()) { - state.getScrollbarAnnotate().clear(); - state.setScrollbarAnnotate(null); - } - } - /** - * Check if pos is in the specified range, INCLUSIVE. - * Range can be specified with 1 or 2 arguments. - * If the first range argument is an array, treat it as an array of line - * numbers. Match pos against any of the lines. - * If the first range argument is a number, - * if there is only 1 range argument, check if pos has the same line - * number - * if there are 2 range arguments, then check if pos is in between the two - * range arguments. - */ - function isInRange(pos, start, end) { - if (typeof pos != 'number') { - // Assume it is a cursor position. Get the line number. - pos = pos.line; - } - if (start instanceof Array) { - return inArray(pos, start); - } else { - if (end) { - return (pos >= start && pos <= end); - } else { - return pos == start; - } - } - } - function getUserVisibleLines(cm) { - var scrollInfo = cm.getScrollInfo(); - var occludeToleranceTop = 6; - var occludeToleranceBottom = 10; - var from = cm.coordsChar({left:0, top: occludeToleranceTop + scrollInfo.top}, 'local'); - var bottomY = scrollInfo.clientHeight - occludeToleranceBottom + scrollInfo.top; - var to = cm.coordsChar({left:0, top: bottomY}, 'local'); - return {top: from.line, bottom: to.line}; - } - - var ExCommandDispatcher = function() { - this.buildCommandMap_(); - }; - ExCommandDispatcher.prototype = { - processCommand: function(cm, input, opt_params) { - var that = this; - cm.operation(function () { - cm.curOp.isVimOp = true; - that._processCommand(cm, input, opt_params); - }); - }, - _processCommand: function(cm, input, opt_params) { - var vim = cm.state.vim; - var commandHistoryRegister = vimGlobalState.registerController.getRegister(':'); - var previousCommand = commandHistoryRegister.toString(); - if (vim.visualMode) { - exitVisualMode(cm); - } - var inputStream = new CodeMirror.StringStream(input); - // update ": with the latest command whether valid or invalid - commandHistoryRegister.setText(input); - var params = opt_params || {}; - params.input = input; - try { - this.parseInput_(cm, inputStream, params); - } catch(e) { - showConfirm(cm, e); - throw e; - } - var command; - var commandName; - if (!params.commandName) { - // If only a line range is defined, move to the line. - if (params.line !== undefined) { - commandName = 'move'; - } - } else { - command = this.matchCommand_(params.commandName); - if (command) { - commandName = command.name; - if (command.excludeFromCommandHistory) { - commandHistoryRegister.setText(previousCommand); - } - this.parseCommandArgs_(inputStream, params, command); - if (command.type == 'exToKey') { - // Handle Ex to Key mapping. - for (var i = 0; i < command.toKeys.length; i++) { - CodeMirror.Vim.handleKey(cm, command.toKeys[i], 'mapping'); - } - return; - } else if (command.type == 'exToEx') { - // Handle Ex to Ex mapping. - this.processCommand(cm, command.toInput); - return; - } - } - } - if (!commandName) { - showConfirm(cm, 'Not an editor command ":' + input + '"'); - return; - } - try { - exCommands[commandName](cm, params); - // Possibly asynchronous commands (e.g. substitute, which might have a - // user confirmation), are responsible for calling the callback when - // done. All others have it taken care of for them here. - if ((!command || !command.possiblyAsync) && params.callback) { - params.callback(); - } - } catch(e) { - showConfirm(cm, e); - throw e; - } - }, - parseInput_: function(cm, inputStream, result) { - inputStream.eatWhile(':'); - // Parse range. - if (inputStream.eat('%')) { - result.line = cm.firstLine(); - result.lineEnd = cm.lastLine(); - } else { - result.line = this.parseLineSpec_(cm, inputStream); - if (result.line !== undefined && inputStream.eat(',')) { - result.lineEnd = this.parseLineSpec_(cm, inputStream); - } - } - - // Parse command name. - var commandMatch = inputStream.match(/^(\w+)/); - if (commandMatch) { - result.commandName = commandMatch[1]; - } else { - result.commandName = inputStream.match(/.*/)[0]; - } - - return result; - }, - parseLineSpec_: function(cm, inputStream) { - var numberMatch = inputStream.match(/^(\d+)/); - if (numberMatch) { - return parseInt(numberMatch[1], 10) - 1; - } - switch (inputStream.next()) { - case '.': - return cm.getCursor().line; - case '$': - return cm.lastLine(); - case '\'': - var mark = cm.state.vim.marks[inputStream.next()]; - if (mark && mark.find()) { - return mark.find().line; - } - throw new Error('Mark not set'); - default: - inputStream.backUp(1); - return undefined; - } - }, - parseCommandArgs_: function(inputStream, params, command) { - if (inputStream.eol()) { - return; - } - params.argString = inputStream.match(/.*/)[0]; - // Parse command-line arguments - var delim = command.argDelimiter || /\s+/; - var args = trim(params.argString).split(delim); - if (args.length && args[0]) { - params.args = args; - } - }, - matchCommand_: function(commandName) { - // Return the command in the command map that matches the shortest - // prefix of the passed in command name. The match is guaranteed to be - // unambiguous if the defaultExCommandMap's shortNames are set up - // correctly. (see @code{defaultExCommandMap}). - for (var i = commandName.length; i > 0; i--) { - var prefix = commandName.substring(0, i); - if (this.commandMap_[prefix]) { - var command = this.commandMap_[prefix]; - if (command.name.indexOf(commandName) === 0) { - return command; - } - } - } - return null; - }, - buildCommandMap_: function() { - this.commandMap_ = {}; - for (var i = 0; i < defaultExCommandMap.length; i++) { - var command = defaultExCommandMap[i]; - var key = command.shortName || command.name; - this.commandMap_[key] = command; - } - }, - map: function(lhs, rhs, ctx) { - if (lhs != ':' && lhs.charAt(0) == ':') { - if (ctx) { throw Error('Mode not supported for ex mappings'); } - var commandName = lhs.substring(1); - if (rhs != ':' && rhs.charAt(0) == ':') { - // Ex to Ex mapping - this.commandMap_[commandName] = { - name: commandName, - type: 'exToEx', - toInput: rhs.substring(1), - user: true - }; - } else { - // Ex to key mapping - this.commandMap_[commandName] = { - name: commandName, - type: 'exToKey', - toKeys: rhs, - user: true - }; - } - } else { - if (rhs != ':' && rhs.charAt(0) == ':') { - // Key to Ex mapping. - var mapping = { - keys: lhs, - type: 'keyToEx', - exArgs: { input: rhs.substring(1) }, - user: true}; - if (ctx) { mapping.context = ctx; } - defaultKeymap.unshift(mapping); - } else { - // Key to key mapping - var mapping = { - keys: lhs, - type: 'keyToKey', - toKeys: rhs, - user: true - }; - if (ctx) { mapping.context = ctx; } - defaultKeymap.unshift(mapping); - } - } - }, - unmap: function(lhs, ctx) { - if (lhs != ':' && lhs.charAt(0) == ':') { - // Ex to Ex or Ex to key mapping - if (ctx) { throw Error('Mode not supported for ex mappings'); } - var commandName = lhs.substring(1); - if (this.commandMap_[commandName] && this.commandMap_[commandName].user) { - delete this.commandMap_[commandName]; - return; - } - } else { - // Key to Ex or key to key mapping - var keys = lhs; - for (var i = 0; i < defaultKeymap.length; i++) { - if (keys == defaultKeymap[i].keys - && defaultKeymap[i].context === ctx - && defaultKeymap[i].user) { - defaultKeymap.splice(i, 1); - return; - } - } - } - throw Error('No such mapping.'); - } - }; - - var exCommands = { - colorscheme: function(cm, params) { - if (!params.args || params.args.length < 1) { - showConfirm(cm, cm.getOption('theme')); - return; - } - cm.setOption('theme', params.args[0]); - }, - map: function(cm, params, ctx) { - var mapArgs = params.args; - if (!mapArgs || mapArgs.length < 2) { - if (cm) { - showConfirm(cm, 'Invalid mapping: ' + params.input); - } - return; - } - exCommandDispatcher.map(mapArgs[0], mapArgs[1], ctx); - }, - imap: function(cm, params) { this.map(cm, params, 'insert'); }, - nmap: function(cm, params) { this.map(cm, params, 'normal'); }, - vmap: function(cm, params) { this.map(cm, params, 'visual'); }, - unmap: function(cm, params, ctx) { - var mapArgs = params.args; - if (!mapArgs || mapArgs.length < 1) { - if (cm) { - showConfirm(cm, 'No such mapping: ' + params.input); - } - return; - } - exCommandDispatcher.unmap(mapArgs[0], ctx); - }, - move: function(cm, params) { - commandDispatcher.processCommand(cm, cm.state.vim, { - type: 'motion', - motion: 'moveToLineOrEdgeOfDocument', - motionArgs: { forward: false, explicitRepeat: true, - linewise: true }, - repeatOverride: params.line+1}); - }, - set: function(cm, params) { - var setArgs = params.args; - // Options passed through to the setOption/getOption calls. May be passed in by the - // local/global versions of the set command - var setCfg = params.setCfg || {}; - if (!setArgs || setArgs.length < 1) { - if (cm) { - showConfirm(cm, 'Invalid mapping: ' + params.input); - } - return; - } - var expr = setArgs[0].split('='); - var optionName = expr[0]; - var value = expr[1]; - var forceGet = false; - - if (optionName.charAt(optionName.length - 1) == '?') { - // If post-fixed with ?, then the set is actually a get. - if (value) { throw Error('Trailing characters: ' + params.argString); } - optionName = optionName.substring(0, optionName.length - 1); - forceGet = true; - } - if (value === undefined && optionName.substring(0, 2) == 'no') { - // To set boolean options to false, the option name is prefixed with - // 'no'. - optionName = optionName.substring(2); - value = false; - } - - var optionIsBoolean = options[optionName] && options[optionName].type == 'boolean'; - if (optionIsBoolean && value == undefined) { - // Calling set with a boolean option sets it to true. - value = true; - } - // If no value is provided, then we assume this is a get. - if (!optionIsBoolean && value === undefined || forceGet) { - var oldValue = getOption(optionName, cm, setCfg); - if (oldValue === true || oldValue === false) { - showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName); - } else { - showConfirm(cm, ' ' + optionName + '=' + oldValue); - } - } else { - setOption(optionName, value, cm, setCfg); - } - }, - setlocal: function (cm, params) { - // setCfg is passed through to setOption - params.setCfg = {scope: 'local'}; - this.set(cm, params); - }, - setglobal: function (cm, params) { - // setCfg is passed through to setOption - params.setCfg = {scope: 'global'}; - this.set(cm, params); - }, - registers: function(cm, params) { - var regArgs = params.args; - var registers = vimGlobalState.registerController.registers; - var regInfo = '----------Registers----------<br><br>'; - if (!regArgs) { - for (var registerName in registers) { - var text = registers[registerName].toString(); - if (text.length) { - regInfo += '"' + registerName + ' ' + text + '<br>'; - } - } - } else { - var registerName; - regArgs = regArgs.join(''); - for (var i = 0; i < regArgs.length; i++) { - registerName = regArgs.charAt(i); - if (!vimGlobalState.registerController.isValidRegister(registerName)) { - continue; - } - var register = registers[registerName] || new Register(); - regInfo += '"' + registerName + ' ' + register.toString() + '<br>'; - } - } - showConfirm(cm, regInfo); - }, - sort: function(cm, params) { - var reverse, ignoreCase, unique, number; - function parseArgs() { - if (params.argString) { - var args = new CodeMirror.StringStream(params.argString); - if (args.eat('!')) { reverse = true; } - if (args.eol()) { return; } - if (!args.eatSpace()) { return 'Invalid arguments'; } - var opts = args.match(/[a-z]+/); - if (opts) { - opts = opts[0]; - ignoreCase = opts.indexOf('i') != -1; - unique = opts.indexOf('u') != -1; - var decimal = opts.indexOf('d') != -1 && 1; - var hex = opts.indexOf('x') != -1 && 1; - var octal = opts.indexOf('o') != -1 && 1; - if (decimal + hex + octal > 1) { return 'Invalid arguments'; } - number = decimal && 'decimal' || hex && 'hex' || octal && 'octal'; - } - if (args.match(/\/.*\//)) { return 'patterns not supported'; } - } - } - var err = parseArgs(); - if (err) { - showConfirm(cm, err + ': ' + params.argString); - return; - } - var lineStart = params.line || cm.firstLine(); - var lineEnd = params.lineEnd || params.line || cm.lastLine(); - if (lineStart == lineEnd) { return; } - var curStart = Pos(lineStart, 0); - var curEnd = Pos(lineEnd, lineLength(cm, lineEnd)); - var text = cm.getRange(curStart, curEnd).split('\n'); - var numberRegex = (number == 'decimal') ? /(-?)([\d]+)/ : - (number == 'hex') ? /(-?)(?:0x)?([0-9a-f]+)/i : - (number == 'octal') ? /([0-7]+)/ : null; - var radix = (number == 'decimal') ? 10 : (number == 'hex') ? 16 : (number == 'octal') ? 8 : null; - var numPart = [], textPart = []; - if (number) { - for (var i = 0; i < text.length; i++) { - if (numberRegex.exec(text[i])) { - numPart.push(text[i]); - } else { - textPart.push(text[i]); - } - } - } else { - textPart = text; - } - function compareFn(a, b) { - if (reverse) { var tmp; tmp = a; a = b; b = tmp; } - if (ignoreCase) { a = a.toLowerCase(); b = b.toLowerCase(); } - var anum = number && numberRegex.exec(a); - var bnum = number && numberRegex.exec(b); - if (!anum) { return a < b ? -1 : 1; } - anum = parseInt((anum[1] + anum[2]).toLowerCase(), radix); - bnum = parseInt((bnum[1] + bnum[2]).toLowerCase(), radix); - return anum - bnum; - } - numPart.sort(compareFn); - textPart.sort(compareFn); - text = (!reverse) ? textPart.concat(numPart) : numPart.concat(textPart); - if (unique) { // Remove duplicate lines - var textOld = text; - var lastLine; - text = []; - for (var i = 0; i < textOld.length; i++) { - if (textOld[i] != lastLine) { - text.push(textOld[i]); - } - lastLine = textOld[i]; - } - } - cm.replaceRange(text.join('\n'), curStart, curEnd); - }, - global: function(cm, params) { - // a global command is of the form - // :[range]g/pattern/[cmd] - // argString holds the string /pattern/[cmd] - var argString = params.argString; - if (!argString) { - showConfirm(cm, 'Regular Expression missing from global'); - return; - } - // range is specified here - var lineStart = (params.line !== undefined) ? params.line : cm.firstLine(); - var lineEnd = params.lineEnd || params.line || cm.lastLine(); - // get the tokens from argString - var tokens = splitBySlash(argString); - var regexPart = argString, cmd; - if (tokens.length) { - regexPart = tokens[0]; - cmd = tokens.slice(1, tokens.length).join('/'); - } - if (regexPart) { - // If regex part is empty, then use the previous query. Otherwise - // use the regex part as the new query. - try { - updateSearchQuery(cm, regexPart, true /** ignoreCase */, - true /** smartCase */); - } catch (e) { - showConfirm(cm, 'Invalid regex: ' + regexPart); - return; - } - } - // now that we have the regexPart, search for regex matches in the - // specified range of lines - var query = getSearchState(cm).getQuery(); - var matchedLines = [], content = ''; - for (var i = lineStart; i <= lineEnd; i++) { - var matched = query.test(cm.getLine(i)); - if (matched) { - matchedLines.push(i+1); - content+= cm.getLine(i) + '<br>'; - } - } - // if there is no [cmd], just display the list of matched lines - if (!cmd) { - showConfirm(cm, content); - return; - } - var index = 0; - var nextCommand = function() { - if (index < matchedLines.length) { - var command = matchedLines[index] + cmd; - exCommandDispatcher.processCommand(cm, command, { - callback: nextCommand - }); - } - index++; - }; - nextCommand(); - }, - substitute: function(cm, params) { - if (!cm.getSearchCursor) { - throw new Error('Search feature not available. Requires searchcursor.js or ' + - 'any other getSearchCursor implementation.'); - } - var argString = params.argString; - var tokens = argString ? splitBySlash(argString) : []; - var regexPart, replacePart = '', trailing, flagsPart, count; - var confirm = false; // Whether to confirm each replace. - var global = false; // True to replace all instances on a line, false to replace only 1. - if (tokens.length) { - regexPart = tokens[0]; - replacePart = tokens[1]; - if (replacePart !== undefined) { - if (getOption('pcre')) { - replacePart = unescapeRegexReplace(replacePart); - } else { - replacePart = translateRegexReplace(replacePart); - } - vimGlobalState.lastSubstituteReplacePart = replacePart; - } - trailing = tokens[2] ? tokens[2].split(' ') : []; - } else { - // either the argString is empty or its of the form ' hello/world' - // actually splitBySlash returns a list of tokens - // only if the string starts with a '/' - if (argString && argString.length) { - showConfirm(cm, 'Substitutions should be of the form ' + - ':s/pattern/replace/'); - return; - } - } - // After the 3rd slash, we can have flags followed by a space followed - // by count. - if (trailing) { - flagsPart = trailing[0]; - count = parseInt(trailing[1]); - if (flagsPart) { - if (flagsPart.indexOf('c') != -1) { - confirm = true; - flagsPart.replace('c', ''); - } - if (flagsPart.indexOf('g') != -1) { - global = true; - flagsPart.replace('g', ''); - } - regexPart = regexPart + '/' + flagsPart; - } - } - if (regexPart) { - // If regex part is empty, then use the previous query. Otherwise use - // the regex part as the new query. - try { - updateSearchQuery(cm, regexPart, true /** ignoreCase */, - true /** smartCase */); - } catch (e) { - showConfirm(cm, 'Invalid regex: ' + regexPart); - return; - } - } - replacePart = replacePart || vimGlobalState.lastSubstituteReplacePart; - if (replacePart === undefined) { - showConfirm(cm, 'No previous substitute regular expression'); - return; - } - var state = getSearchState(cm); - var query = state.getQuery(); - var lineStart = (params.line !== undefined) ? params.line : cm.getCursor().line; - var lineEnd = params.lineEnd || lineStart; - if (lineStart == cm.firstLine() && lineEnd == cm.lastLine()) { - lineEnd = Infinity; - } - if (count) { - lineStart = lineEnd; - lineEnd = lineStart + count - 1; - } - var startPos = clipCursorToContent(cm, Pos(lineStart, 0)); - var cursor = cm.getSearchCursor(query, startPos); - doReplace(cm, confirm, global, lineStart, lineEnd, cursor, query, replacePart, params.callback); - }, - redo: CodeMirror.commands.redo, - undo: CodeMirror.commands.undo, - write: function(cm) { - if (CodeMirror.commands.save) { - // If a save command is defined, call it. - CodeMirror.commands.save(cm); - } else { - // Saves to text area if no save command is defined. - cm.save(); - } - }, - nohlsearch: function(cm) { - clearSearchHighlight(cm); - }, - delmarks: function(cm, params) { - if (!params.argString || !trim(params.argString)) { - showConfirm(cm, 'Argument required'); - return; - } - - var state = cm.state.vim; - var stream = new CodeMirror.StringStream(trim(params.argString)); - while (!stream.eol()) { - stream.eatSpace(); - - // Record the streams position at the beginning of the loop for use - // in error messages. - var count = stream.pos; - - if (!stream.match(/[a-zA-Z]/, false)) { - showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count)); - return; - } - - var sym = stream.next(); - // Check if this symbol is part of a range - if (stream.match('-', true)) { - // This symbol is part of a range. - - // The range must terminate at an alphabetic character. - if (!stream.match(/[a-zA-Z]/, false)) { - showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count)); - return; - } - - var startMark = sym; - var finishMark = stream.next(); - // The range must terminate at an alphabetic character which - // shares the same case as the start of the range. - if (isLowerCase(startMark) && isLowerCase(finishMark) || - isUpperCase(startMark) && isUpperCase(finishMark)) { - var start = startMark.charCodeAt(0); - var finish = finishMark.charCodeAt(0); - if (start >= finish) { - showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count)); - return; - } - - // Because marks are always ASCII values, and we have - // determined that they are the same case, we can use - // their char codes to iterate through the defined range. - for (var j = 0; j <= finish - start; j++) { - var mark = String.fromCharCode(start + j); - delete state.marks[mark]; - } - } else { - showConfirm(cm, 'Invalid argument: ' + startMark + '-'); - return; - } - } else { - // This symbol is a valid mark, and is not part of a range. - delete state.marks[sym]; - } - } - } - }; - - var exCommandDispatcher = new ExCommandDispatcher(); - - /** - * @param {CodeMirror} cm CodeMirror instance we are in. - * @param {boolean} confirm Whether to confirm each replace. - * @param {Cursor} lineStart Line to start replacing from. - * @param {Cursor} lineEnd Line to stop replacing at. - * @param {RegExp} query Query for performing matches with. - * @param {string} replaceWith Text to replace matches with. May contain $1, - * $2, etc for replacing captured groups using Javascript replace. - * @param {function()} callback A callback for when the replace is done. - */ - function doReplace(cm, confirm, global, lineStart, lineEnd, searchCursor, query, - replaceWith, callback) { - // Set up all the functions. - cm.state.vim.exMode = true; - var done = false; - var lastPos = searchCursor.from(); - function replaceAll() { - cm.operation(function() { - while (!done) { - replace(); - next(); - } - stop(); - }); - } - function replace() { - var text = cm.getRange(searchCursor.from(), searchCursor.to()); - var newText = text.replace(query, replaceWith); - searchCursor.replace(newText); - } - function next() { - // The below only loops to skip over multiple occurrences on the same - // line when 'global' is not true. - while(searchCursor.findNext() && - isInRange(searchCursor.from(), lineStart, lineEnd)) { - if (!global && lastPos && searchCursor.from().line == lastPos.line) { - continue; - } - cm.scrollIntoView(searchCursor.from(), 30); - cm.setSelection(searchCursor.from(), searchCursor.to()); - lastPos = searchCursor.from(); - done = false; - return; - } - done = true; - } - function stop(close) { - if (close) { close(); } - cm.focus(); - if (lastPos) { - cm.setCursor(lastPos); - var vim = cm.state.vim; - vim.exMode = false; - vim.lastHPos = vim.lastHSPos = lastPos.ch; - } - if (callback) { callback(); } - } - function onPromptKeyDown(e, _value, close) { - // Swallow all keys. - CodeMirror.e_stop(e); - var keyName = CodeMirror.keyName(e); - switch (keyName) { - case 'Y': - replace(); next(); break; - case 'N': - next(); break; - case 'A': - // replaceAll contains a call to close of its own. We don't want it - // to fire too early or multiple times. - var savedCallback = callback; - callback = undefined; - cm.operation(replaceAll); - callback = savedCallback; - break; - case 'L': - replace(); - // fall through and exit. - case 'Q': - case 'Esc': - case 'Ctrl-C': - case 'Ctrl-[': - stop(close); - break; - } - if (done) { stop(close); } - return true; - } - - // Actually do replace. - next(); - if (done) { - showConfirm(cm, 'No matches for ' + query.source); - return; - } - if (!confirm) { - replaceAll(); - if (callback) { callback(); }; - return; - } - showPrompt(cm, { - prefix: 'replace with <strong>' + replaceWith + '</strong> (y/n/a/q/l)', - onKeyDown: onPromptKeyDown - }); - } - - CodeMirror.keyMap.vim = { - attach: attachVimMap, - detach: detachVimMap, - call: cmKey - }; - - function exitInsertMode(cm) { - var vim = cm.state.vim; - var macroModeState = vimGlobalState.macroModeState; - var insertModeChangeRegister = vimGlobalState.registerController.getRegister('.'); - var isPlaying = macroModeState.isPlaying; - var lastChange = macroModeState.lastInsertModeChanges; - // In case of visual block, the insertModeChanges are not saved as a - // single word, so we convert them to a single word - // so as to update the ". register as expected in real vim. - var text = []; - if (!isPlaying) { - var selLength = lastChange.inVisualBlock ? vim.lastSelection.visualBlock.height : 1; - var changes = lastChange.changes; - var text = []; - var i = 0; - // In case of multiple selections in blockwise visual, - // the inserted text, for example: 'f<Backspace>oo', is stored as - // 'f', 'f', InsertModeKey 'o', 'o', 'o', 'o'. (if you have a block with 2 lines). - // We push the contents of the changes array as per the following: - // 1. In case of InsertModeKey, just increment by 1. - // 2. In case of a character, jump by selLength (2 in the example). - while (i < changes.length) { - // This loop will convert 'ff<bs>oooo' to 'f<bs>oo'. - text.push(changes[i]); - if (changes[i] instanceof InsertModeKey) { - i++; - } else { - i+= selLength; - } - } - lastChange.changes = text; - cm.off('change', onChange); - CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown); - } - if (!isPlaying && vim.insertModeRepeat > 1) { - // Perform insert mode repeat for commands like 3,a and 3,o. - repeatLastEdit(cm, vim, vim.insertModeRepeat - 1, - true /** repeatForInsert */); - vim.lastEditInputState.repeatOverride = vim.insertModeRepeat; - } - delete vim.insertModeRepeat; - vim.insertMode = false; - cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1); - cm.setOption('keyMap', 'vim'); - cm.setOption('disableInput', true); - cm.toggleOverwrite(false); // exit replace mode if we were in it. - // update the ". register before exiting insert mode - insertModeChangeRegister.setText(lastChange.changes.join('')); - CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"}); - if (macroModeState.isRecording) { - logInsertModeChange(macroModeState); - } - } - - function _mapCommand(command) { - defaultKeymap.unshift(command); - } - - function mapCommand(keys, type, name, args, extra) { - var command = {keys: keys, type: type}; - command[type] = name; - command[type + "Args"] = args; - for (var key in extra) - command[key] = extra[key]; - _mapCommand(command); - } - - // The timeout in milliseconds for the two-character ESC keymap should be - // adjusted according to your typing speed to prevent false positives. - defineOption('insertModeEscKeysTimeout', 200, 'number'); - - CodeMirror.keyMap['vim-insert'] = { - // TODO: override navigation keys so that Esc will cancel automatic - // indentation from o, O, i_<CR> - 'Ctrl-N': 'autocomplete', - 'Ctrl-P': 'autocomplete', - 'Enter': function(cm) { - var fn = CodeMirror.commands.newlineAndIndentContinueComment || - CodeMirror.commands.newlineAndIndent; - fn(cm); - }, - fallthrough: ['default'], - attach: attachVimMap, - detach: detachVimMap, - call: cmKey - }; - - CodeMirror.keyMap['vim-replace'] = { - 'Backspace': 'goCharLeft', - fallthrough: ['vim-insert'], - attach: attachVimMap, - detach: detachVimMap, - call: cmKey - }; - - function executeMacroRegister(cm, vim, macroModeState, registerName) { - var register = vimGlobalState.registerController.getRegister(registerName); - if (registerName == ':') { - // Read-only register containing last Ex command. - if (register.keyBuffer[0]) { - exCommandDispatcher.processCommand(cm, register.keyBuffer[0]); - } - macroModeState.isPlaying = false; - return; - } - var keyBuffer = register.keyBuffer; - var imc = 0; - macroModeState.isPlaying = true; - macroModeState.replaySearchQueries = register.searchQueries.slice(0); - for (var i = 0; i < keyBuffer.length; i++) { - var text = keyBuffer[i]; - var match, key; - while (text) { - // Pull off one command key, which is either a single character - // or a special sequence wrapped in '<' and '>', e.g. '<Space>'. - match = (/<\w+-.+?>|<\w+>|./).exec(text); - key = match[0]; - text = text.substring(match.index + key.length); - CodeMirror.Vim.handleKey(cm, key, 'macro'); - if (vim.insertMode) { - var changes = register.insertModeChanges[imc++].changes; - vimGlobalState.macroModeState.lastInsertModeChanges.changes = - changes; - repeatInsertModeChanges(cm, changes, 1); - exitInsertMode(cm); - } - } - }; - macroModeState.isPlaying = false; - } - - function logKey(macroModeState, key) { - if (macroModeState.isPlaying) { return; } - var registerName = macroModeState.latestRegister; - var register = vimGlobalState.registerController.getRegister(registerName); - if (register) { - register.pushText(key); - } - } - - function logInsertModeChange(macroModeState) { - if (macroModeState.isPlaying) { return; } - var registerName = macroModeState.latestRegister; - var register = vimGlobalState.registerController.getRegister(registerName); - if (register && register.pushInsertModeChanges) { - register.pushInsertModeChanges(macroModeState.lastInsertModeChanges); - } - } - - function logSearchQuery(macroModeState, query) { - if (macroModeState.isPlaying) { return; } - var registerName = macroModeState.latestRegister; - var register = vimGlobalState.registerController.getRegister(registerName); - if (register && register.pushSearchQuery) { - register.pushSearchQuery(query); - } - } - - /** - * Listens for changes made in insert mode. - * Should only be active in insert mode. - */ - function onChange(_cm, changeObj) { - var macroModeState = vimGlobalState.macroModeState; - var lastChange = macroModeState.lastInsertModeChanges; - if (!macroModeState.isPlaying) { - while(changeObj) { - lastChange.expectCursorActivityForChange = true; - if (changeObj.origin == '+input' || changeObj.origin == 'paste' - || changeObj.origin === undefined /* only in testing */) { - var text = changeObj.text.join('\n'); - lastChange.changes.push(text); - } - // Change objects may be chained with next. - changeObj = changeObj.next; - } - } - } - - /** - * Listens for any kind of cursor activity on CodeMirror. - */ - function onCursorActivity(cm) { - var vim = cm.state.vim; - if (vim.insertMode) { - // Tracking cursor activity in insert mode (for macro support). - var macroModeState = vimGlobalState.macroModeState; - if (macroModeState.isPlaying) { return; } - var lastChange = macroModeState.lastInsertModeChanges; - if (lastChange.expectCursorActivityForChange) { - lastChange.expectCursorActivityForChange = false; - } else { - // Cursor moved outside the context of an edit. Reset the change. - lastChange.changes = []; - } - } else if (!cm.curOp.isVimOp) { - handleExternalSelection(cm, vim); - } - if (vim.visualMode) { - updateFakeCursor(cm); - } - } - function updateFakeCursor(cm) { - var vim = cm.state.vim; - var from = clipCursorToContent(cm, copyCursor(vim.sel.head)); - var to = offsetCursor(from, 0, 1); - if (vim.fakeCursor) { - vim.fakeCursor.clear(); - } - vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'}); - } - function handleExternalSelection(cm, vim) { - var anchor = cm.getCursor('anchor'); - var head = cm.getCursor('head'); - // Enter or exit visual mode to match mouse selection. - if (vim.visualMode && !cm.somethingSelected()) { - exitVisualMode(cm, false); - } else if (!vim.visualMode && !vim.insertMode && cm.somethingSelected()) { - vim.visualMode = true; - vim.visualLine = false; - CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"}); - } - if (vim.visualMode) { - // Bind CodeMirror selection model to vim selection model. - // Mouse selections are considered visual characterwise. - var headOffset = !cursorIsBefore(head, anchor) ? -1 : 0; - var anchorOffset = cursorIsBefore(head, anchor) ? -1 : 0; - head = offsetCursor(head, 0, headOffset); - anchor = offsetCursor(anchor, 0, anchorOffset); - vim.sel = { - anchor: anchor, - head: head - }; - updateMark(cm, vim, '<', cursorMin(head, anchor)); - updateMark(cm, vim, '>', cursorMax(head, anchor)); - } else if (!vim.insertMode) { - // Reset lastHPos if selection was modified by something outside of vim mode e.g. by mouse. - vim.lastHPos = cm.getCursor().ch; - } - } - - /** Wrapper for special keys pressed in insert mode */ - function InsertModeKey(keyName) { - this.keyName = keyName; - } - - /** - * Handles raw key down events from the text area. - * - Should only be active in insert mode. - * - For recording deletes in insert mode. - */ - function onKeyEventTargetKeyDown(e) { - var macroModeState = vimGlobalState.macroModeState; - var lastChange = macroModeState.lastInsertModeChanges; - var keyName = CodeMirror.keyName(e); - if (!keyName) { return; } - function onKeyFound() { - lastChange.changes.push(new InsertModeKey(keyName)); - return true; - } - if (keyName.indexOf('Delete') != -1 || keyName.indexOf('Backspace') != -1) { - CodeMirror.lookupKey(keyName, 'vim-insert', onKeyFound); - } - } - - /** - * Repeats the last edit, which includes exactly 1 command and at most 1 - * insert. Operator and motion commands are read from lastEditInputState, - * while action commands are read from lastEditActionCommand. - * - * If repeatForInsert is true, then the function was called by - * exitInsertMode to repeat the insert mode changes the user just made. The - * corresponding enterInsertMode call was made with a count. - */ - function repeatLastEdit(cm, vim, repeat, repeatForInsert) { - var macroModeState = vimGlobalState.macroModeState; - macroModeState.isPlaying = true; - var isAction = !!vim.lastEditActionCommand; - var cachedInputState = vim.inputState; - function repeatCommand() { - if (isAction) { - commandDispatcher.processAction(cm, vim, vim.lastEditActionCommand); - } else { - commandDispatcher.evalInput(cm, vim); - } - } - function repeatInsert(repeat) { - if (macroModeState.lastInsertModeChanges.changes.length > 0) { - // For some reason, repeat cw in desktop VIM does not repeat - // insert mode changes. Will conform to that behavior. - repeat = !vim.lastEditActionCommand ? 1 : repeat; - var changeObject = macroModeState.lastInsertModeChanges; - repeatInsertModeChanges(cm, changeObject.changes, repeat); - } - } - vim.inputState = vim.lastEditInputState; - if (isAction && vim.lastEditActionCommand.interlaceInsertRepeat) { - // o and O repeat have to be interlaced with insert repeats so that the - // insertions appear on separate lines instead of the last line. - for (var i = 0; i < repeat; i++) { - repeatCommand(); - repeatInsert(1); - } - } else { - if (!repeatForInsert) { - // Hack to get the cursor to end up at the right place. If I is - // repeated in insert mode repeat, cursor will be 1 insert - // change set left of where it should be. - repeatCommand(); - } - repeatInsert(repeat); - } - vim.inputState = cachedInputState; - if (vim.insertMode && !repeatForInsert) { - // Don't exit insert mode twice. If repeatForInsert is set, then we - // were called by an exitInsertMode call lower on the stack. - exitInsertMode(cm); - } - macroModeState.isPlaying = false; - }; - - function repeatInsertModeChanges(cm, changes, repeat) { - function keyHandler(binding) { - if (typeof binding == 'string') { - CodeMirror.commands[binding](cm); - } else { - binding(cm); - } - return true; - } - var head = cm.getCursor('head'); - var inVisualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock; - if (inVisualBlock) { - // Set up block selection again for repeating the changes. - var vim = cm.state.vim; - var lastSel = vim.lastSelection; - var offset = getOffset(lastSel.anchor, lastSel.head); - selectForInsert(cm, head, offset.line + 1); - repeat = cm.listSelections().length; - cm.setCursor(head); - } - for (var i = 0; i < repeat; i++) { - if (inVisualBlock) { - cm.setCursor(offsetCursor(head, i, 0)); - } - for (var j = 0; j < changes.length; j++) { - var change = changes[j]; - if (change instanceof InsertModeKey) { - CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler); - } else { - var cur = cm.getCursor(); - cm.replaceRange(change, cur, cur); - } - } - } - if (inVisualBlock) { - cm.setCursor(offsetCursor(head, 0, 1)); - } - } - - resetVimGlobalState(); - return vimApi; - }; - // Initialize Vim and make it available as an API. - CodeMirror.Vim = Vim(); -}); diff --git a/plugins/tiddlywiki/codemirror/files/mode/css/css.js b/plugins/tiddlywiki/codemirror/files/mode/css/css.js deleted file mode 100755 index e9656e3dc..000000000 --- a/plugins/tiddlywiki/codemirror/files/mode/css/css.js +++ /dev/null @@ -1,825 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("css", function(config, parserConfig) { - var inline = parserConfig.inline - if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css"); - - var indentUnit = config.indentUnit, - tokenHooks = parserConfig.tokenHooks, - documentTypes = parserConfig.documentTypes || {}, - mediaTypes = parserConfig.mediaTypes || {}, - mediaFeatures = parserConfig.mediaFeatures || {}, - mediaValueKeywords = parserConfig.mediaValueKeywords || {}, - propertyKeywords = parserConfig.propertyKeywords || {}, - nonStandardPropertyKeywords = parserConfig.nonStandardPropertyKeywords || {}, - fontProperties = parserConfig.fontProperties || {}, - counterDescriptors = parserConfig.counterDescriptors || {}, - colorKeywords = parserConfig.colorKeywords || {}, - valueKeywords = parserConfig.valueKeywords || {}, - allowNested = parserConfig.allowNested, - supportsAtComponent = parserConfig.supportsAtComponent === true; - - var type, override; - function ret(style, tp) { type = tp; return style; } - - // Tokenizers - - function tokenBase(stream, state) { - var ch = stream.next(); - if (tokenHooks[ch]) { - var result = tokenHooks[ch](stream, state); - if (result !== false) return result; - } - if (ch == "@") { - stream.eatWhile(/[\w\\\-]/); - return ret("def", stream.current()); - } else if (ch == "=" || (ch == "~" || ch == "|") && stream.eat("=")) { - return ret(null, "compare"); - } else if (ch == "\"" || ch == "'") { - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } else if (ch == "#") { - stream.eatWhile(/[\w\\\-]/); - return ret("atom", "hash"); - } else if (ch == "!") { - stream.match(/^\s*\w*/); - return ret("keyword", "important"); - } else if (/\d/.test(ch) || ch == "." && stream.eat(/\d/)) { - stream.eatWhile(/[\w.%]/); - return ret("number", "unit"); - } else if (ch === "-") { - if (/[\d.]/.test(stream.peek())) { - stream.eatWhile(/[\w.%]/); - return ret("number", "unit"); - } else if (stream.match(/^-[\w\\\-]+/)) { - stream.eatWhile(/[\w\\\-]/); - if (stream.match(/^\s*:/, false)) - return ret("variable-2", "variable-definition"); - return ret("variable-2", "variable"); - } else if (stream.match(/^\w+-/)) { - return ret("meta", "meta"); - } - } else if (/[,+>*\/]/.test(ch)) { - return ret(null, "select-op"); - } else if (ch == "." && stream.match(/^-?[_a-z][_a-z0-9-]*/i)) { - return ret("qualifier", "qualifier"); - } else if (/[:;{}\[\]\(\)]/.test(ch)) { - return ret(null, ch); - } else if ((ch == "u" && stream.match(/rl(-prefix)?\(/)) || - (ch == "d" && stream.match("omain(")) || - (ch == "r" && stream.match("egexp("))) { - stream.backUp(1); - state.tokenize = tokenParenthesized; - return ret("property", "word"); - } else if (/[\w\\\-]/.test(ch)) { - stream.eatWhile(/[\w\\\-]/); - return ret("property", "word"); - } else { - return ret(null, null); - } - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, ch; - while ((ch = stream.next()) != null) { - if (ch == quote && !escaped) { - if (quote == ")") stream.backUp(1); - break; - } - escaped = !escaped && ch == "\\"; - } - if (ch == quote || !escaped && quote != ")") state.tokenize = null; - return ret("string", "string"); - }; - } - - function tokenParenthesized(stream, state) { - stream.next(); // Must be '(' - if (!stream.match(/\s*[\"\')]/, false)) - state.tokenize = tokenString(")"); - else - state.tokenize = null; - return ret(null, "("); - } - - // Context management - - function Context(type, indent, prev) { - this.type = type; - this.indent = indent; - this.prev = prev; - } - - function pushContext(state, stream, type, indent) { - state.context = new Context(type, stream.indentation() + (indent === false ? 0 : indentUnit), state.context); - return type; - } - - function popContext(state) { - if (state.context.prev) - state.context = state.context.prev; - return state.context.type; - } - - function pass(type, stream, state) { - return states[state.context.type](type, stream, state); - } - function popAndPass(type, stream, state, n) { - for (var i = n || 1; i > 0; i--) - state.context = state.context.prev; - return pass(type, stream, state); - } - - // Parser - - function wordAsValue(stream) { - var word = stream.current().toLowerCase(); - if (valueKeywords.hasOwnProperty(word)) - override = "atom"; - else if (colorKeywords.hasOwnProperty(word)) - override = "keyword"; - else - override = "variable"; - } - - var states = {}; - - states.top = function(type, stream, state) { - if (type == "{") { - return pushContext(state, stream, "block"); - } else if (type == "}" && state.context.prev) { - return popContext(state); - } else if (supportsAtComponent && /@component/.test(type)) { - return pushContext(state, stream, "atComponentBlock"); - } else if (/^@(-moz-)?document$/.test(type)) { - return pushContext(state, stream, "documentTypes"); - } else if (/^@(media|supports|(-moz-)?document|import)$/.test(type)) { - return pushContext(state, stream, "atBlock"); - } else if (/^@(font-face|counter-style)/.test(type)) { - state.stateArg = type; - return "restricted_atBlock_before"; - } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) { - return "keyframes"; - } else if (type && type.charAt(0) == "@") { - return pushContext(state, stream, "at"); - } else if (type == "hash") { - override = "builtin"; - } else if (type == "word") { - override = "tag"; - } else if (type == "variable-definition") { - return "maybeprop"; - } else if (type == "interpolation") { - return pushContext(state, stream, "interpolation"); - } else if (type == ":") { - return "pseudo"; - } else if (allowNested && type == "(") { - return pushContext(state, stream, "parens"); - } - return state.context.type; - }; - - states.block = function(type, stream, state) { - if (type == "word") { - var word = stream.current().toLowerCase(); - if (propertyKeywords.hasOwnProperty(word)) { - override = "property"; - return "maybeprop"; - } else if (nonStandardPropertyKeywords.hasOwnProperty(word)) { - override = "string-2"; - return "maybeprop"; - } else if (allowNested) { - override = stream.match(/^\s*:(?:\s|$)/, false) ? "property" : "tag"; - return "block"; - } else { - override += " error"; - return "maybeprop"; - } - } else if (type == "meta") { - return "block"; - } else if (!allowNested && (type == "hash" || type == "qualifier")) { - override = "error"; - return "block"; - } else { - return states.top(type, stream, state); - } - }; - - states.maybeprop = function(type, stream, state) { - if (type == ":") return pushContext(state, stream, "prop"); - return pass(type, stream, state); - }; - - states.prop = function(type, stream, state) { - if (type == ";") return popContext(state); - if (type == "{" && allowNested) return pushContext(state, stream, "propBlock"); - if (type == "}" || type == "{") return popAndPass(type, stream, state); - if (type == "(") return pushContext(state, stream, "parens"); - - if (type == "hash" && !/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(stream.current())) { - override += " error"; - } else if (type == "word") { - wordAsValue(stream); - } else if (type == "interpolation") { - return pushContext(state, stream, "interpolation"); - } - return "prop"; - }; - - states.propBlock = function(type, _stream, state) { - if (type == "}") return popContext(state); - if (type == "word") { override = "property"; return "maybeprop"; } - return state.context.type; - }; - - states.parens = function(type, stream, state) { - if (type == "{" || type == "}") return popAndPass(type, stream, state); - if (type == ")") return popContext(state); - if (type == "(") return pushContext(state, stream, "parens"); - if (type == "interpolation") return pushContext(state, stream, "interpolation"); - if (type == "word") wordAsValue(stream); - return "parens"; - }; - - states.pseudo = function(type, stream, state) { - if (type == "word") { - override = "variable-3"; - return state.context.type; - } - return pass(type, stream, state); - }; - - states.documentTypes = function(type, stream, state) { - if (type == "word" && documentTypes.hasOwnProperty(stream.current())) { - override = "tag"; - return state.context.type; - } else { - return states.atBlock(type, stream, state); - } - }; - - states.atBlock = function(type, stream, state) { - if (type == "(") return pushContext(state, stream, "atBlock_parens"); - if (type == "}" || type == ";") return popAndPass(type, stream, state); - if (type == "{") return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top"); - - if (type == "interpolation") return pushContext(state, stream, "interpolation"); - - if (type == "word") { - var word = stream.current().toLowerCase(); - if (word == "only" || word == "not" || word == "and" || word == "or") - override = "keyword"; - else if (mediaTypes.hasOwnProperty(word)) - override = "attribute"; - else if (mediaFeatures.hasOwnProperty(word)) - override = "property"; - else if (mediaValueKeywords.hasOwnProperty(word)) - override = "keyword"; - else if (propertyKeywords.hasOwnProperty(word)) - override = "property"; - else if (nonStandardPropertyKeywords.hasOwnProperty(word)) - override = "string-2"; - else if (valueKeywords.hasOwnProperty(word)) - override = "atom"; - else if (colorKeywords.hasOwnProperty(word)) - override = "keyword"; - else - override = "error"; - } - return state.context.type; - }; - - states.atComponentBlock = function(type, stream, state) { - if (type == "}") - return popAndPass(type, stream, state); - if (type == "{") - return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top", false); - if (type == "word") - override = "error"; - return state.context.type; - }; - - states.atBlock_parens = function(type, stream, state) { - if (type == ")") return popContext(state); - if (type == "{" || type == "}") return popAndPass(type, stream, state, 2); - return states.atBlock(type, stream, state); - }; - - states.restricted_atBlock_before = function(type, stream, state) { - if (type == "{") - return pushContext(state, stream, "restricted_atBlock"); - if (type == "word" && state.stateArg == "@counter-style") { - override = "variable"; - return "restricted_atBlock_before"; - } - return pass(type, stream, state); - }; - - states.restricted_atBlock = function(type, stream, state) { - if (type == "}") { - state.stateArg = null; - return popContext(state); - } - if (type == "word") { - if ((state.stateArg == "@font-face" && !fontProperties.hasOwnProperty(stream.current().toLowerCase())) || - (state.stateArg == "@counter-style" && !counterDescriptors.hasOwnProperty(stream.current().toLowerCase()))) - override = "error"; - else - override = "property"; - return "maybeprop"; - } - return "restricted_atBlock"; - }; - - states.keyframes = function(type, stream, state) { - if (type == "word") { override = "variable"; return "keyframes"; } - if (type == "{") return pushContext(state, stream, "top"); - return pass(type, stream, state); - }; - - states.at = function(type, stream, state) { - if (type == ";") return popContext(state); - if (type == "{" || type == "}") return popAndPass(type, stream, state); - if (type == "word") override = "tag"; - else if (type == "hash") override = "builtin"; - return "at"; - }; - - states.interpolation = function(type, stream, state) { - if (type == "}") return popContext(state); - if (type == "{" || type == ";") return popAndPass(type, stream, state); - if (type == "word") override = "variable"; - else if (type != "variable" && type != "(" && type != ")") override = "error"; - return "interpolation"; - }; - - return { - startState: function(base) { - return {tokenize: null, - state: inline ? "block" : "top", - stateArg: null, - context: new Context(inline ? "block" : "top", base || 0, null)}; - }, - - token: function(stream, state) { - if (!state.tokenize && stream.eatSpace()) return null; - var style = (state.tokenize || tokenBase)(stream, state); - if (style && typeof style == "object") { - type = style[1]; - style = style[0]; - } - override = style; - state.state = states[state.state](type, stream, state); - return override; - }, - - indent: function(state, textAfter) { - var cx = state.context, ch = textAfter && textAfter.charAt(0); - var indent = cx.indent; - if (cx.type == "prop" && (ch == "}" || ch == ")")) cx = cx.prev; - if (cx.prev) { - if (ch == "}" && (cx.type == "block" || cx.type == "top" || - cx.type == "interpolation" || cx.type == "restricted_atBlock")) { - // Resume indentation from parent context. - cx = cx.prev; - indent = cx.indent; - } else if (ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") || - ch == "{" && (cx.type == "at" || cx.type == "atBlock")) { - // Dedent relative to current context. - indent = Math.max(0, cx.indent - indentUnit); - cx = cx.prev; - } - } - return indent; - }, - - electricChars: "}", - blockCommentStart: "/*", - blockCommentEnd: "*/", - fold: "brace" - }; -}); - - function keySet(array) { - var keys = {}; - for (var i = 0; i < array.length; ++i) { - keys[array[i]] = true; - } - return keys; - } - - var documentTypes_ = [ - "domain", "regexp", "url", "url-prefix" - ], documentTypes = keySet(documentTypes_); - - var mediaTypes_ = [ - "all", "aural", "braille", "handheld", "print", "projection", "screen", - "tty", "tv", "embossed" - ], mediaTypes = keySet(mediaTypes_); - - var mediaFeatures_ = [ - "width", "min-width", "max-width", "height", "min-height", "max-height", - "device-width", "min-device-width", "max-device-width", "device-height", - "min-device-height", "max-device-height", "aspect-ratio", - "min-aspect-ratio", "max-aspect-ratio", "device-aspect-ratio", - "min-device-aspect-ratio", "max-device-aspect-ratio", "color", "min-color", - "max-color", "color-index", "min-color-index", "max-color-index", - "monochrome", "min-monochrome", "max-monochrome", "resolution", - "min-resolution", "max-resolution", "scan", "grid", "orientation", - "device-pixel-ratio", "min-device-pixel-ratio", "max-device-pixel-ratio", - "pointer", "any-pointer", "hover", "any-hover" - ], mediaFeatures = keySet(mediaFeatures_); - - var mediaValueKeywords_ = [ - "landscape", "portrait", "none", "coarse", "fine", "on-demand", "hover", - "interlace", "progressive" - ], mediaValueKeywords = keySet(mediaValueKeywords_); - - var propertyKeywords_ = [ - "align-content", "align-items", "align-self", "alignment-adjust", - "alignment-baseline", "anchor-point", "animation", "animation-delay", - "animation-direction", "animation-duration", "animation-fill-mode", - "animation-iteration-count", "animation-name", "animation-play-state", - "animation-timing-function", "appearance", "azimuth", "backface-visibility", - "background", "background-attachment", "background-blend-mode", "background-clip", - "background-color", "background-image", "background-origin", "background-position", - "background-repeat", "background-size", "baseline-shift", "binding", - "bleed", "bookmark-label", "bookmark-level", "bookmark-state", - "bookmark-target", "border", "border-bottom", "border-bottom-color", - "border-bottom-left-radius", "border-bottom-right-radius", - "border-bottom-style", "border-bottom-width", "border-collapse", - "border-color", "border-image", "border-image-outset", - "border-image-repeat", "border-image-slice", "border-image-source", - "border-image-width", "border-left", "border-left-color", - "border-left-style", "border-left-width", "border-radius", "border-right", - "border-right-color", "border-right-style", "border-right-width", - "border-spacing", "border-style", "border-top", "border-top-color", - "border-top-left-radius", "border-top-right-radius", "border-top-style", - "border-top-width", "border-width", "bottom", "box-decoration-break", - "box-shadow", "box-sizing", "break-after", "break-before", "break-inside", - "caption-side", "clear", "clip", "color", "color-profile", "column-count", - "column-fill", "column-gap", "column-rule", "column-rule-color", - "column-rule-style", "column-rule-width", "column-span", "column-width", - "columns", "content", "counter-increment", "counter-reset", "crop", "cue", - "cue-after", "cue-before", "cursor", "direction", "display", - "dominant-baseline", "drop-initial-after-adjust", - "drop-initial-after-align", "drop-initial-before-adjust", - "drop-initial-before-align", "drop-initial-size", "drop-initial-value", - "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis", - "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap", - "float", "float-offset", "flow-from", "flow-into", "font", "font-feature-settings", - "font-family", "font-kerning", "font-language-override", "font-size", "font-size-adjust", - "font-stretch", "font-style", "font-synthesis", "font-variant", - "font-variant-alternates", "font-variant-caps", "font-variant-east-asian", - "font-variant-ligatures", "font-variant-numeric", "font-variant-position", - "font-weight", "grid", "grid-area", "grid-auto-columns", "grid-auto-flow", - "grid-auto-position", "grid-auto-rows", "grid-column", "grid-column-end", - "grid-column-start", "grid-row", "grid-row-end", "grid-row-start", - "grid-template", "grid-template-areas", "grid-template-columns", - "grid-template-rows", "hanging-punctuation", "height", "hyphens", - "icon", "image-orientation", "image-rendering", "image-resolution", - "inline-box-align", "justify-content", "left", "letter-spacing", - "line-break", "line-height", "line-stacking", "line-stacking-ruby", - "line-stacking-shift", "line-stacking-strategy", "list-style", - "list-style-image", "list-style-position", "list-style-type", "margin", - "margin-bottom", "margin-left", "margin-right", "margin-top", - "marker-offset", "marks", "marquee-direction", "marquee-loop", - "marquee-play-count", "marquee-speed", "marquee-style", "max-height", - "max-width", "min-height", "min-width", "move-to", "nav-down", "nav-index", - "nav-left", "nav-right", "nav-up", "object-fit", "object-position", - "opacity", "order", "orphans", "outline", - "outline-color", "outline-offset", "outline-style", "outline-width", - "overflow", "overflow-style", "overflow-wrap", "overflow-x", "overflow-y", - "padding", "padding-bottom", "padding-left", "padding-right", "padding-top", - "page", "page-break-after", "page-break-before", "page-break-inside", - "page-policy", "pause", "pause-after", "pause-before", "perspective", - "perspective-origin", "pitch", "pitch-range", "play-during", "position", - "presentation-level", "punctuation-trim", "quotes", "region-break-after", - "region-break-before", "region-break-inside", "region-fragment", - "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness", - "right", "rotation", "rotation-point", "ruby-align", "ruby-overhang", - "ruby-position", "ruby-span", "shape-image-threshold", "shape-inside", "shape-margin", - "shape-outside", "size", "speak", "speak-as", "speak-header", - "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set", - "tab-size", "table-layout", "target", "target-name", "target-new", - "target-position", "text-align", "text-align-last", "text-decoration", - "text-decoration-color", "text-decoration-line", "text-decoration-skip", - "text-decoration-style", "text-emphasis", "text-emphasis-color", - "text-emphasis-position", "text-emphasis-style", "text-height", - "text-indent", "text-justify", "text-outline", "text-overflow", "text-shadow", - "text-size-adjust", "text-space-collapse", "text-transform", "text-underline-position", - "text-wrap", "top", "transform", "transform-origin", "transform-style", - "transition", "transition-delay", "transition-duration", - "transition-property", "transition-timing-function", "unicode-bidi", - "vertical-align", "visibility", "voice-balance", "voice-duration", - "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress", - "voice-volume", "volume", "white-space", "widows", "width", "word-break", - "word-spacing", "word-wrap", "z-index", - // SVG-specific - "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color", - "flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events", - "color-interpolation", "color-interpolation-filters", - "color-rendering", "fill", "fill-opacity", "fill-rule", "image-rendering", - "marker", "marker-end", "marker-mid", "marker-start", "shape-rendering", "stroke", - "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", - "stroke-miterlimit", "stroke-opacity", "stroke-width", "text-rendering", - "baseline-shift", "dominant-baseline", "glyph-orientation-horizontal", - "glyph-orientation-vertical", "text-anchor", "writing-mode" - ], propertyKeywords = keySet(propertyKeywords_); - - var nonStandardPropertyKeywords_ = [ - "scrollbar-arrow-color", "scrollbar-base-color", "scrollbar-dark-shadow-color", - "scrollbar-face-color", "scrollbar-highlight-color", "scrollbar-shadow-color", - "scrollbar-3d-light-color", "scrollbar-track-color", "shape-inside", - "searchfield-cancel-button", "searchfield-decoration", "searchfield-results-button", - "searchfield-results-decoration", "zoom" - ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_); - - var fontProperties_ = [ - "font-family", "src", "unicode-range", "font-variant", "font-feature-settings", - "font-stretch", "font-weight", "font-style" - ], fontProperties = keySet(fontProperties_); - - var counterDescriptors_ = [ - "additive-symbols", "fallback", "negative", "pad", "prefix", "range", - "speak-as", "suffix", "symbols", "system" - ], counterDescriptors = keySet(counterDescriptors_); - - var colorKeywords_ = [ - "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige", - "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown", - "burlywood", "cadetblue", "chartreuse", "chocolate", "coral", "cornflowerblue", - "cornsilk", "crimson", "cyan", "darkblue", "darkcyan", "darkgoldenrod", - "darkgray", "darkgreen", "darkkhaki", "darkmagenta", "darkolivegreen", - "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen", - "darkslateblue", "darkslategray", "darkturquoise", "darkviolet", - "deeppink", "deepskyblue", "dimgray", "dodgerblue", "firebrick", - "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite", - "gold", "goldenrod", "gray", "grey", "green", "greenyellow", "honeydew", - "hotpink", "indianred", "indigo", "ivory", "khaki", "lavender", - "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral", - "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightpink", - "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray", - "lightsteelblue", "lightyellow", "lime", "limegreen", "linen", "magenta", - "maroon", "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple", - "mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise", - "mediumvioletred", "midnightblue", "mintcream", "mistyrose", "moccasin", - "navajowhite", "navy", "oldlace", "olive", "olivedrab", "orange", "orangered", - "orchid", "palegoldenrod", "palegreen", "paleturquoise", "palevioletred", - "papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue", - "purple", "rebeccapurple", "red", "rosybrown", "royalblue", "saddlebrown", - "salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue", - "slateblue", "slategray", "snow", "springgreen", "steelblue", "tan", - "teal", "thistle", "tomato", "turquoise", "violet", "wheat", "white", - "whitesmoke", "yellow", "yellowgreen" - ], colorKeywords = keySet(colorKeywords_); - - var valueKeywords_ = [ - "above", "absolute", "activeborder", "additive", "activecaption", "afar", - "after-white-space", "ahead", "alias", "all", "all-scroll", "alphabetic", "alternate", - "always", "amharic", "amharic-abegede", "antialiased", "appworkspace", - "arabic-indic", "armenian", "asterisks", "attr", "auto", "avoid", "avoid-column", "avoid-page", - "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary", - "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box", - "both", "bottom", "break", "break-all", "break-word", "bullets", "button", "button-bevel", - "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "calc", "cambodian", - "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret", - "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch", - "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote", - "col-resize", "collapse", "color", "color-burn", "color-dodge", "column", "column-reverse", - "compact", "condensed", "contain", "content", - "content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop", - "cross", "crosshair", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal", - "decimal-leading-zero", "default", "default-button", "destination-atop", - "destination-in", "destination-out", "destination-over", "devanagari", "difference", - "disc", "discard", "disclosure-closed", "disclosure-open", "document", - "dot-dash", "dot-dot-dash", - "dotted", "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out", - "element", "ellipse", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede", - "ethiopic-abegede-am-et", "ethiopic-abegede-gez", "ethiopic-abegede-ti-er", - "ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er", - "ethiopic-halehame-aa-et", "ethiopic-halehame-am-et", - "ethiopic-halehame-gez", "ethiopic-halehame-om-et", - "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et", - "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig", - "ethiopic-numeric", "ew-resize", "exclusion", "expanded", "extends", "extra-condensed", - "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes", - "forwards", "from", "geometricPrecision", "georgian", "graytext", "groove", - "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hard-light", "hebrew", - "help", "hidden", "hide", "higher", "highlight", "highlighttext", - "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "hue", "icon", "ignore", - "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite", - "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis", - "inline-block", "inline-flex", "inline-table", "inset", "inside", "intrinsic", "invert", - "italic", "japanese-formal", "japanese-informal", "justify", "kannada", - "katakana", "katakana-iroha", "keep-all", "khmer", - "korean-hangul-formal", "korean-hanja-formal", "korean-hanja-informal", - "landscape", "lao", "large", "larger", "left", "level", "lighter", "lighten", - "line-through", "linear", "linear-gradient", "lines", "list-item", "listbox", "listitem", - "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian", - "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian", - "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "match", "matrix", "matrix3d", - "media-controls-background", "media-current-time-display", - "media-fullscreen-button", "media-mute-button", "media-play-button", - "media-return-to-realtime-button", "media-rewind-button", - "media-seek-back-button", "media-seek-forward-button", "media-slider", - "media-sliderthumb", "media-time-remaining-display", "media-volume-slider", - "media-volume-slider-container", "media-volume-sliderthumb", "medium", - "menu", "menulist", "menulist-button", "menulist-text", - "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic", - "mix", "mongolian", "monospace", "move", "multiple", "multiply", "myanmar", "n-resize", - "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop", - "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap", - "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote", - "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset", - "outside", "outside-shape", "overlay", "overline", "padding", "padding-box", - "painted", "page", "paused", "persian", "perspective", "plus-darker", "plus-lighter", - "pointer", "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d", - "progress", "push-button", "radial-gradient", "radio", "read-only", - "read-write", "read-write-plaintext-only", "rectangle", "region", - "relative", "repeat", "repeating-linear-gradient", - "repeating-radial-gradient", "repeat-x", "repeat-y", "reset", "reverse", - "rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY", - "rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running", - "s-resize", "sans-serif", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen", - "scroll", "scrollbar", "se-resize", "searchfield", - "searchfield-cancel-button", "searchfield-decoration", - "searchfield-results-button", "searchfield-results-decoration", - "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama", - "simp-chinese-formal", "simp-chinese-informal", "single", - "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal", - "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow", - "small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali", - "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "spell-out", "square", - "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub", - "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "table", - "table-caption", "table-cell", "table-column", "table-column-group", - "table-footer-group", "table-header-group", "table-row", "table-row-group", - "tamil", - "telugu", "text", "text-bottom", "text-top", "textarea", "textfield", "thai", - "thick", "thin", "threeddarkshadow", "threedface", "threedhighlight", - "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er", - "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top", - "trad-chinese-formal", "trad-chinese-informal", - "translate", "translate3d", "translateX", "translateY", "translateZ", - "transparent", "ultra-condensed", "ultra-expanded", "underline", "up", - "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal", - "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url", - "var", "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted", - "visibleStroke", "visual", "w-resize", "wait", "wave", "wider", - "window", "windowframe", "windowtext", "words", "wrap", "wrap-reverse", "x-large", "x-small", "xor", - "xx-large", "xx-small" - ], valueKeywords = keySet(valueKeywords_); - - var allWords = documentTypes_.concat(mediaTypes_).concat(mediaFeatures_).concat(mediaValueKeywords_) - .concat(propertyKeywords_).concat(nonStandardPropertyKeywords_).concat(colorKeywords_) - .concat(valueKeywords_); - CodeMirror.registerHelper("hintWords", "css", allWords); - - function tokenCComment(stream, state) { - var maybeEnd = false, ch; - while ((ch = stream.next()) != null) { - if (maybeEnd && ch == "/") { - state.tokenize = null; - break; - } - maybeEnd = (ch == "*"); - } - return ["comment", "comment"]; - } - - CodeMirror.defineMIME("text/css", { - documentTypes: documentTypes, - mediaTypes: mediaTypes, - mediaFeatures: mediaFeatures, - mediaValueKeywords: mediaValueKeywords, - propertyKeywords: propertyKeywords, - nonStandardPropertyKeywords: nonStandardPropertyKeywords, - fontProperties: fontProperties, - counterDescriptors: counterDescriptors, - colorKeywords: colorKeywords, - valueKeywords: valueKeywords, - tokenHooks: { - "/": function(stream, state) { - if (!stream.eat("*")) return false; - state.tokenize = tokenCComment; - return tokenCComment(stream, state); - } - }, - name: "css" - }); - - CodeMirror.defineMIME("text/x-scss", { - mediaTypes: mediaTypes, - mediaFeatures: mediaFeatures, - mediaValueKeywords: mediaValueKeywords, - propertyKeywords: propertyKeywords, - nonStandardPropertyKeywords: nonStandardPropertyKeywords, - colorKeywords: colorKeywords, - valueKeywords: valueKeywords, - fontProperties: fontProperties, - allowNested: true, - tokenHooks: { - "/": function(stream, state) { - if (stream.eat("/")) { - stream.skipToEnd(); - return ["comment", "comment"]; - } else if (stream.eat("*")) { - state.tokenize = tokenCComment; - return tokenCComment(stream, state); - } else { - return ["operator", "operator"]; - } - }, - ":": function(stream) { - if (stream.match(/\s*\{/)) - return [null, "{"]; - return false; - }, - "$": function(stream) { - stream.match(/^[\w-]+/); - if (stream.match(/^\s*:/, false)) - return ["variable-2", "variable-definition"]; - return ["variable-2", "variable"]; - }, - "#": function(stream) { - if (!stream.eat("{")) return false; - return [null, "interpolation"]; - } - }, - name: "css", - helperType: "scss" - }); - - CodeMirror.defineMIME("text/x-less", { - mediaTypes: mediaTypes, - mediaFeatures: mediaFeatures, - mediaValueKeywords: mediaValueKeywords, - propertyKeywords: propertyKeywords, - nonStandardPropertyKeywords: nonStandardPropertyKeywords, - colorKeywords: colorKeywords, - valueKeywords: valueKeywords, - fontProperties: fontProperties, - allowNested: true, - tokenHooks: { - "/": function(stream, state) { - if (stream.eat("/")) { - stream.skipToEnd(); - return ["comment", "comment"]; - } else if (stream.eat("*")) { - state.tokenize = tokenCComment; - return tokenCComment(stream, state); - } else { - return ["operator", "operator"]; - } - }, - "@": function(stream) { - if (stream.eat("{")) return [null, "interpolation"]; - if (stream.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/, false)) return false; - stream.eatWhile(/[\w\\\-]/); - if (stream.match(/^\s*:/, false)) - return ["variable-2", "variable-definition"]; - return ["variable-2", "variable"]; - }, - "&": function() { - return ["atom", "atom"]; - } - }, - name: "css", - helperType: "less" - }); - - CodeMirror.defineMIME("text/x-gss", { - documentTypes: documentTypes, - mediaTypes: mediaTypes, - mediaFeatures: mediaFeatures, - propertyKeywords: propertyKeywords, - nonStandardPropertyKeywords: nonStandardPropertyKeywords, - fontProperties: fontProperties, - counterDescriptors: counterDescriptors, - colorKeywords: colorKeywords, - valueKeywords: valueKeywords, - supportsAtComponent: true, - tokenHooks: { - "/": function(stream, state) { - if (!stream.eat("*")) return false; - state.tokenize = tokenCComment; - return tokenCComment(stream, state); - } - }, - name: "css", - helperType: "gss" - }); - -}); diff --git a/plugins/tiddlywiki/codemirror/files/mode/htmlembedded/htmlembedded.js b/plugins/tiddlywiki/codemirror/files/mode/htmlembedded/htmlembedded.js deleted file mode 100755 index 464dc57f8..000000000 --- a/plugins/tiddlywiki/codemirror/files/mode/htmlembedded/htmlembedded.js +++ /dev/null @@ -1,28 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), - require("../../addon/mode/multiplex")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../htmlmixed/htmlmixed", - "../../addon/mode/multiplex"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - "use strict"; - - CodeMirror.defineMode("htmlembedded", function(config, parserConfig) { - return CodeMirror.multiplexingMode(CodeMirror.getMode(config, "htmlmixed"), { - open: parserConfig.open || parserConfig.scriptStartRegex || "<%", - close: parserConfig.close || parserConfig.scriptEndRegex || "%>", - mode: CodeMirror.getMode(config, parserConfig.scriptingModeSpec) - }); - }, "htmlmixed"); - - CodeMirror.defineMIME("application/x-ejs", {name: "htmlembedded", scriptingModeSpec:"javascript"}); - CodeMirror.defineMIME("application/x-aspx", {name: "htmlembedded", scriptingModeSpec:"text/x-csharp"}); - CodeMirror.defineMIME("application/x-jsp", {name: "htmlembedded", scriptingModeSpec:"text/x-java"}); - CodeMirror.defineMIME("application/x-erb", {name: "htmlembedded", scriptingModeSpec:"ruby"}); -}); diff --git a/plugins/tiddlywiki/codemirror/files/mode/htmlmixed/htmlmixed.js b/plugins/tiddlywiki/codemirror/files/mode/htmlmixed/htmlmixed.js deleted file mode 100755 index 6574fbd56..000000000 --- a/plugins/tiddlywiki/codemirror/files/mode/htmlmixed/htmlmixed.js +++ /dev/null @@ -1,152 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../xml/xml"), require("../javascript/javascript"), require("../css/css")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../xml/xml", "../javascript/javascript", "../css/css"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - "use strict"; - - var defaultTags = { - script: [ - ["lang", /(javascript|babel)/i, "javascript"], - ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i, "javascript"], - ["type", /./, "text/plain"], - [null, null, "javascript"] - ], - style: [ - ["lang", /^css$/i, "css"], - ["type", /^(text\/)?(x-)?(stylesheet|css)$/i, "css"], - ["type", /./, "text/plain"], - [null, null, "css"] - ] - }; - - function maybeBackup(stream, pat, style) { - var cur = stream.current(), close = cur.search(pat); - if (close > -1) { - stream.backUp(cur.length - close); - } else if (cur.match(/<\/?$/)) { - stream.backUp(cur.length); - if (!stream.match(pat, false)) stream.match(cur); - } - return style; - } - - var attrRegexpCache = {}; - function getAttrRegexp(attr) { - var regexp = attrRegexpCache[attr]; - if (regexp) return regexp; - return attrRegexpCache[attr] = new RegExp("\\s+" + attr + "\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*"); - } - - function getAttrValue(text, attr) { - var match = text.match(getAttrRegexp(attr)) - return match ? match[2] : "" - } - - function getTagRegexp(tagName, anchored) { - return new RegExp((anchored ? "^" : "") + "<\/\s*" + tagName + "\s*>", "i"); - } - - function addTags(from, to) { - for (var tag in from) { - var dest = to[tag] || (to[tag] = []); - var source = from[tag]; - for (var i = source.length - 1; i >= 0; i--) - dest.unshift(source[i]) - } - } - - function findMatchingMode(tagInfo, tagText) { - for (var i = 0; i < tagInfo.length; i++) { - var spec = tagInfo[i]; - if (!spec[0] || spec[1].test(getAttrValue(tagText, spec[0]))) return spec[2]; - } - } - - CodeMirror.defineMode("htmlmixed", function (config, parserConfig) { - var htmlMode = CodeMirror.getMode(config, { - name: "xml", - htmlMode: true, - multilineTagIndentFactor: parserConfig.multilineTagIndentFactor, - multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag - }); - - var tags = {}; - var configTags = parserConfig && parserConfig.tags, configScript = parserConfig && parserConfig.scriptTypes; - addTags(defaultTags, tags); - if (configTags) addTags(configTags, tags); - if (configScript) for (var i = configScript.length - 1; i >= 0; i--) - tags.script.unshift(["type", configScript[i].matches, configScript[i].mode]) - - function html(stream, state) { - var style = htmlMode.token(stream, state.htmlState), tag = /\btag\b/.test(style), tagName - if (tag && !/[<>\s\/]/.test(stream.current()) && - (tagName = state.htmlState.tagName && state.htmlState.tagName.toLowerCase()) && - tags.hasOwnProperty(tagName)) { - state.inTag = tagName + " " - } else if (state.inTag && tag && />$/.test(stream.current())) { - var inTag = /^([\S]+) (.*)/.exec(state.inTag) - state.inTag = null - var modeSpec = stream.current() == ">" && findMatchingMode(tags[inTag[1]], inTag[2]) - var mode = CodeMirror.getMode(config, modeSpec) - var endTagA = getTagRegexp(inTag[1], true), endTag = getTagRegexp(inTag[1], false); - state.token = function (stream, state) { - if (stream.match(endTagA, false)) { - state.token = html; - state.localState = state.localMode = null; - return null; - } - return maybeBackup(stream, endTag, state.localMode.token(stream, state.localState)); - }; - state.localMode = mode; - state.localState = CodeMirror.startState(mode, htmlMode.indent(state.htmlState, "")); - } else if (state.inTag) { - state.inTag += stream.current() - if (stream.eol()) state.inTag += " " - } - return style; - }; - - return { - startState: function () { - var state = htmlMode.startState(); - return {token: html, inTag: null, localMode: null, localState: null, htmlState: state}; - }, - - copyState: function (state) { - var local; - if (state.localState) { - local = CodeMirror.copyState(state.localMode, state.localState); - } - return {token: state.token, inTag: state.inTag, - localMode: state.localMode, localState: local, - htmlState: CodeMirror.copyState(htmlMode, state.htmlState)}; - }, - - token: function (stream, state) { - return state.token(stream, state); - }, - - indent: function (state, textAfter) { - if (!state.localMode || /^\s*<\//.test(textAfter)) - return htmlMode.indent(state.htmlState, textAfter); - else if (state.localMode.indent) - return state.localMode.indent(state.localState, textAfter); - else - return CodeMirror.Pass; - }, - - innerMode: function (state) { - return {state: state.localState || state.htmlState, mode: state.localMode || htmlMode}; - } - }; - }, "xml", "javascript", "css"); - - CodeMirror.defineMIME("text/html", "htmlmixed"); -}); diff --git a/plugins/tiddlywiki/codemirror/files/mode/javascript/javascript.js b/plugins/tiddlywiki/codemirror/files/mode/javascript/javascript.js deleted file mode 100755 index fa5721d5d..000000000 --- a/plugins/tiddlywiki/codemirror/files/mode/javascript/javascript.js +++ /dev/null @@ -1,742 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -// TODO actually recognize syntax of TypeScript constructs - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -function expressionAllowed(stream, state, backUp) { - return /^(?:operator|sof|keyword c|case|new|[\[{}\(,;:]|=>)$/.test(state.lastType) || - (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0)))) -} - -CodeMirror.defineMode("javascript", function(config, parserConfig) { - var indentUnit = config.indentUnit; - var statementIndent = parserConfig.statementIndent; - var jsonldMode = parserConfig.jsonld; - var jsonMode = parserConfig.json || jsonldMode; - var isTS = parserConfig.typescript; - var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/; - - // Tokenizer - - var keywords = function(){ - function kw(type) {return {type: type, style: "keyword"};} - var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c"); - var operator = kw("operator"), atom = {type: "atom", style: "atom"}; - - var jsKeywords = { - "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B, - "return": C, "break": C, "continue": C, "new": kw("new"), "delete": C, "throw": C, "debugger": C, - "var": kw("var"), "const": kw("var"), "let": kw("var"), - "function": kw("function"), "catch": kw("catch"), - "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"), - "in": operator, "typeof": operator, "instanceof": operator, - "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom, - "this": kw("this"), "class": kw("class"), "super": kw("atom"), - "yield": C, "export": kw("export"), "import": kw("import"), "extends": C - }; - - // Extend the 'normal' keywords with the TypeScript language extensions - if (isTS) { - var type = {type: "variable", style: "variable-3"}; - var tsKeywords = { - // object-like things - "interface": kw("class"), - "implements": C, - "namespace": C, - "module": kw("module"), - "enum": kw("module"), - - // scope modifiers - "public": kw("modifier"), - "private": kw("modifier"), - "protected": kw("modifier"), - "abstract": kw("modifier"), - - // operators - "as": operator, - - // types - "string": type, "number": type, "boolean": type, "any": type - }; - - for (var attr in tsKeywords) { - jsKeywords[attr] = tsKeywords[attr]; - } - } - - return jsKeywords; - }(); - - var isOperatorChar = /[+\-*&%=<>!?|~^]/; - var isJsonldKeyword = /^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/; - - function readRegexp(stream) { - var escaped = false, next, inSet = false; - while ((next = stream.next()) != null) { - if (!escaped) { - if (next == "/" && !inSet) return; - if (next == "[") inSet = true; - else if (inSet && next == "]") inSet = false; - } - escaped = !escaped && next == "\\"; - } - } - - // Used as scratch variables to communicate multiple values without - // consing up tons of objects. - var type, content; - function ret(tp, style, cont) { - type = tp; content = cont; - return style; - } - function tokenBase(stream, state) { - var ch = stream.next(); - if (ch == '"' || ch == "'") { - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/)) { - return ret("number", "number"); - } else if (ch == "." && stream.match("..")) { - return ret("spread", "meta"); - } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) { - return ret(ch); - } else if (ch == "=" && stream.eat(">")) { - return ret("=>", "operator"); - } else if (ch == "0" && stream.eat(/x/i)) { - stream.eatWhile(/[\da-f]/i); - return ret("number", "number"); - } else if (ch == "0" && stream.eat(/o/i)) { - stream.eatWhile(/[0-7]/i); - return ret("number", "number"); - } else if (ch == "0" && stream.eat(/b/i)) { - stream.eatWhile(/[01]/i); - return ret("number", "number"); - } else if (/\d/.test(ch)) { - stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/); - return ret("number", "number"); - } else if (ch == "/") { - if (stream.eat("*")) { - state.tokenize = tokenComment; - return tokenComment(stream, state); - } else if (stream.eat("/")) { - stream.skipToEnd(); - return ret("comment", "comment"); - } else if (expressionAllowed(stream, state, 1)) { - readRegexp(stream); - stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/); - return ret("regexp", "string-2"); - } else { - stream.eatWhile(isOperatorChar); - return ret("operator", "operator", stream.current()); - } - } else if (ch == "`") { - state.tokenize = tokenQuasi; - return tokenQuasi(stream, state); - } else if (ch == "#") { - stream.skipToEnd(); - return ret("error", "error"); - } else if (isOperatorChar.test(ch)) { - stream.eatWhile(isOperatorChar); - return ret("operator", "operator", stream.current()); - } else if (wordRE.test(ch)) { - stream.eatWhile(wordRE); - var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word]; - return (known && state.lastType != ".") ? ret(known.type, known.style, word) : - ret("variable", "variable", word); - } - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, next; - if (jsonldMode && stream.peek() == "@" && stream.match(isJsonldKeyword)){ - state.tokenize = tokenBase; - return ret("jsonld-keyword", "meta"); - } - while ((next = stream.next()) != null) { - if (next == quote && !escaped) break; - escaped = !escaped && next == "\\"; - } - if (!escaped) state.tokenize = tokenBase; - return ret("string", "string"); - }; - } - - function tokenComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = tokenBase; - break; - } - maybeEnd = (ch == "*"); - } - return ret("comment", "comment"); - } - - function tokenQuasi(stream, state) { - var escaped = false, next; - while ((next = stream.next()) != null) { - if (!escaped && (next == "`" || next == "$" && stream.eat("{"))) { - state.tokenize = tokenBase; - break; - } - escaped = !escaped && next == "\\"; - } - return ret("quasi", "string-2", stream.current()); - } - - var brackets = "([{}])"; - // This is a crude lookahead trick to try and notice that we're - // parsing the argument patterns for a fat-arrow function before we - // actually hit the arrow token. It only works if the arrow is on - // the same line as the arguments and there's no strange noise - // (comments) in between. Fallback is to only notice when we hit the - // arrow, and not declare the arguments as locals for the arrow - // body. - function findFatArrow(stream, state) { - if (state.fatArrowAt) state.fatArrowAt = null; - var arrow = stream.string.indexOf("=>", stream.start); - if (arrow < 0) return; - - var depth = 0, sawSomething = false; - for (var pos = arrow - 1; pos >= 0; --pos) { - var ch = stream.string.charAt(pos); - var bracket = brackets.indexOf(ch); - if (bracket >= 0 && bracket < 3) { - if (!depth) { ++pos; break; } - if (--depth == 0) break; - } else if (bracket >= 3 && bracket < 6) { - ++depth; - } else if (wordRE.test(ch)) { - sawSomething = true; - } else if (/["'\/]/.test(ch)) { - return; - } else if (sawSomething && !depth) { - ++pos; - break; - } - } - if (sawSomething && !depth) state.fatArrowAt = pos; - } - - // Parser - - var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true, "jsonld-keyword": true}; - - function JSLexical(indented, column, type, align, prev, info) { - this.indented = indented; - this.column = column; - this.type = type; - this.prev = prev; - this.info = info; - if (align != null) this.align = align; - } - - function inScope(state, varname) { - for (var v = state.localVars; v; v = v.next) - if (v.name == varname) return true; - for (var cx = state.context; cx; cx = cx.prev) { - for (var v = cx.vars; v; v = v.next) - if (v.name == varname) return true; - } - } - - function parseJS(state, style, type, content, stream) { - var cc = state.cc; - // Communicate our context to the combinators. - // (Less wasteful than consing up a hundred closures on every call.) - cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; cx.style = style; - - if (!state.lexical.hasOwnProperty("align")) - state.lexical.align = true; - - while(true) { - var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement; - if (combinator(type, content)) { - while(cc.length && cc[cc.length - 1].lex) - cc.pop()(); - if (cx.marked) return cx.marked; - if (type == "variable" && inScope(state, content)) return "variable-2"; - return style; - } - } - } - - // Combinator utils - - var cx = {state: null, column: null, marked: null, cc: null}; - function pass() { - for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]); - } - function cont() { - pass.apply(null, arguments); - return true; - } - function register(varname) { - function inList(list) { - for (var v = list; v; v = v.next) - if (v.name == varname) return true; - return false; - } - var state = cx.state; - cx.marked = "def"; - if (state.context) { - if (inList(state.localVars)) return; - state.localVars = {name: varname, next: state.localVars}; - } else { - if (inList(state.globalVars)) return; - if (parserConfig.globalVars) - state.globalVars = {name: varname, next: state.globalVars}; - } - } - - // Combinators - - var defaultVars = {name: "this", next: {name: "arguments"}}; - function pushcontext() { - cx.state.context = {prev: cx.state.context, vars: cx.state.localVars}; - cx.state.localVars = defaultVars; - } - function popcontext() { - cx.state.localVars = cx.state.context.vars; - cx.state.context = cx.state.context.prev; - } - function pushlex(type, info) { - var result = function() { - var state = cx.state, indent = state.indented; - if (state.lexical.type == "stat") indent = state.lexical.indented; - else for (var outer = state.lexical; outer && outer.type == ")" && outer.align; outer = outer.prev) - indent = outer.indented; - state.lexical = new JSLexical(indent, cx.stream.column(), type, null, state.lexical, info); - }; - result.lex = true; - return result; - } - function poplex() { - var state = cx.state; - if (state.lexical.prev) { - if (state.lexical.type == ")") - state.indented = state.lexical.indented; - state.lexical = state.lexical.prev; - } - } - poplex.lex = true; - - function expect(wanted) { - function exp(type) { - if (type == wanted) return cont(); - else if (wanted == ";") return pass(); - else return cont(exp); - }; - return exp; - } - - function statement(type, value) { - if (type == "var") return cont(pushlex("vardef", value.length), vardef, expect(";"), poplex); - if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex); - if (type == "keyword b") return cont(pushlex("form"), statement, poplex); - if (type == "{") return cont(pushlex("}"), block, poplex); - if (type == ";") return cont(); - if (type == "if") { - if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex) - cx.state.cc.pop()(); - return cont(pushlex("form"), expression, statement, poplex, maybeelse); - } - if (type == "function") return cont(functiondef); - if (type == "for") return cont(pushlex("form"), forspec, statement, poplex); - if (type == "variable") return cont(pushlex("stat"), maybelabel); - if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"), - block, poplex, poplex); - if (type == "case") return cont(expression, expect(":")); - if (type == "default") return cont(expect(":")); - if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"), - statement, poplex, popcontext); - if (type == "class") return cont(pushlex("form"), className, poplex); - if (type == "export") return cont(pushlex("stat"), afterExport, poplex); - if (type == "import") return cont(pushlex("stat"), afterImport, poplex); - if (type == "module") return cont(pushlex("form"), pattern, pushlex("}"), expect("{"), block, poplex, poplex) - return pass(pushlex("stat"), expression, expect(";"), poplex); - } - function expression(type) { - return expressionInner(type, false); - } - function expressionNoComma(type) { - return expressionInner(type, true); - } - function expressionInner(type, noComma) { - if (cx.state.fatArrowAt == cx.stream.start) { - var body = noComma ? arrowBodyNoComma : arrowBody; - if (type == "(") return cont(pushcontext, pushlex(")"), commasep(pattern, ")"), poplex, expect("=>"), body, popcontext); - else if (type == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext); - } - - var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma; - if (atomicTypes.hasOwnProperty(type)) return cont(maybeop); - if (type == "function") return cont(functiondef, maybeop); - if (type == "keyword c") return cont(noComma ? maybeexpressionNoComma : maybeexpression); - if (type == "(") return cont(pushlex(")"), maybeexpression, comprehension, expect(")"), poplex, maybeop); - if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression); - if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop); - if (type == "{") return contCommasep(objprop, "}", null, maybeop); - if (type == "quasi") return pass(quasi, maybeop); - if (type == "new") return cont(maybeTarget(noComma)); - return cont(); - } - function maybeexpression(type) { - if (type.match(/[;\}\)\],]/)) return pass(); - return pass(expression); - } - function maybeexpressionNoComma(type) { - if (type.match(/[;\}\)\],]/)) return pass(); - return pass(expressionNoComma); - } - - function maybeoperatorComma(type, value) { - if (type == ",") return cont(expression); - return maybeoperatorNoComma(type, value, false); - } - function maybeoperatorNoComma(type, value, noComma) { - var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma; - var expr = noComma == false ? expression : expressionNoComma; - if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext); - if (type == "operator") { - if (/\+\+|--/.test(value)) return cont(me); - if (value == "?") return cont(expression, expect(":"), expr); - return cont(expr); - } - if (type == "quasi") { return pass(quasi, me); } - if (type == ";") return; - if (type == "(") return contCommasep(expressionNoComma, ")", "call", me); - if (type == ".") return cont(property, me); - if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me); - } - function quasi(type, value) { - if (type != "quasi") return pass(); - if (value.slice(value.length - 2) != "${") return cont(quasi); - return cont(expression, continueQuasi); - } - function continueQuasi(type) { - if (type == "}") { - cx.marked = "string-2"; - cx.state.tokenize = tokenQuasi; - return cont(quasi); - } - } - function arrowBody(type) { - findFatArrow(cx.stream, cx.state); - return pass(type == "{" ? statement : expression); - } - function arrowBodyNoComma(type) { - findFatArrow(cx.stream, cx.state); - return pass(type == "{" ? statement : expressionNoComma); - } - function maybeTarget(noComma) { - return function(type) { - if (type == ".") return cont(noComma ? targetNoComma : target); - else return pass(noComma ? expressionNoComma : expression); - }; - } - function target(_, value) { - if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorComma); } - } - function targetNoComma(_, value) { - if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorNoComma); } - } - function maybelabel(type) { - if (type == ":") return cont(poplex, statement); - return pass(maybeoperatorComma, expect(";"), poplex); - } - function property(type) { - if (type == "variable") {cx.marked = "property"; return cont();} - } - function objprop(type, value) { - if (type == "variable" || cx.style == "keyword") { - cx.marked = "property"; - if (value == "get" || value == "set") return cont(getterSetter); - return cont(afterprop); - } else if (type == "number" || type == "string") { - cx.marked = jsonldMode ? "property" : (cx.style + " property"); - return cont(afterprop); - } else if (type == "jsonld-keyword") { - return cont(afterprop); - } else if (type == "modifier") { - return cont(objprop) - } else if (type == "[") { - return cont(expression, expect("]"), afterprop); - } else if (type == "spread") { - return cont(expression); - } - } - function getterSetter(type) { - if (type != "variable") return pass(afterprop); - cx.marked = "property"; - return cont(functiondef); - } - function afterprop(type) { - if (type == ":") return cont(expressionNoComma); - if (type == "(") return pass(functiondef); - } - function commasep(what, end) { - function proceed(type) { - if (type == ",") { - var lex = cx.state.lexical; - if (lex.info == "call") lex.pos = (lex.pos || 0) + 1; - return cont(what, proceed); - } - if (type == end) return cont(); - return cont(expect(end)); - } - return function(type) { - if (type == end) return cont(); - return pass(what, proceed); - }; - } - function contCommasep(what, end, info) { - for (var i = 3; i < arguments.length; i++) - cx.cc.push(arguments[i]); - return cont(pushlex(end, info), commasep(what, end), poplex); - } - function block(type) { - if (type == "}") return cont(); - return pass(statement, block); - } - function maybetype(type) { - if (isTS && type == ":") return cont(typedef); - } - function maybedefault(_, value) { - if (value == "=") return cont(expressionNoComma); - } - function typedef(type) { - if (type == "variable") {cx.marked = "variable-3"; return cont();} - } - function vardef() { - return pass(pattern, maybetype, maybeAssign, vardefCont); - } - function pattern(type, value) { - if (type == "modifier") return cont(pattern) - if (type == "variable") { register(value); return cont(); } - if (type == "spread") return cont(pattern); - if (type == "[") return contCommasep(pattern, "]"); - if (type == "{") return contCommasep(proppattern, "}"); - } - function proppattern(type, value) { - if (type == "variable" && !cx.stream.match(/^\s*:/, false)) { - register(value); - return cont(maybeAssign); - } - if (type == "variable") cx.marked = "property"; - if (type == "spread") return cont(pattern); - if (type == "}") return pass(); - return cont(expect(":"), pattern, maybeAssign); - } - function maybeAssign(_type, value) { - if (value == "=") return cont(expressionNoComma); - } - function vardefCont(type) { - if (type == ",") return cont(vardef); - } - function maybeelse(type, value) { - if (type == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex); - } - function forspec(type) { - if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex); - } - function forspec1(type) { - if (type == "var") return cont(vardef, expect(";"), forspec2); - if (type == ";") return cont(forspec2); - if (type == "variable") return cont(formaybeinof); - return pass(expression, expect(";"), forspec2); - } - function formaybeinof(_type, value) { - if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); } - return cont(maybeoperatorComma, forspec2); - } - function forspec2(type, value) { - if (type == ";") return cont(forspec3); - if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); } - return pass(expression, expect(";"), forspec3); - } - function forspec3(type) { - if (type != ")") cont(expression); - } - function functiondef(type, value) { - if (value == "*") {cx.marked = "keyword"; return cont(functiondef);} - if (type == "variable") {register(value); return cont(functiondef);} - if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, statement, popcontext); - } - function funarg(type) { - if (type == "spread") return cont(funarg); - return pass(pattern, maybetype, maybedefault); - } - function className(type, value) { - if (type == "variable") {register(value); return cont(classNameAfter);} - } - function classNameAfter(type, value) { - if (value == "extends") return cont(expression, classNameAfter); - if (type == "{") return cont(pushlex("}"), classBody, poplex); - } - function classBody(type, value) { - if (type == "variable" || cx.style == "keyword") { - if (value == "static") { - cx.marked = "keyword"; - return cont(classBody); - } - cx.marked = "property"; - if (value == "get" || value == "set") return cont(classGetterSetter, functiondef, classBody); - return cont(functiondef, classBody); - } - if (value == "*") { - cx.marked = "keyword"; - return cont(classBody); - } - if (type == ";") return cont(classBody); - if (type == "}") return cont(); - } - function classGetterSetter(type) { - if (type != "variable") return pass(); - cx.marked = "property"; - return cont(); - } - function afterExport(_type, value) { - if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); } - if (value == "default") { cx.marked = "keyword"; return cont(expression, expect(";")); } - return pass(statement); - } - function afterImport(type) { - if (type == "string") return cont(); - return pass(importSpec, maybeFrom); - } - function importSpec(type, value) { - if (type == "{") return contCommasep(importSpec, "}"); - if (type == "variable") register(value); - if (value == "*") cx.marked = "keyword"; - return cont(maybeAs); - } - function maybeAs(_type, value) { - if (value == "as") { cx.marked = "keyword"; return cont(importSpec); } - } - function maybeFrom(_type, value) { - if (value == "from") { cx.marked = "keyword"; return cont(expression); } - } - function arrayLiteral(type) { - if (type == "]") return cont(); - return pass(expressionNoComma, maybeArrayComprehension); - } - function maybeArrayComprehension(type) { - if (type == "for") return pass(comprehension, expect("]")); - if (type == ",") return cont(commasep(maybeexpressionNoComma, "]")); - return pass(commasep(expressionNoComma, "]")); - } - function comprehension(type) { - if (type == "for") return cont(forspec, comprehension); - if (type == "if") return cont(expression, comprehension); - } - - function isContinuedStatement(state, textAfter) { - return state.lastType == "operator" || state.lastType == "," || - isOperatorChar.test(textAfter.charAt(0)) || - /[,.]/.test(textAfter.charAt(0)); - } - - // Interface - - return { - startState: function(basecolumn) { - var state = { - tokenize: tokenBase, - lastType: "sof", - cc: [], - lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false), - localVars: parserConfig.localVars, - context: parserConfig.localVars && {vars: parserConfig.localVars}, - indented: basecolumn || 0 - }; - if (parserConfig.globalVars && typeof parserConfig.globalVars == "object") - state.globalVars = parserConfig.globalVars; - return state; - }, - - token: function(stream, state) { - if (stream.sol()) { - if (!state.lexical.hasOwnProperty("align")) - state.lexical.align = false; - state.indented = stream.indentation(); - findFatArrow(stream, state); - } - if (state.tokenize != tokenComment && stream.eatSpace()) return null; - var style = state.tokenize(stream, state); - if (type == "comment") return style; - state.lastType = type == "operator" && (content == "++" || content == "--") ? "incdec" : type; - return parseJS(state, style, type, content, stream); - }, - - indent: function(state, textAfter) { - if (state.tokenize == tokenComment) return CodeMirror.Pass; - if (state.tokenize != tokenBase) return 0; - var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical; - // Kludge to prevent 'maybelse' from blocking lexical scope pops - if (!/^\s*else\b/.test(textAfter)) for (var i = state.cc.length - 1; i >= 0; --i) { - var c = state.cc[i]; - if (c == poplex) lexical = lexical.prev; - else if (c != maybeelse) break; - } - if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev; - if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat") - lexical = lexical.prev; - var type = lexical.type, closing = firstChar == type; - - if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info + 1 : 0); - else if (type == "form" && firstChar == "{") return lexical.indented; - else if (type == "form") return lexical.indented + indentUnit; - else if (type == "stat") - return lexical.indented + (isContinuedStatement(state, textAfter) ? statementIndent || indentUnit : 0); - else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false) - return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit); - else if (lexical.align) return lexical.column + (closing ? 0 : 1); - else return lexical.indented + (closing ? 0 : indentUnit); - }, - - electricInput: /^\s*(?:case .*?:|default:|\{|\})$/, - blockCommentStart: jsonMode ? null : "/*", - blockCommentEnd: jsonMode ? null : "*/", - lineComment: jsonMode ? null : "//", - fold: "brace", - closeBrackets: "()[]{}''\"\"``", - - helperType: jsonMode ? "json" : "javascript", - jsonldMode: jsonldMode, - jsonMode: jsonMode, - - expressionAllowed: expressionAllowed, - skipExpression: function(state) { - var top = state.cc[state.cc.length - 1] - if (top == expression || top == expressionNoComma) state.cc.pop() - } - }; -}); - -CodeMirror.registerHelper("wordChars", "javascript", /[\w$]/); - -CodeMirror.defineMIME("text/javascript", "javascript"); -CodeMirror.defineMIME("text/ecmascript", "javascript"); -CodeMirror.defineMIME("application/javascript", "javascript"); -CodeMirror.defineMIME("application/x-javascript", "javascript"); -CodeMirror.defineMIME("application/ecmascript", "javascript"); -CodeMirror.defineMIME("application/json", {name: "javascript", json: true}); -CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true}); -CodeMirror.defineMIME("application/ld+json", {name: "javascript", jsonld: true}); -CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true }); -CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true }); - -}); diff --git a/plugins/tiddlywiki/codemirror/files/mode/markdown/markdown.js b/plugins/tiddlywiki/codemirror/files/mode/markdown/markdown.js deleted file mode 100755 index a6942b39c..000000000 --- a/plugins/tiddlywiki/codemirror/files/mode/markdown/markdown.js +++ /dev/null @@ -1,807 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../xml/xml"), require("../meta")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../xml/xml", "../meta"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { - - var htmlMode = CodeMirror.getMode(cmCfg, "text/html"); - var htmlModeMissing = htmlMode.name == "null" - - function getMode(name) { - if (CodeMirror.findModeByName) { - var found = CodeMirror.findModeByName(name); - if (found) name = found.mime || found.mimes[0]; - } - var mode = CodeMirror.getMode(cmCfg, name); - return mode.name == "null" ? null : mode; - } - - // Should characters that affect highlighting be highlighted separate? - // Does not include characters that will be output (such as `1.` and `-` for lists) - if (modeCfg.highlightFormatting === undefined) - modeCfg.highlightFormatting = false; - - // Maximum number of nested blockquotes. Set to 0 for infinite nesting. - // Excess `>` will emit `error` token. - if (modeCfg.maxBlockquoteDepth === undefined) - modeCfg.maxBlockquoteDepth = 0; - - // Should underscores in words open/close em/strong? - if (modeCfg.underscoresBreakWords === undefined) - modeCfg.underscoresBreakWords = true; - - // Use `fencedCodeBlocks` to configure fenced code blocks. false to - // disable, string to specify a precise regexp that the fence should - // match, and true to allow three or more backticks or tildes (as - // per CommonMark). - - // Turn on task lists? ("- [ ] " and "- [x] ") - if (modeCfg.taskLists === undefined) modeCfg.taskLists = false; - - // Turn on strikethrough syntax - if (modeCfg.strikethrough === undefined) - modeCfg.strikethrough = false; - - // Allow token types to be overridden by user-provided token types. - if (modeCfg.tokenTypeOverrides === undefined) - modeCfg.tokenTypeOverrides = {}; - - var tokenTypes = { - header: "header", - code: "comment", - quote: "quote", - list1: "variable-2", - list2: "variable-3", - list3: "keyword", - hr: "hr", - image: "tag", - formatting: "formatting", - linkInline: "link", - linkEmail: "link", - linkText: "link", - linkHref: "string", - em: "em", - strong: "strong", - strikethrough: "strikethrough" - }; - - for (var tokenType in tokenTypes) { - if (tokenTypes.hasOwnProperty(tokenType) && modeCfg.tokenTypeOverrides[tokenType]) { - tokenTypes[tokenType] = modeCfg.tokenTypeOverrides[tokenType]; - } - } - - var hrRE = /^([*\-_])(?:\s*\1){2,}\s*$/ - , ulRE = /^[*\-+]\s+/ - , olRE = /^[0-9]+([.)])\s+/ - , taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE - , atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/ - , setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/ - , textRE = /^[^#!\[\]*_\\<>` "'(~]+/ - , fencedCodeRE = new RegExp("^(" + (modeCfg.fencedCodeBlocks === true ? "~~~+|```+" : modeCfg.fencedCodeBlocks) + - ")[ \\t]*([\\w+#]*)"); - - function switchInline(stream, state, f) { - state.f = state.inline = f; - return f(stream, state); - } - - function switchBlock(stream, state, f) { - state.f = state.block = f; - return f(stream, state); - } - - function lineIsEmpty(line) { - return !line || !/\S/.test(line.string) - } - - // Blocks - - function blankLine(state) { - // Reset linkTitle state - state.linkTitle = false; - // Reset EM state - state.em = false; - // Reset STRONG state - state.strong = false; - // Reset strikethrough state - state.strikethrough = false; - // Reset state.quote - state.quote = 0; - // Reset state.indentedCode - state.indentedCode = false; - if (htmlModeMissing && state.f == htmlBlock) { - state.f = inlineNormal; - state.block = blockNormal; - } - // Reset state.trailingSpace - state.trailingSpace = 0; - state.trailingSpaceNewLine = false; - // Mark this line as blank - state.prevLine = state.thisLine - state.thisLine = null - return null; - } - - function blockNormal(stream, state) { - - var sol = stream.sol(); - - var prevLineIsList = state.list !== false, - prevLineIsIndentedCode = state.indentedCode; - - state.indentedCode = false; - - if (prevLineIsList) { - if (state.indentationDiff >= 0) { // Continued list - if (state.indentationDiff < 4) { // Only adjust indentation if *not* a code block - state.indentation -= state.indentationDiff; - } - state.list = null; - } else if (state.indentation > 0) { - state.list = null; - } else { // No longer a list - state.list = false; - } - } - - var match = null; - if (state.indentationDiff >= 4) { - stream.skipToEnd(); - if (prevLineIsIndentedCode || lineIsEmpty(state.prevLine)) { - state.indentation -= 4; - state.indentedCode = true; - return tokenTypes.code; - } else { - return null; - } - } else if (stream.eatSpace()) { - return null; - } else if ((match = stream.match(atxHeaderRE)) && match[1].length <= 6) { - state.header = match[1].length; - if (modeCfg.highlightFormatting) state.formatting = "header"; - state.f = state.inline; - return getType(state); - } else if (!lineIsEmpty(state.prevLine) && !state.quote && !prevLineIsList && - !prevLineIsIndentedCode && (match = stream.match(setextHeaderRE))) { - state.header = match[0].charAt(0) == '=' ? 1 : 2; - if (modeCfg.highlightFormatting) state.formatting = "header"; - state.f = state.inline; - return getType(state); - } else if (stream.eat('>')) { - state.quote = sol ? 1 : state.quote + 1; - if (modeCfg.highlightFormatting) state.formatting = "quote"; - stream.eatSpace(); - return getType(state); - } else if (stream.peek() === '[') { - return switchInline(stream, state, footnoteLink); - } else if (stream.match(hrRE, true)) { - state.hr = true; - return tokenTypes.hr; - } else if ((lineIsEmpty(state.prevLine) || prevLineIsList) && (stream.match(ulRE, false) || stream.match(olRE, false))) { - var listType = null; - if (stream.match(ulRE, true)) { - listType = 'ul'; - } else { - stream.match(olRE, true); - listType = 'ol'; - } - state.indentation = stream.column() + stream.current().length; - state.list = true; - - // While this list item's marker's indentation - // is less than the deepest list item's content's indentation, - // pop the deepest list item indentation off the stack. - while (state.listStack && stream.column() < state.listStack[state.listStack.length - 1]) { - state.listStack.pop(); - } - - // Add this list item's content's indentation to the stack - state.listStack.push(state.indentation); - - if (modeCfg.taskLists && stream.match(taskListRE, false)) { - state.taskList = true; - } - state.f = state.inline; - if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType]; - return getType(state); - } else if (modeCfg.fencedCodeBlocks && (match = stream.match(fencedCodeRE, true))) { - state.fencedChars = match[1] - // try switching mode - state.localMode = getMode(match[2]); - if (state.localMode) state.localState = state.localMode.startState(); - state.f = state.block = local; - if (modeCfg.highlightFormatting) state.formatting = "code-block"; - state.code = -1 - return getType(state); - } - - return switchInline(stream, state, state.inline); - } - - function htmlBlock(stream, state) { - var style = htmlMode.token(stream, state.htmlState); - if (!htmlModeMissing) { - var inner = CodeMirror.innerMode(htmlMode, state.htmlState) - if ((inner.mode.name == "xml" && inner.state.tagStart === null && - (!inner.state.context && inner.state.tokenize.isInText)) || - (state.md_inside && stream.current().indexOf(">") > -1)) { - state.f = inlineNormal; - state.block = blockNormal; - state.htmlState = null; - } - } - return style; - } - - function local(stream, state) { - if (state.fencedChars && stream.match(state.fencedChars, false)) { - state.localMode = state.localState = null; - state.f = state.block = leavingLocal; - return null; - } else if (state.localMode) { - return state.localMode.token(stream, state.localState); - } else { - stream.skipToEnd(); - return tokenTypes.code; - } - } - - function leavingLocal(stream, state) { - stream.match(state.fencedChars); - state.block = blockNormal; - state.f = inlineNormal; - state.fencedChars = null; - if (modeCfg.highlightFormatting) state.formatting = "code-block"; - state.code = 1 - var returnType = getType(state); - state.code = 0 - return returnType; - } - - // Inline - function getType(state) { - var styles = []; - - if (state.formatting) { - styles.push(tokenTypes.formatting); - - if (typeof state.formatting === "string") state.formatting = [state.formatting]; - - for (var i = 0; i < state.formatting.length; i++) { - styles.push(tokenTypes.formatting + "-" + state.formatting[i]); - - if (state.formatting[i] === "header") { - styles.push(tokenTypes.formatting + "-" + state.formatting[i] + "-" + state.header); - } - - // Add `formatting-quote` and `formatting-quote-#` for blockquotes - // Add `error` instead if the maximum blockquote nesting depth is passed - if (state.formatting[i] === "quote") { - if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) { - styles.push(tokenTypes.formatting + "-" + state.formatting[i] + "-" + state.quote); - } else { - styles.push("error"); - } - } - } - } - - if (state.taskOpen) { - styles.push("meta"); - return styles.length ? styles.join(' ') : null; - } - if (state.taskClosed) { - styles.push("property"); - return styles.length ? styles.join(' ') : null; - } - - if (state.linkHref) { - styles.push(tokenTypes.linkHref, "url"); - } else { // Only apply inline styles to non-url text - if (state.strong) { styles.push(tokenTypes.strong); } - if (state.em) { styles.push(tokenTypes.em); } - if (state.strikethrough) { styles.push(tokenTypes.strikethrough); } - if (state.linkText) { styles.push(tokenTypes.linkText); } - if (state.code) { styles.push(tokenTypes.code); } - } - - if (state.header) { styles.push(tokenTypes.header, tokenTypes.header + "-" + state.header); } - - if (state.quote) { - styles.push(tokenTypes.quote); - - // Add `quote-#` where the maximum for `#` is modeCfg.maxBlockquoteDepth - if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) { - styles.push(tokenTypes.quote + "-" + state.quote); - } else { - styles.push(tokenTypes.quote + "-" + modeCfg.maxBlockquoteDepth); - } - } - - if (state.list !== false) { - var listMod = (state.listStack.length - 1) % 3; - if (!listMod) { - styles.push(tokenTypes.list1); - } else if (listMod === 1) { - styles.push(tokenTypes.list2); - } else { - styles.push(tokenTypes.list3); - } - } - - if (state.trailingSpaceNewLine) { - styles.push("trailing-space-new-line"); - } else if (state.trailingSpace) { - styles.push("trailing-space-" + (state.trailingSpace % 2 ? "a" : "b")); - } - - return styles.length ? styles.join(' ') : null; - } - - function handleText(stream, state) { - if (stream.match(textRE, true)) { - return getType(state); - } - return undefined; - } - - function inlineNormal(stream, state) { - var style = state.text(stream, state); - if (typeof style !== 'undefined') - return style; - - if (state.list) { // List marker (*, +, -, 1., etc) - state.list = null; - return getType(state); - } - - if (state.taskList) { - var taskOpen = stream.match(taskListRE, true)[1] !== "x"; - if (taskOpen) state.taskOpen = true; - else state.taskClosed = true; - if (modeCfg.highlightFormatting) state.formatting = "task"; - state.taskList = false; - return getType(state); - } - - state.taskOpen = false; - state.taskClosed = false; - - if (state.header && stream.match(/^#+$/, true)) { - if (modeCfg.highlightFormatting) state.formatting = "header"; - return getType(state); - } - - // Get sol() value now, before character is consumed - var sol = stream.sol(); - - var ch = stream.next(); - - // Matches link titles present on next line - if (state.linkTitle) { - state.linkTitle = false; - var matchCh = ch; - if (ch === '(') { - matchCh = ')'; - } - matchCh = (matchCh+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1"); - var regex = '^\\s*(?:[^' + matchCh + '\\\\]+|\\\\\\\\|\\\\.)' + matchCh; - if (stream.match(new RegExp(regex), true)) { - return tokenTypes.linkHref; - } - } - - // If this block is changed, it may need to be updated in GFM mode - if (ch === '`') { - var previousFormatting = state.formatting; - if (modeCfg.highlightFormatting) state.formatting = "code"; - stream.eatWhile('`'); - var count = stream.current().length - if (state.code == 0) { - state.code = count - return getType(state) - } else if (count == state.code) { // Must be exact - var t = getType(state) - state.code = 0 - return t - } else { - state.formatting = previousFormatting - return getType(state) - } - } else if (state.code) { - return getType(state); - } - - if (ch === '\\') { - stream.next(); - if (modeCfg.highlightFormatting) { - var type = getType(state); - var formattingEscape = tokenTypes.formatting + "-escape"; - return type ? type + " " + formattingEscape : formattingEscape; - } - } - - if (ch === '!' && stream.match(/\[[^\]]*\] ?(?:\(|\[)/, false)) { - stream.match(/\[[^\]]*\]/); - state.inline = state.f = linkHref; - return tokenTypes.image; - } - - if (ch === '[' && stream.match(/.*\](\(.*\)| ?\[.*\])/, false)) { - state.linkText = true; - if (modeCfg.highlightFormatting) state.formatting = "link"; - return getType(state); - } - - if (ch === ']' && state.linkText && stream.match(/\(.*\)| ?\[.*\]/, false)) { - if (modeCfg.highlightFormatting) state.formatting = "link"; - var type = getType(state); - state.linkText = false; - state.inline = state.f = linkHref; - return type; - } - - if (ch === '<' && stream.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/, false)) { - state.f = state.inline = linkInline; - if (modeCfg.highlightFormatting) state.formatting = "link"; - var type = getType(state); - if (type){ - type += " "; - } else { - type = ""; - } - return type + tokenTypes.linkInline; - } - - if (ch === '<' && stream.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/, false)) { - state.f = state.inline = linkInline; - if (modeCfg.highlightFormatting) state.formatting = "link"; - var type = getType(state); - if (type){ - type += " "; - } else { - type = ""; - } - return type + tokenTypes.linkEmail; - } - - if (ch === '<' && stream.match(/^(!--|\w)/, false)) { - var end = stream.string.indexOf(">", stream.pos); - if (end != -1) { - var atts = stream.string.substring(stream.start, end); - if (/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(atts)) state.md_inside = true; - } - stream.backUp(1); - state.htmlState = CodeMirror.startState(htmlMode); - return switchBlock(stream, state, htmlBlock); - } - - if (ch === '<' && stream.match(/^\/\w*?>/)) { - state.md_inside = false; - return "tag"; - } - - var ignoreUnderscore = false; - if (!modeCfg.underscoresBreakWords) { - if (ch === '_' && stream.peek() !== '_' && stream.match(/(\w)/, false)) { - var prevPos = stream.pos - 2; - if (prevPos >= 0) { - var prevCh = stream.string.charAt(prevPos); - if (prevCh !== '_' && prevCh.match(/(\w)/, false)) { - ignoreUnderscore = true; - } - } - } - } - if (ch === '*' || (ch === '_' && !ignoreUnderscore)) { - if (sol && stream.peek() === ' ') { - // Do nothing, surrounded by newline and space - } else if (state.strong === ch && stream.eat(ch)) { // Remove STRONG - if (modeCfg.highlightFormatting) state.formatting = "strong"; - var t = getType(state); - state.strong = false; - return t; - } else if (!state.strong && stream.eat(ch)) { // Add STRONG - state.strong = ch; - if (modeCfg.highlightFormatting) state.formatting = "strong"; - return getType(state); - } else if (state.em === ch) { // Remove EM - if (modeCfg.highlightFormatting) state.formatting = "em"; - var t = getType(state); - state.em = false; - return t; - } else if (!state.em) { // Add EM - state.em = ch; - if (modeCfg.highlightFormatting) state.formatting = "em"; - return getType(state); - } - } else if (ch === ' ') { - if (stream.eat('*') || stream.eat('_')) { // Probably surrounded by spaces - if (stream.peek() === ' ') { // Surrounded by spaces, ignore - return getType(state); - } else { // Not surrounded by spaces, back up pointer - stream.backUp(1); - } - } - } - - if (modeCfg.strikethrough) { - if (ch === '~' && stream.eatWhile(ch)) { - if (state.strikethrough) {// Remove strikethrough - if (modeCfg.highlightFormatting) state.formatting = "strikethrough"; - var t = getType(state); - state.strikethrough = false; - return t; - } else if (stream.match(/^[^\s]/, false)) {// Add strikethrough - state.strikethrough = true; - if (modeCfg.highlightFormatting) state.formatting = "strikethrough"; - return getType(state); - } - } else if (ch === ' ') { - if (stream.match(/^~~/, true)) { // Probably surrounded by space - if (stream.peek() === ' ') { // Surrounded by spaces, ignore - return getType(state); - } else { // Not surrounded by spaces, back up pointer - stream.backUp(2); - } - } - } - } - - if (ch === ' ') { - if (stream.match(/ +$/, false)) { - state.trailingSpace++; - } else if (state.trailingSpace) { - state.trailingSpaceNewLine = true; - } - } - - return getType(state); - } - - function linkInline(stream, state) { - var ch = stream.next(); - - if (ch === ">") { - state.f = state.inline = inlineNormal; - if (modeCfg.highlightFormatting) state.formatting = "link"; - var type = getType(state); - if (type){ - type += " "; - } else { - type = ""; - } - return type + tokenTypes.linkInline; - } - - stream.match(/^[^>]+/, true); - - return tokenTypes.linkInline; - } - - function linkHref(stream, state) { - // Check if space, and return NULL if so (to avoid marking the space) - if(stream.eatSpace()){ - return null; - } - var ch = stream.next(); - if (ch === '(' || ch === '[') { - state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]"); - if (modeCfg.highlightFormatting) state.formatting = "link-string"; - state.linkHref = true; - return getType(state); - } - return 'error'; - } - - function getLinkHrefInside(endChar) { - return function(stream, state) { - var ch = stream.next(); - - if (ch === endChar) { - state.f = state.inline = inlineNormal; - if (modeCfg.highlightFormatting) state.formatting = "link-string"; - var returnState = getType(state); - state.linkHref = false; - return returnState; - } - - if (stream.match(inlineRE(endChar), true)) { - stream.backUp(1); - } - - state.linkHref = true; - return getType(state); - }; - } - - function footnoteLink(stream, state) { - if (stream.match(/^([^\]\\]|\\.)*\]:/, false)) { - state.f = footnoteLinkInside; - stream.next(); // Consume [ - if (modeCfg.highlightFormatting) state.formatting = "link"; - state.linkText = true; - return getType(state); - } - return switchInline(stream, state, inlineNormal); - } - - function footnoteLinkInside(stream, state) { - if (stream.match(/^\]:/, true)) { - state.f = state.inline = footnoteUrl; - if (modeCfg.highlightFormatting) state.formatting = "link"; - var returnType = getType(state); - state.linkText = false; - return returnType; - } - - stream.match(/^([^\]\\]|\\.)+/, true); - - return tokenTypes.linkText; - } - - function footnoteUrl(stream, state) { - // Check if space, and return NULL if so (to avoid marking the space) - if(stream.eatSpace()){ - return null; - } - // Match URL - stream.match(/^[^\s]+/, true); - // Check for link title - if (stream.peek() === undefined) { // End of line, set flag to check next line - state.linkTitle = true; - } else { // More content on line, check if link title - stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true); - } - state.f = state.inline = inlineNormal; - return tokenTypes.linkHref + " url"; - } - - var savedInlineRE = []; - function inlineRE(endChar) { - if (!savedInlineRE[endChar]) { - // Escape endChar for RegExp (taken from http://stackoverflow.com/a/494122/526741) - endChar = (endChar+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1"); - // Match any non-endChar, escaped character, as well as the closing - // endChar. - savedInlineRE[endChar] = new RegExp('^(?:[^\\\\]|\\\\.)*?(' + endChar + ')'); - } - return savedInlineRE[endChar]; - } - - var mode = { - startState: function() { - return { - f: blockNormal, - - prevLine: null, - thisLine: null, - - block: blockNormal, - htmlState: null, - indentation: 0, - - inline: inlineNormal, - text: handleText, - - formatting: false, - linkText: false, - linkHref: false, - linkTitle: false, - code: 0, - em: false, - strong: false, - header: 0, - hr: false, - taskList: false, - list: false, - listStack: [], - quote: 0, - trailingSpace: 0, - trailingSpaceNewLine: false, - strikethrough: false, - fencedChars: null - }; - }, - - copyState: function(s) { - return { - f: s.f, - - prevLine: s.prevLine, - thisLine: s.thisLine, - - block: s.block, - htmlState: s.htmlState && CodeMirror.copyState(htmlMode, s.htmlState), - indentation: s.indentation, - - localMode: s.localMode, - localState: s.localMode ? CodeMirror.copyState(s.localMode, s.localState) : null, - - inline: s.inline, - text: s.text, - formatting: false, - linkTitle: s.linkTitle, - code: s.code, - em: s.em, - strong: s.strong, - strikethrough: s.strikethrough, - header: s.header, - hr: s.hr, - taskList: s.taskList, - list: s.list, - listStack: s.listStack.slice(0), - quote: s.quote, - indentedCode: s.indentedCode, - trailingSpace: s.trailingSpace, - trailingSpaceNewLine: s.trailingSpaceNewLine, - md_inside: s.md_inside, - fencedChars: s.fencedChars - }; - }, - - token: function(stream, state) { - - // Reset state.formatting - state.formatting = false; - - if (stream != state.thisLine) { - var forceBlankLine = state.header || state.hr; - - // Reset state.header and state.hr - state.header = 0; - state.hr = false; - - if (stream.match(/^\s*$/, true) || forceBlankLine) { - blankLine(state); - if (!forceBlankLine) return null - state.prevLine = null - } - - state.prevLine = state.thisLine - state.thisLine = stream - - // Reset state.taskList - state.taskList = false; - - // Reset state.trailingSpace - state.trailingSpace = 0; - state.trailingSpaceNewLine = false; - - state.f = state.block; - var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, ' ').length; - state.indentationDiff = Math.min(indentation - state.indentation, 4); - state.indentation = state.indentation + state.indentationDiff; - if (indentation > 0) return null; - } - return state.f(stream, state); - }, - - innerMode: function(state) { - if (state.block == htmlBlock) return {state: state.htmlState, mode: htmlMode}; - if (state.localState) return {state: state.localState, mode: state.localMode}; - return {state: state, mode: mode}; - }, - - blankLine: blankLine, - - getType: getType, - - fold: "markdown" - }; - return mode; -}, "xml"); - -CodeMirror.defineMIME("text/x-markdown", "markdown"); - -}); diff --git a/plugins/tiddlywiki/codemirror/files/mode/meta.js b/plugins/tiddlywiki/codemirror/files/mode/meta.js deleted file mode 100755 index 3cb9de21e..000000000 --- a/plugins/tiddlywiki/codemirror/files/mode/meta.js +++ /dev/null @@ -1,203 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - "use strict"; - - CodeMirror.modeInfo = [ - {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]}, - {name: "PGP", mimes: ["application/pgp", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["pgp"]}, - {name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn", "asn1"]}, - {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i}, - {name: "Brainfuck", mime: "text/x-brainfuck", mode: "brainfuck", ext: ["b", "bf"]}, - {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]}, - {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]}, - {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]}, - {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]}, - {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]}, - {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]}, - {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]}, - {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/}, - {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]}, - {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]}, - {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]}, - {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]}, - {name: "Crystal", mime: "text/x-crystal", mode: "crystal", ext: ["cr"]}, - {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]}, - {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]}, - {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]}, - {name: "Dart", mimes: ["application/dart", "text/x-dart"], mode: "dart", ext: ["dart"]}, - {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]}, - {name: "Django", mime: "text/x-django", mode: "django"}, - {name: "Dockerfile", mime: "text/x-dockerfile", mode: "dockerfile", file: /^Dockerfile$/}, - {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]}, - {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]}, - {name: "EBNF", mime: "text/x-ebnf", mode: "ebnf"}, - {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]}, - {name: "edn", mime: "application/edn", mode: "clojure", ext: ["edn"]}, - {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]}, - {name: "Elm", mime: "text/x-elm", mode: "elm", ext: ["elm"]}, - {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]}, - {name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]}, - {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]}, - {name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]}, - {name: "FCL", mime: "text/x-fcl", mode: "fcl"}, - {name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]}, - {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]}, - {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]}, - {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]}, - {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]}, - {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i}, - {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]}, - {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"]}, - {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]}, - {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]}, - {name: "Haskell (Literate)", mime: "text/x-literate-haskell", mode: "haskell-literate", ext: ["lhs"]}, - {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]}, - {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]}, - {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]}, - {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"], alias: ["xhtml"]}, - {name: "HTTP", mime: "message/http", mode: "http"}, - {name: "IDL", mime: "text/x-idl", mode: "idl", ext: ["pro"]}, - {name: "Jade", mime: "text/x-jade", mode: "jade", ext: ["jade"]}, - {name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]}, - {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"], alias: ["jsp"]}, - {name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript"], - mode: "javascript", ext: ["js"], alias: ["ecmascript", "js", "node"]}, - {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]}, - {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]}, - {name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]}, - {name: "Jinja2", mime: "null", mode: "jinja2"}, - {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]}, - {name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]}, - {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]}, - {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"], alias: ["ls"]}, - {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]}, - {name: "Markdown", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]}, - {name: "mIRC", mime: "text/mirc", mode: "mirc"}, - {name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"}, - {name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb"]}, - {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]}, - {name: "MUMPS", mime: "text/x-mumps", mode: "mumps", ext: ["mps"]}, - {name: "MS SQL", mime: "text/x-mssql", mode: "sql"}, - {name: "MySQL", mime: "text/x-mysql", mode: "sql"}, - {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i}, - {name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]}, - {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]}, - {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"]}, - {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]}, - {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]}, - {name: "Oz", mime: "text/x-oz", mode: "oz", ext: ["oz"]}, - {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]}, - {name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]}, - {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]}, - {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "phtml"]}, - {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]}, - {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]}, - {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]}, - {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]}, - {name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]}, - {name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]}, - {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]}, - {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]}, - {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"], alias: ["rscript"]}, - {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"], alias: ["rst"]}, - {name: "RPM Changes", mime: "text/x-rpm-changes", mode: "rpm"}, - {name: "RPM Spec", mime: "text/x-rpm-spec", mode: "rpm", ext: ["spec"]}, - {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"], alias: ["jruby", "macruby", "rake", "rb", "rbx"]}, - {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ["rs"]}, - {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ["sass"]}, - {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]}, - {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]}, - {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]}, - {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/}, - {name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ["siv", "sieve"]}, - {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim", ext: ["slim"]}, - {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]}, - {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]}, - {name: "Solr", mime: "text/x-solr", mode: "solr"}, - {name: "Soy", mime: "text/x-soy", mode: "soy", ext: ["soy"], alias: ["closure template"]}, - {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]}, - {name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]}, - {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]}, - {name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]}, - {name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]}, - {name: "sTeX", mime: "text/x-stex", mode: "stex"}, - {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]}, - {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]}, - {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]}, - {name: "Textile", mime: "text/x-textile", mode: "textile", ext: ["textile"]}, - {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"}, - {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"}, - {name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]}, - {name: "Tornado", mime: "text/x-tornado", mode: "tornado"}, - {name: "troff", mime: "text/troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]}, - {name: "TTCN", mime: "text/x-ttcn", mode: "ttcn", ext: ["ttcn", "ttcn3", "ttcnpp"]}, - {name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]}, - {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]}, - {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]}, - {name: "Twig", mime: "text/x-twig", mode: "twig"}, - {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]}, - {name: "VBScript", mime: "text/vbscript", mode: "vbscript", ext: ["vbs"]}, - {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]}, - {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]}, - {name: "VHDL", mime: "text/x-vhdl", mode: "vhdl", ext: ["vhd", "vhdl"]}, - {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]}, - {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]}, - {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]}, - {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]}, - {name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]}, - {name: "xu", mime: "text/x-xu", mode: "mscgen", ext: ["xu"]}, - {name: "msgenny", mime: "text/x-msgenny", mode: "mscgen", ext: ["msgenny"]} - ]; - // Ensure all modes have a mime property for backwards compatibility - for (var i = 0; i < CodeMirror.modeInfo.length; i++) { - var info = CodeMirror.modeInfo[i]; - if (info.mimes) info.mime = info.mimes[0]; - } - - CodeMirror.findModeByMIME = function(mime) { - mime = mime.toLowerCase(); - for (var i = 0; i < CodeMirror.modeInfo.length; i++) { - var info = CodeMirror.modeInfo[i]; - if (info.mime == mime) return info; - if (info.mimes) for (var j = 0; j < info.mimes.length; j++) - if (info.mimes[j] == mime) return info; - } - }; - - CodeMirror.findModeByExtension = function(ext) { - for (var i = 0; i < CodeMirror.modeInfo.length; i++) { - var info = CodeMirror.modeInfo[i]; - if (info.ext) for (var j = 0; j < info.ext.length; j++) - if (info.ext[j] == ext) return info; - } - }; - - CodeMirror.findModeByFileName = function(filename) { - for (var i = 0; i < CodeMirror.modeInfo.length; i++) { - var info = CodeMirror.modeInfo[i]; - if (info.file && info.file.test(filename)) return info; - } - var dot = filename.lastIndexOf("."); - var ext = dot > -1 && filename.substring(dot + 1, filename.length); - if (ext) return CodeMirror.findModeByExtension(ext); - }; - - CodeMirror.findModeByName = function(name) { - name = name.toLowerCase(); - for (var i = 0; i < CodeMirror.modeInfo.length; i++) { - var info = CodeMirror.modeInfo[i]; - if (info.name.toLowerCase() == name) return info; - if (info.alias) for (var j = 0; j < info.alias.length; j++) - if (info.alias[j].toLowerCase() == name) return info; - } - }; -}); diff --git a/plugins/tiddlywiki/codemirror/files/mode/tiddlywiki/tiddlywiki.js b/plugins/tiddlywiki/codemirror/files/mode/tiddlywiki/tiddlywiki.js deleted file mode 100755 index 1df01647a..000000000 --- a/plugins/tiddlywiki/codemirror/files/mode/tiddlywiki/tiddlywiki.js +++ /dev/null @@ -1,358 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/*** - |''Name''|tiddlywiki.js| - |''Description''|Enables TiddlyWikiy syntax highlighting using CodeMirror| - |''Author''|PMario| - |''Version''|0.1.7| - |''Status''|''stable''| - |''Source''|[[GitHub|https://github.com/pmario/CodeMirror2/blob/tw-syntax/mode/tiddlywiki]]| - |''Documentation''|http://codemirror.tiddlyspace.com/| - |''License''|[[MIT License|http://www.opensource.org/licenses/mit-license.php]]| - |''CoreVersion''|2.5.0| - |''Requires''|codemirror.js| - |''Keywords''|syntax highlighting color code mirror codemirror| - ! Info - CoreVersion parameter is needed for TiddlyWiki only! -***/ -//{{{ - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("tiddlywiki", function () { - // Tokenizer - var textwords = {}; - - var keywords = function () { - function kw(type) { - return { type: type, style: "macro"}; - } - return { - "allTags": kw('allTags'), "closeAll": kw('closeAll'), "list": kw('list'), - "newJournal": kw('newJournal'), "newTiddler": kw('newTiddler'), - "permaview": kw('permaview'), "saveChanges": kw('saveChanges'), - "search": kw('search'), "slider": kw('slider'), "tabs": kw('tabs'), - "tag": kw('tag'), "tagging": kw('tagging'), "tags": kw('tags'), - "tiddler": kw('tiddler'), "timeline": kw('timeline'), - "today": kw('today'), "version": kw('version'), "option": kw('option'), - - "with": kw('with'), - "filter": kw('filter') - }; - }(); - - var isSpaceName = /[\w_\-]/i, - reHR = /^\-\-\-\-+$/, // <hr> - reWikiCommentStart = /^\/\*\*\*$/, // /*** - reWikiCommentStop = /^\*\*\*\/$/, // ***/ - reBlockQuote = /^<<<$/, - - reJsCodeStart = /^\/\/\{\{\{$/, // //{{{ js block start - reJsCodeStop = /^\/\/\}\}\}$/, // //}}} js stop - reXmlCodeStart = /^<!--\{\{\{-->$/, // xml block start - reXmlCodeStop = /^<!--\}\}\}-->$/, // xml stop - - reCodeBlockStart = /^\{\{\{$/, // {{{ TW text div block start - reCodeBlockStop = /^\}\}\}$/, // }}} TW text stop - - reUntilCodeStop = /.*?\}\}\}/; - - function chain(stream, state, f) { - state.tokenize = f; - return f(stream, state); - } - - function jsTokenBase(stream, state) { - var sol = stream.sol(), ch; - - state.block = false; // indicates the start of a code block. - - ch = stream.peek(); // don't eat, to make matching simpler - - // check start of blocks - if (sol && /[<\/\*{}\-]/.test(ch)) { - if (stream.match(reCodeBlockStart)) { - state.block = true; - return chain(stream, state, twTokenCode); - } - if (stream.match(reBlockQuote)) { - return 'quote'; - } - if (stream.match(reWikiCommentStart) || stream.match(reWikiCommentStop)) { - return 'comment'; - } - if (stream.match(reJsCodeStart) || stream.match(reJsCodeStop) || stream.match(reXmlCodeStart) || stream.match(reXmlCodeStop)) { - return 'comment'; - } - if (stream.match(reHR)) { - return 'hr'; - } - } // sol - ch = stream.next(); - - if (sol && /[\/\*!#;:>|]/.test(ch)) { - if (ch == "!") { // tw header - stream.skipToEnd(); - return "header"; - } - if (ch == "*") { // tw list - stream.eatWhile('*'); - return "comment"; - } - if (ch == "#") { // tw numbered list - stream.eatWhile('#'); - return "comment"; - } - if (ch == ";") { // definition list, term - stream.eatWhile(';'); - return "comment"; - } - if (ch == ":") { // definition list, description - stream.eatWhile(':'); - return "comment"; - } - if (ch == ">") { // single line quote - stream.eatWhile(">"); - return "quote"; - } - if (ch == '|') { - return 'header'; - } - } - - if (ch == '{' && stream.match(/\{\{/)) { - return chain(stream, state, twTokenCode); - } - - // rudimentary html:// file:// link matching. TW knows much more ... - if (/[hf]/i.test(ch)) { - if (/[ti]/i.test(stream.peek()) && stream.match(/\b(ttps?|tp|ile):\/\/[\-A-Z0-9+&@#\/%?=~_|$!:,.;]*[A-Z0-9+&@#\/%=~_|$]/i)) { - return "link"; - } - } - // just a little string indicator, don't want to have the whole string covered - if (ch == '"') { - return 'string'; - } - if (ch == '~') { // _no_ CamelCase indicator should be bold - return 'brace'; - } - if (/[\[\]]/.test(ch)) { // check for [[..]] - if (stream.peek() == ch) { - stream.next(); - return 'brace'; - } - } - if (ch == "@") { // check for space link. TODO fix @@...@@ highlighting - stream.eatWhile(isSpaceName); - return "link"; - } - if (/\d/.test(ch)) { // numbers - stream.eatWhile(/\d/); - return "number"; - } - if (ch == "/") { // tw invisible comment - if (stream.eat("%")) { - return chain(stream, state, twTokenComment); - } - else if (stream.eat("/")) { // - return chain(stream, state, twTokenEm); - } - } - if (ch == "_") { // tw underline - if (stream.eat("_")) { - return chain(stream, state, twTokenUnderline); - } - } - // strikethrough and mdash handling - if (ch == "-") { - if (stream.eat("-")) { - // if strikethrough looks ugly, change CSS. - if (stream.peek() != ' ') - return chain(stream, state, twTokenStrike); - // mdash - if (stream.peek() == ' ') - return 'brace'; - } - } - if (ch == "'") { // tw bold - if (stream.eat("'")) { - return chain(stream, state, twTokenStrong); - } - } - if (ch == "<") { // tw macro - if (stream.eat("<")) { - return chain(stream, state, twTokenMacro); - } - } - else { - return null; - } - - // core macro handling - stream.eatWhile(/[\w\$_]/); - var word = stream.current(), - known = textwords.propertyIsEnumerable(word) && textwords[word]; - - return known ? known.style : null; - } // jsTokenBase() - - // tw invisible comment - function twTokenComment(stream, state) { - var maybeEnd = false, - ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = jsTokenBase; - break; - } - maybeEnd = (ch == "%"); - } - return "comment"; - } - - // tw strong / bold - function twTokenStrong(stream, state) { - var maybeEnd = false, - ch; - while (ch = stream.next()) { - if (ch == "'" && maybeEnd) { - state.tokenize = jsTokenBase; - break; - } - maybeEnd = (ch == "'"); - } - return "strong"; - } - - // tw code - function twTokenCode(stream, state) { - var sb = state.block; - - if (sb && stream.current()) { - return "comment"; - } - - if (!sb && stream.match(reUntilCodeStop)) { - state.tokenize = jsTokenBase; - return "comment"; - } - - if (sb && stream.sol() && stream.match(reCodeBlockStop)) { - state.tokenize = jsTokenBase; - return "comment"; - } - - stream.next(); - return "comment"; - } - - // tw em / italic - function twTokenEm(stream, state) { - var maybeEnd = false, - ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = jsTokenBase; - break; - } - maybeEnd = (ch == "/"); - } - return "em"; - } - - // tw underlined text - function twTokenUnderline(stream, state) { - var maybeEnd = false, - ch; - while (ch = stream.next()) { - if (ch == "_" && maybeEnd) { - state.tokenize = jsTokenBase; - break; - } - maybeEnd = (ch == "_"); - } - return "underlined"; - } - - // tw strike through text looks ugly - // change CSS if needed - function twTokenStrike(stream, state) { - var maybeEnd = false, ch; - - while (ch = stream.next()) { - if (ch == "-" && maybeEnd) { - state.tokenize = jsTokenBase; - break; - } - maybeEnd = (ch == "-"); - } - return "strikethrough"; - } - - // macro - function twTokenMacro(stream, state) { - var ch, word, known; - - if (stream.current() == '<<') { - return 'macro'; - } - - ch = stream.next(); - if (!ch) { - state.tokenize = jsTokenBase; - return null; - } - if (ch == ">") { - if (stream.peek() == '>') { - stream.next(); - state.tokenize = jsTokenBase; - return "macro"; - } - } - - stream.eatWhile(/[\w\$_]/); - word = stream.current(); - known = keywords.propertyIsEnumerable(word) && keywords[word]; - - if (known) { - return known.style, word; - } - else { - return null, word; - } - } - - // Interface - return { - startState: function () { - return { - tokenize: jsTokenBase, - indented: 0, - level: 0 - }; - }, - - token: function (stream, state) { - if (stream.eatSpace()) return null; - var style = state.tokenize(stream, state); - return style; - }, - - electricChars: "" - }; -}); - -CodeMirror.defineMIME("text/x-tiddlywiki", "tiddlywiki"); -}); - -//}}} diff --git a/plugins/tiddlywiki/codemirror/files/mode/tw-meta.js b/plugins/tiddlywiki/codemirror/files/mode/tw-meta.js new file mode 100755 index 000000000..552d6deea --- /dev/null +++ b/plugins/tiddlywiki/codemirror/files/mode/tw-meta.js @@ -0,0 +1 @@ +!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../lib/codemirror")):"function"==typeof define&&define.amd?define(["../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";e.modeInfo=[{name:"CMake",mime:"text/x-cmake",mode:"cmake",ext:["cmake","cmake.in"],file:/^CMakeLists.txt$/},{name:"Cython",mime:"text/x-cython",mode:"python",ext:["pyx","pxd","pxi"]},{name:"CSS",mime:"text/css",mode:"css",ext:["css"]},{name:"diff",mime:"text/x-diff",mode:"diff",ext:["diff","patch"]},{name:"Embedded Javascript",mime:"application/x-ejs",mode:"htmlembedded",ext:["ejs"]},{name:"Embedded Ruby",mime:"application/x-erb",mode:"htmlembedded",ext:["erb"]},{name:"Erlang",mime:"text/x-erlang",mode:"erlang",ext:["erl"]},{name:"GitHub Flavored Markdown",mime:"text/x-gfm",mode:"gfm",file:/^(readme|contributing|history).md$/i},{name:"Go",mime:"text/x-go",mode:"go",ext:["go"]},{name:"ASP.NET",mime:"application/x-aspx",mode:"htmlembedded",ext:["aspx"],alias:["asp","aspx"]},{name:"HTML",mime:"text/html",mode:"htmlmixed",ext:["html","htm","handlebars","hbs"],alias:["xhtml"]},{name:"HTTP",mime:"message/http",mode:"http"},{name:"JavaScript",mimes:["text/javascript","text/ecmascript","application/javascript","application/x-javascript","application/ecmascript"],mode:"javascript",ext:["js"],alias:["ecmascript","js","node"]},{name:"JSON",mimes:["application/json","application/x-json"],mode:"javascript",ext:["json","map"],alias:["json5"]},{name:"JSON-LD",mime:"application/ld+json",mode:"javascript",ext:["jsonld"],alias:["jsonld"]},{name:"Lua",mime:"text/x-lua",mode:"lua",ext:["lua"]},{name:"Markdown",mime:"text/x-markdown",mode:"markdown",ext:["markdown","md","mkd"]},{name:"MySQL",mime:"text/x-mysql",mode:"sql"},{name:"Plain Text",mime:"text/plain",mode:"null",ext:["txt","text","conf","def","list","log"]},{name:"Python",mime:"text/x-python",mode:"python",ext:["BUILD","bzl","py","pyw"],file:/^(BUCK|BUILD)$/},{name:"SCSS",mime:"text/x-scss",mode:"css",ext:["scss"]},{name:"LaTeX",mime:"text/x-latex",mode:"stex",ext:["text","ltx","tex"],alias:["tex"]},{name:"TiddlyWiki ",mime:"text/x-tiddlywiki",mode:"tiddlywiki"}];for(var t=0;t<e.modeInfo.length;t++){var m=e.modeInfo[t];m.mimes&&(m.mime=m.mimes[0])}e.findModeByMIME=function(t){t=t.toLowerCase();for(var m=0;m<e.modeInfo.length;m++){var i=e.modeInfo[m];if(i.mime==t)return i;if(i.mimes)for(var a=0;a<i.mimes.length;a++)if(i.mimes[a]==t)return i}return/\+xml$/.test(t)?e.findModeByMIME("application/xml"):/\+json$/.test(t)?e.findModeByMIME("application/json"):void 0},e.findModeByExtension=function(t){for(var m=0;m<e.modeInfo.length;m++){var i=e.modeInfo[m];if(i.ext)for(var a=0;a<i.ext.length;a++)if(i.ext[a]==t)return i}},e.findModeByFileName=function(t){for(var m=0;m<e.modeInfo.length;m++){var i=e.modeInfo[m];if(i.file&&i.file.test(t))return i}var a=t.lastIndexOf("."),o=a>-1&&t.substring(a+1,t.length);if(o)return e.findModeByExtension(o)},e.findModeByName=function(t){t=t.toLowerCase();for(var m=0;m<e.modeInfo.length;m++){var i=e.modeInfo[m];if(i.name.toLowerCase()==t)return i;if(i.alias)for(var a=0;a<i.alias.length;a++)if(i.alias[a].toLowerCase()==t)return i}}}); diff --git a/plugins/tiddlywiki/codemirror/files/mode/xml/xml.js b/plugins/tiddlywiki/codemirror/files/mode/xml/xml.js deleted file mode 100755 index f987a3a3c..000000000 --- a/plugins/tiddlywiki/codemirror/files/mode/xml/xml.js +++ /dev/null @@ -1,394 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -var htmlConfig = { - autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true, - 'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true, - 'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true, - 'track': true, 'wbr': true, 'menuitem': true}, - implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true, - 'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true, - 'th': true, 'tr': true}, - contextGrabbers: { - 'dd': {'dd': true, 'dt': true}, - 'dt': {'dd': true, 'dt': true}, - 'li': {'li': true}, - 'option': {'option': true, 'optgroup': true}, - 'optgroup': {'optgroup': true}, - 'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true, - 'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true, - 'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true, - 'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true, - 'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true}, - 'rp': {'rp': true, 'rt': true}, - 'rt': {'rp': true, 'rt': true}, - 'tbody': {'tbody': true, 'tfoot': true}, - 'td': {'td': true, 'th': true}, - 'tfoot': {'tbody': true}, - 'th': {'td': true, 'th': true}, - 'thead': {'tbody': true, 'tfoot': true}, - 'tr': {'tr': true} - }, - doNotIndent: {"pre": true}, - allowUnquoted: true, - allowMissing: true, - caseFold: true -} - -var xmlConfig = { - autoSelfClosers: {}, - implicitlyClosed: {}, - contextGrabbers: {}, - doNotIndent: {}, - allowUnquoted: false, - allowMissing: false, - caseFold: false -} - -CodeMirror.defineMode("xml", function(editorConf, config_) { - var indentUnit = editorConf.indentUnit - var config = {} - var defaults = config_.htmlMode ? htmlConfig : xmlConfig - for (var prop in defaults) config[prop] = defaults[prop] - for (var prop in config_) config[prop] = config_[prop] - - // Return variables for tokenizers - var type, setStyle; - - function inText(stream, state) { - function chain(parser) { - state.tokenize = parser; - return parser(stream, state); - } - - var ch = stream.next(); - if (ch == "<") { - if (stream.eat("!")) { - if (stream.eat("[")) { - if (stream.match("CDATA[")) return chain(inBlock("atom", "]]>")); - else return null; - } else if (stream.match("--")) { - return chain(inBlock("comment", "-->")); - } else if (stream.match("DOCTYPE", true, true)) { - stream.eatWhile(/[\w\._\-]/); - return chain(doctype(1)); - } else { - return null; - } - } else if (stream.eat("?")) { - stream.eatWhile(/[\w\._\-]/); - state.tokenize = inBlock("meta", "?>"); - return "meta"; - } else { - type = stream.eat("/") ? "closeTag" : "openTag"; - state.tokenize = inTag; - return "tag bracket"; - } - } else if (ch == "&") { - var ok; - if (stream.eat("#")) { - if (stream.eat("x")) { - ok = stream.eatWhile(/[a-fA-F\d]/) && stream.eat(";"); - } else { - ok = stream.eatWhile(/[\d]/) && stream.eat(";"); - } - } else { - ok = stream.eatWhile(/[\w\.\-:]/) && stream.eat(";"); - } - return ok ? "atom" : "error"; - } else { - stream.eatWhile(/[^&<]/); - return null; - } - } - inText.isInText = true; - - function inTag(stream, state) { - var ch = stream.next(); - if (ch == ">" || (ch == "/" && stream.eat(">"))) { - state.tokenize = inText; - type = ch == ">" ? "endTag" : "selfcloseTag"; - return "tag bracket"; - } else if (ch == "=") { - type = "equals"; - return null; - } else if (ch == "<") { - state.tokenize = inText; - state.state = baseState; - state.tagName = state.tagStart = null; - var next = state.tokenize(stream, state); - return next ? next + " tag error" : "tag error"; - } else if (/[\'\"]/.test(ch)) { - state.tokenize = inAttribute(ch); - state.stringStartCol = stream.column(); - return state.tokenize(stream, state); - } else { - stream.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/); - return "word"; - } - } - - function inAttribute(quote) { - var closure = function(stream, state) { - while (!stream.eol()) { - if (stream.next() == quote) { - state.tokenize = inTag; - break; - } - } - return "string"; - }; - closure.isInAttribute = true; - return closure; - } - - function inBlock(style, terminator) { - return function(stream, state) { - while (!stream.eol()) { - if (stream.match(terminator)) { - state.tokenize = inText; - break; - } - stream.next(); - } - return style; - }; - } - function doctype(depth) { - return function(stream, state) { - var ch; - while ((ch = stream.next()) != null) { - if (ch == "<") { - state.tokenize = doctype(depth + 1); - return state.tokenize(stream, state); - } else if (ch == ">") { - if (depth == 1) { - state.tokenize = inText; - break; - } else { - state.tokenize = doctype(depth - 1); - return state.tokenize(stream, state); - } - } - } - return "meta"; - }; - } - - function Context(state, tagName, startOfLine) { - this.prev = state.context; - this.tagName = tagName; - this.indent = state.indented; - this.startOfLine = startOfLine; - if (config.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent)) - this.noIndent = true; - } - function popContext(state) { - if (state.context) state.context = state.context.prev; - } - function maybePopContext(state, nextTagName) { - var parentTagName; - while (true) { - if (!state.context) { - return; - } - parentTagName = state.context.tagName; - if (!config.contextGrabbers.hasOwnProperty(parentTagName) || - !config.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) { - return; - } - popContext(state); - } - } - - function baseState(type, stream, state) { - if (type == "openTag") { - state.tagStart = stream.column(); - return tagNameState; - } else if (type == "closeTag") { - return closeTagNameState; - } else { - return baseState; - } - } - function tagNameState(type, stream, state) { - if (type == "word") { - state.tagName = stream.current(); - setStyle = "tag"; - return attrState; - } else { - setStyle = "error"; - return tagNameState; - } - } - function closeTagNameState(type, stream, state) { - if (type == "word") { - var tagName = stream.current(); - if (state.context && state.context.tagName != tagName && - config.implicitlyClosed.hasOwnProperty(state.context.tagName)) - popContext(state); - if ((state.context && state.context.tagName == tagName) || config.matchClosing === false) { - setStyle = "tag"; - return closeState; - } else { - setStyle = "tag error"; - return closeStateErr; - } - } else { - setStyle = "error"; - return closeStateErr; - } - } - - function closeState(type, _stream, state) { - if (type != "endTag") { - setStyle = "error"; - return closeState; - } - popContext(state); - return baseState; - } - function closeStateErr(type, stream, state) { - setStyle = "error"; - return closeState(type, stream, state); - } - - function attrState(type, _stream, state) { - if (type == "word") { - setStyle = "attribute"; - return attrEqState; - } else if (type == "endTag" || type == "selfcloseTag") { - var tagName = state.tagName, tagStart = state.tagStart; - state.tagName = state.tagStart = null; - if (type == "selfcloseTag" || - config.autoSelfClosers.hasOwnProperty(tagName)) { - maybePopContext(state, tagName); - } else { - maybePopContext(state, tagName); - state.context = new Context(state, tagName, tagStart == state.indented); - } - return baseState; - } - setStyle = "error"; - return attrState; - } - function attrEqState(type, stream, state) { - if (type == "equals") return attrValueState; - if (!config.allowMissing) setStyle = "error"; - return attrState(type, stream, state); - } - function attrValueState(type, stream, state) { - if (type == "string") return attrContinuedState; - if (type == "word" && config.allowUnquoted) {setStyle = "string"; return attrState;} - setStyle = "error"; - return attrState(type, stream, state); - } - function attrContinuedState(type, stream, state) { - if (type == "string") return attrContinuedState; - return attrState(type, stream, state); - } - - return { - startState: function(baseIndent) { - var state = {tokenize: inText, - state: baseState, - indented: baseIndent || 0, - tagName: null, tagStart: null, - context: null} - if (baseIndent != null) state.baseIndent = baseIndent - return state - }, - - token: function(stream, state) { - if (!state.tagName && stream.sol()) - state.indented = stream.indentation(); - - if (stream.eatSpace()) return null; - type = null; - var style = state.tokenize(stream, state); - if ((style || type) && style != "comment") { - setStyle = null; - state.state = state.state(type || style, stream, state); - if (setStyle) - style = setStyle == "error" ? style + " error" : setStyle; - } - return style; - }, - - indent: function(state, textAfter, fullLine) { - var context = state.context; - // Indent multi-line strings (e.g. css). - if (state.tokenize.isInAttribute) { - if (state.tagStart == state.indented) - return state.stringStartCol + 1; - else - return state.indented + indentUnit; - } - if (context && context.noIndent) return CodeMirror.Pass; - if (state.tokenize != inTag && state.tokenize != inText) - return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0; - // Indent the starts of attribute names. - if (state.tagName) { - if (config.multilineTagIndentPastTag !== false) - return state.tagStart + state.tagName.length + 2; - else - return state.tagStart + indentUnit * (config.multilineTagIndentFactor || 1); - } - if (config.alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0; - var tagAfter = textAfter && /^<(\/)?([\w_:\.-]*)/.exec(textAfter); - if (tagAfter && tagAfter[1]) { // Closing tag spotted - while (context) { - if (context.tagName == tagAfter[2]) { - context = context.prev; - break; - } else if (config.implicitlyClosed.hasOwnProperty(context.tagName)) { - context = context.prev; - } else { - break; - } - } - } else if (tagAfter) { // Opening tag spotted - while (context) { - var grabbers = config.contextGrabbers[context.tagName]; - if (grabbers && grabbers.hasOwnProperty(tagAfter[2])) - context = context.prev; - else - break; - } - } - while (context && context.prev && !context.startOfLine) - context = context.prev; - if (context) return context.indent + indentUnit; - else return state.baseIndent || 0; - }, - - electricInput: /<\/[\s\w:]+>$/, - blockCommentStart: "<!--", - blockCommentEnd: "-->", - - configuration: config.htmlMode ? "html" : "xml", - helperType: config.htmlMode ? "html" : "xml", - - skipAttribute: function(state) { - if (state.state == attrValueState) - state.state = attrState - } - }; -}); - -CodeMirror.defineMIME("text/xml", "xml"); -CodeMirror.defineMIME("application/xml", "xml"); -if (!CodeMirror.mimeModes.hasOwnProperty("text/html")) - CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true}); - -}); diff --git a/plugins/tiddlywiki/codemirror/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror/files/tiddlywiki.files index 27f27d7e9..f3c1d1666 100755 --- a/plugins/tiddlywiki/codemirror/files/tiddlywiki.files +++ b/plugins/tiddlywiki/codemirror/files/tiddlywiki.files @@ -10,7 +10,7 @@ },{ "file": "codemirror.css", "fields": { - "type": "text/css", + "type": "text/vnd.tiddlywiki", "title": "$:/plugins/tiddlywiki/codemirror/lib/codemirror.css", "tags": "[[$:/tags/Stylesheet]]" } @@ -26,112 +26,21 @@ "fields": { "type": "application/javascript", "title": "$:/plugins/tiddlywiki/codemirror/addon/dialog/dialog.js", - "module-type": "library" + "module-type": "codemirror" } },{ - "file": "addon/edit/matchbrackets.js", + "file": "addon/selection/activeline.js", "fields": { "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/codemirror/addon/edit/matchbrackets.js", - "module-type": "library" + "title": "$:/plugins/tiddlywiki/codemirror/addon/selection/activeline.js", + "module-type": "codemirror" } },{ - "file": "addon/mode/multiplex.js", + "file": "mode/tw-meta.js", "fields": { "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/codemirror/addon/mode/multiplex.js", - "module-type": "library" - } - },{ - "file": "addon/search/searchcursor.js", - "fields": { - "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/codemirror/addon/search/searchcursor.js", - "module-type": "library" - } - },{ - "file": "mode/css/css.js", - "fields": { - "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/codemirror/mode/css/css.js", - "module-type": "library" - } - },{ - "file": "mode/htmlembedded/htmlembedded.js", - "fields": { - "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/codemirror/mode/htmlembedded/htmlembedded.js", - "module-type": "library" - } - },{ - "file": "mode/htmlmixed/htmlmixed.js", - "fields": { - "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/codemirror/mode/htmlmixed/htmlmixed.js", - "module-type": "library" - } - },{ - "file": "mode/javascript/javascript.js", - "fields": { - "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/codemirror/mode/javascript/javascript.js", - "module-type": "library" - } - },{ - "file": "mode/markdown/markdown.js", - "fields": { - "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/codemirror/mode/markdown/markdown.js", - "module-type": "library" - } - },{ - "file": "mode/meta.js", - "fields": { - "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/codemirror/mode/meta.js", - "module-type": "library" - } - },{ - "file": "mode/tiddlywiki/tiddlywiki.css", - "fields": { - "type": "text/css", - "title": "$:/plugins/tiddlywiki/codemirror/mode/tiddlywiki/tiddlywiki.css", - "tags": "[[$:/tags/Stylesheet]]" - } - },{ - "file": "mode/tiddlywiki/tiddlywiki.js", - "fields": { - "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/codemirror/mode/tiddlywiki/tiddlywiki.js", - "module-type": "library" - } - },{ - "file": "mode/xml/xml.js", - "fields": { - "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/codemirror/mode/xml/xml.js", - "module-type": "library" - } - },{ - "file": "keymap/vim.js", - "fields": { - "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/codemirror/keymap/vim.js", - "module-type": "library" - } - },{ - "file": "keymap/sublime.js", - "fields": { - "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/codemirror/keymap/sublime.js", - "module-type": "library" - } - },{ - "file": "keymap/emacs.js", - "fields": { - "type": "application/javascript", - "title": "$:/plugins/tiddlywiki/codemirror/keymap/emacs.js", - "module-type": "library" + "title": "$:/plugins/tiddlywiki/codemirror/mode/tw-meta.js", + "module-type": "codemirror" } } ] diff --git a/plugins/tiddlywiki/codemirror/keyboard.tid b/plugins/tiddlywiki/codemirror/keyboard.tid new file mode 100755 index 000000000..143aabfb7 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/keyboard.tid @@ -0,0 +1,107 @@ +title: $:/plugins/tiddlywiki/codemirror/keyboard + + +!!Default keyboard shortcuts + +!!!Basic shortcuts + +|Shortcut |Function |h +|Left |goCharLeft | +|Right |goCharRight | +|Up |goLineUp | +|Down |goLineDown | +|End |goLineEnd | +|Home |goLineStartSmart | +|~PageUp |goPageUp | +|~PageDown |goPageDown | +|Delete |delCharAfter | +|Backspace |delCharBefore | +|Shift-Backspace |delCharBefore | +|Tab |defaultTab | +|Shift-Tab |indentAuto | +|Enter |newlineAndIndent | +|Insert |toggleOverwrite | +|Ctrl-Esc |singleSelection | + + +!!!Shortcuts on Windows and Linux + +|Shortcut |Function |h +|Ctrl-A |selectAll | +|Ctrl-D |deleteLine | +|Ctrl-Z |undo | +|Shift-Ctrl-Z |redo | +|Ctrl-Y |redo | +|Ctrl-Home |goDocStart | +|Ctrl-End |goDocEnd | +|Ctrl-Up |goLineUp | +|Ctrl-Down |goLineDown | +|Ctrl-Left |goGroupLeft | +|Ctrl-Right |goGroupRight | +|Alt-Left |goLineStart | +|Alt-Right |goLineEnd | +|Ctrl-Backspace |delGroupBefore | +|Ctrl-Delete |delGroupAfter | +|Ctrl-F |find | +|Ctrl-G |findNext | +|Shift-Ctrl-G |findPrev | +|Shift-Ctrl-F |replace | +|Shift-Ctrl-R |replaceAll | +|Ctrl-[ |indentLess | +|Ctrl-] |indentMore | +|Alt-U |undoSelection | +|Shift-Ctrl-U |redoSelection | +|Shift-Alt-U |redoSelection | + + +!!!Shortcuts on ~MacOs + +|Shortcut |Function |h +|Cmd-A |selectAll | +|Cmd-D |deleteLine | +|Cmd-Z |undo | +|Shift-Cmd-Z |redo | +|Cmd-Y |redo | +|Cmd-Home |goDocStart | +|Cmd-Up |goDocStart | +|Cmd-End |goDocEnd | +|Cmd-Down |goDocEnd | +|Alt-Left |goGroupLeft | +|Alt-Right |goGroupRight | +|Cmd-Left |goLineLeft | +|Cmd-Right |goLineRight | +|Alt-Backspace |delGroupBefore | +|Ctrl-Alt-Backspace |delGroupAfter | +|Alt-Delete |delGroupAfter | +|Cmd-F |find | +|Cmd-G |findNext | +|Shift-Cmd-G |findPrev | +|Cmd-Alt-F |replace | +|Shift-Cmd-Alt-F |replaceAll | +|Cmd-[ |indentLess | +|Cmd-] |indentMore | +|Cmd-Backspace |delWrappedLineLeft | +|Cmd-Delete |delWrappedLineRight | +|Alt-U |undoSelection | +|Shift-Alt-U |redoSelection | +|Ctrl-Up |goDocStart | +|Ctrl-Down |goDocEnd | +|Ctrl-F |goCharRight | +|Ctrl-B |goCharLeft | +|Ctrl-P |goLineUp | +|Ctrl-N |goLineDown | +|Alt-F |goWordRight | +|Alt-B |goWordLeft | +|Ctrl-A |goLineStart | +|Ctrl-E |goLineEnd | +|Ctrl-V |goPageDown | +|Shift-Ctrl-V |goPageUp | +|Ctrl-D |delCharAfter | +|Ctrl-H |delCharBefore | +|Alt-D |delWordAfter | +|Alt-Backspace |delWordBefore | +|Ctrl-K |killLine | +|Alt-T |transposeChars | +|Ctrl-O |openLine | + + diff --git a/plugins/tiddlywiki/codemirror/license.tid b/plugins/tiddlywiki/codemirror/license.tid new file mode 100644 index 000000000..4e1143d94 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/license.tid @@ -0,0 +1,10 @@ +title: $:/plugins/tiddlywiki/codemirror/license + +""" +~CodeMirror, copyright (c) by Marijn Haverbeke and others +Distributed under an MIT license: http://codemirror.net/LICENSE + +Copyright (c) 2004-2007, Jeremy Ruston +Copyright (c) 2007-2018, UnaMesa Association +Distributed under an BSD license: https://tiddlywiki.com/#License +""" diff --git a/plugins/tiddlywiki/codemirror/plugin.info b/plugins/tiddlywiki/codemirror/plugin.info index 58565d3c8..bbe17c5af 100755 --- a/plugins/tiddlywiki/codemirror/plugin.info +++ b/plugins/tiddlywiki/codemirror/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror", - "description": "CodeMirror: text editor", + "description": "CodeMirror _Editor", "author": "JeremyRuston", - "list": "readme usage" + "list": "readme usage keyboard license" } diff --git a/plugins/tiddlywiki/codemirror/readme.tid b/plugins/tiddlywiki/codemirror/readme.tid index a8c46456f..15b668346 100755 --- a/plugins/tiddlywiki/codemirror/readme.tid +++ b/plugins/tiddlywiki/codemirror/readme.tid @@ -1,12 +1,18 @@ title: $:/plugins/tiddlywiki/codemirror/readme -This plugin provides an enhanced text editor component based on [[CodeMirror|http://codemirror.net]]. It provides several advantages over the default browser text editor: +This plugin provides an enhanced text editor component based on [[CodeMirror|http://codemirror.net]]. +The basic configuration is designed to be as lightweight as possible and is just around 235kb of size. +Additional features can be installed with ~CodeMirror ~AddOns from the plugin library: * Code colouring for many languages (see [[the official documentation here|http://codemirror.net/mode/index.html]]) * Auto closing brackets and tags * Folding brackets, comments, and tags * Auto-completion +* Search and Replace +* Fullscreen Editing +* Optional Emacs, Sublime Text or Vim Keymaps + [[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/codemirror]] -Based on ~CodeMirror version 5.13.2 +Based on ~CodeMirror version 5.37.0 diff --git a/plugins/tiddlywiki/codemirror/settings/editorFont.tid b/plugins/tiddlywiki/codemirror/settings/editorFont.tid new file mode 100644 index 000000000..220a98785 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/settings/editorFont.tid @@ -0,0 +1,7 @@ +title: $:/core/ui/ControlPanel/Settings/codemirror/editorFont +tags: $:/tags/ControlPanel/Settings/CodeMirror +caption: {{$:/language/codemirror/editorFont/hint}} + +\define lingo-base() $:/language/ThemeTweaks/ + +|<$link to="$:/themes/tiddlywiki/vanilla/settings/editorfontfamily"><<lingo Settings/EditorFontFamily>></$link> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/editorfontfamily" default="" tag="input"/> | | diff --git a/plugins/tiddlywiki/codemirror/settings/keyMap.tid b/plugins/tiddlywiki/codemirror/settings/keyMap.tid new file mode 100644 index 000000000..b9aceaf56 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/settings/keyMap.tid @@ -0,0 +1,15 @@ +title: $:/core/ui/ControlPanel/Settings/codemirror/keyMap +tags: $:/tags/ControlPanel/Settings/CodeMirror +caption: {{$:/language/codemirror/keyMap/hint}} + +\define lingo-base() $:/language/codemirror/keyMap + +<$link to="$:/config/codemirror/keyMap"><<lingo hint>></$link> + +<$select tiddler="$:/config/codemirror/keyMap" default="default"> +<option value="default">default</option> +<$list filter="[all[shadows+tiddlers]module-type[codemirror-keymap]!has[draft.of]get[text]]"> +<option value=<<currentTiddler>>><$transclude><$text text=<<currentTiddler>>/></$transclude></option> +</$list> +</$select> + diff --git a/plugins/tiddlywiki/codemirror/settings/lineNumbers.tid b/plugins/tiddlywiki/codemirror/settings/lineNumbers.tid new file mode 100644 index 000000000..c78dc65d0 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/settings/lineNumbers.tid @@ -0,0 +1,9 @@ +title: $:/core/ui/ControlPanel/Settings/codemirror/lineNumbers +tags: $:/tags/ControlPanel/Settings/CodeMirror +caption: {{$:/language/codemirror/lineNumbers/hint}} + +\define lingo-base() $:/language/codemirror/lineNumbers/ +<<lingo hint>> + +<$checkbox tiddler="$:/config/codemirror/lineNumbers" field="text" checked="true" unchecked="false" default="false"> <$link to="$:/config/codemirror/lineNumbers"><<lingo info>></$link> </$checkbox> + diff --git a/plugins/tiddlywiki/codemirror/settings/lineWrapping.tid b/plugins/tiddlywiki/codemirror/settings/lineWrapping.tid new file mode 100644 index 000000000..8168bcb8d --- /dev/null +++ b/plugins/tiddlywiki/codemirror/settings/lineWrapping.tid @@ -0,0 +1,9 @@ +title: $:/core/ui/ControlPanel/Settings/codemirror/lineWrapping +tags: $:/tags/ControlPanel/Settings/CodeMirror +caption: {{$:/language/codemirror/lineWrapping/hint}} + +\define lingo-base() $:/language/codemirror/lineWrapping/ +<<lingo hint>> + +<$checkbox tiddler="$:/config/codemirror/lineWrapping" field="text" checked="true" unchecked="false" default="true"> <$link to="$:/config/codemirror/lineWrapping"><<lingo info>></$link> </$checkbox> + diff --git a/plugins/tiddlywiki/codemirror/settings/showCursorWhenSelecting.tid b/plugins/tiddlywiki/codemirror/settings/showCursorWhenSelecting.tid new file mode 100644 index 000000000..b92f9055f --- /dev/null +++ b/plugins/tiddlywiki/codemirror/settings/showCursorWhenSelecting.tid @@ -0,0 +1,9 @@ +title: $:/core/ui/ControlPanel/Settings/codemirror/showCursorWhenSelecting +tags: $:/tags/ControlPanel/Settings/CodeMirror +caption: {{$:/language/codemirror/showCursorWhenSelecting/hint}} + +\define lingo-base() $:/language/codemirror/showCursorWhenSelecting/ +<<lingo hint>> + +<$checkbox tiddler="$:/config/codemirror/showCursorWhenSelecting" field="text" checked="true" unchecked="false" default="true"> <$link to="$:/config/codemirror/showCursorWhenSelecting"><<lingo info>></$link> </$checkbox> + diff --git a/plugins/tiddlywiki/codemirror/settings/styleActiveLine.tid b/plugins/tiddlywiki/codemirror/settings/styleActiveLine.tid new file mode 100644 index 000000000..0ca0994c2 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/settings/styleActiveLine.tid @@ -0,0 +1,9 @@ +title: $:/core/ui/ControlPanel/Settings/codemirror/styleActiveLine +tags: $:/tags/ControlPanel/Settings/CodeMirror +caption: {{$:/language/codemirror/styleActiveLine/hint}} + +\define lingo-base() $:/language/codemirror/styleActiveLine/ +<<lingo hint>> + +<$checkbox tiddler="$:/config/codemirror/styleActiveLine" field="text" checked="true" unchecked="false" default="false"> <$link to="$:/config/codemirror/styleActiveLine"><<lingo info>></$link> </$checkbox> + diff --git a/plugins/tiddlywiki/codemirror/settings/theme.tid b/plugins/tiddlywiki/codemirror/settings/theme.tid new file mode 100644 index 000000000..d5b4627bc --- /dev/null +++ b/plugins/tiddlywiki/codemirror/settings/theme.tid @@ -0,0 +1,16 @@ +title: $:/core/ui/ControlPanel/Settings/codemirror/theme +tags: $:/tags/ControlPanel/Settings/CodeMirror +caption: {{$:/language/codemirror/theme/hint}} + +\define lingo-base() $:/language/codemirror/ + +<$link to="$:/config/codemirror/theme"><<lingo hint>></$link> + +<$select tiddler="$:/config/codemirror/theme" default="default"> +<option value="default">default</option> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]module-type[codemirror-theme]!has[draft.of]get[name]]"> +<option value=<<currentTiddler>>><$transclude field="name"><$text text=<<currentTiddler>>/></$transclude></option> +</$list> +</$select> + +//see the [[CodeMirror Usage|$:/plugins/tiddlywiki/codemirror/usage]] how to add themes// diff --git a/plugins/tiddlywiki/codemirror/styles.tid b/plugins/tiddlywiki/codemirror/styles.tid index 5158856df..3dfad6a4c 100755 --- a/plugins/tiddlywiki/codemirror/styles.tid +++ b/plugins/tiddlywiki/codemirror/styles.tid @@ -7,7 +7,8 @@ tags: [[$:/tags/Stylesheet]] height: auto; border: 1px solid #ddd; line-height: 1.5; - font-family: "Monaco", monospace; + font-family: {{$:/themes/tiddlywiki/vanilla/settings/editorfontfamily}}; + font-size: {{$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize}}; } .CodeMirror-scroll { diff --git a/plugins/tiddlywiki/codemirror/ui/controlpanel/codemirror.tid b/plugins/tiddlywiki/codemirror/ui/controlpanel/codemirror.tid new file mode 100644 index 000000000..f0e16ddee --- /dev/null +++ b/plugins/tiddlywiki/codemirror/ui/controlpanel/codemirror.tid @@ -0,0 +1,24 @@ +title: $:/core/ui/ControlPanel/Settings/CodeMirror +tags: $:/tags/ControlPanel/SettingsTab +caption: CodeMirror +list-after: $:/core/ui/ControlPanel/Settings/TiddlyWiki + +\define lingo-base() $:/language/codemirror/controlPanel/ + +<<lingo hint>> + +<$link to="$:/plugins/tiddlywiki/codemirror/usage"><<lingo usage>></$link> + +<$link to="$:/plugins/tiddlywiki/codemirror/keyboard"><<lingo keyboard>></$link> + +<$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings/CodeMirror]]"> + +<div style="border-top:1px solid #eee;"> + +!! <$link><$transclude field="caption"/></$link> + +<$transclude/> + +</div> + +</$list> diff --git a/plugins/tiddlywiki/codemirror/ui/controlpanel/settings.tid b/plugins/tiddlywiki/codemirror/ui/controlpanel/settings.tid new file mode 100644 index 000000000..a0aee5441 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/ui/controlpanel/settings.tid @@ -0,0 +1,7 @@ +title: $:/core/ui/ControlPanel/Settings +tags: $:/tags/ControlPanel +caption: {{$:/language/ControlPanel/Settings/Caption}} + +<div class="tc-control-panel"> +<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/SettingsTab]!has[draft.of]]" "$:/core/ui/ControlPanel/Settings/TiddlyWiki">> +</div> diff --git a/plugins/tiddlywiki/codemirror/ui/controlpanel/tiddlywiki.tid b/plugins/tiddlywiki/codemirror/ui/controlpanel/tiddlywiki.tid new file mode 100644 index 000000000..f88865997 --- /dev/null +++ b/plugins/tiddlywiki/codemirror/ui/controlpanel/tiddlywiki.tid @@ -0,0 +1,19 @@ +title: $:/core/ui/ControlPanel/Settings/TiddlyWiki +tags: $:/tags/ControlPanel/SettingsTab +caption: TiddlyWiki + +\define lingo-base() $:/language/ControlPanel/Settings/ + +<<lingo Hint>> + +<$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings]]"> + +<div style="border-top:1px solid #eee;"> + +!! <$link><$transclude field="caption"/></$link> + +<$transclude/> + +</div> + +</$list> diff --git a/plugins/tiddlywiki/codemirror/usage.tid b/plugins/tiddlywiki/codemirror/usage.tid index 24a8fd8f5..05fc174ed 100755 --- a/plugins/tiddlywiki/codemirror/usage.tid +++ b/plugins/tiddlywiki/codemirror/usage.tid @@ -1,256 +1,76 @@ title: $:/plugins/tiddlywiki/codemirror/usage -! Setting ~CodeMirror Content Types +! Configuration -You can determine which tiddler content types are edited by the ~CodeMirror widget by creating or modifying special tiddlers whose prefix is comprised of the string `$:/config/EditorTypeMappings/` concatenated with the content type. The text of that tiddler gives the editor type to be used (eg, ''text'', ''bitmap'', ''codemirror''). - -The current editor type mappings are shown in [[$:/ControlPanel]] under the "Advanced" tab. - -! ~CodeMirror Configuration - -You can configure the ~CodeMirror plugin by creating a tiddler called [[$:/config/CodeMirror]] containing a JSON configuration object. The configuration tiddler must have its type field set to `application/json` to take effect. - -See http://codemirror.net/ for details of available configuration options. - -For example: - -``` -{ - "require": [ - "$:/plugins/tiddlywiki/codemirror/mode/javascript/javascript.js", - "$:/plugins/tiddlywiki/codemirror/addon/dialog/dialog.js", - "$:/plugins/tiddlywiki/codemirror/addon/search/searchcursor.js", - "$:/plugins/tiddlywiki/codemirror/addon/edit/matchbrackets.js", - "$:/plugins/tiddlywiki/codemirror/keymap/vim.js", - "$:/plugins/tiddlywiki/codemirror/keymap/emacs.js" - ], - "configuration": { - "keyMap": "vim", - "matchBrackets":true, - "showCursorWhenSelecting": true - } -} -``` - -!! Basic working configuration - -# Create a tiddler called `$:/config/CodeMirror` - -# The type of the tiddler has to be set to `application/json` - -# The text of the tiddler is the following: - -``` -{ - "require": [ - "$:/plugins/tiddlywiki/codemirror/mode/javascript/javascript.js", - "$:/plugins/tiddlywiki/codemirror/addon/edit/matchbrackets.js" - ], - "configuration": { - "matchBrackets":true, - "showCursorWhenSelecting": true - } -} - -``` - -# You should see line numbers when editing a tiddler -# When editing a tiddler, no matter what the type of the tiddler is set to, you should see matching brackets being highlighted whenever the cursor is next to one of them -# If you edit a tiddler with the type `application/javascript` or `application/json` you should see the code being syntax highlighted - -!! Add HTML syntax highlighting - -# Create a tiddler `$:/plugins/tiddlywiki/codemirror/mode/xml/xml.js` -## Add a field `module-type` and set it to ''library'' -## Set the field `type` to ''application/javascript'' -## Set the text field of the tiddler with the javascript code from this link : [[https://raw.githubusercontent.com/codemirror/CodeMirror/master/mode/xml/xml.js]] -# Set the text field of the tiddler `$:/config/CodeMirror` to: - -``` -{ - "require": [ - "$:/plugins/tiddlywiki/codemirror/mode/javascript/javascript.js", - "$:/plugins/tiddlywiki/codemirror/mode/xml/xml.js", - "$:/plugins/tiddlywiki/codemirror/addon/edit/matchbrackets.js" - ], - "configuration": { - "showCursorWhenSelecting": true, - "matchBrackets":true - } -} -``` -# Edit a tiddler with the type `text/html` and write some html code. You should see your code being coloured - -!! Add a non-existing language mode - -Here's an example of adding a new language mode - in this case, the language C. +Configuration for the ~CodeMirror text-editor can be done from within the CodeMirror Settings Tab in the [[ControlPanel|$:/ControlPanel]] (Settings - ~CodeMirror) -# Create a tiddler `$:/plugins/tiddlywiki/codemirror/mode/clike/clike.js` -## Add a field `module-type` and set it to ''library'' -## Set the field `type` to ''application/javascript'' -## Set the text field of the tiddler with the javascript code from this link : [[https://raw.githubusercontent.com/codemirror/CodeMirror/master/mode/clike/clike.js]] -# Set the text field of the tiddler `$:/config/CodeMirror` to: +!!Setting a different Theme -``` -{ - "require": [ - "$:/plugins/tiddlywiki/codemirror/mode/javascript/javascript.js", - "$:/plugins/tiddlywiki/codemirror/mode/clike/clike.js" - ], - "configuration": { - "showCursorWhenSelecting": true - } -} -``` +~CodeMirror themes are available in the [ext[official GitHub repository|https://github.com/codemirror/CodeMirror/tree/master/theme]] -# Add the correct ~EditorTypeMappings tiddler -## Find the matching MIME type. If you go on the [[CodeMirror documentation for language modes|http://codemirror.net/mode/index.html]] you can see the [[documentation for the c-like mode|http://codemirror.net/mode/clike/index.html]]. In this documentation, at the end you will be told the MIME types defined. Here it's ''text/x-csrc'' -## Add the tiddler: `$:/config/EditorTypeMappings/text/x-csrc` and fill the text field with : ''codemirror'' +More themes can be found at https://github.com/FarhadG/code-mirror-themes/tree/master/themes and previewed [ext[here|http://farhadg.github.io/code-mirror-themes/]] -If you edit a tiddler with the type `text/x-csrc` and write some code in C, you should see your text being coloured. -!! Add matching tags +To add a theme to your wiki, follow these four steps: -# Add XML and HTML colouring -# Create a tiddler `$:/plugins/tiddlywiki/codemirror/addon/edit/matchtags.js` -## Add a field `module-type` and set it to ''library'' -## Set the field `type` to ''application/javascript'' -## Set the text field of the tiddler with the javascript code from this link : [[http://codemirror.net/addon/edit/matchtags.js]] -# Set the text field of the tiddler `$:/config/CodeMirror` to: +* choose one of the CSS files and copy its content to a new tiddler +* remove all comments from the top and tag the tiddler with <<tag-pill "$:/tags/Stylesheet">> +* add a field "module-type" with the value "codemirror-theme". add a field "name" with the exact ''name'' of the theme as value +* save the tiddler and go to the Settings tab in $:/ControlPanel - look for the "theme" dropdown to select your newly added theme -``` -{ - "require": [ - "$:/plugins/tiddlywiki/codemirror/mode/javascript/javascript.js", - "$:/plugins/tiddlywiki/codemirror/addon/edit/matchtags.js", - "$:/plugins/tiddlywiki/codemirror/mode/xml/xml.js" - ], - "configuration": { - "showCursorWhenSelecting": true, - "matchTags": {"bothTags": true}, - "extraKeys": {"Ctrl-J": "toMatchingTag"} - } -} -``` -Edit a tiddler that has the type :`text/htm` and write this code: +!!Line Numbers -``` -<html> - <div id="click here and press CTRL+J"> - <ul> - <li> - </li> - </ul> - </div> -</html> -``` +To show or hide the Line Numbers at the left, go to ~ControlPanel - Settings - ~CodeMirror and look for the "Line Numbers" checkbox -If you click on a tag and press CTRL+J, your cursor will select the matching tag. Supposedly, it should highlight the pair when clicking a tag. However, that part doesn't work. -!! Adding closing tags +!!Line Wrapping -# Add the xml mode (see "Add XML and HTML colouring") -# Create a tiddler `$:/plugins/tiddlywiki/codemirror/addon/edit/closetags.js` -## Add a field `module-type` and set it to ''library'' -## Set the field `type` to ''application/javascript'' -## Set the text field of the tiddler with the javascript code from this link : [[http://codemirror.net/addon/edit/closetag.js]] +Controls if long lines get visually wrapped to a new line if they're too long to fit the editor width or if the editor should scroll horizontally -# Set the text field of the tiddler `$:/config/CodeMirror` to: +To change the line-wrapping behaviour, go to ~ControlPanel - Settings - ~CodeMirror and look for the "Line Wrapping" checkbox -``` -{ - "require": [ - "$:/plugins/tiddlywiki/codemirror/mode/javascript/javascript.js", - "$:/plugins/tiddlywiki/codemirror/mode/xml/xml.js", - "$:/plugins/tiddlywiki/codemirror/addon/edit/closetags.js" - ], - "configuration": { - "showCursorWhenSelecting": true, - "autoCloseTags":true - } -} -``` -If you edit a tiddler with the type`text/html` and write: +!!Show Cursor when selecting -``` -<html> -``` +Defines whether the Mouse cursor should be visually shown or hidden when making a text-selection -Then the closing tag ''</html>'' should automatically appear. +To change the show-cursor-when-selecting behaviour, go to ~ControlPanel - Settings - ~CodeMirror and look for the "Show cursor when selecting" checkbox -!! Add closing brackets -# Create a tiddler `$:/plugins/tiddlywiki/codemirror/addon/edit/closebrackets.js` -## Add a field `module-type` and set it to ''library'' -## Set the field `type` to ''application/javascript'' -## Set the text field of the tiddler with the javascript code from this link : [[http://codemirror.net/addon/edit/closebrackets.js]] -# Set the text field of the tiddler `$:/config/CodeMirror` to: +!!~CodeMirror Font Family -``` -{ - "require": [ - "$:/plugins/tiddlywiki/codemirror/mode/javascript/javascript.js", - "$:/plugins/tiddlywiki/codemirror/addon/edit/matchbrackets.js", - "$:/plugins/tiddlywiki/codemirror/addon/edit/closebrackets.js" - ], +The Font-Family used within the ~CodeMirror text-editor defaults to "monospace" which will choose your configured monospace system-font - "configuration": { +That setting can be overridden entering one or more Font-Families in the "Font Family" input field at ~ControlPanel - Settings - ~CodeMirror - "showCursorWhenSelecting": true, - "matchBrackets":true, - "autoCloseBrackets":true - } -} -``` +* The entries must be separated by semicolons ',' +* Font-Family Names that contain spaces must be quoted like "My Font" +* If a list of Font-Families is specified, the last Font-Family found on the user-system gets used, non-existing fonts get ignored +* If none of the specified Font-Families is available, ~CodeMirror uses the default "monospace" -# If you try to edit any tiddler and write `if(` you should see the bracket closing itself automatically (you will get "if()"). It works with (), [], and {} -# If you try and edit a tiddler with the type `application/javascript`, it will auto-close `()`,`[]`,`{}`,`''` and `""` -!! Adding folding tags +!!"Hidden" Settings: -# Create a tiddler `$:/plugins/tiddlywiki/codemirror/addon/fold/foldcode.js` -## Add a field `module-type` and set it to ''library'' -## Set the field `type` to ''application/javascript'' -## Set the text field of the tiddler with the javascript code from this link : [[http://codemirror.net/addon/fold/foldcode.js]] -# Repeat the above process for the following tiddlers, but replace the code with the one from the given link: -## Create a tiddler `$:/plugins/tiddlywiki/codemirror/addon/fold/xml-fold.js`, the code can be found here [[https://raw.githubusercontent.com/codemirror/CodeMirror/master/addon/fold/xml-fold.js]] -## Create a tiddler `$:/plugins/tiddlywiki/codemirror/addon/fold/foldgutter.js`, the code can be found here [[http://codemirror.net/addon/fold/foldgutter.js]] -# Create a tiddler `$:/plugins/tiddlywiki/codemirror/addon/fold/foldgutter.css` -## Add the tag `$:/tags/Stylesheet` -## Set the text field of the tiddler with the css code from this link : [[http://codemirror.net/addon/fold/foldgutter.css]] -# Set the text field of the tiddler `$:/config/CodeMirror` to: +!!!Cursor Blink Rate -``` -{ - "require": [ - "$:/plugins/tiddlywiki/codemirror/mode/javascript/javascript.js", - "$:/plugins/tiddlywiki/codemirror/mode/xml/xml.js", - "$:/plugins/tiddlywiki/codemirror/addon/fold/foldcode.js", - "$:/plugins/tiddlywiki/codemirror/addon/fold/xml-fold.js", - "$:/plugins/tiddlywiki/codemirror/addon/fold/foldgutter.js" - ], - "configuration": { - "showCursorWhenSelecting": true, - "matchTags": {"bothTags": true}, - "foldGutter": true, - "gutters": ["CodeMirror-linenumbers", "CodeMirror-foldgutter"] - } -} -``` +The cursor blink-rate defines how fast (in milliseconds) the cursor blinks inside the textarea -Now if you type the below code in a tiddler with the type `text/html`: +You can change it by editing $:/config/codemirror/cursorBlinkRate +"0" disables blinking -``` -<html> - <div> - <ul> +!!!Tabsize - </ul> - </div> -</html> -``` +The Tabsize defines the width of a tab character. Default is 4. + +You can change it by editing $:/config/codemirror/tabSize + +!!!Indent Unit + +Not enabled for vnd.tiddlywiki and x-tiddlywiki + +Defines how many spaces a text-block should be indented. Defaults to 2. + +You can change it by editing $:/config/codemirror/indentUnit -You should see little arrows just next to the line numbers. Clicking on it will have the effect to fold the code (or unfold it). diff --git a/plugins/tiddlywiki/comments/EnableFilter.tid b/plugins/tiddlywiki/comments/EnableFilter.tid new file mode 100644 index 000000000..c5d46cec8 --- /dev/null +++ b/plugins/tiddlywiki/comments/EnableFilter.tid @@ -0,0 +1,3 @@ +title: $:/config/Comments/EnableFilter + +[all[current]!is[system]] diff --git a/plugins/tiddlywiki/comments/add-comment-button.tid b/plugins/tiddlywiki/comments/add-comment-button.tid new file mode 100644 index 000000000..49110c5ec --- /dev/null +++ b/plugins/tiddlywiki/comments/add-comment-button.tid @@ -0,0 +1,10 @@ +title: $:/plugins/tiddlywiki/comments/add-comment-button + +<$reveal state="$:/status/IsReadOnly" type="match" text="no" default="no" tag="div" class="tc-comment-button"> +<$button class="tc-btn-invisible"> +<$set name="username" value={{$:/status/UserName}} emptyValue="(anonymous)"> +<$action-createtiddler $basetitle={{{ [[Comment by ']addsuffix<username>addsuffix[' on ']addsuffix<currentTiddler>addsuffix[']] }}} comment-target=<<currentTiddler>> text="" edit-mode="yes"/> +</$set> +add comment {{$:/core/images/add-comment}} +</$button> +</$reveal> diff --git a/plugins/tiddlywiki/comments/comments-template.tid b/plugins/tiddlywiki/comments/comments-template.tid new file mode 100644 index 000000000..485e1d3c9 --- /dev/null +++ b/plugins/tiddlywiki/comments/comments-template.tid @@ -0,0 +1,49 @@ +title: $:/plugins/tiddlywiki/comments/comments-template + +<div class="tc-comments"> +<ol class="tc-comment-list"> +<$list filter="[all[tiddlers+shadows]comment-target<currentTiddler>sort[created]!has[draft.of]]"> +<li> +<div class="tc-comment-entry"> +<div class="tc-comment-entry-heading"> +<$link>{{!!creator}} at <$view field="modified" format="date" template="0hh:0mm:0ss DDD DDth MMM YYYY"/></$link> +<$reveal state="$:/status/IsReadOnly" type="match" text="no" default="no" tag="span"> +<$reveal type="match" state="!!edit-mode" text="yes"> +<$button> +<$action-setfield $tiddler=<<currentTiddler>> $field="edit-mode" $value="no"/> +<$action-setfield $tiddler=<<currentTiddler>> $field="text" $value={{!!saved-text}}/> +cancel +</$button> +<$button> +<$action-deletetiddler $tiddler=<<currentTiddler>>/> +delete +</$button> +<$button> +<$action-setfield $tiddler=<<currentTiddler>> $field="edit-mode" $value="no"/> +save +</$button> +</$reveal> +<$reveal type="nomatch" state="!!edit-mode" text="yes"> +<$button> +<$action-setfield $tiddler=<<currentTiddler>> $field="edit-mode" $value="yes"/> +<$action-setfield $tiddler=<<currentTiddler>> $field="saved-text" $value={{!!text}}/> +edit +</$button> +</$reveal> +</$reveal> +</div> +<div class="tc-comment-entry-body"> +<$reveal type="match" state="!!edit-mode" text="yes"> +<$edit-text tiddler=<<currentTiddler>> tag="textarea"/> +</$reveal> +<$reveal type="nomatch" state="!!edit-mode" text="yes"> +<$transclude tiddler=<<currentTiddler>> mode="block"/> +<$transclude tiddler="$:/plugins/tiddlywiki/comments/add-comment-button" mode="inline"/> +</$reveal> +</div> +</div> +<$transclude tiddler="$:/plugins/tiddlywiki/comments/comments-template" mode="inline"/> +</li> +</$list> +</ol> +</div> diff --git a/plugins/tiddlywiki/comments/config.tid b/plugins/tiddlywiki/comments/config.tid new file mode 100644 index 000000000..5a58c659d --- /dev/null +++ b/plugins/tiddlywiki/comments/config.tid @@ -0,0 +1,18 @@ +title: $:/plugins/tiddlywiki/comments/config + +\define select(description,filter) +<$button> +<$action-setfield $tiddler="$:/config/Comments/EnableFilter" $value=<<__filter__>>/> +$description$ +</$button> +\end + +This filter expression determines which tiddlers will have commenting enabled: + +<$edit-text tiddler="$:/config/Comments/EnableFilter" tag="input"/> + +Or you can choose a preselected filter: + +* <<select "All tiddlers except system tiddlers" "[all[current]!is[system]]">> +* <<select "Only tiddlers tagged 'commentable'" "[all[current]tag[commentable]]">> +* <<select "Disable all commenting" "">> diff --git a/plugins/tiddlywiki/comments/footer-view-template-segment.tid b/plugins/tiddlywiki/comments/footer-view-template-segment.tid new file mode 100644 index 000000000..0df67d7c2 --- /dev/null +++ b/plugins/tiddlywiki/comments/footer-view-template-segment.tid @@ -0,0 +1,10 @@ +title: $:/plugins/tiddlywiki/comments/footer-view-template-segment +tags: $:/tags/ViewTemplate +list-after: $:/core/ui/ViewTemplate/body + +<$list filter={{$:/config/Comments/EnableFilter}} variable="ignore"> +<div class="tc-comments-segment"> +<$transclude tiddler="$:/plugins/tiddlywiki/comments/add-comment-button" mode="inline"/> +<$transclude tiddler="$:/plugins/tiddlywiki/comments/comments-template" mode="inline"/> +</div> +</$list> \ No newline at end of file diff --git a/plugins/tiddlywiki/comments/header-view-template-segment.tid b/plugins/tiddlywiki/comments/header-view-template-segment.tid new file mode 100644 index 000000000..0a2d539d3 --- /dev/null +++ b/plugins/tiddlywiki/comments/header-view-template-segment.tid @@ -0,0 +1,9 @@ +title: $:/plugins/tiddlywiki/comments/header-view-template-segment +tags: $:/tags/ViewTemplate +list-before: $:/core/ui/ViewTemplate/body + +<$list filter="[all[current]has[comment-target]]" variable="ignore"> +<div class="tc-is-comment-header"> +This tiddler is a comment on <$link to={{!!comment-target}}><$text text={{!!comment-target}}/></$link> +</div> +</$list> diff --git a/plugins/tiddlywiki/comments/plugin.info b/plugins/tiddlywiki/comments/plugin.info new file mode 100644 index 000000000..8be289f4b --- /dev/null +++ b/plugins/tiddlywiki/comments/plugin.info @@ -0,0 +1,7 @@ +{ + "title": "$:/plugins/tiddlywiki/comments", + "description": "Comments", + "author": "JeremyRuston", + "core-version": ">=5.0.0", + "list": "readme config" +} diff --git a/plugins/tiddlywiki/comments/readme.tid b/plugins/tiddlywiki/comments/readme.tid new file mode 100644 index 000000000..cbf5c7256 --- /dev/null +++ b/plugins/tiddlywiki/comments/readme.tid @@ -0,0 +1,10 @@ +title: $:/plugins/tiddlywiki/comments/readme + +This plugin provides a simple means for adding threaded comments to tiddlers. + +* Click the "add comment" button to make a new comment, and then click the "save" button to save it +* You can comment on a tiddler itself, or add a comment to an existing comment +* The sidebar tab ''Comments'' lists a timeline of all comments +* Comments are attributed to the username stored in the system tiddler [[$:/status/UserName]] +* By default, comments are available on all non-system tiddlers. The ''config'' tab lets you customise which tiddlers can accept comments by specifying a filter extension +* The buttons for adding and editing comments are only available if the system tiddler [[$:/status/IsReadOnly]] is not set to `yes` diff --git a/plugins/tiddlywiki/comments/sidebar.tid b/plugins/tiddlywiki/comments/sidebar.tid new file mode 100644 index 000000000..40f32e755 --- /dev/null +++ b/plugins/tiddlywiki/comments/sidebar.tid @@ -0,0 +1,16 @@ +title: $:/plugins/tiddlywiki/comments/sidebar +tags: $:/tags/SideBar +caption: Comments + +<div class="tc-timeline"> +<$list filter="[all[tiddlers+shadows]has[comment-target]has[modified]!sort[modified]eachday[modified]]"> +<div class="tc-menu-list-item"> +<$view field="modified" format="date" template="DDth MMM YYYY"/> +<$list filter="[all[tiddlers+shadows]has[comment-target]sameday:modified{!!modified}!sort[modified]]"> +<div class="tc-menu-list-subitem"> +<$link>Comment by '<$view field="modifier">(anonymous)</$view>' on <$text text={{!!comment-target}}/></$link> +</div> +</$list> +</div> +</$list> +</div> diff --git a/plugins/tiddlywiki/comments/styles.tid b/plugins/tiddlywiki/comments/styles.tid new file mode 100644 index 000000000..d8d9a9c1c --- /dev/null +++ b/plugins/tiddlywiki/comments/styles.tid @@ -0,0 +1,61 @@ +title: $:/plugins/tiddlywiki/comments/styles +tags: [[$:/tags/Stylesheet]] + +\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline + +.tc-is-comment-header { + background: #c1e1e9; + padding: 0.25em; +} + +.tc-comments-segment { + border-top: 2px solid #c1e1e9; +} + +.tc-comment-button button { + width: 100%; + text-align: right; +} + +.tc-comment-button button svg { + fill: #26cb56; + height: 2em; + width: 2em; +} + +.tc-comments { +} + +.tc-comment-list { + list-style: none; + padding-left: 0; +} + +.tc-comment-list .tc-comments { + padding-left: 1em; +} + +.tc-comment-entry { + border: 1px solid #c1e1ea; + margin: 0.5em 0 0 0; + background: #dbf6ff; +} + +.tc-comment-entry-heading { + font-size: 0.7em; + font-weight: bold; + text-transform: uppercase; + background: #c1e1ea; + color: #5B6D80; + padding: 0 0.5em; +} + +.tc-comment-entry-body { + font-size: 0.8em; + padding: 0 0.5em; +} + +.tc-comment-entry-body textarea { + font-size: 1.1em; + width: 100% +} diff --git a/plugins/tiddlywiki/dynaview/above-story.tid b/plugins/tiddlywiki/dynaview/above-story.tid new file mode 100644 index 000000000..89e32f4d5 --- /dev/null +++ b/plugins/tiddlywiki/dynaview/above-story.tid @@ -0,0 +1,7 @@ +title: $:/plugins/tiddlywiki/dynaview/above-story +tags: $:/tags/AboveStory-disabled + +<!-- Remove the "-disabled" part of the tag to cause the currently selected example to appear at the top of the story river. Intended to make it easier to make clean screencaps --> +<div style="height:100em;"> +<$transclude tiddler={{$:/state/tab--1915807570}} mode="block"/> +</div> diff --git a/plugins/tiddlywiki/dynaview/config.multids b/plugins/tiddlywiki/dynaview/config.multids new file mode 100644 index 000000000..e85dbab96 --- /dev/null +++ b/plugins/tiddlywiki/dynaview/config.multids @@ -0,0 +1,6 @@ +title: $:/config/DynaView/ + +Optisizer: no +Optisizer/Text: ABCDEFGHIJKLMnopqrstuvwxyzABCDEFGHIJKLMnopqrstuvwxyz +ViewportDimensions: no +UpdateAddressBar: no diff --git a/plugins/tiddlywiki/dynaview/config.tid b/plugins/tiddlywiki/dynaview/config.tid new file mode 100644 index 000000000..1433c59a1 --- /dev/null +++ b/plugins/tiddlywiki/dynaview/config.tid @@ -0,0 +1,6 @@ +title: $:/plugins/tiddlywiki/dynaview/config + +<$checkbox tiddler="$:/config/DynaView/ViewportDimensions" field="text" checked="yes" unchecked="no" default="no"> Enable dynamic saving of the viewport [[width|$:/state/DynaView/ViewportDimensions/Width]] and [[height|$:/state/DynaView/ViewportDimensions/Height]]</$checkbox> + +<$checkbox tiddler="$:/config/DynaView/UpdateAddressBar" field="text" checked="yes" unchecked="no" default="no"> Update address bar while scrolling</$checkbox> + diff --git a/plugins/tiddlywiki/dynaview/docs.tid b/plugins/tiddlywiki/dynaview/docs.tid new file mode 100644 index 000000000..822b10cfc --- /dev/null +++ b/plugins/tiddlywiki/dynaview/docs.tid @@ -0,0 +1,90 @@ +title: $:/plugins/tiddlywiki/dynaview/docs + +! Documentation + +The components of this plugin include: + +* A background task that: +** performs specified actions when elements are scrolled into view +** updates certain base classes on the `document.body` according to the current zoom level +** if enabled in the DynaView config panel - dynamically stores the viewport dimensions in $:/state/viewport/width and $:/state/viewport/height +* Pre-configured CSS classes to simplify using those base classes +* Usage examples + +! Scroll Features + +!! Set tiddler field when visible + +The background task detects when elements with the class `tc-dynaview-set-tiddler-when-visible` scroll into view. The first time that they do, the background task assigns the value in the attribute `data-dynaview-set-value` to the tiddler whose title is in the attribute `data-dynaview-set-tiddler`. This assignment can be tied to a reveal widget to cause content to be displayed when it becomes visible. If the class `tc-dynaview-expand-viewport` is set then the viewport is expanded so that the processing occurs when elements move near the viewport. + +!! Unset tiddler field when set visible before but then scrolled out of view + +The background task detects when elements with the class `tc-dynaview-set-tiddler-when-visible` scroll out view after they have scrolled into view. When scrolling out of view after they have scrolled in, the background task assigns the value in the attribute `data-dynaview-unset-value` to the tiddler whose title is in the attribute `data-dynaview-unset-tiddler`. This assignment can be tied to a reveal widget to cause content to be hidden when it becomes invisible. If the class `tc-dynaview-expand-viewport` is set then the viewport is expanded so that the processing occurs when elements move near the viewport. + +!! Update address bar when scrolling + +The background task detects the tiddler at the top of the viewport and sets the address bar location hash to the title of that tiddler. + +! Viewport Size Features + +!! Viewport Size Tracking + +The background task can optionally dynamically update a pair of state tiddlers with the dimensions of the browser viewport. + +* Set the configuration tiddler $:/config/DynaView/ViewportDimensions to the text "yes" to enable this feature +* The viewport dimensions can be found in $:/state/DynaView/ViewportDimensions/Width and $:/state/DynaView/ViewportDimensions/Height + +!! Font "Optisizer" + +The background task can optionally dynamically optimise the font size of a passage of text to match a desired line length. + +* Set the configuration tiddler $:/config/DynaView/Optisizer to the text "yes" to enable this feature +* Optionally, update the configuration tiddler $:/config/DynaView/Optisizer/Text with the "maquette" -- a character string matchng the desired length (this string should not include spaces). +* Assign the following CSS classes to appropriate elements on the page: +** `.tc-dynaview-optisizer-site` for an HTML element whose `offsetWidth` property gives the desired output width +** `.tc-dynaview-optisizer-maquette` for an HTML element that will contain the maquette +* The computed optimum font size can be found in the tiddler $:/state/DynaView/Optisizer/FontSize + +The tiddler $:/plugins/tiddlywiki/dynaview/optisizer-maquette contains an example configuration that can be used to adjust the size of tiddler body text. To use it: + +* Set $:/config/DynaView/Optisizer to the text "yes" +* Set $:/themes/tiddlywiki/vanilla/metrics/bodyfontsize to `{{$:/state/DynaView/Optisizer/FontSize}}` +* Set $:/themes/tiddlywiki/vanilla/metrics/bodylineheight to `1.5` to ensure that the line height matches the font size + +! Zoom Features + +!! Document Body Zoom Classes + +The background task sets the following classes on `document.body` according to the current zoom level. + +|!Class |!Description | +|`tc-dynaview-zoom-factor-1` |Set when the zoom level is less than 2.00 | +|`tc-dynaview-zoom-factor-2` |Set when the zoom level is greater than 2.00 and less than 3.00 | +|`tc-dynaview-zoom-factor-3` |Set when the zoom level is greater than 3.00 and less than 4.00 | +|`tc-dynaview-zoom-factor-4` |Set when the zoom level is greater than 4.00 | +|`tc-dynaview-zoom-factor-1-and-above` |Set when the zoom level is greater than or equal to 1.00 | +|`tc-dynaview-zoom-factor-1a-and-above` |Set when the zoom level is greater than or equal to 1.14 | +|`tc-dynaview-zoom-factor-1b-and-above` |Set when the zoom level is greater than or equal to 1.33 | +|`tc-dynaview-zoom-factor-1c-and-above` |Set when the zoom level is greater than or equal to 1.60 | +|`tc-dynaview-zoom-factor-2-and-above` |Set when the zoom level is greater than or equal to 2.00 | +|`tc-dynaview-zoom-factor-2a-and-above` |Set when the zoom level is greater than or equal to 2.66 | +|`tc-dynaview-zoom-factor-3-and-above` |Set when the zoom level is greater than or equal to 3.00 | +|`tc-dynaview-zoom-factor-4-and-above` |Set when the zoom level is greater than or equal to 4.00 | + +!! Pre-configured Classes + +These classes can be used on any element to control its visibility at different zoom levels. + +|!Class |!Description | +|`tc-dynaview-zoom-visible-1-and-above` |Visible when the zoom level is 1.00 or more | +|`tc-dynaview-zoom-visible-1a-and-above` |Visible when the zoom level is 1.14 or more | +|`tc-dynaview-zoom-visible-1b-and-above` |Visible when the zoom level is 1.33 or more | +|`tc-dynaview-zoom-visible-1c-and-above` |Visible when the zoom level is 1.60 or more | +|`tc-dynaview-zoom-visible-2-and-above` |Visible when the zoom level is 2.00 or more | +|`tc-dynaview-zoom-visible-2a-and-above` |Visible when the zoom level is 2.66 or more | +|`tc-dynaview-zoom-visible-3-and-above` |Visible when the zoom level is 3.00 or more | +|`tc-dynaview-zoom-visible-4-and-above` |Visible when the zoom level is 4.00 or more | +|`tc-dynaview-zoom-visible-1` |Visible when the zoom level is less than 2.00 | +|`tc-dynaview-zoom-visible-2` |Visible when the zoom level is greater than or equal to 2.00 and less than 3.00 | +|`tc-dynaview-zoom-visible-3` |Visible when the zoom level is greater than or equal to 3.00 and less than 4.00 | +|`tc-dynaview-zoom-visible-4` |Visible when the zoom level is greater than or equal to 4.00 | diff --git a/plugins/tiddlywiki/dynaview/dynaview.js b/plugins/tiddlywiki/dynaview/dynaview.js new file mode 100644 index 000000000..0272ac0d8 --- /dev/null +++ b/plugins/tiddlywiki/dynaview/dynaview.js @@ -0,0 +1,225 @@ +/*\ +title: $:/plugins/tiddlywiki/dynaview/dynaview.js +type: application/javascript +module-type: startup + +Zoom everything + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +// Export name and synchronous status +exports.name = "dynaview"; +exports.platforms = ["browser"]; +exports.after = ["render"]; +exports.synchronous = true; + +var isWaitingForAnimationFrame = 0, // Bitmask: + ANIM_FRAME_CAUSED_BY_LOAD = 1, // Animation frame was requested because of page load + ANIM_FRAME_CAUSED_BY_SCROLL = 2, // Animation frame was requested because of page scroll + ANIM_FRAME_CAUSED_BY_RESIZE = 4; // Animation frame was requested because of window resize + +exports.startup = function() { + window.addEventListener("load",onLoad,false); + window.addEventListener("scroll",onScroll,false); + window.addEventListener("resize",onResize,false); + $tw.hooks.addHook("th-page-refreshed",function() { + optisizeFonts(); + checkTopmost(); + checkVisibility(); + saveViewportDimensions(); + }); +}; + +function onLoad(event) { + if(!isWaitingForAnimationFrame) { + window.requestAnimationFrame(worker); + } + isWaitingForAnimationFrame |= ANIM_FRAME_CAUSED_BY_LOAD; +} + +function onScroll(event) { + if(!isWaitingForAnimationFrame) { + window.requestAnimationFrame(worker); + } + isWaitingForAnimationFrame |= ANIM_FRAME_CAUSED_BY_SCROLL; +} + +function onResize(event) { + if(!isWaitingForAnimationFrame) { + window.requestAnimationFrame(worker); + } + isWaitingForAnimationFrame |= ANIM_FRAME_CAUSED_BY_RESIZE; +} + +function worker() { + if(isWaitingForAnimationFrame & (ANIM_FRAME_CAUSED_BY_RESIZE | ANIM_FRAME_CAUSED_BY_LOAD)) { + optisizeFonts(); + saveViewportDimensions(); + } + setZoomClasses(); + checkTopmost(); + checkVisibility(); + isWaitingForAnimationFrame = 0; +} + +var lastSiteWidth, lastMaquetteString; + +function optisizeFonts() { + if($tw.wiki.getTiddlerText("$:/config/DynaView/Optisizer") === "yes") { + var domSite = document.querySelector(".tc-dynaview-optisizer-site"), + domMaquette = document.querySelector(".tc-dynaview-optisizer-maquette"); + if(domSite && domMaquette) { + // Check that we're not at the same size as last time + if(domSite.offsetWidth === lastSiteWidth && $tw.wiki.getTiddlerText("$:/config/DynaView/Optisizer/Text") === lastMaquetteString) { + return; + } + // Get the current font size + domMaquette.style.fontSize = ""; + var initialFontSize = parseInt(window.getComputedStyle(domMaquette).fontSize,10), + minFontSize = 1, + maxFontSize = 100, + adjustFontSize = maxFontSize, + newFontSize = initialFontSize, + maquetteWidth; + lastSiteWidth = domSite.offsetWidth; + lastMaquetteString = $tw.wiki.getTiddlerText("$:/config/DynaView/Optisizer/Text"); + while(domMaquette.firstChild) { + domMaquette.removeChild(domMaquette.firstChild); + } + domMaquette.appendChild(document.createTextNode(lastMaquetteString)); + // We use a binary search algorithm to find the optimum size + do { + // Apply the size we're considering + domMaquette.style.fontSize = newFontSize + "px"; + // Measure the width of the maquette + maquetteWidth = domMaquette.offsetWidth; + // Adjust bigger or smaller + if(maquetteWidth < lastSiteWidth) { + newFontSize += adjustFontSize; + } else { + newFontSize -= adjustFontSize; + } + newFontSize = Math.min(newFontSize,maxFontSize); + newFontSize = Math.max(newFontSize,minFontSize); + adjustFontSize = adjustFontSize / 2; + } while (adjustFontSize > 0.5); + var newFontSizeString = newFontSize + "px"; + if($tw.wiki.getTiddlerText("$:/state/DynaView/Optisizer/FontSize") !== newFontSizeString) { + $tw.wiki.setText("$:/state/DynaView/Optisizer/FontSize",undefined,undefined,newFontSizeString,undefined); + } + } + } +} + +function setZoomClasses() { + var zoomFactor = document.body.scrollWidth / window.innerWidth, + classList = document.body.classList; + classList.add("tc-dynaview"); + classList.toggle("tc-dynaview-zoom-factor-1",zoomFactor <= 2); + classList.toggle("tc-dynaview-zoom-factor-1-and-above",zoomFactor >= 1); + classList.toggle("tc-dynaview-zoom-factor-1a-and-above",zoomFactor >= 1.14); + classList.toggle("tc-dynaview-zoom-factor-1b-and-above",zoomFactor >= 1.33); + classList.toggle("tc-dynaview-zoom-factor-1c-and-above",zoomFactor >= 1.6); + classList.toggle("tc-dynaview-zoom-factor-2",zoomFactor >= 2 && zoomFactor <= 3); + classList.toggle("tc-dynaview-zoom-factor-2-and-above",zoomFactor >= 2); + classList.toggle("tc-dynaview-zoom-factor-2a-and-above",zoomFactor >= 2.66); + classList.toggle("tc-dynaview-zoom-factor-3",zoomFactor >= 3 && zoomFactor <= 4); + classList.toggle("tc-dynaview-zoom-factor-3-and-above",zoomFactor >= 3); + classList.toggle("tc-dynaview-zoom-factor-4",zoomFactor >= 4); + classList.toggle("tc-dynaview-zoom-factor-4-and-above",zoomFactor >= 4); +} + +function checkVisibility() { + var elements = document.querySelectorAll(".tc-dynaview-set-tiddler-when-visible"); + $tw.utils.each(elements,function(element) { + // Bail if we've already triggered this element and we're not unsetting a tiddler when this element leaves the viewport + if(element.getAttribute("data-dynaview-has-triggered") === "true" && !element.hasAttribute("data-dynaview-unset-tiddler")) { + return; + } + // Calculate whether the element is visible + var elementRect = element.getBoundingClientRect(), + viewportWidth = window.innerWidth || document.documentElement.clientWidth, + viewportHeight = window.innerHeight || document.documentElement.clientHeight, + viewportRect = { + left: 0, + right: viewportWidth, + top: 0, + bottom: viewportHeight + }, + tiddler, + value; + if(element.classList.contains("tc-dynaview-expand-viewport")) { + viewportRect.left -= viewportWidth; + viewportRect.right += viewportWidth; + viewportRect.top -= viewportHeight; + viewportRect.bottom += viewportHeight; + } + if(elementRect.left > viewportRect.right || + elementRect.right < viewportRect.left || + elementRect.top > viewportRect.bottom || + elementRect.bottom < viewportRect.top) { + // Element is not visible + // Set the unset tiddler if required and this element has previously been triggered + if(element.getAttribute("data-dynaview-has-triggered") === "true" && element.hasAttribute("data-dynaview-unset-tiddler")) { + tiddler = element.getAttribute("data-dynaview-unset-tiddler"); + value = element.getAttribute("data-dynaview-unset-value") || ""; + if(tiddler && $tw.wiki.getTiddlerText(tiddler) !== value) { + $tw.wiki.addTiddler(new $tw.Tiddler({title: tiddler, text: value})); + } + element.setAttribute("data-dynaview-has-triggered","false"); + } + } else { + // Element is visible + tiddler = element.getAttribute("data-dynaview-set-tiddler"); + value = element.getAttribute("data-dynaview-set-value") || ""; + if(tiddler && $tw.wiki.getTiddlerText(tiddler) !== value) { + $tw.wiki.addTiddler(new $tw.Tiddler({title: tiddler, text: value})); + } + element.setAttribute("data-dynaview-has-triggered","true"); + } + }); +} + +function checkTopmost() { + if($tw.wiki.getTiddlerText("$:/config/DynaView/UpdateAddressBar") === "yes") { + var elements = document.querySelectorAll(".tc-tiddler-frame[data-tiddler-title]"), + topmostElement = null, + topmostElementTop = 1 * 1000 * 1000; + $tw.utils.each(elements,function(element) { + // Check if the element is visible + var elementRect = element.getBoundingClientRect(); + if((elementRect.top < topmostElementTop) && (elementRect.bottom > 0)) { + topmostElement = element; + topmostElementTop = elementRect.top; + } + }); + if(topmostElement) { + var title = topmostElement.getAttribute("data-tiddler-title"), + hash = "#" + encodeURIComponent(title) + ":" + encodeURIComponent("[list[$:/StoryList]]"); + if(title && $tw.locationHash !== hash) { + $tw.locationHash = hash; + window.location.hash = hash; + } + } + } +} + +function saveViewportDimensions() { + if($tw.wiki.getTiddlerText("$:/config/DynaView/ViewportDimensions") === "yes") { + var viewportWidth = window.innerWidth || document.documentElement.clientWidth, + viewportHeight = window.innerHeight || document.documentElement.clientHeight; + if($tw.wiki.getTiddlerText("$:/state/DynaView/ViewportDimensions/Width") !== viewportWidth.toString()) { + $tw.wiki.setText("$:/state/DynaView/ViewportDimensions/Width",undefined,undefined,viewportWidth.toString(),undefined); + } + if($tw.wiki.getTiddlerText("$:/state/DynaView/ViewportDimensions/Height") !== viewportHeight.toString()) { + $tw.wiki.setText("$:/state/DynaView/ViewportDimensions/Height",undefined,undefined,viewportHeight.toString(),undefined); + } + } +} + +})(); diff --git a/plugins/tiddlywiki/dynaview/examples.tid b/plugins/tiddlywiki/dynaview/examples.tid new file mode 100644 index 000000000..6fe5605b6 --- /dev/null +++ b/plugins/tiddlywiki/dynaview/examples.tid @@ -0,0 +1,3 @@ +title: $:/plugins/tiddlywiki/dynaview/examples + +<<tabs "[all[tiddlers+shadows]tag[$:/tags/dynaviewExamples]!has[draft.of]]" "$:/plugins/tiddlywiki/dynaview/examples/progressive-text">> diff --git a/plugins/tiddlywiki/dynaview/examples/font-optisizer.tid b/plugins/tiddlywiki/dynaview/examples/font-optisizer.tid new file mode 100644 index 000000000..ff11db6aa --- /dev/null +++ b/plugins/tiddlywiki/dynaview/examples/font-optisizer.tid @@ -0,0 +1,17 @@ +title: $:/plugins/tiddlywiki/dynaview/examples/font-optisizer +tags: $:/tags/dynaviewExamples +caption: Font Optisizer + +<$button> +<$action-setfield $tiddler="$:/config/DynaView/Optisizer" $value="yes"/> +<$action-setfield $tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize" $value="{{$:/state/DynaView/Optisizer/FontSize}}"/> +<$action-setfield $tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodylineheight" $value="1.5"/> +Enable font optisizer for tiddler body text +</$button> + +<$button> +<$action-setfield $tiddler="$:/config/DynaView/Optisizer" $value="no"/> +<$action-setfield $tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize" $value="14px"/> +<$action-setfield $tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodylineheight" $value="20px"/> +Disable font optisizer +</$button> diff --git a/plugins/tiddlywiki/dynaview/examples/progressive-text.tid b/plugins/tiddlywiki/dynaview/examples/progressive-text.tid new file mode 100644 index 000000000..7dd37ae6b --- /dev/null +++ b/plugins/tiddlywiki/dynaview/examples/progressive-text.tid @@ -0,0 +1,47 @@ +title: $:/plugins/tiddlywiki/dynaview/examples/progressive-text +tags: $:/tags/dynaviewExamples +caption: Progressive Text + +//Zoom into the space below to see a poem// + +''N.B. This example only works in Safari at the moment'' + +<pre><div class="tc-dynaview-zoom-visible-1-and-above" style="font-size: 0.7em;line-height:1.5;"> + 'Fury said to a + mouse, That he + met in the + house,</div><div class="tc-dynaview-zoom-visible-1a-and-above" style="font-size: 0.6em;line-height:1.5;"> "Let us + both go to + law: I will + prosecute + YOU.--Come,</div><div class="tc-dynaview-zoom-visible-1b-and-above" style="font-size: 0.5em;line-height:1.5;"> I'll take no + denial; We + must have a + trial: For</div><div class="tc-dynaview-zoom-visible-1c-and-above" style="font-size: 0.4em;line-height:1.5;"> really this + morning I've + nothing + to do."</div><div class="tc-dynaview-zoom-visible-2-and-above" style="font-size: 0.3em;line-height:1.5;"> Said the + mouse to the + cur, "Such + a trial, + dear Sir,</div><div class="tc-dynaview-zoom-visible-2a-and-above" style="font-size: 0.25em;line-height:1.5;"> With + no jury + or judge, + would be + wasting + our + breath."</div><div class="tc-dynaview-zoom-visible-3-and-above" style="font-size: 0.2em;line-height:1.5;"> "I'll be + judge, I'll + be jury," + Said + cunning + old Fury: + "I'll + try the + whole + cause,</div><div class="tc-dynaview-zoom-visible-4-and-above" style="font-size: 0.15em;line-height:1.5;"> and + condemn + you + to + death."' +</div></pre> diff --git a/plugins/tiddlywiki/dynaview/examples/reveal-on-scroll.tid b/plugins/tiddlywiki/dynaview/examples/reveal-on-scroll.tid new file mode 100644 index 000000000..860b71c92 --- /dev/null +++ b/plugins/tiddlywiki/dynaview/examples/reveal-on-scroll.tid @@ -0,0 +1,28 @@ +title: $:/plugins/tiddlywiki/dynaview/examples/reveal-on-scroll +tags: $:/tags/dynaviewExamples +caption: Reveal on Scroll + +\define indicator(index) +<$reveal state="$:/state/unreveal-on-scroll/example$index$" type="match" text="yes"> +$index$ +</$reveal> +\end + +\define lorem-ipsum(index) +<div class="tc-dynaview-set-tiddler-when-visible" style="min-height: 75px;" data-dynaview-set-tiddler="$:/state/unreveal-on-scroll/example$index$" data-dynaview-set-value="yes"> +<h1>Heading $index$</h1> +<$reveal state="$:/state/unreveal-on-scroll/example$index$" type="match" text="yes"> +(Rendered at <<now "[UTC]YYYY-0MM-0DD 0hh:0mm:0ss.XXX">>) Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +</$reveal> +</div> +\end + +This example renders tiddlers as they are scrolled into view. + +Visible: <$list filter="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16"> +<$macrocall $name="indicator" index=<<currentTiddler>>/> +</$list> + +<$list filter="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16"> +<$macrocall $name="lorem-ipsum" index=<<currentTiddler>>/> +</$list> \ No newline at end of file diff --git a/plugins/tiddlywiki/dynaview/examples/unreveal-on-scroll.tid b/plugins/tiddlywiki/dynaview/examples/unreveal-on-scroll.tid new file mode 100644 index 000000000..b0bed8777 --- /dev/null +++ b/plugins/tiddlywiki/dynaview/examples/unreveal-on-scroll.tid @@ -0,0 +1,28 @@ +title: $:/plugins/tiddlywiki/dynaview/examples/unreveal-on-scroll +tags: $:/tags/dynaviewExamples +caption: Unreveal on Scroll + +\define indicator(index) +<$reveal state="$:/state/reveal-on-scroll/example$index$" type="match" text="yes"> +$index$ +</$reveal> +\end + +\define lorem-ipsum(index) +<div class="tc-dynaview-set-tiddler-when-visible" style="min-height: 75px;" data-dynaview-set-tiddler="$:/state/reveal-on-scroll/example$index$" data-dynaview-set-value="yes" data-dynaview-unset-tiddler="$:/state/reveal-on-scroll/example$index$" data-dynaview-unset-value="no"> +<h1>Heading $index$</h1> +<$reveal state="$:/state/reveal-on-scroll/example$index$" type="match" text="yes"> +(Rendered at <<now "[UTC]YYYY-0MM-0DD 0hh:0mm:0ss.XXX">>) Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +</$reveal> +</div> +\end + +This example renders tiddlers as they are scrolled into view, and hides them when they scroll out of view again. + +Visible: <$list filter="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16"> +<$macrocall $name="indicator" index=<<currentTiddler>>/> +</$list> + +<$list filter="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16"> +<$macrocall $name="lorem-ipsum" index=<<currentTiddler>>/> +</$list> diff --git a/plugins/tiddlywiki/dynaview/examples/zoomable-diagram-content.json b/plugins/tiddlywiki/dynaview/examples/zoomable-diagram-content.json new file mode 100644 index 000000000..89d0b86ad --- /dev/null +++ b/plugins/tiddlywiki/dynaview/examples/zoomable-diagram-content.json @@ -0,0 +1,134 @@ +[ + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/TiddlyWiki Architecture", + "caption": "TiddlyWiki Architecture", + "tags": "[[$:/tags:/ZoomableDiagram]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Browser Architecture", + "caption": "Browser Architecture", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/TiddlyWiki Architecture]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Service Workers", + "caption": "Service Workers", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Browser Architecture]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Service Bosses", + "caption": "Service Bosses", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Service Workers]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Out of Service Workers", + "caption": "Out of Service Workers", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Service Workers]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Events", + "caption": "Events", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Browser Architecture]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Non Events", + "caption": "Non Events", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Events]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Past Events", + "caption": "Past Events", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Events]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/DOM", + "caption": "DOM", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Browser Architecture]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Nodes", + "caption": "Nodes", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/DOM]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Attributes", + "caption": "Attributes", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/DOM]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Pathogens", + "caption": "Pathogens", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/DOM]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Connection", + "caption": "Connection", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/TiddlyWiki Architecture]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/HTTP", + "caption": "HTTP", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Connection]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Server Architecture", + "caption": "Server Architecture", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/TiddlyWiki Architecture]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Node.js", + "caption": "Node.js", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Server Architecture]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/C/C++", + "caption": "C/C++", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Node.js]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Quotation Marks", + "caption": "Quotation Marks", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Node.js]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Asterisks", + "caption": "Asterisks", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Node.js]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Potatoes", + "caption": "Potatoes", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Server Architecture]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Carrots", + "caption": "Carrots", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Potatoes]]", + "text": "<<lorem-ipsum>>" + }, + { + "title": "$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Apricots", + "caption": "Apricots", + "tags": "[[$:/plugins/tiddlywiki/dynaview/zoomable-diagram/Potatoes]]", + "text": "<<lorem-ipsum>>" + } +] diff --git a/plugins/tiddlywiki/dynaview/examples/zoomable-diagram.tid b/plugins/tiddlywiki/dynaview/examples/zoomable-diagram.tid new file mode 100644 index 000000000..c543b2132 --- /dev/null +++ b/plugins/tiddlywiki/dynaview/examples/zoomable-diagram.tid @@ -0,0 +1,111 @@ +title: $:/plugins/tiddlywiki/dynaview/examples/zoomable-diagram +tags: $:/tags/dynaviewExamples +caption: Zoomable Diagram + +\define lorem-ipsum() +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +\end + +\define zoomable-diagram(tag,level:"1 2 3 4 5 6 7") +<div class={{{ $level$ +[addprefix[zoomable-diagram-level-]addprefix[zoomable-diagram-list ]] }}}> + <$list filter="[all[shadows+tiddlers]tag[$tag$]]"> + <div class="zoomable-diagram-item"> + <div class="zoomable-diagram-title"> + <$transclude field="caption" mode="inline"/> + </div> + <div class="zoomable-diagram-body"> + <div class="zoomable-diagram-text"> + <$transclude field="text" mode="block"/> + </div> + <div class="zoomable-diagram-children"> + <$set name="new-level" filter=""" $level$ +[butfirst[]] """> + <$macrocall $name="zoomable-diagram" tag=<<currentTiddler>> level=<<new-level>>/> + </$set> + </div> + </div> + </div> + </$list> +</div> +\end + +//Zoom into the diagram below to find out more// + +''N.B. This example only works in Safari at the moment'' + +<style> +.zoomable-diagram-wrapper { + min-height: 300px; +} + +.zoomable-diagram-list { + display: flex; + flex-direction: row; + line-height: 1.5; +} + +.zoomable-diagram-level-1 {font-size: 1em;} +.zoomable-diagram-level-2 {font-size: 0.8em;} +.zoomable-diagram-level-3 {font-size: 0.6em;} +.zoomable-diagram-level-4 {font-size: 0.4em;} + +.zoomable-diagram-level-1, +.zoomable-diagram-level-2, +.zoomable-diagram-level-3, +.zoomable-diagram-level-4, +.zoomable-diagram-text { + transition: opacity 150ms ease-in-out; +} + +body.tc-dynaview.tc-dynaview-zoom-factor-1 .zoomable-diagram-level-1 {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-1 .zoomable-diagram-level-2 {opacity: 0;} +body.tc-dynaview.tc-dynaview-zoom-factor-1 .zoomable-diagram-level-3 {opacity: 0;} +body.tc-dynaview.tc-dynaview-zoom-factor-1 .zoomable-diagram-level-4 {opacity: 0;} + +body.tc-dynaview.tc-dynaview-zoom-factor-2 .zoomable-diagram-level-1 {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-2 .zoomable-diagram-level-1 > .zoomable-diagram-item > .zoomable-diagram-body > .zoomable-diagram-text {opacity: 0;} +body.tc-dynaview.tc-dynaview-zoom-factor-2 .zoomable-diagram-level-2 {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-2 .zoomable-diagram-level-3 {opacity: 0;} +body.tc-dynaview.tc-dynaview-zoom-factor-2 .zoomable-diagram-level-4 {opacity: 0;} + +body.tc-dynaview.tc-dynaview-zoom-factor-3 .zoomable-diagram-level-1 {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-3 .zoomable-diagram-level-1 > .zoomable-diagram-item > .zoomable-diagram-body > .zoomable-diagram-text {opacity: 0;} +body.tc-dynaview.tc-dynaview-zoom-factor-3 .zoomable-diagram-level-2 {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-3 .zoomable-diagram-level-2 > .zoomable-diagram-item > .zoomable-diagram-body > .zoomable-diagram-text {opacity: 0;} +body.tc-dynaview.tc-dynaview-zoom-factor-3 .zoomable-diagram-level-3 {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-3 .zoomable-diagram-level-4 {opacity: 0;} + +body.tc-dynaview.tc-dynaview-zoom-factor-4 .zoomable-diagram-level-1 {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-4 .zoomable-diagram-level-1 > .zoomable-diagram-item > .zoomable-diagram-body > .zoomable-diagram-text {opacity: 0;} +body.tc-dynaview.tc-dynaview-zoom-factor-4 .zoomable-diagram-level-2 {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-4 .zoomable-diagram-level-2 > .zoomable-diagram-item > .zoomable-diagram-body > .zoomable-diagram-text {opacity: 0;} +body.tc-dynaview.tc-dynaview-zoom-factor-4 .zoomable-diagram-level-3 {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-4 .zoomable-diagram-level-3 > .zoomable-diagram-item > .zoomable-diagram-body > .zoomable-diagram-text {opacity: 0;} +body.tc-dynaview.tc-dynaview-zoom-factor-4 .zoomable-diagram-level-4 {opacity: 1;} + +.zoomable-diagram-item { + margin: 0.5em; + flex: 1 1 0; +} + +.zoomable-diagram-title { + font-weight: bold; +} + +.zoomable-diagram-body { + display: flex; + flex-direction: column; + position: relative; +} + +.zoomable-diagram-text { + position: absolute; +} + +.zoomable-diagram-children { +} + +</style> + +<div class="zoomable-diagram-wrapper"> +<<zoomable-diagram "$:/tags:/ZoomableDiagram">> +</div> diff --git a/plugins/tiddlywiki/dynaview/examples/zoomable-tooltips.tid b/plugins/tiddlywiki/dynaview/examples/zoomable-tooltips.tid new file mode 100644 index 000000000..8f5640607 --- /dev/null +++ b/plugins/tiddlywiki/dynaview/examples/zoomable-tooltips.tid @@ -0,0 +1,56 @@ +title: $:/plugins/tiddlywiki/dynaview/examples/zoomable-tooltips +tags: $:/tags/dynaviewExamples +caption: Zoomable Tooltips + +//Zoom into the images below to see their titles// + +''N.B. This example only works in Safari at the moment'' + +<style> +.zoomable-tooltip-demo-container { + display: flex; + flex-wrap: wrap; +} + +.zoomable-tooltip-demo-item { + display: flex; + flex-direction: column; + flex: 0 0 auto; + padding: 4px; + width: 5em; + height: 7em; +} + +.zoomable-tooltip-demo-item-image { + flex: 0 0 auto; +} + +.zoomable-tooltip-demo-item-image svg { + width: 4em; + height: 4em; +} + +.zoomable-tooltip-demo-item-text { + font-size:0.3em; + flex: 0 0 auto; + line-height: 1.1; + text-align: center; + text-align: center; + background: #f7f747; + border: 1px solid #c2c235; + padding: 2px; + border-radius: 2px; +} +</style> +<div class="zoomable-tooltip-demo-container"> +<$list filter="[all[tiddlers+shadows]tag[$:/tags/Image]]"> +<div class="zoomable-tooltip-demo-item"> +<span class="zoomable-tooltip-demo-item-image"> +<$transclude/> +</span> +<span class="zoomable-tooltip-demo-item-text tc-dynaview-zoom-visible-3-and-above"> +<$text text=<<currentTiddler>>/> +</span> +</div> +</$list> +</div> diff --git a/plugins/tiddlywiki/dynaview/macros.tid b/plugins/tiddlywiki/dynaview/macros.tid new file mode 100644 index 000000000..b4a82202a --- /dev/null +++ b/plugins/tiddlywiki/dynaview/macros.tid @@ -0,0 +1,15 @@ +title: $:/plugins/tiddlywiki/dynaview/macros +tags: $:/tags/Macro + +\define transclude-when-visible(tiddler,mode:"block",state,minHeight:"1em",loadingText:"…") +<$reveal state=<<__state__>> type="match" text="visible" tag="div"> +<div class="tc-dynaview-set-tiddler-when-visible" data-dynaview-set-tiddler=<<__state__>> data-dynaview-set-value="visible"> +<$transclude tiddler=<<__tiddler__>> mode=<<__block__>>/> +</div> +</$reveal> +<$reveal state=<<__state__>> type="nomatch" text="visible" tag="div"> +<div class="tc-dynaview-set-tiddler-when-visible" style="min-height: $minHeight$;" data-dynaview-set-tiddler=<<__state__>> data-dynaview-set-value="visible"> +$loadingText$ +</div> +</$reveal> +\end diff --git a/plugins/tiddlywiki/dynaview/optisizer-maquette.tid b/plugins/tiddlywiki/dynaview/optisizer-maquette.tid new file mode 100644 index 000000000..127259e61 --- /dev/null +++ b/plugins/tiddlywiki/dynaview/optisizer-maquette.tid @@ -0,0 +1,24 @@ +title: $:/plugins/tiddlywiki/dynaview/optisizer-maquette +tags: $:/tags/AboveStory + +<div class="tc-tiddler-frame" style="border: none; background: none; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; margin-top: 0; margin-bottom: 0; padding-top: 0; padding-bottom: 0; "> + +<div class="tc-tiddler-body tc-dynaview-optisizer-site" style="margin-top: -3em; visibility: hidden;"> + +X + +</div> + +</div> + +<div style="position: relative;"> + +<div style="position: absolute; visibility: hidden;"> + +<div class="tc-dynaview-optisizer-maquette" style="white-space: nowrap;"> + +</div> + +</div> + +</div> diff --git a/plugins/tiddlywiki/dynaview/plugin.info b/plugins/tiddlywiki/dynaview/plugin.info new file mode 100644 index 000000000..7c90e3a53 --- /dev/null +++ b/plugins/tiddlywiki/dynaview/plugin.info @@ -0,0 +1,7 @@ +{ + "title": "$:/plugins/tiddlywiki/dynaview", + "description": "Dynamic scrolling and zooming effects", + "author": "JeremyRuston", + "core-version": ">=5.0.0", + "list": "readme docs examples config" +} diff --git a/plugins/tiddlywiki/dynaview/readme.tid b/plugins/tiddlywiki/dynaview/readme.tid new file mode 100644 index 000000000..ae23cbe2d --- /dev/null +++ b/plugins/tiddlywiki/dynaview/readme.tid @@ -0,0 +1,23 @@ +title: $:/plugins/tiddlywiki/dynaview/readme + +! Dynaview + +This plugin makes it possible to build user interfaces that dynamically respond to changes in the browser viewport via scrolling or zooming: + +* CSS classes that allow rendering to be deferred until the output is scrolled into view +* CSS classes that allow the opacity of DOM elements to vary according to the current zoom level +* A daemon that can dynamically update a pair of state tiddlers with the current dimensions of the browser viewport +* A daemon that can dynamically adjust the size of text to yield a particular number of characters per line +* A daemon that can dynamically update the address bar with the title of the tiddler at the top of the viewport + +Some points to note about the zoom features: + +<<< + +* The zoom level currently only works on Safari, both on Mac OS and on the iPhone/iPad +* The zoom level tracked by the plugin is the pinch-zoom level, and not the text-zoom level +* Rather than being progressively rendered as needed, hidden item are rendered with zero opacity. Which means that they can still be interacted with + +This is really just a proof of concept to allow the user experience to be evaluated. A production version would need to work in all browsers, which would mean adopting a polyfill such as [[Hammer.js|http://hammerjs.github.io/]] to give us manual pan and zoom support. It would also allow deeper levels of zoom. + +<<< diff --git a/plugins/tiddlywiki/dynaview/styles.tid b/plugins/tiddlywiki/dynaview/styles.tid new file mode 100644 index 000000000..aeda4e356 --- /dev/null +++ b/plugins/tiddlywiki/dynaview/styles.tid @@ -0,0 +1,34 @@ +title: $:/plugins/tiddlywiki/help/styles +tags: [[$:/tags/Stylesheet]] + +\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline + +body.tc-dynaview .tc-dynaview-zoom-visible-1-and-above, +body.tc-dynaview .tc-dynaview-zoom-visible-1a-and-above, +body.tc-dynaview .tc-dynaview-zoom-visible-1b-and-above, +body.tc-dynaview .tc-dynaview-zoom-visible-1c-and-above, +body.tc-dynaview .tc-dynaview-zoom-visible-2-and-above, +body.tc-dynaview .tc-dynaview-zoom-visible-2a-and-above, +body.tc-dynaview .tc-dynaview-zoom-visible-3-and-above, +body.tc-dynaview .tc-dynaview-zoom-visible-4-and-above, +body.tc-dynaview .tc-dynaview-zoom-visible-1, +body.tc-dynaview .tc-dynaview-zoom-visible-2, +body.tc-dynaview .tc-dynaview-zoom-visible-3, +body.tc-dynaview .tc-dynaview-zoom-visible-4 { + transition: opacity 150ms ease-in-out; + opacity: 0; +} + +body.tc-dynaview .tc-dynaview-zoom-visible-1-and-above {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-1a-and-above .tc-dynaview-zoom-visible-1a-and-above {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-1b-and-above .tc-dynaview-zoom-visible-1b-and-above {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-1c-and-above .tc-dynaview-zoom-visible-1c-and-above {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-2-and-above .tc-dynaview-zoom-visible-2-and-above {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-2a-and-above .tc-dynaview-zoom-visible-2a-and-above {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-3-and-above .tc-dynaview-zoom-visible-3-and-above {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-4-and-above .tc-dynaview-zoom-visible-4-and-above {opacity: 1;} + +body.tc-dynaview.tc-dynaview-zoom-factor-1 .tc-dynaview-zoom-visible-1 {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-2 .tc-dynaview-zoom-visible-2 {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-3 .tc-dynaview-zoom-visible-3 {opacity: 1;} +body.tc-dynaview.tc-dynaview-zoom-factor-4 .tc-dynaview-zoom-visible-4 {opacity: 1;} diff --git a/plugins/tiddlywiki/evernote/modules/enex-deserializer.js b/plugins/tiddlywiki/evernote/modules/enex-deserializer.js index cffd4f4ab..72e0e9201 100644 --- a/plugins/tiddlywiki/evernote/modules/enex-deserializer.js +++ b/plugins/tiddlywiki/evernote/modules/enex-deserializer.js @@ -55,7 +55,7 @@ exports["application/enex+xml"] = function(text,fields) { result[attrNode.tagName] = attrNode.textContent; }); results.push(result); - $tw.utils.each(noteNode.querySelectorAll("resources"),function(resourceNode) { + $tw.utils.each(noteNode.querySelectorAll("resource"),function(resourceNode) { results.push({ title: getTextContent(resourceNode,"resource-attributes>file-name"), type: getTextContent(resourceNode,"mime"), diff --git a/plugins/tiddlywiki/evernote/samples/sample-enex-with-image.xml.enex b/plugins/tiddlywiki/evernote/samples/sample-enex-with-image.xml.enex new file mode 100755 index 000000000..b3e3e3918 --- /dev/null +++ b/plugins/tiddlywiki/evernote/samples/sample-enex-with-image.xml.enex @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export3.dtd"> +<en-export export-date="20130730T205637Z" application="Evernote" version="Evernote Mac"> + <note> + <title>Test Note for Export + + + + + Hello, World. +
+
+
+
+ +
+
+
+
+ + ]]> + + 20130730T205204Z + 20130730T205624Z + fake-tag + + 33.88394692352314 + -117.9191355110099 + 96 + Brett Kelly + + + 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 + image/jpeg + 1280 + 720 + + snapshot-DAE9FC15-88E3-46CF-B744-DA9B1B56EB57.jpg + + + + + diff --git a/plugins/tiddlywiki/evernote/samples/sample-enex.xml.enex b/plugins/tiddlywiki/evernote/samples/sample-enex.xml.enex new file mode 100755 index 000000000..b67767679 --- /dev/null +++ b/plugins/tiddlywiki/evernote/samples/sample-enex.xml.enex @@ -0,0 +1,48 @@ + + + + + Test Note for Export + + + + + Hello, World. +
+
+
+
+ +
+
+
+
+ + ]]> + + 20130730T205204Z + 20130730T205624Z + fake-tag + + 33.88394692352314 + -117.9191355110099 + 96 + Brett Kelly + + + /9j/4AAQSkZJRgABAQAAAQABAAD/4gxYSUNDX1BST0ZJTEUAAQEAAAxITGlubwIQAABtbnRyUkdCIFhZ + WiAHzgACAAkABgAxAABhY3NwTVNGVAAAAABJRUMgc1JHQgAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLUhQ + + kfeIGT/+uufk8DpM0gyVjGfmzkgetesnUoTHJ+5Cxn86zmv4/wB75EW+QHAPUH/P9Ky+s1rtrr/wfvOm + dBSamnq/xPKp/hpLKmS7x4OBjgn6elee6v4OuLJirRSHb/FtyG9s9u1fR0+oTiIRvGq7W4bpisfUGk1C + GVWtkIyM57n1rfDY+uqigtU76ffZkUsA6iajHZ6v/P8A4B//2Q== + image/jpeg + 1280 + 720 + + snapshot-DAE9FC15-88E3-46CF-B744-DA9B1B56EB57.jpg + + + + + diff --git a/plugins/tiddlywiki/evernote/samples/tiddlywiki.files b/plugins/tiddlywiki/evernote/samples/tiddlywiki.files new file mode 100644 index 000000000..cff7acd09 --- /dev/null +++ b/plugins/tiddlywiki/evernote/samples/tiddlywiki.files @@ -0,0 +1,3 @@ +{ + "tiddlers": [] +} \ No newline at end of file diff --git a/plugins/tiddlywiki/external-attachments/config.multids b/plugins/tiddlywiki/external-attachments/config.multids new file mode 100644 index 000000000..0a5f0dc80 --- /dev/null +++ b/plugins/tiddlywiki/external-attachments/config.multids @@ -0,0 +1,6 @@ +title: $:/config/ExternalAttachments/ + +Enable: yes +UseAbsoluteForDescendents: no +UseAbsoluteForNonDescendents: no + diff --git a/plugins/tiddlywiki/external-attachments/plugin.info b/plugins/tiddlywiki/external-attachments/plugin.info new file mode 100644 index 000000000..a2d4f9bea --- /dev/null +++ b/plugins/tiddlywiki/external-attachments/plugin.info @@ -0,0 +1,7 @@ +{ + "title": "$:/plugins/tiddlywiki/external-attachments", + "description": "External attachment support for TiddlyDesktop et al.", + "author": "Jeremy Ruston", + "core-version": ">=5.0.0", + "list": "readme settings" +} diff --git a/plugins/tiddlywiki/external-attachments/readme.tid b/plugins/tiddlywiki/external-attachments/readme.tid new file mode 100644 index 000000000..44a3c059d --- /dev/null +++ b/plugins/tiddlywiki/external-attachments/readme.tid @@ -0,0 +1,10 @@ +title: $:/plugins/tiddlywiki/external-attachments/readme + +! Introduction + +This plugin provides support for importing tiddlers as external attachments. That means that instead of importing binary files as self-contained tiddlers, they are imported as "skinny" tiddlers that reference the original file via the ''_canonical_uri'' field. This reduces the size of the wiki and thus improves performance. However, it does mean that the wiki is no longer fully self-contained. + +! Compatibility + +This plugin only works when using TiddlyWiki with platforms such as TiddlyDesktop that support the ''path'' attribute for imported/dragged files. + diff --git a/plugins/tiddlywiki/external-attachments/settings.tid b/plugins/tiddlywiki/external-attachments/settings.tid new file mode 100644 index 000000000..1ab3c4e27 --- /dev/null +++ b/plugins/tiddlywiki/external-attachments/settings.tid @@ -0,0 +1,11 @@ +title: $:/plugins/tiddlywiki/external-attachments/settings + +When used on platforms that provide the necessary support (such as ~TiddlyDesktop), you can optionally import binary files as external tiddlers that reference the original file via the ''_canonical_uri'' field. + +By default, a relative path is used to reference the file. Optionally, you can specify that an absolute path is used instead. You can do this separately for "descendent" attachments -- files that are contained within the directory containing the wiki -- vs. "non-descendent" attachments. + +<$checkbox tiddler="$:/config/ExternalAttachments/Enable" field="text" checked="yes" unchecked="no" default="no"> <$link to="$:/config/ExternalAttachments/Enable">Enable importing binary files as external attachments + +<$checkbox tiddler="$:/config/ExternalAttachments/UseAbsoluteForDescendents" field="text" checked="yes" unchecked="no" default="no"> <$link to="$:/config/ExternalAttachments/UseAbsoluteForDescendents">Use absolute paths for descendent attachments + +<$checkbox tiddler="$:/config/ExternalAttachments/UseAbsoluteForNonDescendents" field="text" checked="yes" unchecked="no" default="no"> <$link to="$:/config/ExternalAttachments/UseAbsoluteForNonDescendents">Use absolute paths for non-descendent attachments diff --git a/plugins/tiddlywiki/external-attachments/startup.js b/plugins/tiddlywiki/external-attachments/startup.js new file mode 100644 index 000000000..174f43ff2 --- /dev/null +++ b/plugins/tiddlywiki/external-attachments/startup.js @@ -0,0 +1,111 @@ +/*\ +title: $:/plugins/tiddlywiki/external-attachments/startup.js +type: application/javascript +module-type: startup + +Startup initialisation + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +var ENABLE_EXTERNAL_ATTACHMENTS_TITLE = "$:/config/ExternalAttachments/Enable", + USE_ABSOLUTE_FOR_DESCENDENTS_TITLE = "$:/config/ExternalAttachments/UseAbsoluteForDescendents", + USE_ABSOLUTE_FOR_NON_DESCENDENTS_TITLE = "$:/config/ExternalAttachments/UseAbsoluteForNonDescendents"; + +// Export name and synchronous status +exports.name = "external-attachments"; +exports.platforms = ["browser"]; +exports.after = ["startup"]; +exports.synchronous = true; + +exports.startup = function() { + test_makePathRelative(); + $tw.hooks.addHook("th-importing-file",function(info) { + if(document.location.protocol === "file:" && info.isBinary && info.file.path && $tw.wiki.getTiddlerText(ENABLE_EXTERNAL_ATTACHMENTS_TITLE,"") === "yes") { + var locationPathParts = document.location.pathname.split("/").slice(0,-1), + filePathParts = info.file.path.split(/[\\\/]/mg).map(encodeURIComponent); + info.callback([ + { + title: info.file.name, + type: info.type, + "_canonical_uri": makePathRelative( + filePathParts.join("/"), + locationPathParts.join("/"), + { + useAbsoluteForNonDescendents: $tw.wiki.getTiddlerText(USE_ABSOLUTE_FOR_NON_DESCENDENTS_TITLE,"") === "yes", + useAbsoluteForDescendents: $tw.wiki.getTiddlerText(USE_ABSOLUTE_FOR_DESCENDENTS_TITLE,"") === "yes" + } + ) + } + ]); + return true; + } else { + return false; + } + }); +}; + +/* +Given a source absolute path and a root absolute path, returns the source path expressed as a relative path from the root path. +*/ +function makePathRelative(sourcepath,rootpath,options) { + options = options || {}; + var sourceParts = sourcepath.split("/"), + rootParts = rootpath.split("/"), + outputParts = []; + // Check that each path started with a slash + if(sourceParts[0] || rootParts[0]) { + throw "makePathRelative: both paths must be absolute"; + } + // Identify any common portion from the start + var c = 1, + p; + while(c < sourceParts.length && c < rootParts.length && sourceParts[c] === rootParts[c]) { + c += 1; + } + // Return "." if there's nothing left + if(c === sourceParts.length && c === rootParts.length ) { + return "." + } + // Use an absolute path if required + if((options.useAbsoluteForNonDescendents && c < rootParts.length) || (options.useAbsoluteForDescendents && c === rootParts.length)) { + return sourcepath; + } + // Move up a directory for each directory left in the root + for(p = c; p < rootParts.length; p++) { + outputParts.push(".."); + } + // Add on the remaining parts of the source path + for(p = c; p < sourceParts.length; p++) { + outputParts.push(sourceParts[p]); + } + return outputParts.join("/"); +} + +function test_makePathRelative() { + var msg = "makePathRelative test failed"; + if(makePathRelative("/Users/me/something","/Users/you/something") !== "../../me/something") { + throw msg; + } + if(makePathRelative("/Users/me/something","/Users/you/something",{useAbsoluteForNonDescendents: true}) !== "/Users/me/something") { + throw msg; + } + if(makePathRelative("/Users/me/something/else","/Users/me/something") !== "else") { + throw msg; + } + if(makePathRelative("/Users/me/something","/Users/me/something/new") !== "..") { + throw msg; + } + if(makePathRelative("/Users/me/something","/Users/me/something/new",{useAbsoluteForNonDescendents: true}) !== "/Users/me/something") { + throw msg; + } + if(makePathRelative("/Users/me/something","/Users/me/something") !== ".") { + throw msg; + } +} + +})(); diff --git a/plugins/tiddlywiki/filesystem/filesystemadaptor.js b/plugins/tiddlywiki/filesystem/filesystemadaptor.js index acbd6faf6..c824bd0fb 100644 --- a/plugins/tiddlywiki/filesystem/filesystemadaptor.js +++ b/plugins/tiddlywiki/filesystem/filesystemadaptor.js @@ -19,11 +19,13 @@ var fs = $tw.node ? require("fs") : null, function FileSystemAdaptor(options) { var self = this; this.wiki = options.wiki; - this.logger = new $tw.utils.Logger("FileSystem"); + this.logger = new $tw.utils.Logger("filesystem",{colour: "blue"}); // Create the /tiddlers folder if it doesn't exist $tw.utils.createDirectory($tw.boot.wikiTiddlersPath); } +FileSystemAdaptor.prototype.name = "filesystem"; + FileSystemAdaptor.prototype.isReady = function() { // The file system adaptor is always ready return true; @@ -33,113 +35,109 @@ FileSystemAdaptor.prototype.getTiddlerInfo = function(tiddler) { return {}; }; -$tw.config.typeInfo = { - "text/vnd.tiddlywiki": { - fileType: "application/x-tiddler", - extension: ".tid" - } -}; +/* +Return a fileInfo object for a tiddler, creating it if necessary: + filepath: the absolute path to the file containing the tiddler + type: the type of the tiddler file (NOT the type of the tiddler -- see below) + hasMetaFile: true if the file also has a companion .meta file +The boot process populates $tw.boot.files for each of the tiddler files that it loads. The type is found by looking up the extension in $tw.config.fileExtensionInfo (eg "application/x-tiddler" for ".tid" files). + +It is the responsibility of the filesystem adaptor to update $tw.boot.files for new files that are created. +*/ FileSystemAdaptor.prototype.getTiddlerFileInfo = function(tiddler,callback) { // See if we've already got information about this file var self = this, title = tiddler.fields.title, fileInfo = $tw.boot.files[title]; - // Get information about how to save tiddlers of this type - var type = tiddler.fields.type || "text/vnd.tiddlywiki"; - var typeInfo = $tw.config.typeInfo[type] || - $tw.config.contentTypeInfo[type] || - $tw.config.typeInfo["text/vnd.tiddlywiki"]; - var extension = typeInfo.extension || ""; - if(!fileInfo) { - // If not, we'll need to generate it + if(fileInfo) { + // If so, just invoke the callback + callback(null,fileInfo); + } else { + // Otherwise, we'll need to generate it + fileInfo = {}; + var tiddlerType = tiddler.fields.type || "text/vnd.tiddlywiki"; + // Get the content type info + var contentTypeInfo = $tw.config.contentTypeInfo[tiddlerType] || {}; + // Get the file type by looking up the extension + var extension = contentTypeInfo.extension || ".tid"; + fileInfo.type = ($tw.config.fileExtensionInfo[extension] || {type: "application/x-tiddler"}).type; + // Use a .meta file unless we're saving a .tid file. + // (We would need more complex logic if we supported other template rendered tiddlers besides .tid) + fileInfo.hasMetaFile = (fileInfo.type !== "application/x-tiddler") && (fileInfo.type !== "application/json"); + if(!fileInfo.hasMetaFile) { + extension = ".tid"; + } + // Generate the base filepath and ensure the directories exist + var baseFilepath = path.resolve($tw.boot.wikiTiddlersPath,this.generateTiddlerBaseFilepath(title)); + $tw.utils.createFileDirectories(baseFilepath); // Start by getting a list of the existing files in the directory - fs.readdir($tw.boot.wikiTiddlersPath,function(err,files) { + fs.readdir(path.dirname(baseFilepath),function(err,files) { if(err) { return callback(err); } - // Assemble the new fileInfo - fileInfo = {}; - fileInfo.filepath = $tw.boot.wikiTiddlersPath + path.sep + self.generateTiddlerFilename(title,extension,files); - fileInfo.type = typeInfo.fileType || tiddler.fields.type; - fileInfo.hasMetaFile = typeInfo.hasMetaFile; - // Save the newly created fileInfo + // Start with the base filename plus the extension + var filepath = baseFilepath; + if(filepath.substr(-extension.length).toLocaleLowerCase() !== extension.toLocaleLowerCase()) { + filepath = filepath + extension; + } + var filename = path.basename(filepath), + count = 1; + // Add a discriminator if we're clashing with an existing filename while + // handling case-insensitive filesystems (NTFS, FAT/FAT32, etc.) + while(files.some(function(value) {return value.toLocaleLowerCase() === filename.toLocaleLowerCase();})) { + filepath = baseFilepath + " " + (count++) + extension; + filename = path.basename(filepath); + } + // Set the final fileInfo + fileInfo.filepath = filepath; +console.log("\x1b[1;35m" + "For " + title + ", type is " + fileInfo.type + " hasMetaFile is " + fileInfo.hasMetaFile + " filepath is " + fileInfo.filepath + "\x1b[0m"); $tw.boot.files[title] = fileInfo; // Pass it to the callback callback(null,fileInfo); }); - } else { - // Otherwise just invoke the callback - callback(null,fileInfo); } }; -/* -Transliterate string from cyrillic russian to latin -*/ - var transliterate = function(cyrillyc) { - var a = {"Ё":"YO","Й":"I","Ц":"TS","У":"U","К":"K","Е":"E","Н":"N","Г":"G","Ш":"SH","Щ":"SCH","З":"Z","Х":"H","Ъ":"'","ё":"yo","й":"i","ц":"ts","у":"u","к":"k","е":"e","н":"n","г":"g","ш":"sh","щ":"sch","з":"z","х":"h","ъ":"'","Ф":"F","Ы":"I","В":"V","А":"a","П":"P","Р":"R","О":"O","Л":"L","Д":"D","Ж":"ZH","Э":"E","ф":"f","ы":"i","в":"v","а":"a","п":"p","р":"r","о":"o","л":"l","д":"d","ж":"zh","э":"e","Я":"Ya","Ч":"CH","С":"S","М":"M","И":"I","Т":"T","Ь":"'","Б":"B","Ю":"YU","я":"ya","ч":"ch","с":"s","м":"m","и":"i","т":"t","ь":"'","б":"b","ю":"yu"}; - return cyrillyc.split("").map(function (char) { - return a[char] || char; - }).join(""); -}; - /* Given a list of filters, apply every one in turn to source, and return the first result of the first filter with non-empty result. */ FileSystemAdaptor.prototype.findFirstFilter = function(filters,source) { - var numFilters = filters.length; - for(var i=0; i 0) { return result[0]; } } + return null; }; -/* -Add file extension to a file path if it doesn't already exist. -*/ -FileSystemAdaptor.addFileExtension = function(file,extension) { - return $tw.utils.strEndsWith(file,extension) ? file : file + extension; -}; - - /* Given a tiddler title and an array of existing filenames, generate a new legal filename for the title, case insensitively avoiding the array of existing filenames */ -FileSystemAdaptor.prototype.generateTiddlerFilename = function(title,extension,existingFilenames) { +FileSystemAdaptor.prototype.generateTiddlerBaseFilepath = function(title) { var baseFilename; // Check whether the user has configured a tiddler -> pathname mapping var pathNameFilters = this.wiki.getTiddlerText("$:/config/FileSystemPaths"); if(pathNameFilters) { var source = this.wiki.makeTiddlerIterator([title]); - var result = this.findFirstFilter(pathNameFilters.split("\n"),source); - if(result) { - // interpret "/" as path separator - baseFilename = result.replace(/\//g,path.sep); + baseFilename = this.findFirstFilter(pathNameFilters.split("\n"),source); + if(baseFilename) { + // Interpret "/" and "\" as path separator + baseFilename = baseFilename.replace(/\/|\\/g,path.sep); } } if(!baseFilename) { - // no mapping configured, or it did not match this tiddler - // in this case, we fall back to legacy behaviour - baseFilename = title.replace(/\//g,"_"); + // No mappings provided, or failed to match this tiddler so we use title as filename + baseFilename = title.replace(/\/|\\/g,"_"); } // Remove any of the characters that are illegal in Windows filenames - var baseFilename = transliterate(baseFilename.replace(/<|>|\:|\"|\\|\||\?|\*|\^|\s/g,"_")); + var baseFilename = $tw.utils.transliterate(baseFilename.replace(/<|>|\:|\"|\||\?|\*|\^/g,"_")); // Truncate the filename if it is too long if(baseFilename.length > 200) { baseFilename = baseFilename.substr(0,200); } - // Start with the base filename plus the extension - var filename = FileSystemAdaptor.addFileExtension(baseFilename,extension), - count = 1; - // Add a discriminator if we're clashing with an existing filename while - // handling case-insensitive filesystems (NTFS, FAT/FAT32, etc.) - while(existingFilenames.some(function(value) {return value.toLocaleLowerCase() === filename.toLocaleLowerCase();})) { - filename = baseFilename + " " + (count++) + extension; - } - return filename; + return baseFilename; }; /* @@ -148,45 +146,39 @@ Save a tiddler and invoke the callback with (err,adaptorInfo,revision) FileSystemAdaptor.prototype.saveTiddler = function(tiddler,callback) { var self = this; this.getTiddlerFileInfo(tiddler,function(err,fileInfo) { - var template, content, encoding, filepath, - _finish = function() { - callback(null, {}, 0); - }; if(err) { return callback(err); } - var error = $tw.utils.createDirectory(path.dirname(fileInfo.filepath)); + var filepath = fileInfo.filepath, + error = $tw.utils.createDirectory(path.dirname(filepath)); if(error) { return callback(error); } - var typeInfo = $tw.config.contentTypeInfo[fileInfo.type]; - if(fileInfo.hasMetaFile || typeInfo.encoding === "base64") { + if(fileInfo.hasMetaFile) { // Save the tiddler as a separate body and meta file - filepath = fileInfo.filepath; + var typeInfo = $tw.config.contentTypeInfo[tiddler.fields.type || "text/plain"] || {encoding: "utf8"}; fs.writeFile(filepath,tiddler.fields.text,{encoding: typeInfo.encoding},function(err) { if(err) { return callback(err); } content = self.wiki.renderTiddler("text/plain","$:/core/templates/tiddler-metadata",{variables: {currentTiddler: tiddler.fields.title}}); - filepath = FileSystemAdaptor.addFileExtension(fileInfo.filepath,".meta"); - fs.writeFile(filepath,content,{encoding: "utf8"},function (err) { + fs.writeFile(fileInfo.filepath + ".meta",content,{encoding: "utf8"},function (err) { if(err) { return callback(err); } self.logger.log("Saved file",filepath); - _finish(); + return callback(null); }); }); } else { // Save the tiddler as a self contained templated file - content = self.wiki.renderTiddler("text/plain","$:/core/templates/tid-tiddler",{variables: {currentTiddler: tiddler.fields.title}}); - filepath = FileSystemAdaptor.addFileExtension(fileInfo.filepath,".tid"); + var content = self.wiki.renderTiddler("text/plain","$:/core/templates/tid-tiddler",{variables: {currentTiddler: tiddler.fields.title}}); fs.writeFile(filepath,content,{encoding: "utf8"},function (err) { if(err) { return callback(err); } self.logger.log("Saved file",filepath); - _finish(); + return callback(null); }); } }); @@ -217,14 +209,14 @@ FileSystemAdaptor.prototype.deleteTiddler = function(title,callback,options) { self.logger.log("Deleted file",fileInfo.filepath); // Delete the metafile if present if(fileInfo.hasMetaFile) { - fs.unlink(FileSystemAdaptor.addFileExtension(fileInfo.filepath,".meta"),function(err) { + fs.unlink(fileInfo.filepath + ".meta",function(err) { if(err) { return callback(err); } - $tw.utils.deleteEmptyDirs(path.dirname(fileInfo.filepath),callback); + return $tw.utils.deleteEmptyDirs(path.dirname(fileInfo.filepath),callback); }); } else { - $tw.utils.deleteEmptyDirs(path.dirname(fileInfo.filepath),callback); + return $tw.utils.deleteEmptyDirs(path.dirname(fileInfo.filepath),callback); } }); } else { diff --git a/plugins/tiddlywiki/googleanalytics/googleanalytics.js b/plugins/tiddlywiki/googleanalytics/googleanalytics.js index 974a1c253..a3f48a321 100644 --- a/plugins/tiddlywiki/googleanalytics/googleanalytics.js +++ b/plugins/tiddlywiki/googleanalytics/googleanalytics.js @@ -17,19 +17,20 @@ exports.name = "google-analytics"; exports.platforms = ["browser"]; exports.synchronous = true; -var GOOGLE_ANALYTICS_ACCOUNT = "$:/GoogleAnalyticsAccount", - GOOGLE_ANALYTICS_DOMAIN = "$:/GoogleAnalyticsDomain"; - exports.startup = function() { - window._gaq = window._gaq || []; - _gaq.push(["_setAccount", $tw.wiki.getTiddlerText(GOOGLE_ANALYTICS_ACCOUNT)]); - _gaq.push(["_setDomainName", $tw.wiki.getTiddlerText(GOOGLE_ANALYTICS_DOMAIN)]); - _gaq.push(["_trackPageview"]); - var ga = document.createElement("script"); - ga.type = "text/javascript"; - ga.async = true; - ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js"; - document.body.appendChild(ga); + // getting parameters + var GA_ACCOUNT = $tw.wiki.getTiddlerText("$:/GoogleAnalyticsAccount","").replace(/\n/g,""), + GA_DOMAIN = $tw.wiki.getTiddlerText("$:/GoogleAnalyticsDomain","").replace(/\n/g,""); + if (GA_DOMAIN == "" || GA_DOMAIN == undefined) GA_DOMAIN = "auto"; + + // using ga "isogram" function + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); + + ga('create', GA_ACCOUNT, GA_DOMAIN); + ga('send', 'pageview'); }; })(); diff --git a/plugins/tiddlywiki/googleanalytics/plugin.info b/plugins/tiddlywiki/googleanalytics/plugin.info index 6fd93b295..4754bca2a 100644 --- a/plugins/tiddlywiki/googleanalytics/plugin.info +++ b/plugins/tiddlywiki/googleanalytics/plugin.info @@ -2,6 +2,7 @@ "title": "$:/plugins/tiddlywiki/googleanalytics", "description": "Google Analytics: website statistics", "author": "JeremyRuston", + "contributor": "Sylvain Comte", "core-version": ">=5.0.0", - "list": "readme usage" + "list": "readme settings usage" } diff --git a/plugins/tiddlywiki/googleanalytics/readme.tid b/plugins/tiddlywiki/googleanalytics/readme.tid index 616b7bc64..8a94012eb 100644 --- a/plugins/tiddlywiki/googleanalytics/readme.tid +++ b/plugins/tiddlywiki/googleanalytics/readme.tid @@ -1,5 +1,5 @@ title: $:/plugins/tiddlywiki/googleanalytics/readme -This plugin enables you to use Google Analytics to track access to your online TiddlyWiki document. +This plugin enables you to use Google Analytics to track access to your online TiddlyWiki document. Based upon the [[official Google code|https://developers.google.com/analytics/devguides/collection/analyticsjs]]. [[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/googleanalytics]] diff --git a/plugins/tiddlywiki/googleanalytics/settings.tid b/plugins/tiddlywiki/googleanalytics/settings.tid new file mode 100644 index 000000000..d88fe0579 --- /dev/null +++ b/plugins/tiddlywiki/googleanalytics/settings.tid @@ -0,0 +1,7 @@ +title: $:/plugins/tiddlywiki/googleanalytics/settings + +You have only two value to set, only first is mandatory: + +# ''[[Google Analytics Account|$:/GoogleAnalyticsAccount]]'': (mandatory) a code of the form `UA-XXXXXX-XX` where X are digits
<$edit-text tiddler="$:/GoogleAnalyticsAccount" default="" tag="input"/> + +# ''[[Google Analytics Domain|$:/GoogleAnalyticsDomain]]'': (optional) the website URL where the TiddlyWiki file is published. Defaults to `auto` if not set.
<$edit-text tiddler="$:/GoogleAnalyticsDomain" default="" tag="input"/> diff --git a/plugins/tiddlywiki/googleanalytics/usage.tid b/plugins/tiddlywiki/googleanalytics/usage.tid index a59684424..d6572f27d 100644 --- a/plugins/tiddlywiki/googleanalytics/usage.tid +++ b/plugins/tiddlywiki/googleanalytics/usage.tid @@ -1,16 +1,24 @@ title: $:/plugins/tiddlywiki/googleanalytics/usage -These instructions assume you are using TiddlySpot to publish your wiki. +!! Create a Google Analytics account + +If you don't already have an account: # Go to the Google Analytics website: http://www.google.com/analytics/ # Click the ''Access Google Analytics'' button and follow instructions to set up your account -# Enter the name of your TiddlySpot domain, for example "mysite.tiddlyspot.com" -# You will be given your own Tracking ID for this domain -# Go to http://tiddlywiki.com -- open the More/System tab and drag the links to these three tiddlers across to a local copy of your site: -#* [[$:/GoogleAnalyticsDomain]] -#* [[$:/GoogleAnalyticsAccount]] -#* [[$:/plugins/tiddlywiki/googleanalytics]] -# Edit the first two of these tiddlers to reflect your Domain and Tracking ID -# Upload the new version to TiddlySpot or other web host -# Return to your Google Analytics page to check that your site is being tracked +# Enter the URL where the wiki is hosted +# Note the Tracking ID for this domain of the form `UA-XXXXXX-XX` +!! Install the plugin on your local copy of the TiddlyWiki + +# ''Backup your TiddlyWiki''. Just in case +# Install the plugin via the plugin manager in control panel +# Save the TiddlyWiki andrefresh the page to load the plugin +# Go to [[$:/ControlPanel]] > Plugins tab and unfold the Google Analytics Plugin +# Go to the //settings// tab and edit the parameters +# Save the TiddlyWiki + +!! Upload the new version of your TiddlyWiki + +# Upload the saved TiddlyWiki to TiddlySpot, GitHub, GitLab or other web host +# Return to your Google Analytics page to check that your site is being tracked diff --git a/plugins/tiddlywiki/hammerjs/files/LICENSE.markdown b/plugins/tiddlywiki/hammerjs/files/LICENSE.markdown new file mode 100644 index 000000000..ddaf0238d --- /dev/null +++ b/plugins/tiddlywiki/hammerjs/files/LICENSE.markdown @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (C) 2011-2017 by Jorik Tangelder (Eight Media) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/plugins/tiddlywiki/hammerjs/files/hammer.min.v2.0.8.js b/plugins/tiddlywiki/hammerjs/files/hammer.min.v2.0.8.js new file mode 100644 index 000000000..6221643e7 --- /dev/null +++ b/plugins/tiddlywiki/hammerjs/files/hammer.min.v2.0.8.js @@ -0,0 +1,7 @@ +/*! Hammer.JS - v2.0.8 - 2016-04-23 + * http://hammerjs.github.io/ + * + * Copyright (c) 2016 Jorik Tangelder; + * Licensed under the MIT license */ +!function(a,b,c,d){"use strict";function e(a,b,c){return setTimeout(j(a,c),b)}function f(a,b,c){return Array.isArray(a)?(g(a,c[b],c),!0):!1}function g(a,b,c){var e;if(a)if(a.forEach)a.forEach(b,c);else if(a.length!==d)for(e=0;e\s*\(/gm,"{anonymous}()@"):"Unknown Stack Trace",f=a.console&&(a.console.warn||a.console.log);return f&&f.call(a.console,e,d),b.apply(this,arguments)}}function i(a,b,c){var d,e=b.prototype;d=a.prototype=Object.create(e),d.constructor=a,d._super=e,c&&la(d,c)}function j(a,b){return function(){return a.apply(b,arguments)}}function k(a,b){return typeof a==oa?a.apply(b?b[0]||d:d,b):a}function l(a,b){return a===d?b:a}function m(a,b,c){g(q(b),function(b){a.addEventListener(b,c,!1)})}function n(a,b,c){g(q(b),function(b){a.removeEventListener(b,c,!1)})}function o(a,b){for(;a;){if(a==b)return!0;a=a.parentNode}return!1}function p(a,b){return a.indexOf(b)>-1}function q(a){return a.trim().split(/\s+/g)}function r(a,b,c){if(a.indexOf&&!c)return a.indexOf(b);for(var d=0;dc[b]}):d.sort()),d}function u(a,b){for(var c,e,f=b[0].toUpperCase()+b.slice(1),g=0;g1&&!c.firstMultiple?c.firstMultiple=D(b):1===e&&(c.firstMultiple=!1);var f=c.firstInput,g=c.firstMultiple,h=g?g.center:f.center,i=b.center=E(d);b.timeStamp=ra(),b.deltaTime=b.timeStamp-f.timeStamp,b.angle=I(h,i),b.distance=H(h,i),B(c,b),b.offsetDirection=G(b.deltaX,b.deltaY);var j=F(b.deltaTime,b.deltaX,b.deltaY);b.overallVelocityX=j.x,b.overallVelocityY=j.y,b.overallVelocity=qa(j.x)>qa(j.y)?j.x:j.y,b.scale=g?K(g.pointers,d):1,b.rotation=g?J(g.pointers,d):0,b.maxPointers=c.prevInput?b.pointers.length>c.prevInput.maxPointers?b.pointers.length:c.prevInput.maxPointers:b.pointers.length,C(c,b);var k=a.element;o(b.srcEvent.target,k)&&(k=b.srcEvent.target),b.target=k}function B(a,b){var c=b.center,d=a.offsetDelta||{},e=a.prevDelta||{},f=a.prevInput||{};b.eventType!==Ea&&f.eventType!==Ga||(e=a.prevDelta={x:f.deltaX||0,y:f.deltaY||0},d=a.offsetDelta={x:c.x,y:c.y}),b.deltaX=e.x+(c.x-d.x),b.deltaY=e.y+(c.y-d.y)}function C(a,b){var c,e,f,g,h=a.lastInterval||b,i=b.timeStamp-h.timeStamp;if(b.eventType!=Ha&&(i>Da||h.velocity===d)){var j=b.deltaX-h.deltaX,k=b.deltaY-h.deltaY,l=F(i,j,k);e=l.x,f=l.y,c=qa(l.x)>qa(l.y)?l.x:l.y,g=G(j,k),a.lastInterval=b}else c=h.velocity,e=h.velocityX,f=h.velocityY,g=h.direction;b.velocity=c,b.velocityX=e,b.velocityY=f,b.direction=g}function D(a){for(var b=[],c=0;ce;)c+=a[e].clientX,d+=a[e].clientY,e++;return{x:pa(c/b),y:pa(d/b)}}function F(a,b,c){return{x:b/a||0,y:c/a||0}}function G(a,b){return a===b?Ia:qa(a)>=qa(b)?0>a?Ja:Ka:0>b?La:Ma}function H(a,b,c){c||(c=Qa);var d=b[c[0]]-a[c[0]],e=b[c[1]]-a[c[1]];return Math.sqrt(d*d+e*e)}function I(a,b,c){c||(c=Qa);var d=b[c[0]]-a[c[0]],e=b[c[1]]-a[c[1]];return 180*Math.atan2(e,d)/Math.PI}function J(a,b){return I(b[1],b[0],Ra)+I(a[1],a[0],Ra)}function K(a,b){return H(b[0],b[1],Ra)/H(a[0],a[1],Ra)}function L(){this.evEl=Ta,this.evWin=Ua,this.pressed=!1,x.apply(this,arguments)}function M(){this.evEl=Xa,this.evWin=Ya,x.apply(this,arguments),this.store=this.manager.session.pointerEvents=[]}function N(){this.evTarget=$a,this.evWin=_a,this.started=!1,x.apply(this,arguments)}function O(a,b){var c=s(a.touches),d=s(a.changedTouches);return b&(Ga|Ha)&&(c=t(c.concat(d),"identifier",!0)),[c,d]}function P(){this.evTarget=bb,this.targetIds={},x.apply(this,arguments)}function Q(a,b){var c=s(a.touches),d=this.targetIds;if(b&(Ea|Fa)&&1===c.length)return d[c[0].identifier]=!0,[c,c];var e,f,g=s(a.changedTouches),h=[],i=this.target;if(f=c.filter(function(a){return o(a.target,i)}),b===Ea)for(e=0;e-1&&d.splice(a,1)};setTimeout(e,cb)}}function U(a){for(var b=a.srcEvent.clientX,c=a.srcEvent.clientY,d=0;d=f&&db>=g)return!0}return!1}function V(a,b){this.manager=a,this.set(b)}function W(a){if(p(a,jb))return jb;var b=p(a,kb),c=p(a,lb);return b&&c?jb:b||c?b?kb:lb:p(a,ib)?ib:hb}function X(){if(!fb)return!1;var b={},c=a.CSS&&a.CSS.supports;return["auto","manipulation","pan-y","pan-x","pan-x pan-y","none"].forEach(function(d){b[d]=c?a.CSS.supports("touch-action",d):!0}),b}function Y(a){this.options=la({},this.defaults,a||{}),this.id=v(),this.manager=null,this.options.enable=l(this.options.enable,!0),this.state=nb,this.simultaneous={},this.requireFail=[]}function Z(a){return a&sb?"cancel":a&qb?"end":a&pb?"move":a&ob?"start":""}function $(a){return a==Ma?"down":a==La?"up":a==Ja?"left":a==Ka?"right":""}function _(a,b){var c=b.manager;return c?c.get(a):a}function aa(){Y.apply(this,arguments)}function ba(){aa.apply(this,arguments),this.pX=null,this.pY=null}function ca(){aa.apply(this,arguments)}function da(){Y.apply(this,arguments),this._timer=null,this._input=null}function ea(){aa.apply(this,arguments)}function fa(){aa.apply(this,arguments)}function ga(){Y.apply(this,arguments),this.pTime=!1,this.pCenter=!1,this._timer=null,this._input=null,this.count=0}function ha(a,b){return b=b||{},b.recognizers=l(b.recognizers,ha.defaults.preset),new ia(a,b)}function ia(a,b){this.options=la({},ha.defaults,b||{}),this.options.inputTarget=this.options.inputTarget||a,this.handlers={},this.session={},this.recognizers=[],this.oldCssProps={},this.element=a,this.input=y(this),this.touchAction=new V(this,this.options.touchAction),ja(this,!0),g(this.options.recognizers,function(a){var b=this.add(new a[0](a[1]));a[2]&&b.recognizeWith(a[2]),a[3]&&b.requireFailure(a[3])},this)}function ja(a,b){var c=a.element;if(c.style){var d;g(a.options.cssProps,function(e,f){d=u(c.style,f),b?(a.oldCssProps[d]=c.style[d],c.style[d]=e):c.style[d]=a.oldCssProps[d]||""}),b||(a.oldCssProps={})}}function ka(a,c){var d=b.createEvent("Event");d.initEvent(a,!0,!0),d.gesture=c,c.target.dispatchEvent(d)}var la,ma=["","webkit","Moz","MS","ms","o"],na=b.createElement("div"),oa="function",pa=Math.round,qa=Math.abs,ra=Date.now;la="function"!=typeof Object.assign?function(a){if(a===d||null===a)throw new TypeError("Cannot convert undefined or null to object");for(var b=Object(a),c=1;ch&&(b.push(a),h=b.length-1):e&(Ga|Ha)&&(c=!0),0>h||(b[h]=a,this.callback(this.manager,e,{pointers:b,changedPointers:[a],pointerType:f,srcEvent:a}),c&&b.splice(h,1))}});var Za={touchstart:Ea,touchmove:Fa,touchend:Ga,touchcancel:Ha},$a="touchstart",_a="touchstart touchmove touchend touchcancel";i(N,x,{handler:function(a){var b=Za[a.type];if(b===Ea&&(this.started=!0),this.started){var c=O.call(this,a,b);b&(Ga|Ha)&&c[0].length-c[1].length===0&&(this.started=!1),this.callback(this.manager,b,{pointers:c[0],changedPointers:c[1],pointerType:za,srcEvent:a})}}});var ab={touchstart:Ea,touchmove:Fa,touchend:Ga,touchcancel:Ha},bb="touchstart touchmove touchend touchcancel";i(P,x,{handler:function(a){var b=ab[a.type],c=Q.call(this,a,b);c&&this.callback(this.manager,b,{pointers:c[0],changedPointers:c[1],pointerType:za,srcEvent:a})}});var cb=2500,db=25;i(R,x,{handler:function(a,b,c){var d=c.pointerType==za,e=c.pointerType==Ba;if(!(e&&c.sourceCapabilities&&c.sourceCapabilities.firesTouchEvents)){if(d)S.call(this,b,c);else if(e&&U.call(this,c))return;this.callback(a,b,c)}},destroy:function(){this.touch.destroy(),this.mouse.destroy()}});var eb=u(na.style,"touchAction"),fb=eb!==d,gb="compute",hb="auto",ib="manipulation",jb="none",kb="pan-x",lb="pan-y",mb=X();V.prototype={set:function(a){a==gb&&(a=this.compute()),fb&&this.manager.element.style&&mb[a]&&(this.manager.element.style[eb]=a),this.actions=a.toLowerCase().trim()},update:function(){this.set(this.manager.options.touchAction)},compute:function(){var a=[];return g(this.manager.recognizers,function(b){k(b.options.enable,[b])&&(a=a.concat(b.getTouchAction()))}),W(a.join(" "))},preventDefaults:function(a){var b=a.srcEvent,c=a.offsetDirection;if(this.manager.session.prevented)return void b.preventDefault();var d=this.actions,e=p(d,jb)&&!mb[jb],f=p(d,lb)&&!mb[lb],g=p(d,kb)&&!mb[kb];if(e){var h=1===a.pointers.length,i=a.distance<2,j=a.deltaTime<250;if(h&&i&&j)return}return g&&f?void 0:e||f&&c&Na||g&&c&Oa?this.preventSrc(b):void 0},preventSrc:function(a){this.manager.session.prevented=!0,a.preventDefault()}};var nb=1,ob=2,pb=4,qb=8,rb=qb,sb=16,tb=32;Y.prototype={defaults:{},set:function(a){return la(this.options,a),this.manager&&this.manager.touchAction.update(),this},recognizeWith:function(a){if(f(a,"recognizeWith",this))return this;var b=this.simultaneous;return a=_(a,this),b[a.id]||(b[a.id]=a,a.recognizeWith(this)),this},dropRecognizeWith:function(a){return f(a,"dropRecognizeWith",this)?this:(a=_(a,this),delete this.simultaneous[a.id],this)},requireFailure:function(a){if(f(a,"requireFailure",this))return this;var b=this.requireFail;return a=_(a,this),-1===r(b,a)&&(b.push(a),a.requireFailure(this)),this},dropRequireFailure:function(a){if(f(a,"dropRequireFailure",this))return this;a=_(a,this);var b=r(this.requireFail,a);return b>-1&&this.requireFail.splice(b,1),this},hasRequireFailures:function(){return this.requireFail.length>0},canRecognizeWith:function(a){return!!this.simultaneous[a.id]},emit:function(a){function b(b){c.manager.emit(b,a)}var c=this,d=this.state;qb>d&&b(c.options.event+Z(d)),b(c.options.event),a.additionalEvent&&b(a.additionalEvent),d>=qb&&b(c.options.event+Z(d))},tryEmit:function(a){return this.canEmit()?this.emit(a):void(this.state=tb)},canEmit:function(){for(var a=0;af?Ja:Ka,c=f!=this.pX,d=Math.abs(a.deltaX)):(e=0===g?Ia:0>g?La:Ma,c=g!=this.pY,d=Math.abs(a.deltaY))),a.direction=e,c&&d>b.threshold&&e&b.direction},attrTest:function(a){return aa.prototype.attrTest.call(this,a)&&(this.state&ob||!(this.state&ob)&&this.directionTest(a))},emit:function(a){this.pX=a.deltaX,this.pY=a.deltaY;var b=$(a.direction);b&&(a.additionalEvent=this.options.event+b),this._super.emit.call(this,a)}}),i(ca,aa,{defaults:{event:"pinch",threshold:0,pointers:2},getTouchAction:function(){return[jb]},attrTest:function(a){return this._super.attrTest.call(this,a)&&(Math.abs(a.scale-1)>this.options.threshold||this.state&ob)},emit:function(a){if(1!==a.scale){var b=a.scale<1?"in":"out";a.additionalEvent=this.options.event+b}this._super.emit.call(this,a)}}),i(da,Y,{defaults:{event:"press",pointers:1,time:251,threshold:9},getTouchAction:function(){return[hb]},process:function(a){var b=this.options,c=a.pointers.length===b.pointers,d=a.distanceb.time;if(this._input=a,!d||!c||a.eventType&(Ga|Ha)&&!f)this.reset();else if(a.eventType&Ea)this.reset(),this._timer=e(function(){this.state=rb,this.tryEmit()},b.time,this);else if(a.eventType&Ga)return rb;return tb},reset:function(){clearTimeout(this._timer)},emit:function(a){this.state===rb&&(a&&a.eventType&Ga?this.manager.emit(this.options.event+"up",a):(this._input.timeStamp=ra(),this.manager.emit(this.options.event,this._input)))}}),i(ea,aa,{defaults:{event:"rotate",threshold:0,pointers:2},getTouchAction:function(){return[jb]},attrTest:function(a){return this._super.attrTest.call(this,a)&&(Math.abs(a.rotation)>this.options.threshold||this.state&ob)}}),i(fa,aa,{defaults:{event:"swipe",threshold:10,velocity:.3,direction:Na|Oa,pointers:1},getTouchAction:function(){return ba.prototype.getTouchAction.call(this)},attrTest:function(a){var b,c=this.options.direction;return c&(Na|Oa)?b=a.overallVelocity:c&Na?b=a.overallVelocityX:c&Oa&&(b=a.overallVelocityY),this._super.attrTest.call(this,a)&&c&a.offsetDirection&&a.distance>this.options.threshold&&a.maxPointers==this.options.pointers&&qa(b)>this.options.velocity&&a.eventType&Ga},emit:function(a){var b=$(a.offsetDirection);b&&this.manager.emit(this.options.event+b,a),this.manager.emit(this.options.event,a)}}),i(ga,Y,{defaults:{event:"tap",pointers:1,taps:1,interval:300,time:250,threshold:9,posThreshold:10},getTouchAction:function(){return[ib]},process:function(a){var b=this.options,c=a.pointers.length===b.pointers,d=a.distance=5.0.0", + "list": "readme license" +} diff --git a/plugins/tiddlywiki/hammerjs/readme.tid b/plugins/tiddlywiki/hammerjs/readme.tid new file mode 100644 index 000000000..cab685002 --- /dev/null +++ b/plugins/tiddlywiki/hammerjs/readme.tid @@ -0,0 +1,3 @@ +title: $:/plugins/tiddlywiki/hammerjs/readme + +This plugin packages [[HammerJS|https://hammerjs.github.io]] for use by other plugins. It does not provide any end-user visible features. diff --git a/plugins/tiddlywiki/help/styles.tid b/plugins/tiddlywiki/help/styles.tid index 51ac25a90..7d70efc98 100644 --- a/plugins/tiddlywiki/help/styles.tid +++ b/plugins/tiddlywiki/help/styles.tid @@ -9,7 +9,7 @@ tags: [[$:/tags/Stylesheet]] right: 0; width: 310px; height: 400px; - overflow: scroll; + overflow: auto; -webkit-overflow-scrolling: touch; <> border: 1px solid <>; diff --git a/plugins/tiddlywiki/help/tabs/Videos.tid b/plugins/tiddlywiki/help/tabs/Videos.tid index 9744a5cc7..84a4b71ee 100644 --- a/plugins/tiddlywiki/help/tabs/Videos.tid +++ b/plugins/tiddlywiki/help/tabs/Videos.tid @@ -3,7 +3,7 @@ tags: $:/tags/HelpPanel caption: Videos \define show-video-inner(embed) - + \end \define show-video(title) diff --git a/plugins/tiddlywiki/highlight/TypeMappings.multids b/plugins/tiddlywiki/highlight/TypeMappings.multids new file mode 100644 index 000000000..9e07d07bd --- /dev/null +++ b/plugins/tiddlywiki/highlight/TypeMappings.multids @@ -0,0 +1,8 @@ +title: $:/config/HighlightPlugin/TypeMappings/ + +application/javascript: javascript +application/json: json +text/css: css +text/html: html +image/svg+xml: xml +text/x-markdown: markdown diff --git a/plugins/tiddlywiki/highlight/highlightblock.js b/plugins/tiddlywiki/highlight/highlightblock.js index a2187e8d7..22ba0d7d0 100644 --- a/plugins/tiddlywiki/highlight/highlightblock.js +++ b/plugins/tiddlywiki/highlight/highlightblock.js @@ -12,6 +12,8 @@ Wraps up the fenced code blocks parser for highlight and use in TiddlyWiki5 /*global $tw: false */ "use strict"; +var TYPE_MAPPINGS_BASE = "$:/config/HighlightPlugin/TypeMappings/"; + var CodeBlockWidget = require("$:/core/modules/widgets/codeblock.js").codeblock; var hljs = require("$:/plugins/tiddlywiki/highlight/highlight.js"); @@ -19,18 +21,23 @@ var hljs = require("$:/plugins/tiddlywiki/highlight/highlight.js"); hljs.configure({tabReplace: " "}); CodeBlockWidget.prototype.postRender = function() { - var domNode = this.domNodes[0]; - if($tw.browser && this.document !== $tw.fakeDocument && this.language) { - domNode.className = this.language.toLowerCase(); - hljs.highlightBlock(domNode); - } else if(!$tw.browser && this.language && this.language.indexOf("/") === -1 ){ - try { - domNode.className = this.language.toLowerCase() + " hljs"; - domNode.children[0].innerHTML = hljs.fixMarkup(hljs.highlight(this.language, this.getAttribute("code")).value); - } - catch(err) { - // Can't easily tell if a language is registered or not in the packed version of hightlight.js, - // so we silently fail and the codeblock remains unchanged + var domNode = this.domNodes[0], + language = this.language, + tiddler = this.wiki.getTiddler(TYPE_MAPPINGS_BASE + language); + if(tiddler) { + language = tiddler.fields.text || ""; + } + if(language && hljs.listLanguages().indexOf(language) !== -1) { + domNode.className = language.toLowerCase() + " hljs"; + if($tw.browser && !domNode.isTiddlyWikiFakeDom) { + hljs.highlightBlock(domNode); + } else { + var text = domNode.textContent; + domNode.children[0].innerHTML = hljs.fixMarkup(hljs.highlight(language,text).value); + // If we're using the fakedom then specially save the original raw text + if(domNode.isTiddlyWikiFakeDom) { + domNode.children[0].textInnerHTML = text; + } } } }; diff --git a/plugins/tiddlywiki/highlight/readme.tid b/plugins/tiddlywiki/highlight/readme.tid index 2b645432a..59001fc85 100644 --- a/plugins/tiddlywiki/highlight/readme.tid +++ b/plugins/tiddlywiki/highlight/readme.tid @@ -45,3 +45,4 @@ The plugin includes support for the following languages (referred to as "brushes * sql * xml +You can also specify the language as a MIME content type (eg `text/html` or `text/css`). The mapping is accomplished via mapping tiddlers whose titles start with `$:/config/HighlightPlugin/TypeMappings/`. diff --git a/plugins/tiddlywiki/jszip/files/jszip.min.v2.5.0.js b/plugins/tiddlywiki/jszip/files/jszip.min.v2.5.0.js deleted file mode 100755 index a09f35b86..000000000 --- a/plugins/tiddlywiki/jszip/files/jszip.min.v2.5.0.js +++ /dev/null @@ -1,14 +0,0 @@ -/*! - -JSZip - A Javascript class for generating and reading zip files - - -(c) 2009-2014 Stuart Knightley -Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown. - -JSZip uses the library pako released under the MIT license : -https://github.com/nodeca/pako/blob/master/LICENSE -*/ -!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;"undefined"!=typeof window?b=window:"undefined"!=typeof global?b=global:"undefined"!=typeof self&&(b=self),b.JSZip=a()}}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g>2,g=(3&b)<<4|c>>4,h=(15&c)<<2|e>>6,i=63&e,isNaN(c)?h=i=64:isNaN(e)&&(i=64),j=j+d.charAt(f)+d.charAt(g)+d.charAt(h)+d.charAt(i);return j},c.decode=function(a){var b,c,e,f,g,h,i,j="",k=0;for(a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");k>4,c=(15&g)<<4|h>>2,e=(3&h)<<6|i,j+=String.fromCharCode(b),64!=h&&(j+=String.fromCharCode(c)),64!=i&&(j+=String.fromCharCode(e));return j}},{}],2:[function(a,b){"use strict";function c(){this.compressedSize=0,this.uncompressedSize=0,this.crc32=0,this.compressionMethod=null,this.compressedContent=null}c.prototype={getContent:function(){return null},getCompressedContent:function(){return null}},b.exports=c},{}],3:[function(a,b,c){"use strict";c.STORE={magic:"\x00\x00",compress:function(a){return a},uncompress:function(a){return a},compressInputType:null,uncompressInputType:null},c.DEFLATE=a("./flate")},{"./flate":8}],4:[function(a,b){"use strict";var c=a("./utils"),d=[0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918e3,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117];b.exports=function(a,b){if("undefined"==typeof a||!a.length)return 0;var e="string"!==c.getTypeOf(a);"undefined"==typeof b&&(b=0);var f=0,g=0,h=0;b=-1^b;for(var i=0,j=a.length;j>i;i++)h=e?a[i]:a.charCodeAt(i),g=255&(b^h),f=d[g],b=b>>>8^f;return-1^b}},{"./utils":21}],5:[function(a,b){"use strict";function c(){this.data=null,this.length=0,this.index=0}var d=a("./utils");c.prototype={checkOffset:function(a){this.checkIndex(this.index+a)},checkIndex:function(a){if(this.lengtha)throw new Error("End of data reached (data length = "+this.length+", asked index = "+a+"). Corrupted zip ?")},setIndex:function(a){this.checkIndex(a),this.index=a},skip:function(a){this.setIndex(this.index+a)},byteAt:function(){},readInt:function(a){var b,c=0;for(this.checkOffset(a),b=this.index+a-1;b>=this.index;b--)c=(c<<8)+this.byteAt(b);return this.index+=a,c},readString:function(a){return d.transformTo("string",this.readData(a))},readData:function(){},lastIndexOfSignature:function(){},readDate:function(){var a=this.readInt(4);return new Date((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&31,a>>5&63,(31&a)<<1)}},b.exports=c},{"./utils":21}],6:[function(a,b,c){"use strict";c.base64=!1,c.binary=!1,c.dir=!1,c.createFolders=!1,c.date=null,c.compression=null,c.compressionOptions=null,c.comment=null,c.unixPermissions=null,c.dosPermissions=null},{}],7:[function(a,b,c){"use strict";var d=a("./utils");c.string2binary=function(a){return d.string2binary(a)},c.string2Uint8Array=function(a){return d.transformTo("uint8array",a)},c.uint8Array2String=function(a){return d.transformTo("string",a)},c.string2Blob=function(a){var b=d.transformTo("arraybuffer",a);return d.arrayBuffer2Blob(b)},c.arrayBuffer2Blob=function(a){return d.arrayBuffer2Blob(a)},c.transformTo=function(a,b){return d.transformTo(a,b)},c.getTypeOf=function(a){return d.getTypeOf(a)},c.checkSupport=function(a){return d.checkSupport(a)},c.MAX_VALUE_16BITS=d.MAX_VALUE_16BITS,c.MAX_VALUE_32BITS=d.MAX_VALUE_32BITS,c.pretty=function(a){return d.pretty(a)},c.findCompression=function(a){return d.findCompression(a)},c.isRegExp=function(a){return d.isRegExp(a)}},{"./utils":21}],8:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,e=a("pako");c.uncompressInputType=d?"uint8array":"array",c.compressInputType=d?"uint8array":"array",c.magic="\b\x00",c.compress=function(a,b){return e.deflateRaw(a,{level:b.level||-1})},c.uncompress=function(a){return e.inflateRaw(a)}},{pako:24}],9:[function(a,b){"use strict";function c(a,b){return this instanceof c?(this.files={},this.comment=null,this.root="",a&&this.load(a,b),void(this.clone=function(){var a=new c;for(var b in this)"function"!=typeof this[b]&&(a[b]=this[b]);return a})):new c(a,b)}var d=a("./base64");c.prototype=a("./object"),c.prototype.load=a("./load"),c.support=a("./support"),c.defaults=a("./defaults"),c.utils=a("./deprecatedPublicUtils"),c.base64={encode:function(a){return d.encode(a)},decode:function(a){return d.decode(a)}},c.compressions=a("./compressions"),b.exports=c},{"./base64":1,"./compressions":3,"./defaults":6,"./deprecatedPublicUtils":7,"./load":10,"./object":13,"./support":17}],10:[function(a,b){"use strict";var c=a("./base64"),d=a("./zipEntries");b.exports=function(a,b){var e,f,g,h;for(b=b||{},b.base64&&(a=c.decode(a)),f=new d(a,b),e=f.files,g=0;gc;c++)d+=String.fromCharCode(255&a),a>>>=8;return d},t=function(){var a,b,c={};for(a=0;a0?a.substring(0,b):""},x=function(a){return"/"!=a.slice(-1)&&(a+="/"),a},y=function(a,b){return b="undefined"!=typeof b?b:!1,a=x(a),this.files[a]||v.call(this,a,null,{dir:!0,createFolders:b}),this.files[a]},z=function(a,b,c){var f,g=new j;return a._data instanceof j?(g.uncompressedSize=a._data.uncompressedSize,g.crc32=a._data.crc32,0===g.uncompressedSize||a.dir?(b=i.STORE,g.compressedContent="",g.crc32=0):a._data.compressionMethod===b.magic?g.compressedContent=a._data.getCompressedContent():(f=a._data.getContent(),g.compressedContent=b.compress(d.transformTo(b.compressInputType,f),c))):(f=p(a),(!f||0===f.length||a.dir)&&(b=i.STORE,f=""),g.uncompressedSize=f.length,g.crc32=e(f),g.compressedContent=b.compress(d.transformTo(b.compressInputType,f),c)),g.compressedSize=g.compressedContent.length,g.compressionMethod=b.magic,g},A=function(a,b){var c=a;return a||(c=b?16893:33204),(65535&c)<<16},B=function(a){return 63&(a||0)},C=function(a,b,c,g,h){var i,j,k,m,n=(c.compressedContent,d.transformTo("string",l.utf8encode(b.name))),o=b.comment||"",p=d.transformTo("string",l.utf8encode(o)),q=n.length!==b.name.length,r=p.length!==o.length,t=b.options,u="",v="",w="";k=b._initialMetadata.dir!==b.dir?b.dir:t.dir,m=b._initialMetadata.date!==b.date?b.date:t.date;var x=0,y=0;k&&(x|=16),"UNIX"===h?(y=798,x|=A(b.unixPermissions,k)):(y=20,x|=B(b.dosPermissions,k)),i=m.getHours(),i<<=6,i|=m.getMinutes(),i<<=5,i|=m.getSeconds()/2,j=m.getFullYear()-1980,j<<=4,j|=m.getMonth()+1,j<<=5,j|=m.getDate(),q&&(v=s(1,1)+s(e(n),4)+n,u+="up"+s(v.length,2)+v),r&&(w=s(1,1)+s(this.crc32(p),4)+p,u+="uc"+s(w.length,2)+w);var z="";z+="\n\x00",z+=q||r?"\x00\b":"\x00\x00",z+=c.compressionMethod,z+=s(i,2),z+=s(j,2),z+=s(c.crc32,4),z+=s(c.compressedSize,4),z+=s(c.uncompressedSize,4),z+=s(n.length,2),z+=s(u.length,2);var C=f.LOCAL_FILE_HEADER+z+n+u,D=f.CENTRAL_FILE_HEADER+s(y,2)+z+s(p.length,2)+"\x00\x00\x00\x00"+s(x,4)+s(g,4)+n+u+p;return{fileRecord:C,dirRecord:D,compressedObject:c}},D={load:function(){throw new Error("Load method is not defined. Is the file jszip-load.js included ?")},filter:function(a){var b,c,d,e,f=[];for(b in this.files)this.files.hasOwnProperty(b)&&(d=this.files[b],e=new r(d.name,d._data,t(d.options)),c=b.slice(this.root.length,b.length),b.slice(0,this.root.length)===this.root&&a(c,e)&&f.push(e));return f},file:function(a,b,c){if(1===arguments.length){if(d.isRegExp(a)){var e=a;return this.filter(function(a,b){return!b.dir&&e.test(a)})}return this.filter(function(b,c){return!c.dir&&b===a})[0]||null}return a=this.root+a,v.call(this,a,b,c),this},folder:function(a){if(!a)return this;if(d.isRegExp(a))return this.filter(function(b,c){return c.dir&&a.test(b)});var b=this.root+a,c=y.call(this,b),e=this.clone();return e.root=c.name,e},remove:function(a){a=this.root+a;var b=this.files[a];if(b||("/"!=a.slice(-1)&&(a+="/"),b=this.files[a]),b&&!b.dir)delete this.files[a];else for(var c=this.filter(function(b,c){return c.name.slice(0,a.length)===a}),d=0;d=0;--f)if(this.data[f]===b&&this.data[f+1]===c&&this.data[f+2]===d&&this.data[f+3]===e)return f;return-1},c.prototype.readData=function(a){if(this.checkOffset(a),0===a)return new Uint8Array(0);var b=this.data.subarray(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./dataReader":5}],19:[function(a,b){"use strict";var c=a("./utils"),d=function(a){this.data=new Uint8Array(a),this.index=0};d.prototype={append:function(a){0!==a.length&&(a=c.transformTo("uint8array",a),this.data.set(a,this.index),this.index+=a.length)},finalize:function(){return this.data}},b.exports=d},{"./utils":21}],20:[function(a,b,c){"use strict";for(var d=a("./utils"),e=a("./support"),f=a("./nodeBuffer"),g=new Array(256),h=0;256>h;h++)g[h]=h>=252?6:h>=248?5:h>=240?4:h>=224?3:h>=192?2:1;g[254]=g[254]=1;var i=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=e.uint8array?new Uint8Array(i):new Array(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},j=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+g[a[c]]>b?c:b},k=function(a){var b,c,e,f,h=a.length,i=new Array(2*h);for(c=0,b=0;h>b;)if(e=a[b++],128>e)i[c++]=e;else if(f=g[e],f>4)i[c++]=65533,b+=f-1;else{for(e&=2===f?31:3===f?15:7;f>1&&h>b;)e=e<<6|63&a[b++],f--;f>1?i[c++]=65533:65536>e?i[c++]=e:(e-=65536,i[c++]=55296|e>>10&1023,i[c++]=56320|1023&e)}return i.length!==c&&(i.subarray?i=i.subarray(0,c):i.length=c),d.applyFromCharCode(i)};c.utf8encode=function(a){return e.nodebuffer?f(a,"utf-8"):i(a)},c.utf8decode=function(a){if(e.nodebuffer)return d.transformTo("nodebuffer",a).toString("utf-8");a=d.transformTo(e.uint8array?"uint8array":"array",a);for(var b=[],c=0,f=a.length,g=65536;f>c;){var h=j(a,Math.min(c+g,f));b.push(e.uint8array?k(a.subarray(c,h)):k(a.slice(c,h))),c=h}return b.join("")}},{"./nodeBuffer":11,"./support":17,"./utils":21}],21:[function(a,b,c){"use strict";function d(a){return a}function e(a,b){for(var c=0;cg&&b>1;)try{d.push("array"===f||"nodebuffer"===f?String.fromCharCode.apply(null,a.slice(g,Math.min(g+b,e))):String.fromCharCode.apply(null,a.subarray(g,Math.min(g+b,e)))),g+=b}catch(i){b=Math.floor(b/2)}return d.join("")}function g(a,b){for(var c=0;cb?"0":"")+b.toString(16).toUpperCase();return d},c.findCompression=function(a){for(var b in i)if(i.hasOwnProperty(b)&&i[b].magic===a)return i[b];return null},c.isRegExp=function(a){return"[object RegExp]"===Object.prototype.toString.call(a)}},{"./compressions":3,"./nodeBuffer":11,"./support":17}],22:[function(a,b){"use strict";function c(a,b){this.files=[],this.loadOptions=b,a&&this.load(a)}var d=a("./stringReader"),e=a("./nodeBufferReader"),f=a("./uint8ArrayReader"),g=a("./utils"),h=a("./signature"),i=a("./zipEntry"),j=a("./support"),k=a("./object");c.prototype={checkSignature:function(a){var b=this.reader.readString(4);if(b!==a)throw new Error("Corrupted zip or bug : unexpected signature ("+g.pretty(b)+", expected "+g.pretty(a)+")")},readBlockEndOfCentral:function(){this.diskNumber=this.reader.readInt(2),this.diskWithCentralDirStart=this.reader.readInt(2),this.centralDirRecordsOnThisDisk=this.reader.readInt(2),this.centralDirRecords=this.reader.readInt(2),this.centralDirSize=this.reader.readInt(4),this.centralDirOffset=this.reader.readInt(4),this.zipCommentLength=this.reader.readInt(2),this.zipComment=this.reader.readString(this.zipCommentLength),this.zipComment=k.utf8decode(this.zipComment)},readBlockZip64EndOfCentral:function(){this.zip64EndOfCentralSize=this.reader.readInt(8),this.versionMadeBy=this.reader.readString(2),this.versionNeeded=this.reader.readInt(2),this.diskNumber=this.reader.readInt(4),this.diskWithCentralDirStart=this.reader.readInt(4),this.centralDirRecordsOnThisDisk=this.reader.readInt(8),this.centralDirRecords=this.reader.readInt(8),this.centralDirSize=this.reader.readInt(8),this.centralDirOffset=this.reader.readInt(8),this.zip64ExtensibleData={};for(var a,b,c,d=this.zip64EndOfCentralSize-44,e=0;d>e;)a=this.reader.readInt(2),b=this.reader.readInt(4),c=this.reader.readString(b),this.zip64ExtensibleData[a]={id:a,length:b,value:c}},readBlockZip64EndOfCentralLocator:function(){if(this.diskWithZip64CentralDirStart=this.reader.readInt(4),this.relativeOffsetEndOfZip64CentralDir=this.reader.readInt(8),this.disksCount=this.reader.readInt(4),this.disksCount>1)throw new Error("Multi-volumes zip are not supported")},readLocalFiles:function(){var a,b;for(a=0;a>8;this.dir=16&this.externalFileAttributes?!0:!1,a===h&&(this.dosPermissions=63&this.externalFileAttributes),a===i&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileName.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(){if(this.extraFields[1]){var a=new d(this.extraFields[1].value);this.uncompressedSize===e.MAX_VALUE_32BITS&&(this.uncompressedSize=a.readInt(8)),this.compressedSize===e.MAX_VALUE_32BITS&&(this.compressedSize=a.readInt(8)),this.localHeaderOffset===e.MAX_VALUE_32BITS&&(this.localHeaderOffset=a.readInt(8)),this.diskNumberStart===e.MAX_VALUE_32BITS&&(this.diskNumberStart=a.readInt(4))}},readExtraFields:function(a){var b,c,d,e=a.index;for(this.extraFields=this.extraFields||{};a.index0?b.windowBits=-b.windowBits:b.gzip&&b.windowBits>0&&b.windowBits<16&&(b.windowBits+=16),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new k,this.strm.avail_out=0;var c=g.deflateInit2(this.strm,b.level,b.method,b.windowBits,b.memLevel,b.strategy);if(c!==n)throw new Error(j[c]);b.header&&g.deflateSetHeader(this.strm,b.header)};s.prototype.push=function(a,b){var c,d,e=this.strm,f=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?m:l,e.input="string"==typeof a?i.string2buf(a):a,e.next_in=0,e.avail_in=e.input.length;do{if(0===e.avail_out&&(e.output=new h.Buf8(f),e.next_out=0,e.avail_out=f),c=g.deflate(e,d),c!==o&&c!==n)return this.onEnd(c),this.ended=!0,!1;(0===e.avail_out||0===e.avail_in&&d===m)&&this.onData("string"===this.options.to?i.buf2binstring(h.shrinkBuf(e.output,e.next_out)):h.shrinkBuf(e.output,e.next_out))}while((e.avail_in>0||0===e.avail_out)&&c!==o);return d===m?(c=g.deflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===n):!0},s.prototype.onData=function(a){this.chunks.push(a)},s.prototype.onEnd=function(a){a===n&&(this.result="string"===this.options.to?this.chunks.join(""):h.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Deflate=s,c.deflate=d,c.deflateRaw=e,c.gzip=f},{"./utils/common":27,"./utils/strings":28,"./zlib/deflate.js":32,"./zlib/messages":37,"./zlib/zstream":39}],26:[function(a,b,c){"use strict";function d(a,b){var c=new m(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function e(a,b){return b=b||{},b.raw=!0,d(a,b)}var f=a("./zlib/inflate.js"),g=a("./utils/common"),h=a("./utils/strings"),i=a("./zlib/constants"),j=a("./zlib/messages"),k=a("./zlib/zstream"),l=a("./zlib/gzheader"),m=function(a){this.options=g.assign({chunkSize:16384,windowBits:0,to:""},a||{});var b=this.options;b.raw&&b.windowBits>=0&&b.windowBits<16&&(b.windowBits=-b.windowBits,0===b.windowBits&&(b.windowBits=-15)),!(b.windowBits>=0&&b.windowBits<16)||a&&a.windowBits||(b.windowBits+=32),b.windowBits>15&&b.windowBits<48&&0===(15&b.windowBits)&&(b.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new k,this.strm.avail_out=0;var c=f.inflateInit2(this.strm,b.windowBits);if(c!==i.Z_OK)throw new Error(j[c]);this.header=new l,f.inflateGetHeader(this.strm,this.header)};m.prototype.push=function(a,b){var c,d,e,j,k,l=this.strm,m=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?i.Z_FINISH:i.Z_NO_FLUSH,l.input="string"==typeof a?h.binstring2buf(a):a,l.next_in=0,l.avail_in=l.input.length;do{if(0===l.avail_out&&(l.output=new g.Buf8(m),l.next_out=0,l.avail_out=m),c=f.inflate(l,i.Z_NO_FLUSH),c!==i.Z_STREAM_END&&c!==i.Z_OK)return this.onEnd(c),this.ended=!0,!1;l.next_out&&(0===l.avail_out||c===i.Z_STREAM_END||0===l.avail_in&&d===i.Z_FINISH)&&("string"===this.options.to?(e=h.utf8border(l.output,l.next_out),j=l.next_out-e,k=h.buf2string(l.output,e),l.next_out=j,l.avail_out=m-j,j&&g.arraySet(l.output,l.output,e,j,0),this.onData(k)):this.onData(g.shrinkBuf(l.output,l.next_out)))}while(l.avail_in>0&&c!==i.Z_STREAM_END);return c===i.Z_STREAM_END&&(d=i.Z_FINISH),d===i.Z_FINISH?(c=f.inflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===i.Z_OK):!0},m.prototype.onData=function(a){this.chunks.push(a)},m.prototype.onEnd=function(a){a===i.Z_OK&&(this.result="string"===this.options.to?this.chunks.join(""):g.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Inflate=m,c.inflate=d,c.inflateRaw=e,c.ungzip=d},{"./utils/common":27,"./utils/strings":28,"./zlib/constants":30,"./zlib/gzheader":33,"./zlib/inflate.js":35,"./zlib/messages":37,"./zlib/zstream":39}],27:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;c.assign=function(a){for(var b=Array.prototype.slice.call(arguments,1);b.length;){var c=b.shift();if(c){if("object"!=typeof c)throw new TypeError(c+"must be non-object");for(var d in c)c.hasOwnProperty(d)&&(a[d]=c[d])}}return a},c.shrinkBuf=function(a,b){return a.length===b?a:a.subarray?a.subarray(0,b):(a.length=b,a)};var e={arraySet:function(a,b,c,d,e){if(b.subarray&&a.subarray)return void a.set(b.subarray(c,c+d),e);for(var f=0;d>f;f++)a[e+f]=b[c+f]},flattenChunks:function(a){var b,c,d,e,f,g;for(d=0,b=0,c=a.length;c>b;b++)d+=a[b].length;for(g=new Uint8Array(d),e=0,b=0,c=a.length;c>b;b++)f=a[b],g.set(f,e),e+=f.length;return g}},f={arraySet:function(a,b,c,d,e){for(var f=0;d>f;f++)a[e+f]=b[c+f]},flattenChunks:function(a){return[].concat.apply([],a)}};c.setTyped=function(a){a?(c.Buf8=Uint8Array,c.Buf16=Uint16Array,c.Buf32=Int32Array,c.assign(c,e)):(c.Buf8=Array,c.Buf16=Array,c.Buf32=Array,c.assign(c,f))},c.setTyped(d)},{}],28:[function(a,b,c){"use strict";function d(a,b){if(65537>b&&(a.subarray&&g||!a.subarray&&f))return String.fromCharCode.apply(null,e.shrinkBuf(a,b));for(var c="",d=0;b>d;d++)c+=String.fromCharCode(a[d]);return c}var e=a("./common"),f=!0,g=!0;try{String.fromCharCode.apply(null,[0])}catch(h){f=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(h){g=!1}for(var i=new e.Buf8(256),j=0;256>j;j++)i[j]=j>=252?6:j>=248?5:j>=240?4:j>=224?3:j>=192?2:1;i[254]=i[254]=1,c.string2buf=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=new e.Buf8(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},c.buf2binstring=function(a){return d(a,a.length)},c.binstring2buf=function(a){for(var b=new e.Buf8(a.length),c=0,d=b.length;d>c;c++)b[c]=a.charCodeAt(c);return b},c.buf2string=function(a,b){var c,e,f,g,h=b||a.length,j=new Array(2*h);for(e=0,c=0;h>c;)if(f=a[c++],128>f)j[e++]=f;else if(g=i[f],g>4)j[e++]=65533,c+=g-1;else{for(f&=2===g?31:3===g?15:7;g>1&&h>c;)f=f<<6|63&a[c++],g--;g>1?j[e++]=65533:65536>f?j[e++]=f:(f-=65536,j[e++]=55296|f>>10&1023,j[e++]=56320|1023&f)}return d(j,e)},c.utf8border=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+i[a[c]]>b?c:b}},{"./common":27}],29:[function(a,b){"use strict";function c(a,b,c,d){for(var e=65535&a|0,f=a>>>16&65535|0,g=0;0!==c;){g=c>2e3?2e3:c,c-=g;do e=e+b[d++]|0,f=f+e|0;while(--g);e%=65521,f%=65521}return e|f<<16|0}b.exports=c},{}],30:[function(a,b){b.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},{}],31:[function(a,b){"use strict";function c(){for(var a,b=[],c=0;256>c;c++){a=c;for(var d=0;8>d;d++)a=1&a?3988292384^a>>>1:a>>>1;b[c]=a}return b}function d(a,b,c,d){var f=e,g=d+c;a=-1^a;for(var h=d;g>h;h++)a=a>>>8^f[255&(a^b[h])];return-1^a}var e=c();b.exports=d},{}],32:[function(a,b,c){"use strict";function d(a,b){return a.msg=G[b],b}function e(a){return(a<<1)-(a>4?9:0)}function f(a){for(var b=a.length;--b>=0;)a[b]=0}function g(a){var b=a.state,c=b.pending;c>a.avail_out&&(c=a.avail_out),0!==c&&(C.arraySet(a.output,b.pending_buf,b.pending_out,c,a.next_out),a.next_out+=c,b.pending_out+=c,a.total_out+=c,a.avail_out-=c,b.pending-=c,0===b.pending&&(b.pending_out=0))}function h(a,b){D._tr_flush_block(a,a.block_start>=0?a.block_start:-1,a.strstart-a.block_start,b),a.block_start=a.strstart,g(a.strm)}function i(a,b){a.pending_buf[a.pending++]=b}function j(a,b){a.pending_buf[a.pending++]=b>>>8&255,a.pending_buf[a.pending++]=255&b}function k(a,b,c,d){var e=a.avail_in;return e>d&&(e=d),0===e?0:(a.avail_in-=e,C.arraySet(b,a.input,a.next_in,e,c),1===a.state.wrap?a.adler=E(a.adler,b,e,c):2===a.state.wrap&&(a.adler=F(a.adler,b,e,c)),a.next_in+=e,a.total_in+=e,e)}function l(a,b){var c,d,e=a.max_chain_length,f=a.strstart,g=a.prev_length,h=a.nice_match,i=a.strstart>a.w_size-jb?a.strstart-(a.w_size-jb):0,j=a.window,k=a.w_mask,l=a.prev,m=a.strstart+ib,n=j[f+g-1],o=j[f+g];a.prev_length>=a.good_match&&(e>>=2),h>a.lookahead&&(h=a.lookahead);do if(c=b,j[c+g]===o&&j[c+g-1]===n&&j[c]===j[f]&&j[++c]===j[f+1]){f+=2,c++;do;while(j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&m>f);if(d=ib-(m-f),f=m-ib,d>g){if(a.match_start=b,g=d,d>=h)break;n=j[f+g-1],o=j[f+g]}}while((b=l[b&k])>i&&0!==--e);return g<=a.lookahead?g:a.lookahead}function m(a){var b,c,d,e,f,g=a.w_size;do{if(e=a.window_size-a.lookahead-a.strstart,a.strstart>=g+(g-jb)){C.arraySet(a.window,a.window,g,g,0),a.match_start-=g,a.strstart-=g,a.block_start-=g,c=a.hash_size,b=c;do d=a.head[--b],a.head[b]=d>=g?d-g:0;while(--c);c=g,b=c;do d=a.prev[--b],a.prev[b]=d>=g?d-g:0;while(--c);e+=g}if(0===a.strm.avail_in)break;if(c=k(a.strm,a.window,a.strstart+a.lookahead,e),a.lookahead+=c,a.lookahead+a.insert>=hb)for(f=a.strstart-a.insert,a.ins_h=a.window[f],a.ins_h=(a.ins_h<a.pending_buf_size-5&&(c=a.pending_buf_size-5);;){if(a.lookahead<=1){if(m(a),0===a.lookahead&&b===H)return sb;if(0===a.lookahead)break}a.strstart+=a.lookahead,a.lookahead=0;var d=a.block_start+c;if((0===a.strstart||a.strstart>=d)&&(a.lookahead=a.strstart-d,a.strstart=d,h(a,!1),0===a.strm.avail_out))return sb;if(a.strstart-a.block_start>=a.w_size-jb&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.strstart>a.block_start&&(h(a,!1),0===a.strm.avail_out)?sb:sb}function o(a,b){for(var c,d;;){if(a.lookahead=hb&&(a.ins_h=(a.ins_h<=hb)if(d=D._tr_tally(a,a.strstart-a.match_start,a.match_length-hb),a.lookahead-=a.match_length,a.match_length<=a.max_lazy_match&&a.lookahead>=hb){a.match_length--;do a.strstart++,a.ins_h=(a.ins_h<=hb&&(a.ins_h=(a.ins_h<4096)&&(a.match_length=hb-1)),a.prev_length>=hb&&a.match_length<=a.prev_length){e=a.strstart+a.lookahead-hb,d=D._tr_tally(a,a.strstart-1-a.prev_match,a.prev_length-hb),a.lookahead-=a.prev_length-1,a.prev_length-=2;do++a.strstart<=e&&(a.ins_h=(a.ins_h<=hb&&a.strstart>0&&(e=a.strstart-1,d=g[e],d===g[++e]&&d===g[++e]&&d===g[++e])){f=a.strstart+ib;do;while(d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&f>e);a.match_length=ib-(f-e),a.match_length>a.lookahead&&(a.match_length=a.lookahead)}if(a.match_length>=hb?(c=D._tr_tally(a,1,a.match_length-hb),a.lookahead-=a.match_length,a.strstart+=a.match_length,a.match_length=0):(c=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++),c&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function r(a,b){for(var c;;){if(0===a.lookahead&&(m(a),0===a.lookahead)){if(b===H)return sb;break}if(a.match_length=0,c=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++,c&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function s(a){a.window_size=2*a.w_size,f(a.head),a.max_lazy_match=B[a.level].max_lazy,a.good_match=B[a.level].good_length,a.nice_match=B[a.level].nice_length,a.max_chain_length=B[a.level].max_chain,a.strstart=0,a.block_start=0,a.lookahead=0,a.insert=0,a.match_length=a.prev_length=hb-1,a.match_available=0,a.ins_h=0}function t(){this.strm=null,this.status=0,this.pending_buf=null,this.pending_buf_size=0,this.pending_out=0,this.pending=0,this.wrap=0,this.gzhead=null,this.gzindex=0,this.method=Y,this.last_flush=-1,this.w_size=0,this.w_bits=0,this.w_mask=0,this.window=null,this.window_size=0,this.prev=null,this.head=null,this.ins_h=0,this.hash_size=0,this.hash_bits=0,this.hash_mask=0,this.hash_shift=0,this.block_start=0,this.match_length=0,this.prev_match=0,this.match_available=0,this.strstart=0,this.match_start=0,this.lookahead=0,this.prev_length=0,this.max_chain_length=0,this.max_lazy_match=0,this.level=0,this.strategy=0,this.good_match=0,this.nice_match=0,this.dyn_ltree=new C.Buf16(2*fb),this.dyn_dtree=new C.Buf16(2*(2*db+1)),this.bl_tree=new C.Buf16(2*(2*eb+1)),f(this.dyn_ltree),f(this.dyn_dtree),f(this.bl_tree),this.l_desc=null,this.d_desc=null,this.bl_desc=null,this.bl_count=new C.Buf16(gb+1),this.heap=new C.Buf16(2*cb+1),f(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new C.Buf16(2*cb+1),f(this.depth),this.l_buf=0,this.lit_bufsize=0,this.last_lit=0,this.d_buf=0,this.opt_len=0,this.static_len=0,this.matches=0,this.insert=0,this.bi_buf=0,this.bi_valid=0}function u(a){var b;return a&&a.state?(a.total_in=a.total_out=0,a.data_type=X,b=a.state,b.pending=0,b.pending_out=0,b.wrap<0&&(b.wrap=-b.wrap),b.status=b.wrap?lb:qb,a.adler=2===b.wrap?0:1,b.last_flush=H,D._tr_init(b),M):d(a,O)}function v(a){var b=u(a);return b===M&&s(a.state),b}function w(a,b){return a&&a.state?2!==a.state.wrap?O:(a.state.gzhead=b,M):O}function x(a,b,c,e,f,g){if(!a)return O;var h=1;if(b===R&&(b=6),0>e?(h=0,e=-e):e>15&&(h=2,e-=16),1>f||f>Z||c!==Y||8>e||e>15||0>b||b>9||0>g||g>V)return d(a,O);8===e&&(e=9);var i=new t;return a.state=i,i.strm=a,i.wrap=h,i.gzhead=null,i.w_bits=e,i.w_size=1<>1,i.l_buf=3*i.lit_bufsize,i.level=b,i.strategy=g,i.method=c,v(a)}function y(a,b){return x(a,b,Y,$,_,W)}function z(a,b){var c,h,k,l;if(!a||!a.state||b>L||0>b)return a?d(a,O):O;if(h=a.state,!a.output||!a.input&&0!==a.avail_in||h.status===rb&&b!==K)return d(a,0===a.avail_out?Q:O);if(h.strm=a,c=h.last_flush,h.last_flush=b,h.status===lb)if(2===h.wrap)a.adler=0,i(h,31),i(h,139),i(h,8),h.gzhead?(i(h,(h.gzhead.text?1:0)+(h.gzhead.hcrc?2:0)+(h.gzhead.extra?4:0)+(h.gzhead.name?8:0)+(h.gzhead.comment?16:0)),i(h,255&h.gzhead.time),i(h,h.gzhead.time>>8&255),i(h,h.gzhead.time>>16&255),i(h,h.gzhead.time>>24&255),i(h,9===h.level?2:h.strategy>=T||h.level<2?4:0),i(h,255&h.gzhead.os),h.gzhead.extra&&h.gzhead.extra.length&&(i(h,255&h.gzhead.extra.length),i(h,h.gzhead.extra.length>>8&255)),h.gzhead.hcrc&&(a.adler=F(a.adler,h.pending_buf,h.pending,0)),h.gzindex=0,h.status=mb):(i(h,0),i(h,0),i(h,0),i(h,0),i(h,0),i(h,9===h.level?2:h.strategy>=T||h.level<2?4:0),i(h,wb),h.status=qb);else{var m=Y+(h.w_bits-8<<4)<<8,n=-1;n=h.strategy>=T||h.level<2?0:h.level<6?1:6===h.level?2:3,m|=n<<6,0!==h.strstart&&(m|=kb),m+=31-m%31,h.status=qb,j(h,m),0!==h.strstart&&(j(h,a.adler>>>16),j(h,65535&a.adler)),a.adler=1}if(h.status===mb)if(h.gzhead.extra){for(k=h.pending;h.gzindex<(65535&h.gzhead.extra.length)&&(h.pending!==h.pending_buf_size||(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending!==h.pending_buf_size));)i(h,255&h.gzhead.extra[h.gzindex]),h.gzindex++;h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),h.gzindex===h.gzhead.extra.length&&(h.gzindex=0,h.status=nb)}else h.status=nb;if(h.status===nb)if(h.gzhead.name){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindexk&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.gzindex=0,h.status=ob)}else h.status=ob;if(h.status===ob)if(h.gzhead.comment){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindexk&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.status=pb)}else h.status=pb;if(h.status===pb&&(h.gzhead.hcrc?(h.pending+2>h.pending_buf_size&&g(a),h.pending+2<=h.pending_buf_size&&(i(h,255&a.adler),i(h,a.adler>>8&255),a.adler=0,h.status=qb)):h.status=qb),0!==h.pending){if(g(a),0===a.avail_out)return h.last_flush=-1,M}else if(0===a.avail_in&&e(b)<=e(c)&&b!==K)return d(a,Q);if(h.status===rb&&0!==a.avail_in)return d(a,Q);if(0!==a.avail_in||0!==h.lookahead||b!==H&&h.status!==rb){var o=h.strategy===T?r(h,b):h.strategy===U?q(h,b):B[h.level].func(h,b);if((o===ub||o===vb)&&(h.status=rb),o===sb||o===ub)return 0===a.avail_out&&(h.last_flush=-1),M;if(o===tb&&(b===I?D._tr_align(h):b!==L&&(D._tr_stored_block(h,0,0,!1),b===J&&(f(h.head),0===h.lookahead&&(h.strstart=0,h.block_start=0,h.insert=0))),g(a),0===a.avail_out))return h.last_flush=-1,M}return b!==K?M:h.wrap<=0?N:(2===h.wrap?(i(h,255&a.adler),i(h,a.adler>>8&255),i(h,a.adler>>16&255),i(h,a.adler>>24&255),i(h,255&a.total_in),i(h,a.total_in>>8&255),i(h,a.total_in>>16&255),i(h,a.total_in>>24&255)):(j(h,a.adler>>>16),j(h,65535&a.adler)),g(a),h.wrap>0&&(h.wrap=-h.wrap),0!==h.pending?M:N)}function A(a){var b;return a&&a.state?(b=a.state.status,b!==lb&&b!==mb&&b!==nb&&b!==ob&&b!==pb&&b!==qb&&b!==rb?d(a,O):(a.state=null,b===qb?d(a,P):M)):O}var B,C=a("../utils/common"),D=a("./trees"),E=a("./adler32"),F=a("./crc32"),G=a("./messages"),H=0,I=1,J=3,K=4,L=5,M=0,N=1,O=-2,P=-3,Q=-5,R=-1,S=1,T=2,U=3,V=4,W=0,X=2,Y=8,Z=9,$=15,_=8,ab=29,bb=256,cb=bb+1+ab,db=30,eb=19,fb=2*cb+1,gb=15,hb=3,ib=258,jb=ib+hb+1,kb=32,lb=42,mb=69,nb=73,ob=91,pb=103,qb=113,rb=666,sb=1,tb=2,ub=3,vb=4,wb=3,xb=function(a,b,c,d,e){this.good_length=a,this.max_lazy=b,this.nice_length=c,this.max_chain=d,this.func=e};B=[new xb(0,0,0,0,n),new xb(4,4,8,4,o),new xb(4,5,16,8,o),new xb(4,6,32,32,o),new xb(4,4,16,16,p),new xb(8,16,32,32,p),new xb(8,16,128,128,p),new xb(8,32,128,256,p),new xb(32,128,258,1024,p),new xb(32,258,258,4096,p)],c.deflateInit=y,c.deflateInit2=x,c.deflateReset=v,c.deflateResetKeep=u,c.deflateSetHeader=w,c.deflate=z,c.deflateEnd=A,c.deflateInfo="pako deflate (from Nodeca project)"},{"../utils/common":27,"./adler32":29,"./crc32":31,"./messages":37,"./trees":38}],33:[function(a,b){"use strict";function c(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}b.exports=c},{}],34:[function(a,b){"use strict";var c=30,d=12;b.exports=function(a,b){var e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C;e=a.state,f=a.next_in,B=a.input,g=f+(a.avail_in-5),h=a.next_out,C=a.output,i=h-(b-a.avail_out),j=h+(a.avail_out-257),k=e.dmax,l=e.wsize,m=e.whave,n=e.wnext,o=e.window,p=e.hold,q=e.bits,r=e.lencode,s=e.distcode,t=(1<q&&(p+=B[f++]<>>24,p>>>=w,q-=w,w=v>>>16&255,0===w)C[h++]=65535&v;else{if(!(16&w)){if(0===(64&w)){v=r[(65535&v)+(p&(1<q&&(p+=B[f++]<>>=w,q-=w),15>q&&(p+=B[f++]<>>24,p>>>=w,q-=w,w=v>>>16&255,!(16&w)){if(0===(64&w)){v=s[(65535&v)+(p&(1<q&&(p+=B[f++]<q&&(p+=B[f++]<k){a.msg="invalid distance too far back",e.mode=c;break a}if(p>>>=w,q-=w,w=h-i,y>w){if(w=y-w,w>m&&e.sane){a.msg="invalid distance too far back",e.mode=c;break a}if(z=0,A=o,0===n){if(z+=l-w,x>w){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}else if(w>n){if(z+=l+n-w,w-=n,x>w){x-=w;do C[h++]=o[z++];while(--w);if(z=0,x>n){w=n,x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}}else if(z+=n-w,x>w){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}for(;x>2;)C[h++]=A[z++],C[h++]=A[z++],C[h++]=A[z++],x-=3;x&&(C[h++]=A[z++],x>1&&(C[h++]=A[z++]))}else{z=h-y;do C[h++]=C[z++],C[h++]=C[z++],C[h++]=C[z++],x-=3;while(x>2);x&&(C[h++]=C[z++],x>1&&(C[h++]=C[z++]))}break}}break}}while(g>f&&j>h);x=q>>3,f-=x,q-=x<<3,p&=(1<f?5+(g-f):5-(f-g),a.avail_out=j>h?257+(j-h):257-(h-j),e.hold=p,e.bits=q}},{}],35:[function(a,b,c){"use strict";function d(a){return(a>>>24&255)+(a>>>8&65280)+((65280&a)<<8)+((255&a)<<24)}function e(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new r.Buf16(320),this.work=new r.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function f(a){var b;return a&&a.state?(b=a.state,a.total_in=a.total_out=b.total=0,a.msg="",b.wrap&&(a.adler=1&b.wrap),b.mode=K,b.last=0,b.havedict=0,b.dmax=32768,b.head=null,b.hold=0,b.bits=0,b.lencode=b.lendyn=new r.Buf32(ob),b.distcode=b.distdyn=new r.Buf32(pb),b.sane=1,b.back=-1,C):F}function g(a){var b;return a&&a.state?(b=a.state,b.wsize=0,b.whave=0,b.wnext=0,f(a)):F}function h(a,b){var c,d;return a&&a.state?(d=a.state,0>b?(c=0,b=-b):(c=(b>>4)+1,48>b&&(b&=15)),b&&(8>b||b>15)?F:(null!==d.window&&d.wbits!==b&&(d.window=null),d.wrap=c,d.wbits=b,g(a))):F}function i(a,b){var c,d;return a?(d=new e,a.state=d,d.window=null,c=h(a,b),c!==C&&(a.state=null),c):F}function j(a){return i(a,rb)}function k(a){if(sb){var b;for(p=new r.Buf32(512),q=new r.Buf32(32),b=0;144>b;)a.lens[b++]=8;for(;256>b;)a.lens[b++]=9;for(;280>b;)a.lens[b++]=7;for(;288>b;)a.lens[b++]=8;for(v(x,a.lens,0,288,p,0,a.work,{bits:9}),b=0;32>b;)a.lens[b++]=5;v(y,a.lens,0,32,q,0,a.work,{bits:5}),sb=!1}a.lencode=p,a.lenbits=9,a.distcode=q,a.distbits=5}function l(a,b,c,d){var e,f=a.state;return null===f.window&&(f.wsize=1<=f.wsize?(r.arraySet(f.window,b,c-f.wsize,f.wsize,0),f.wnext=0,f.whave=f.wsize):(e=f.wsize-f.wnext,e>d&&(e=d),r.arraySet(f.window,b,c-d,e,f.wnext),d-=e,d?(r.arraySet(f.window,b,c-d,d,0),f.wnext=d,f.whave=f.wsize):(f.wnext+=e,f.wnext===f.wsize&&(f.wnext=0),f.whaven;){if(0===i)break a;i--,m+=e[g++]<>>8&255,c.check=t(c.check,Bb,2,0),m=0,n=0,c.mode=L;break}if(c.flags=0,c.head&&(c.head.done=!1),!(1&c.wrap)||(((255&m)<<8)+(m>>8))%31){a.msg="incorrect header check",c.mode=lb;break}if((15&m)!==J){a.msg="unknown compression method",c.mode=lb;break}if(m>>>=4,n-=4,wb=(15&m)+8,0===c.wbits)c.wbits=wb;else if(wb>c.wbits){a.msg="invalid window size",c.mode=lb;break}c.dmax=1<n;){if(0===i)break a;i--,m+=e[g++]<>8&1),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0)),m=0,n=0,c.mode=M;case M:for(;32>n;){if(0===i)break a;i--,m+=e[g++]<>>8&255,Bb[2]=m>>>16&255,Bb[3]=m>>>24&255,c.check=t(c.check,Bb,4,0)),m=0,n=0,c.mode=N;case N:for(;16>n;){if(0===i)break a;i--,m+=e[g++]<>8),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0)),m=0,n=0,c.mode=O;case O:if(1024&c.flags){for(;16>n;){if(0===i)break a;i--,m+=e[g++]<>>8&255,c.check=t(c.check,Bb,2,0)),m=0,n=0}else c.head&&(c.head.extra=null);c.mode=P;case P:if(1024&c.flags&&(q=c.length,q>i&&(q=i),q&&(c.head&&(wb=c.head.extra_len-c.length,c.head.extra||(c.head.extra=new Array(c.head.extra_len)),r.arraySet(c.head.extra,e,g,q,wb)),512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,c.length-=q),c.length))break a;c.length=0,c.mode=Q;case Q:if(2048&c.flags){if(0===i)break a;q=0;do wb=e[g+q++],c.head&&wb&&c.length<65536&&(c.head.name+=String.fromCharCode(wb));while(wb&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wb)break a}else c.head&&(c.head.name=null);c.length=0,c.mode=R;case R:if(4096&c.flags){if(0===i)break a;q=0;do wb=e[g+q++],c.head&&wb&&c.length<65536&&(c.head.comment+=String.fromCharCode(wb));while(wb&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wb)break a}else c.head&&(c.head.comment=null);c.mode=S;case S:if(512&c.flags){for(;16>n;){if(0===i)break a;i--,m+=e[g++]<>9&1,c.head.done=!0),a.adler=c.check=0,c.mode=V;break;case T:for(;32>n;){if(0===i)break a;i--,m+=e[g++]<>>=7&n,n-=7&n,c.mode=ib;break}for(;3>n;){if(0===i)break a;i--,m+=e[g++]<>>=1,n-=1,3&m){case 0:c.mode=X;break;case 1:if(k(c),c.mode=bb,b===B){m>>>=2,n-=2;break a}break;case 2:c.mode=$;break;case 3:a.msg="invalid block type",c.mode=lb}m>>>=2,n-=2;break;case X:for(m>>>=7&n,n-=7&n;32>n;){if(0===i)break a;i--,m+=e[g++]<>>16^65535)){a.msg="invalid stored block lengths",c.mode=lb;break}if(c.length=65535&m,m=0,n=0,c.mode=Y,b===B)break a;case Y:c.mode=Z;case Z:if(q=c.length){if(q>i&&(q=i),q>j&&(q=j),0===q)break a;r.arraySet(f,e,g,q,h),i-=q,g+=q,j-=q,h+=q,c.length-=q;break}c.mode=V;break;case $:for(;14>n;){if(0===i)break a;i--,m+=e[g++]<>>=5,n-=5,c.ndist=(31&m)+1,m>>>=5,n-=5,c.ncode=(15&m)+4,m>>>=4,n-=4,c.nlen>286||c.ndist>30){a.msg="too many length or distance symbols",c.mode=lb;break}c.have=0,c.mode=_;case _:for(;c.haven;){if(0===i)break a;i--,m+=e[g++]<>>=3,n-=3}for(;c.have<19;)c.lens[Cb[c.have++]]=0;if(c.lencode=c.lendyn,c.lenbits=7,yb={bits:c.lenbits},xb=v(w,c.lens,0,19,c.lencode,0,c.work,yb),c.lenbits=yb.bits,xb){a.msg="invalid code lengths set",c.mode=lb;break}c.have=0,c.mode=ab;case ab:for(;c.have>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=qb);){if(0===i)break a;i--,m+=e[g++]<sb)m>>>=qb,n-=qb,c.lens[c.have++]=sb;else{if(16===sb){for(zb=qb+2;zb>n;){if(0===i)break a;i--,m+=e[g++]<>>=qb,n-=qb,0===c.have){a.msg="invalid bit length repeat",c.mode=lb;break}wb=c.lens[c.have-1],q=3+(3&m),m>>>=2,n-=2}else if(17===sb){for(zb=qb+3;zb>n;){if(0===i)break a;i--,m+=e[g++]<>>=qb,n-=qb,wb=0,q=3+(7&m),m>>>=3,n-=3}else{for(zb=qb+7;zb>n;){if(0===i)break a;i--,m+=e[g++]<>>=qb,n-=qb,wb=0,q=11+(127&m),m>>>=7,n-=7}if(c.have+q>c.nlen+c.ndist){a.msg="invalid bit length repeat",c.mode=lb;break}for(;q--;)c.lens[c.have++]=wb}}if(c.mode===lb)break;if(0===c.lens[256]){a.msg="invalid code -- missing end-of-block",c.mode=lb;break}if(c.lenbits=9,yb={bits:c.lenbits},xb=v(x,c.lens,0,c.nlen,c.lencode,0,c.work,yb),c.lenbits=yb.bits,xb){a.msg="invalid literal/lengths set",c.mode=lb;break}if(c.distbits=6,c.distcode=c.distdyn,yb={bits:c.distbits},xb=v(y,c.lens,c.nlen,c.ndist,c.distcode,0,c.work,yb),c.distbits=yb.bits,xb){a.msg="invalid distances set",c.mode=lb;break}if(c.mode=bb,b===B)break a;case bb:c.mode=cb;case cb:if(i>=6&&j>=258){a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,u(a,p),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,c.mode===V&&(c.back=-1); -break}for(c.back=0;Ab=c.lencode[m&(1<>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=qb);){if(0===i)break a;i--,m+=e[g++]<>tb)],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=tb+qb);){if(0===i)break a;i--,m+=e[g++]<>>=tb,n-=tb,c.back+=tb}if(m>>>=qb,n-=qb,c.back+=qb,c.length=sb,0===rb){c.mode=hb;break}if(32&rb){c.back=-1,c.mode=V;break}if(64&rb){a.msg="invalid literal/length code",c.mode=lb;break}c.extra=15&rb,c.mode=db;case db:if(c.extra){for(zb=c.extra;zb>n;){if(0===i)break a;i--,m+=e[g++]<>>=c.extra,n-=c.extra,c.back+=c.extra}c.was=c.length,c.mode=eb;case eb:for(;Ab=c.distcode[m&(1<>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=qb);){if(0===i)break a;i--,m+=e[g++]<>tb)],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=tb+qb);){if(0===i)break a;i--,m+=e[g++]<>>=tb,n-=tb,c.back+=tb}if(m>>>=qb,n-=qb,c.back+=qb,64&rb){a.msg="invalid distance code",c.mode=lb;break}c.offset=sb,c.extra=15&rb,c.mode=fb;case fb:if(c.extra){for(zb=c.extra;zb>n;){if(0===i)break a;i--,m+=e[g++]<>>=c.extra,n-=c.extra,c.back+=c.extra}if(c.offset>c.dmax){a.msg="invalid distance too far back",c.mode=lb;break}c.mode=gb;case gb:if(0===j)break a;if(q=p-j,c.offset>q){if(q=c.offset-q,q>c.whave&&c.sane){a.msg="invalid distance too far back",c.mode=lb;break}q>c.wnext?(q-=c.wnext,ob=c.wsize-q):ob=c.wnext-q,q>c.length&&(q=c.length),pb=c.window}else pb=f,ob=h-c.offset,q=c.length;q>j&&(q=j),j-=q,c.length-=q;do f[h++]=pb[ob++];while(--q);0===c.length&&(c.mode=cb);break;case hb:if(0===j)break a;f[h++]=c.length,j--,c.mode=cb;break;case ib:if(c.wrap){for(;32>n;){if(0===i)break a;i--,m|=e[g++]<n;){if(0===i)break a;i--,m+=e[g++]<=D;D++)P[D]=0;for(E=0;o>E;E++)P[b[n+E]]++;for(H=C,G=d;G>=1&&0===P[G];G--);if(H>G&&(H=G),0===G)return p[q++]=20971520,p[q++]=20971520,s.bits=1,0;for(F=1;G>F&&0===P[F];F++);for(F>H&&(H=F),K=1,D=1;d>=D;D++)if(K<<=1,K-=P[D],0>K)return-1;if(K>0&&(a===g||1!==G))return-1;for(Q[1]=0,D=1;d>D;D++)Q[D+1]=Q[D]+P[D];for(E=0;o>E;E++)0!==b[n+E]&&(r[Q[b[n+E]]++]=E);if(a===g?(N=R=r,y=19):a===h?(N=j,O-=257,R=k,S-=257,y=256):(N=l,R=m,y=-1),M=0,E=0,D=F,x=q,I=H,J=0,v=-1,L=1<e||a===i&&L>f)return 1;for(var T=0;;){T++,z=D-J,r[E]y?(A=R[S+r[E]],B=N[O+r[E]]):(A=96,B=0),t=1<>J)+u]=z<<24|A<<16|B|0;while(0!==u);for(t=1<>=1;if(0!==t?(M&=t-1,M+=t):M=0,E++,0===--P[D]){if(D===G)break;D=b[n+r[E]]}if(D>H&&(M&w)!==v){for(0===J&&(J=H),x+=F,I=D-J,K=1<I+J&&(K-=P[I+J],!(0>=K));)I++,K<<=1;if(L+=1<e||a===i&&L>f)return 1;v=M&w,p[v]=H<<24|I<<16|x-q|0}}return 0!==M&&(p[x+M]=D-J<<24|64<<16|0),s.bits=H,0}},{"../utils/common":27}],37:[function(a,b){"use strict";b.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},{}],38:[function(a,b,c){"use strict";function d(a){for(var b=a.length;--b>=0;)a[b]=0}function e(a){return 256>a?gb[a]:gb[256+(a>>>7)]}function f(a,b){a.pending_buf[a.pending++]=255&b,a.pending_buf[a.pending++]=b>>>8&255}function g(a,b,c){a.bi_valid>V-c?(a.bi_buf|=b<>V-a.bi_valid,a.bi_valid+=c-V):(a.bi_buf|=b<>>=1,c<<=1;while(--b>0);return c>>>1}function j(a){16===a.bi_valid?(f(a,a.bi_buf),a.bi_buf=0,a.bi_valid=0):a.bi_valid>=8&&(a.pending_buf[a.pending++]=255&a.bi_buf,a.bi_buf>>=8,a.bi_valid-=8)}function k(a,b){var c,d,e,f,g,h,i=b.dyn_tree,j=b.max_code,k=b.stat_desc.static_tree,l=b.stat_desc.has_stree,m=b.stat_desc.extra_bits,n=b.stat_desc.extra_base,o=b.stat_desc.max_length,p=0;for(f=0;U>=f;f++)a.bl_count[f]=0;for(i[2*a.heap[a.heap_max]+1]=0,c=a.heap_max+1;T>c;c++)d=a.heap[c],f=i[2*i[2*d+1]+1]+1,f>o&&(f=o,p++),i[2*d+1]=f,d>j||(a.bl_count[f]++,g=0,d>=n&&(g=m[d-n]),h=i[2*d],a.opt_len+=h*(f+g),l&&(a.static_len+=h*(k[2*d+1]+g)));if(0!==p){do{for(f=o-1;0===a.bl_count[f];)f--;a.bl_count[f]--,a.bl_count[f+1]+=2,a.bl_count[o]--,p-=2}while(p>0);for(f=o;0!==f;f--)for(d=a.bl_count[f];0!==d;)e=a.heap[--c],e>j||(i[2*e+1]!==f&&(a.opt_len+=(f-i[2*e+1])*i[2*e],i[2*e+1]=f),d--)}}function l(a,b,c){var d,e,f=new Array(U+1),g=0;for(d=1;U>=d;d++)f[d]=g=g+c[d-1]<<1;for(e=0;b>=e;e++){var h=a[2*e+1];0!==h&&(a[2*e]=i(f[h]++,h))}}function m(){var a,b,c,d,e,f=new Array(U+1);for(c=0,d=0;O-1>d;d++)for(ib[d]=c,a=0;a<1<<_[d];a++)hb[c++]=d;for(hb[c-1]=d,e=0,d=0;16>d;d++)for(jb[d]=e,a=0;a<1<>=7;R>d;d++)for(jb[d]=e<<7,a=0;a<1<=b;b++)f[b]=0;for(a=0;143>=a;)eb[2*a+1]=8,a++,f[8]++;for(;255>=a;)eb[2*a+1]=9,a++,f[9]++;for(;279>=a;)eb[2*a+1]=7,a++,f[7]++;for(;287>=a;)eb[2*a+1]=8,a++,f[8]++;for(l(eb,Q+1,f),a=0;R>a;a++)fb[2*a+1]=5,fb[2*a]=i(a,5);kb=new nb(eb,_,P+1,Q,U),lb=new nb(fb,ab,0,R,U),mb=new nb(new Array(0),bb,0,S,W)}function n(a){var b;for(b=0;Q>b;b++)a.dyn_ltree[2*b]=0;for(b=0;R>b;b++)a.dyn_dtree[2*b]=0;for(b=0;S>b;b++)a.bl_tree[2*b]=0;a.dyn_ltree[2*X]=1,a.opt_len=a.static_len=0,a.last_lit=a.matches=0}function o(a){a.bi_valid>8?f(a,a.bi_buf):a.bi_valid>0&&(a.pending_buf[a.pending++]=a.bi_buf),a.bi_buf=0,a.bi_valid=0}function p(a,b,c,d){o(a),d&&(f(a,c),f(a,~c)),E.arraySet(a.pending_buf,a.window,b,c,a.pending),a.pending+=c}function q(a,b,c,d){var e=2*b,f=2*c;return a[e]c;c++)0!==f[2*c]?(a.heap[++a.heap_len]=j=c,a.depth[c]=0):f[2*c+1]=0;for(;a.heap_len<2;)e=a.heap[++a.heap_len]=2>j?++j:0,f[2*e]=1,a.depth[e]=0,a.opt_len--,h&&(a.static_len-=g[2*e+1]);for(b.max_code=j,c=a.heap_len>>1;c>=1;c--)r(a,f,c);e=i;do c=a.heap[1],a.heap[1]=a.heap[a.heap_len--],r(a,f,1),d=a.heap[1],a.heap[--a.heap_max]=c,a.heap[--a.heap_max]=d,f[2*e]=f[2*c]+f[2*d],a.depth[e]=(a.depth[c]>=a.depth[d]?a.depth[c]:a.depth[d])+1,f[2*c+1]=f[2*d+1]=e,a.heap[1]=e++,r(a,f,1);while(a.heap_len>=2);a.heap[--a.heap_max]=a.heap[1],k(a,b),l(f,j,a.bl_count)}function u(a,b,c){var d,e,f=-1,g=b[1],h=0,i=7,j=4;for(0===g&&(i=138,j=3),b[2*(c+1)+1]=65535,d=0;c>=d;d++)e=g,g=b[2*(d+1)+1],++hh?a.bl_tree[2*e]+=h:0!==e?(e!==f&&a.bl_tree[2*e]++,a.bl_tree[2*Y]++):10>=h?a.bl_tree[2*Z]++:a.bl_tree[2*$]++,h=0,f=e,0===g?(i=138,j=3):e===g?(i=6,j=3):(i=7,j=4))}function v(a,b,c){var d,e,f=-1,i=b[1],j=0,k=7,l=4;for(0===i&&(k=138,l=3),d=0;c>=d;d++)if(e=i,i=b[2*(d+1)+1],!(++jj){do h(a,e,a.bl_tree);while(0!==--j)}else 0!==e?(e!==f&&(h(a,e,a.bl_tree),j--),h(a,Y,a.bl_tree),g(a,j-3,2)):10>=j?(h(a,Z,a.bl_tree),g(a,j-3,3)):(h(a,$,a.bl_tree),g(a,j-11,7));j=0,f=e,0===i?(k=138,l=3):e===i?(k=6,l=3):(k=7,l=4)}}function w(a){var b;for(u(a,a.dyn_ltree,a.l_desc.max_code),u(a,a.dyn_dtree,a.d_desc.max_code),t(a,a.bl_desc),b=S-1;b>=3&&0===a.bl_tree[2*cb[b]+1];b--);return a.opt_len+=3*(b+1)+5+5+4,b}function x(a,b,c,d){var e;for(g(a,b-257,5),g(a,c-1,5),g(a,d-4,4),e=0;d>e;e++)g(a,a.bl_tree[2*cb[e]+1],3);v(a,a.dyn_ltree,b-1),v(a,a.dyn_dtree,c-1)}function y(a){var b,c=4093624447;for(b=0;31>=b;b++,c>>>=1)if(1&c&&0!==a.dyn_ltree[2*b])return G;if(0!==a.dyn_ltree[18]||0!==a.dyn_ltree[20]||0!==a.dyn_ltree[26])return H;for(b=32;P>b;b++)if(0!==a.dyn_ltree[2*b])return H;return G}function z(a){pb||(m(),pb=!0),a.l_desc=new ob(a.dyn_ltree,kb),a.d_desc=new ob(a.dyn_dtree,lb),a.bl_desc=new ob(a.bl_tree,mb),a.bi_buf=0,a.bi_valid=0,n(a)}function A(a,b,c,d){g(a,(J<<1)+(d?1:0),3),p(a,b,c,!0)}function B(a){g(a,K<<1,3),h(a,X,eb),j(a)}function C(a,b,c,d){var e,f,h=0;a.level>0?(a.strm.data_type===I&&(a.strm.data_type=y(a)),t(a,a.l_desc),t(a,a.d_desc),h=w(a),e=a.opt_len+3+7>>>3,f=a.static_len+3+7>>>3,e>=f&&(e=f)):e=f=c+5,e>=c+4&&-1!==b?A(a,b,c,d):a.strategy===F||f===e?(g(a,(K<<1)+(d?1:0),3),s(a,eb,fb)):(g(a,(L<<1)+(d?1:0),3),x(a,a.l_desc.max_code+1,a.d_desc.max_code+1,h+1),s(a,a.dyn_ltree,a.dyn_dtree)),n(a),d&&o(a)}function D(a,b,c){return a.pending_buf[a.d_buf+2*a.last_lit]=b>>>8&255,a.pending_buf[a.d_buf+2*a.last_lit+1]=255&b,a.pending_buf[a.l_buf+a.last_lit]=255&c,a.last_lit++,0===b?a.dyn_ltree[2*c]++:(a.matches++,b--,a.dyn_ltree[2*(hb[c]+P+1)]++,a.dyn_dtree[2*e(b)]++),a.last_lit===a.lit_bufsize-1}var E=a("../utils/common"),F=4,G=0,H=1,I=2,J=0,K=1,L=2,M=3,N=258,O=29,P=256,Q=P+1+O,R=30,S=19,T=2*Q+1,U=15,V=16,W=7,X=256,Y=16,Z=17,$=18,_=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0],ab=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],bb=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7],cb=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],db=512,eb=new Array(2*(Q+2));d(eb);var fb=new Array(2*R);d(fb);var gb=new Array(db);d(gb);var hb=new Array(N-M+1);d(hb);var ib=new Array(O);d(ib);var jb=new Array(R);d(jb);var kb,lb,mb,nb=function(a,b,c,d,e){this.static_tree=a,this.extra_bits=b,this.extra_base=c,this.elems=d,this.max_length=e,this.has_stree=a&&a.length},ob=function(a,b){this.dyn_tree=a,this.max_code=0,this.stat_desc=b},pb=!1;c._tr_init=z,c._tr_stored_block=A,c._tr_flush_block=C,c._tr_tally=D,c._tr_align=B},{"../utils/common":27}],39:[function(a,b){"use strict";function c(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}b.exports=c},{}]},{},[9])(9)}); \ No newline at end of file diff --git a/plugins/tiddlywiki/jszip/files/jszip.min.v2.6.1.js b/plugins/tiddlywiki/jszip/files/jszip.min.v2.6.1.js new file mode 100755 index 000000000..de61e9bed --- /dev/null +++ b/plugins/tiddlywiki/jszip/files/jszip.min.v2.6.1.js @@ -0,0 +1,14 @@ +/*! + +JSZip - A Javascript class for generating and reading zip files + + +(c) 2009-2014 Stuart Knightley +Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown. + +JSZip uses the library pako released under the MIT license : +https://github.com/nodeca/pako/blob/master/LICENSE +*/ +!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;b="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,b.JSZip=a()}}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g=0;--f)if(this.data[f]===b&&this.data[f+1]===c&&this.data[f+2]===d&&this.data[f+3]===e)return f-this.zero;return-1},d.prototype.readData=function(a){if(this.checkOffset(a),0===a)return[];var b=this.data.slice(this.zero+this.index,this.zero+this.index+a);return this.index+=a,b},b.exports=d},{"./dataReader":6}],2:[function(a,b,c){"use strict";var d="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";c.encode=function(a,b){for(var c,e,f,g,h,i,j,k="",l=0;l>2,h=(3&c)<<4|e>>4,i=(15&e)<<2|f>>6,j=63&f,isNaN(e)?i=j=64:isNaN(f)&&(j=64),k=k+d.charAt(g)+d.charAt(h)+d.charAt(i)+d.charAt(j);return k},c.decode=function(a,b){var c,e,f,g,h,i,j,k="",l=0;for(a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");l>4,e=(15&h)<<4|i>>2,f=(3&i)<<6|j,k+=String.fromCharCode(c),64!=i&&(k+=String.fromCharCode(e)),64!=j&&(k+=String.fromCharCode(f));return k}},{}],3:[function(a,b,c){"use strict";function d(){this.compressedSize=0,this.uncompressedSize=0,this.crc32=0,this.compressionMethod=null,this.compressedContent=null}d.prototype={getContent:function(){return null},getCompressedContent:function(){return null}},b.exports=d},{}],4:[function(a,b,c){"use strict";c.STORE={magic:"\0\0",compress:function(a,b){return a},uncompress:function(a){return a},compressInputType:null,uncompressInputType:null},c.DEFLATE=a("./flate")},{"./flate":9}],5:[function(a,b,c){"use strict";var d=a("./utils"),e=[0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918e3,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117];b.exports=function(a,b){if("undefined"==typeof a||!a.length)return 0;var c="string"!==d.getTypeOf(a);"undefined"==typeof b&&(b=0);var f=0,g=0,h=0;b^=-1;for(var i=0,j=a.length;i>>8^f;return b^-1}},{"./utils":22}],6:[function(a,b,c){"use strict";function d(a){this.data=null,this.length=0,this.index=0,this.zero=0}var e=a("./utils");d.prototype={checkOffset:function(a){this.checkIndex(this.index+a)},checkIndex:function(a){if(this.length=this.index;b--)c=(c<<8)+this.byteAt(b);return this.index+=a,c},readString:function(a){return e.transformTo("string",this.readData(a))},readData:function(a){},lastIndexOfSignature:function(a){},readDate:function(){var a=this.readInt(4);return new Date((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&31,a>>5&63,(31&a)<<1)}},b.exports=d},{"./utils":22}],7:[function(a,b,c){"use strict";c.base64=!1,c.binary=!1,c.dir=!1,c.createFolders=!1,c.date=null,c.compression=null,c.compressionOptions=null,c.comment=null,c.unixPermissions=null,c.dosPermissions=null},{}],8:[function(a,b,c){"use strict";var d=a("./utils");c.string2binary=function(a){return d.string2binary(a)},c.string2Uint8Array=function(a){return d.transformTo("uint8array",a)},c.uint8Array2String=function(a){return d.transformTo("string",a)},c.string2Blob=function(a){var b=d.transformTo("arraybuffer",a);return d.arrayBuffer2Blob(b)},c.arrayBuffer2Blob=function(a){return d.arrayBuffer2Blob(a)},c.transformTo=function(a,b){return d.transformTo(a,b)},c.getTypeOf=function(a){return d.getTypeOf(a)},c.checkSupport=function(a){return d.checkSupport(a)},c.MAX_VALUE_16BITS=d.MAX_VALUE_16BITS,c.MAX_VALUE_32BITS=d.MAX_VALUE_32BITS,c.pretty=function(a){return d.pretty(a)},c.findCompression=function(a){return d.findCompression(a)},c.isRegExp=function(a){return d.isRegExp(a)}},{"./utils":22}],9:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,e=a("pako");c.uncompressInputType=d?"uint8array":"array",c.compressInputType=d?"uint8array":"array",c.magic="\b\0",c.compress=function(a,b){return e.deflateRaw(a,{level:b.level||-1})},c.uncompress=function(a){return e.inflateRaw(a)}},{pako:25}],10:[function(a,b,c){"use strict";function d(a,b){return this instanceof d?(this.files={},this.comment=null,this.root="",a&&this.load(a,b),void(this.clone=function(){var a=new d;for(var b in this)"function"!=typeof this[b]&&(a[b]=this[b]);return a})):new d(a,b)}var e=a("./base64");d.prototype=a("./object"),d.prototype.load=a("./load"),d.support=a("./support"),d.defaults=a("./defaults"),d.utils=a("./deprecatedPublicUtils"),d.base64={encode:function(a){return e.encode(a)},decode:function(a){return e.decode(a)}},d.compressions=a("./compressions"),b.exports=d},{"./base64":2,"./compressions":4,"./defaults":7,"./deprecatedPublicUtils":8,"./load":11,"./object":14,"./support":18}],11:[function(a,b,c){"use strict";var d=a("./base64"),e=a("./utf8"),f=a("./utils"),g=a("./zipEntries");b.exports=function(a,b){var c,h,i,j;for(b=f.extend(b||{},{base64:!1,checkCRC32:!1,optimizedBinaryString:!1,createFolders:!1,decodeFileName:e.utf8decode}),b.base64&&(a=d.decode(a)),h=new g(a,b),c=h.files,i=0;i>>=8;return d},u=function(a){return a=a||{},a.base64!==!0||null!==a.binary&&void 0!==a.binary||(a.binary=!0),a=e.extend(a,h),a.date=a.date||new Date,null!==a.compression&&(a.compression=a.compression.toUpperCase()),a},v=function(a,b,c){var d,f=e.getTypeOf(b);if(c=u(c),"string"==typeof c.unixPermissions&&(c.unixPermissions=parseInt(c.unixPermissions,8)),c.unixPermissions&&16384&c.unixPermissions&&(c.dir=!0),c.dosPermissions&&16&c.dosPermissions&&(c.dir=!0),c.dir&&(a=x(a)),c.createFolders&&(d=w(a))&&y.call(this,d,!0),c.dir||null===b||"undefined"==typeof b)c.base64=!1,c.binary=!1,b=null,f=null;else if("string"===f)c.binary&&!c.base64&&c.optimizedBinaryString!==!0&&(b=e.string2binary(b));else{if(c.base64=!1,c.binary=!0,!(f||b instanceof k))throw new Error("The data of '"+a+"' is in an unsupported format !");"arraybuffer"===f&&(b=e.transformTo("uint8array",b))}var g=new s(a,b,c);return this.files[a]=g,g},w=function(a){"/"==a.slice(-1)&&(a=a.substring(0,a.length-1));var b=a.lastIndexOf("/");return b>0?a.substring(0,b):""},x=function(a){return"/"!=a.slice(-1)&&(a+="/"),a},y=function(a,b){return b="undefined"!=typeof b&&b,a=x(a),this.files[a]||v.call(this,a,null,{dir:!0,createFolders:b}),this.files[a]},z=function(a,b,c){var d,g=new k;return a._data instanceof k?(g.uncompressedSize=a._data.uncompressedSize,g.crc32=a._data.crc32,0===g.uncompressedSize||a.dir?(b=j.STORE,g.compressedContent="",g.crc32=0):a._data.compressionMethod===b.magic?g.compressedContent=a._data.getCompressedContent():(d=a._data.getContent(),g.compressedContent=b.compress(e.transformTo(b.compressInputType,d),c))):(d=q(a),d&&0!==d.length&&!a.dir||(b=j.STORE,d=""),g.uncompressedSize=d.length,g.crc32=f(d),g.compressedContent=b.compress(e.transformTo(b.compressInputType,d),c)),g.compressedSize=g.compressedContent.length,g.compressionMethod=b.magic,g},A=function(a,b){var c=a;return a||(c=b?16893:33204),(65535&c)<<16},B=function(a,b){return 63&(a||0)},C=function(a,b,c,d,h,i){var j,k,l,n,o=(c.compressedContent,i!==m.utf8encode),p=e.transformTo("string",i(b.name)),q=e.transformTo("string",m.utf8encode(b.name)),r=b.comment||"",s=e.transformTo("string",i(r)),u=e.transformTo("string",m.utf8encode(r)),v=q.length!==b.name.length,w=u.length!==r.length,x=b.options,y="",z="",C="";l=b._initialMetadata.dir!==b.dir?b.dir:x.dir,n=b._initialMetadata.date!==b.date?b.date:x.date;var D=0,E=0;l&&(D|=16),"UNIX"===h?(E=798,D|=A(b.unixPermissions,l)):(E=20,D|=B(b.dosPermissions,l)),j=n.getHours(),j<<=6,j|=n.getMinutes(),j<<=5,j|=n.getSeconds()/2,k=n.getFullYear()-1980,k<<=4,k|=n.getMonth()+1,k<<=5,k|=n.getDate(),v&&(z=t(1,1)+t(f(p),4)+q,y+="up"+t(z.length,2)+z),w&&(C=t(1,1)+t(this.crc32(s),4)+u,y+="uc"+t(C.length,2)+C);var F="";F+="\n\0",F+=o||!v&&!w?"\0\0":"\0\b",F+=c.compressionMethod,F+=t(j,2),F+=t(k,2),F+=t(c.crc32,4),F+=t(c.compressedSize,4),F+=t(c.uncompressedSize,4),F+=t(p.length,2),F+=t(y.length,2);var G=g.LOCAL_FILE_HEADER+F+p+y,H=g.CENTRAL_FILE_HEADER+t(E,2)+F+t(s.length,2)+"\0\0\0\0"+t(D,4)+t(d,4)+p+y+s;return{fileRecord:G,dirRecord:H,compressedObject:c}},D={load:function(a,b){throw new Error("Load method is not defined. Is the file jszip-load.js included ?")},filter:function(a){var b,c,d,f,g=[];for(b in this.files)this.files.hasOwnProperty(b)&&(d=this.files[b],f=new s(d.name,d._data,e.extend(d.options)),c=b.slice(this.root.length,b.length),b.slice(0,this.root.length)===this.root&&a(c,f)&&g.push(f));return g},file:function(a,b,c){if(1===arguments.length){if(e.isRegExp(a)){var d=a;return this.filter(function(a,b){return!b.dir&&d.test(a)})}return this.filter(function(b,c){return!c.dir&&b===a})[0]||null}return a=this.root+a,v.call(this,a,b,c),this},folder:function(a){if(!a)return this;if(e.isRegExp(a))return this.filter(function(b,c){return c.dir&&a.test(b)});var b=this.root+a,c=y.call(this,b),d=this.clone();return d.root=c.name,d},remove:function(a){a=this.root+a;var b=this.files[a];if(b||("/"!=a.slice(-1)&&(a+="/"),b=this.files[a]),b&&!b.dir)delete this.files[a];else for(var c=this.filter(function(b,c){return c.name.slice(0,a.length)===a}),d=0;d=252?6:h>=248?5:h>=240?4:h>=224?3:h>=192?2:1;g[254]=g[254]=1;var i=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;f>>6,b[g++]=128|63&c):c<65536?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},j=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return c<0?b:0===c?b:c+g[a[c]]>b?c:b},k=function(a){var b,c,e,f,h=a.length,i=new Array(2*h);for(c=0,b=0;b4)i[c++]=65533,b+=f-1;else{for(e&=2===f?31:3===f?15:7;f>1&&b1?i[c++]=65533:e<65536?i[c++]=e:(e-=65536,i[c++]=55296|e>>10&1023,i[c++]=56320|1023&e)}return i.length!==c&&(i.subarray?i=i.subarray(0,c):i.length=c),d.applyFromCharCode(i)};c.utf8encode=function(a){return e.nodebuffer?f(a,"utf-8"):i(a)},c.utf8decode=function(a){if(e.nodebuffer)return d.transformTo("nodebuffer",a).toString("utf-8");a=d.transformTo(e.uint8array?"uint8array":"array",a);for(var b=[],c=0,f=a.length,g=65536;c1;)try{"array"===f||"nodebuffer"===f?d.push(String.fromCharCode.apply(null,a.slice(g,Math.min(g+b,e)))):d.push(String.fromCharCode.apply(null,a.subarray(g,Math.min(g+b,e)))),g+=b}catch(i){b=Math.floor(b/2)}return d.join("")}function g(a,b){for(var c=0;c1)throw new Error("Multi-volumes zip are not supported")},readLocalFiles:function(){var a,b;for(a=0;a0)this.isSignature(c,j.CENTRAL_FILE_HEADER)||(this.reader.zero=e);else if(e<0)throw new Error("Corrupted zip: missing "+Math.abs(e)+" bytes.")},prepareReader:function(a){var b=i.getTypeOf(a);if(i.checkSupport(b),"string"!==b||l.uint8array)if("nodebuffer"===b)this.reader=new f(a);else if(l.uint8array)this.reader=new g(i.transformTo("uint8array",a));else{if(!l.array)throw new Error("Unexpected error: unsupported type '"+b+"'");this.reader=new h(i.transformTo("array",a))}else this.reader=new e(a,this.loadOptions.optimizedBinaryString)},load:function(a){this.prepareReader(a),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},b.exports=d},{"./arrayReader":1,"./nodeBufferReader":13,"./object":14,"./signature":15,"./stringReader":16,"./support":18,"./uint8ArrayReader":19,"./utils":22,"./zipEntry":24}],24:[function(a,b,c){"use strict";function d(a,b){this.options=a,this.loadOptions=b}var e=a("./stringReader"),f=a("./utils"),g=a("./compressedObject"),h=a("./object"),i=a("./support"),j=0,k=3;d.prototype={isEncrypted:function(){return 1===(1&this.bitFlag)},useUTF8:function(){return 2048===(2048&this.bitFlag)},prepareCompressedContent:function(a,b,c){return function(){var d=a.index;a.setIndex(b);var e=a.readData(c);return a.setIndex(d),e}},prepareContent:function(a,b,c,d,e){return function(){var a=f.transformTo(d.uncompressInputType,this.getCompressedContent()),b=d.uncompress(a);if(b.length!==e)throw new Error("Bug : uncompressed data size mismatch");return b}},readLocalPart:function(a){var b,c;if(a.skip(22),this.fileNameLength=a.readInt(2),c=a.readInt(2),this.fileName=a.readData(this.fileNameLength),a.skip(c),this.compressedSize==-1||this.uncompressedSize==-1)throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory (compressedSize == -1 || uncompressedSize == -1)");if(b=f.findCompression(this.compressionMethod),null===b)throw new Error("Corrupted zip : compression "+f.pretty(this.compressionMethod)+" unknown (inner file : "+f.transformTo("string",this.fileName)+")");if(this.decompressed=new g,this.decompressed.compressedSize=this.compressedSize,this.decompressed.uncompressedSize=this.uncompressedSize,this.decompressed.crc32=this.crc32,this.decompressed.compressionMethod=this.compressionMethod,this.decompressed.getCompressedContent=this.prepareCompressedContent(a,a.index,this.compressedSize,b),this.decompressed.getContent=this.prepareContent(a,a.index,this.compressedSize,b,this.uncompressedSize),this.loadOptions.checkCRC32&&(this.decompressed=f.transformTo("string",this.decompressed.getContent()),h.crc32(this.decompressed)!==this.crc32))throw new Error("Corrupted zip : CRC32 mismatch"); +},readCentralPart:function(a){if(this.versionMadeBy=a.readInt(2),this.versionNeeded=a.readInt(2),this.bitFlag=a.readInt(2),this.compressionMethod=a.readString(2),this.date=a.readDate(),this.crc32=a.readInt(4),this.compressedSize=a.readInt(4),this.uncompressedSize=a.readInt(4),this.fileNameLength=a.readInt(2),this.extraFieldsLength=a.readInt(2),this.fileCommentLength=a.readInt(2),this.diskNumberStart=a.readInt(2),this.internalFileAttributes=a.readInt(2),this.externalFileAttributes=a.readInt(4),this.localHeaderOffset=a.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");this.fileName=a.readData(this.fileNameLength),this.readExtraFields(a),this.parseZIP64ExtraField(a),this.fileComment=a.readData(this.fileCommentLength)},processAttributes:function(){this.unixPermissions=null,this.dosPermissions=null;var a=this.versionMadeBy>>8;this.dir=!!(16&this.externalFileAttributes),a===j&&(this.dosPermissions=63&this.externalFileAttributes),a===k&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(a){if(this.extraFields[1]){var b=new e(this.extraFields[1].value);this.uncompressedSize===f.MAX_VALUE_32BITS&&(this.uncompressedSize=b.readInt(8)),this.compressedSize===f.MAX_VALUE_32BITS&&(this.compressedSize=b.readInt(8)),this.localHeaderOffset===f.MAX_VALUE_32BITS&&(this.localHeaderOffset=b.readInt(8)),this.diskNumberStart===f.MAX_VALUE_32BITS&&(this.diskNumberStart=b.readInt(4))}},readExtraFields:function(a){var b,c,d,e=a.index;for(this.extraFields=this.extraFields||{};a.index0?b.windowBits=-b.windowBits:b.gzip&&b.windowBits>0&&b.windowBits<16&&(b.windowBits+=16),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new l,this.strm.avail_out=0;var c=h.deflateInit2(this.strm,b.level,b.method,b.windowBits,b.memLevel,b.strategy);if(c!==p)throw new Error(k[c]);if(b.header&&h.deflateSetHeader(this.strm,b.header),b.dictionary){var e;if(e="string"==typeof b.dictionary?j.string2buf(b.dictionary):"[object ArrayBuffer]"===m.call(b.dictionary)?new Uint8Array(b.dictionary):b.dictionary,c=h.deflateSetDictionary(this.strm,e),c!==p)throw new Error(k[c]);this._dict_set=!0}}function e(a,b){var c=new d(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function f(a,b){return b=b||{},b.raw=!0,e(a,b)}function g(a,b){return b=b||{},b.gzip=!0,e(a,b)}var h=a("./zlib/deflate"),i=a("./utils/common"),j=a("./utils/strings"),k=a("./zlib/messages"),l=a("./zlib/zstream"),m=Object.prototype.toString,n=0,o=4,p=0,q=1,r=2,s=-1,t=0,u=8;d.prototype.push=function(a,b){var c,d,e=this.strm,f=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?o:n,"string"==typeof a?e.input=j.string2buf(a):"[object ArrayBuffer]"===m.call(a)?e.input=new Uint8Array(a):e.input=a,e.next_in=0,e.avail_in=e.input.length;do{if(0===e.avail_out&&(e.output=new i.Buf8(f),e.next_out=0,e.avail_out=f),c=h.deflate(e,d),c!==q&&c!==p)return this.onEnd(c),this.ended=!0,!1;0!==e.avail_out&&(0!==e.avail_in||d!==o&&d!==r)||("string"===this.options.to?this.onData(j.buf2binstring(i.shrinkBuf(e.output,e.next_out))):this.onData(i.shrinkBuf(e.output,e.next_out)))}while((e.avail_in>0||0===e.avail_out)&&c!==q);return d===o?(c=h.deflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===p):d!==r||(this.onEnd(p),e.avail_out=0,!0)},d.prototype.onData=function(a){this.chunks.push(a)},d.prototype.onEnd=function(a){a===p&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=i.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Deflate=d,c.deflate=e,c.deflateRaw=f,c.gzip=g},{"./utils/common":28,"./utils/strings":29,"./zlib/deflate":33,"./zlib/messages":38,"./zlib/zstream":40}],27:[function(a,b,c){"use strict";function d(a){if(!(this instanceof d))return new d(a);this.options=h.assign({chunkSize:16384,windowBits:0,to:""},a||{});var b=this.options;b.raw&&b.windowBits>=0&&b.windowBits<16&&(b.windowBits=-b.windowBits,0===b.windowBits&&(b.windowBits=-15)),!(b.windowBits>=0&&b.windowBits<16)||a&&a.windowBits||(b.windowBits+=32),b.windowBits>15&&b.windowBits<48&&0===(15&b.windowBits)&&(b.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new l,this.strm.avail_out=0;var c=g.inflateInit2(this.strm,b.windowBits);if(c!==j.Z_OK)throw new Error(k[c]);this.header=new m,g.inflateGetHeader(this.strm,this.header)}function e(a,b){var c=new d(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function f(a,b){return b=b||{},b.raw=!0,e(a,b)}var g=a("./zlib/inflate"),h=a("./utils/common"),i=a("./utils/strings"),j=a("./zlib/constants"),k=a("./zlib/messages"),l=a("./zlib/zstream"),m=a("./zlib/gzheader"),n=Object.prototype.toString;d.prototype.push=function(a,b){var c,d,e,f,k,l,m=this.strm,o=this.options.chunkSize,p=this.options.dictionary,q=!1;if(this.ended)return!1;d=b===~~b?b:b===!0?j.Z_FINISH:j.Z_NO_FLUSH,"string"==typeof a?m.input=i.binstring2buf(a):"[object ArrayBuffer]"===n.call(a)?m.input=new Uint8Array(a):m.input=a,m.next_in=0,m.avail_in=m.input.length;do{if(0===m.avail_out&&(m.output=new h.Buf8(o),m.next_out=0,m.avail_out=o),c=g.inflate(m,j.Z_NO_FLUSH),c===j.Z_NEED_DICT&&p&&(l="string"==typeof p?i.string2buf(p):"[object ArrayBuffer]"===n.call(p)?new Uint8Array(p):p,c=g.inflateSetDictionary(this.strm,l)),c===j.Z_BUF_ERROR&&q===!0&&(c=j.Z_OK,q=!1),c!==j.Z_STREAM_END&&c!==j.Z_OK)return this.onEnd(c),this.ended=!0,!1;m.next_out&&(0!==m.avail_out&&c!==j.Z_STREAM_END&&(0!==m.avail_in||d!==j.Z_FINISH&&d!==j.Z_SYNC_FLUSH)||("string"===this.options.to?(e=i.utf8border(m.output,m.next_out),f=m.next_out-e,k=i.buf2string(m.output,e),m.next_out=f,m.avail_out=o-f,f&&h.arraySet(m.output,m.output,e,f,0),this.onData(k)):this.onData(h.shrinkBuf(m.output,m.next_out)))),0===m.avail_in&&0===m.avail_out&&(q=!0)}while((m.avail_in>0||0===m.avail_out)&&c!==j.Z_STREAM_END);return c===j.Z_STREAM_END&&(d=j.Z_FINISH),d===j.Z_FINISH?(c=g.inflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===j.Z_OK):d!==j.Z_SYNC_FLUSH||(this.onEnd(j.Z_OK),m.avail_out=0,!0)},d.prototype.onData=function(a){this.chunks.push(a)},d.prototype.onEnd=function(a){a===j.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=h.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Inflate=d,c.inflate=e,c.inflateRaw=f,c.ungzip=e},{"./utils/common":28,"./utils/strings":29,"./zlib/constants":31,"./zlib/gzheader":34,"./zlib/inflate":36,"./zlib/messages":38,"./zlib/zstream":40}],28:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;c.assign=function(a){for(var b=Array.prototype.slice.call(arguments,1);b.length;){var c=b.shift();if(c){if("object"!=typeof c)throw new TypeError(c+"must be non-object");for(var d in c)c.hasOwnProperty(d)&&(a[d]=c[d])}}return a},c.shrinkBuf=function(a,b){return a.length===b?a:a.subarray?a.subarray(0,b):(a.length=b,a)};var e={arraySet:function(a,b,c,d,e){if(b.subarray&&a.subarray)return void a.set(b.subarray(c,c+d),e);for(var f=0;f=252?6:j>=248?5:j>=240?4:j>=224?3:j>=192?2:1;i[254]=i[254]=1,c.string2buf=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;f>>6,b[g++]=128|63&c):c<65536?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},c.buf2binstring=function(a){return d(a,a.length)},c.binstring2buf=function(a){for(var b=new e.Buf8(a.length),c=0,d=b.length;c4)j[e++]=65533,c+=g-1;else{for(f&=2===g?31:3===g?15:7;g>1&&c1?j[e++]=65533:f<65536?j[e++]=f:(f-=65536,j[e++]=55296|f>>10&1023,j[e++]=56320|1023&f)}return d(j,e)},c.utf8border=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return c<0?b:0===c?b:c+i[a[c]]>b?c:b}},{"./common":28}],30:[function(a,b,c){"use strict";function d(a,b,c,d){for(var e=65535&a|0,f=a>>>16&65535|0,g=0;0!==c;){g=c>2e3?2e3:c,c-=g;do e=e+b[d++]|0,f=f+e|0;while(--g);e%=65521,f%=65521}return e|f<<16|0}b.exports=d},{}],31:[function(a,b,c){"use strict";b.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},{}],32:[function(a,b,c){"use strict";function d(){for(var a,b=[],c=0;c<256;c++){a=c;for(var d=0;d<8;d++)a=1&a?3988292384^a>>>1:a>>>1;b[c]=a}return b}function e(a,b,c,d){var e=f,g=d+c;a^=-1;for(var h=d;h>>8^e[255&(a^b[h])];return a^-1}var f=d();b.exports=e},{}],33:[function(a,b,c){"use strict";function d(a,b){return a.msg=I[b],b}function e(a){return(a<<1)-(a>4?9:0)}function f(a){for(var b=a.length;--b>=0;)a[b]=0}function g(a){var b=a.state,c=b.pending;c>a.avail_out&&(c=a.avail_out),0!==c&&(E.arraySet(a.output,b.pending_buf,b.pending_out,c,a.next_out),a.next_out+=c,b.pending_out+=c,a.total_out+=c,a.avail_out-=c,b.pending-=c,0===b.pending&&(b.pending_out=0))}function h(a,b){F._tr_flush_block(a,a.block_start>=0?a.block_start:-1,a.strstart-a.block_start,b),a.block_start=a.strstart,g(a.strm)}function i(a,b){a.pending_buf[a.pending++]=b}function j(a,b){a.pending_buf[a.pending++]=b>>>8&255,a.pending_buf[a.pending++]=255&b}function k(a,b,c,d){var e=a.avail_in;return e>d&&(e=d),0===e?0:(a.avail_in-=e,E.arraySet(b,a.input,a.next_in,e,c),1===a.state.wrap?a.adler=G(a.adler,b,e,c):2===a.state.wrap&&(a.adler=H(a.adler,b,e,c)),a.next_in+=e,a.total_in+=e,e)}function l(a,b){var c,d,e=a.max_chain_length,f=a.strstart,g=a.prev_length,h=a.nice_match,i=a.strstart>a.w_size-la?a.strstart-(a.w_size-la):0,j=a.window,k=a.w_mask,l=a.prev,m=a.strstart+ka,n=j[f+g-1],o=j[f+g];a.prev_length>=a.good_match&&(e>>=2),h>a.lookahead&&(h=a.lookahead);do if(c=b,j[c+g]===o&&j[c+g-1]===n&&j[c]===j[f]&&j[++c]===j[f+1]){f+=2,c++;do;while(j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&fg){if(a.match_start=b,g=d,d>=h)break;n=j[f+g-1],o=j[f+g]}}while((b=l[b&k])>i&&0!==--e);return g<=a.lookahead?g:a.lookahead}function m(a){var b,c,d,e,f,g=a.w_size;do{if(e=a.window_size-a.lookahead-a.strstart,a.strstart>=g+(g-la)){E.arraySet(a.window,a.window,g,g,0),a.match_start-=g,a.strstart-=g,a.block_start-=g,c=a.hash_size,b=c;do d=a.head[--b],a.head[b]=d>=g?d-g:0;while(--c);c=g,b=c;do d=a.prev[--b],a.prev[b]=d>=g?d-g:0;while(--c);e+=g}if(0===a.strm.avail_in)break;if(c=k(a.strm,a.window,a.strstart+a.lookahead,e),a.lookahead+=c,a.lookahead+a.insert>=ja)for(f=a.strstart-a.insert,a.ins_h=a.window[f],a.ins_h=(a.ins_h<a.pending_buf_size-5&&(c=a.pending_buf_size-5);;){if(a.lookahead<=1){if(m(a),0===a.lookahead&&b===J)return ua;if(0===a.lookahead)break}a.strstart+=a.lookahead,a.lookahead=0;var d=a.block_start+c;if((0===a.strstart||a.strstart>=d)&&(a.lookahead=a.strstart-d,a.strstart=d,h(a,!1),0===a.strm.avail_out))return ua;if(a.strstart-a.block_start>=a.w_size-la&&(h(a,!1),0===a.strm.avail_out))return ua}return a.insert=0,b===M?(h(a,!0),0===a.strm.avail_out?wa:xa):a.strstart>a.block_start&&(h(a,!1),0===a.strm.avail_out)?ua:ua}function o(a,b){for(var c,d;;){if(a.lookahead=ja&&(a.ins_h=(a.ins_h<=ja)if(d=F._tr_tally(a,a.strstart-a.match_start,a.match_length-ja),a.lookahead-=a.match_length,a.match_length<=a.max_lazy_match&&a.lookahead>=ja){a.match_length--;do a.strstart++,a.ins_h=(a.ins_h<=ja&&(a.ins_h=(a.ins_h<4096)&&(a.match_length=ja-1)),a.prev_length>=ja&&a.match_length<=a.prev_length){e=a.strstart+a.lookahead-ja,d=F._tr_tally(a,a.strstart-1-a.prev_match,a.prev_length-ja),a.lookahead-=a.prev_length-1,a.prev_length-=2;do++a.strstart<=e&&(a.ins_h=(a.ins_h<=ja&&a.strstart>0&&(e=a.strstart-1,d=g[e],d===g[++e]&&d===g[++e]&&d===g[++e])){f=a.strstart+ka;do;while(d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&ea.lookahead&&(a.match_length=a.lookahead)}if(a.match_length>=ja?(c=F._tr_tally(a,1,a.match_length-ja),a.lookahead-=a.match_length,a.strstart+=a.match_length,a.match_length=0):(c=F._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++),c&&(h(a,!1),0===a.strm.avail_out))return ua}return a.insert=0,b===M?(h(a,!0),0===a.strm.avail_out?wa:xa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ua:va}function r(a,b){for(var c;;){if(0===a.lookahead&&(m(a),0===a.lookahead)){if(b===J)return ua;break}if(a.match_length=0,c=F._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++,c&&(h(a,!1),0===a.strm.avail_out))return ua}return a.insert=0,b===M?(h(a,!0),0===a.strm.avail_out?wa:xa):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?ua:va}function s(a,b,c,d,e){this.good_length=a,this.max_lazy=b,this.nice_length=c,this.max_chain=d,this.func=e}function t(a){a.window_size=2*a.w_size,f(a.head),a.max_lazy_match=D[a.level].max_lazy,a.good_match=D[a.level].good_length,a.nice_match=D[a.level].nice_length,a.max_chain_length=D[a.level].max_chain,a.strstart=0,a.block_start=0,a.lookahead=0,a.insert=0,a.match_length=a.prev_length=ja-1,a.match_available=0,a.ins_h=0}function u(){this.strm=null,this.status=0,this.pending_buf=null,this.pending_buf_size=0,this.pending_out=0,this.pending=0,this.wrap=0,this.gzhead=null,this.gzindex=0,this.method=$,this.last_flush=-1,this.w_size=0,this.w_bits=0,this.w_mask=0,this.window=null,this.window_size=0,this.prev=null,this.head=null,this.ins_h=0,this.hash_size=0,this.hash_bits=0,this.hash_mask=0,this.hash_shift=0,this.block_start=0,this.match_length=0,this.prev_match=0,this.match_available=0,this.strstart=0,this.match_start=0,this.lookahead=0,this.prev_length=0,this.max_chain_length=0,this.max_lazy_match=0,this.level=0,this.strategy=0,this.good_match=0,this.nice_match=0,this.dyn_ltree=new E.Buf16(2*ha),this.dyn_dtree=new E.Buf16(2*(2*fa+1)),this.bl_tree=new E.Buf16(2*(2*ga+1)),f(this.dyn_ltree),f(this.dyn_dtree),f(this.bl_tree),this.l_desc=null,this.d_desc=null,this.bl_desc=null,this.bl_count=new E.Buf16(ia+1),this.heap=new E.Buf16(2*ea+1),f(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new E.Buf16(2*ea+1),f(this.depth),this.l_buf=0,this.lit_bufsize=0,this.last_lit=0,this.d_buf=0,this.opt_len=0,this.static_len=0,this.matches=0,this.insert=0,this.bi_buf=0,this.bi_valid=0}function v(a){var b;return a&&a.state?(a.total_in=a.total_out=0,a.data_type=Z,b=a.state,b.pending=0,b.pending_out=0,b.wrap<0&&(b.wrap=-b.wrap),b.status=b.wrap?na:sa,a.adler=2===b.wrap?0:1,b.last_flush=J,F._tr_init(b),O):d(a,Q)}function w(a){var b=v(a);return b===O&&t(a.state),b}function x(a,b){return a&&a.state?2!==a.state.wrap?Q:(a.state.gzhead=b,O):Q}function y(a,b,c,e,f,g){if(!a)return Q;var h=1;if(b===T&&(b=6),e<0?(h=0,e=-e):e>15&&(h=2,e-=16),f<1||f>_||c!==$||e<8||e>15||b<0||b>9||g<0||g>X)return d(a,Q);8===e&&(e=9);var i=new u;return a.state=i,i.strm=a,i.wrap=h,i.gzhead=null,i.w_bits=e,i.w_size=1<N||b<0)return a?d(a,Q):Q;if(h=a.state,!a.output||!a.input&&0!==a.avail_in||h.status===ta&&b!==M)return d(a,0===a.avail_out?S:Q);if(h.strm=a,c=h.last_flush,h.last_flush=b,h.status===na)if(2===h.wrap)a.adler=0,i(h,31),i(h,139),i(h,8),h.gzhead?(i(h,(h.gzhead.text?1:0)+(h.gzhead.hcrc?2:0)+(h.gzhead.extra?4:0)+(h.gzhead.name?8:0)+(h.gzhead.comment?16:0)),i(h,255&h.gzhead.time),i(h,h.gzhead.time>>8&255),i(h,h.gzhead.time>>16&255),i(h,h.gzhead.time>>24&255),i(h,9===h.level?2:h.strategy>=V||h.level<2?4:0),i(h,255&h.gzhead.os),h.gzhead.extra&&h.gzhead.extra.length&&(i(h,255&h.gzhead.extra.length),i(h,h.gzhead.extra.length>>8&255)),h.gzhead.hcrc&&(a.adler=H(a.adler,h.pending_buf,h.pending,0)),h.gzindex=0,h.status=oa):(i(h,0),i(h,0),i(h,0),i(h,0),i(h,0),i(h,9===h.level?2:h.strategy>=V||h.level<2?4:0),i(h,ya),h.status=sa);else{var m=$+(h.w_bits-8<<4)<<8,n=-1;n=h.strategy>=V||h.level<2?0:h.level<6?1:6===h.level?2:3,m|=n<<6,0!==h.strstart&&(m|=ma),m+=31-m%31,h.status=sa,j(h,m),0!==h.strstart&&(j(h,a.adler>>>16),j(h,65535&a.adler)),a.adler=1}if(h.status===oa)if(h.gzhead.extra){for(k=h.pending;h.gzindex<(65535&h.gzhead.extra.length)&&(h.pending!==h.pending_buf_size||(h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending!==h.pending_buf_size));)i(h,255&h.gzhead.extra[h.gzindex]),h.gzindex++;h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),h.gzindex===h.gzhead.extra.length&&(h.gzindex=0,h.status=pa)}else h.status=pa;if(h.status===pa)if(h.gzhead.name){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindexk&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.gzindex=0,h.status=qa)}else h.status=qa;if(h.status===qa)if(h.gzhead.comment){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindexk&&(a.adler=H(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.status=ra)}else h.status=ra;if(h.status===ra&&(h.gzhead.hcrc?(h.pending+2>h.pending_buf_size&&g(a),h.pending+2<=h.pending_buf_size&&(i(h,255&a.adler),i(h,a.adler>>8&255),a.adler=0,h.status=sa)):h.status=sa),0!==h.pending){if(g(a),0===a.avail_out)return h.last_flush=-1,O}else if(0===a.avail_in&&e(b)<=e(c)&&b!==M)return d(a,S);if(h.status===ta&&0!==a.avail_in)return d(a,S);if(0!==a.avail_in||0!==h.lookahead||b!==J&&h.status!==ta){var o=h.strategy===V?r(h,b):h.strategy===W?q(h,b):D[h.level].func(h,b);if(o!==wa&&o!==xa||(h.status=ta),o===ua||o===wa)return 0===a.avail_out&&(h.last_flush=-1),O;if(o===va&&(b===K?F._tr_align(h):b!==N&&(F._tr_stored_block(h,0,0,!1),b===L&&(f(h.head),0===h.lookahead&&(h.strstart=0,h.block_start=0,h.insert=0))),g(a),0===a.avail_out))return h.last_flush=-1,O}return b!==M?O:h.wrap<=0?P:(2===h.wrap?(i(h,255&a.adler),i(h,a.adler>>8&255),i(h,a.adler>>16&255),i(h,a.adler>>24&255),i(h,255&a.total_in),i(h,a.total_in>>8&255),i(h,a.total_in>>16&255),i(h,a.total_in>>24&255)):(j(h,a.adler>>>16),j(h,65535&a.adler)),g(a),h.wrap>0&&(h.wrap=-h.wrap),0!==h.pending?O:P)}function B(a){var b;return a&&a.state?(b=a.state.status,b!==na&&b!==oa&&b!==pa&&b!==qa&&b!==ra&&b!==sa&&b!==ta?d(a,Q):(a.state=null,b===sa?d(a,R):O)):Q}function C(a,b){var c,d,e,g,h,i,j,k,l=b.length;if(!a||!a.state)return Q;if(c=a.state,g=c.wrap,2===g||1===g&&c.status!==na||c.lookahead)return Q;for(1===g&&(a.adler=G(a.adler,b,l,0)),c.wrap=0,l>=c.w_size&&(0===g&&(f(c.head),c.strstart=0,c.block_start=0,c.insert=0),k=new E.Buf8(c.w_size),E.arraySet(k,b,l-c.w_size,c.w_size,0),b=k,l=c.w_size),h=a.avail_in,i=a.next_in,j=a.input,a.avail_in=l,a.next_in=0,a.input=b,m(c);c.lookahead>=ja;){d=c.strstart,e=c.lookahead-(ja-1);do c.ins_h=(c.ins_h<>>24,p>>>=w,q-=w,w=v>>>16&255,0===w)C[h++]=65535&v;else{if(!(16&w)){if(0===(64&w)){v=r[(65535&v)+(p&(1<>>=w,q-=w),q<15&&(p+=B[f++]<>>24,p>>>=w,q-=w,w=v>>>16&255,!(16&w)){if(0===(64&w)){v=s[(65535&v)+(p&(1<k){a.msg="invalid distance too far back",c.mode=d;break a}if(p>>>=w,q-=w,w=h-i,y>w){if(w=y-w,w>m&&c.sane){a.msg="invalid distance too far back",c.mode=d;break a}if(z=0,A=o,0===n){if(z+=l-w,w2;)C[h++]=A[z++],C[h++]=A[z++],C[h++]=A[z++],x-=3;x&&(C[h++]=A[z++],x>1&&(C[h++]=A[z++]))}else{z=h-y;do C[h++]=C[z++],C[h++]=C[z++],C[h++]=C[z++],x-=3;while(x>2);x&&(C[h++]=C[z++],x>1&&(C[h++]=C[z++]))}break}}break}}while(f>3,f-=x,q-=x<<3,p&=(1<>>24&255)+(a>>>8&65280)+((65280&a)<<8)+((255&a)<<24)}function e(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new s.Buf16(320),this.work=new s.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function f(a){var b;return a&&a.state?(b=a.state,a.total_in=a.total_out=b.total=0,a.msg="",b.wrap&&(a.adler=1&b.wrap),b.mode=L,b.last=0,b.havedict=0,b.dmax=32768,b.head=null,b.hold=0,b.bits=0,b.lencode=b.lendyn=new s.Buf32(pa),b.distcode=b.distdyn=new s.Buf32(qa),b.sane=1,b.back=-1,D):G}function g(a){var b;return a&&a.state?(b=a.state,b.wsize=0,b.whave=0,b.wnext=0,f(a)):G}function h(a,b){var c,d;return a&&a.state?(d=a.state,b<0?(c=0,b=-b):(c=(b>>4)+1,b<48&&(b&=15)),b&&(b<8||b>15)?G:(null!==d.window&&d.wbits!==b&&(d.window=null),d.wrap=c,d.wbits=b,g(a))):G}function i(a,b){var c,d;return a?(d=new e,a.state=d,d.window=null,c=h(a,b),c!==D&&(a.state=null),c):G}function j(a){return i(a,sa)}function k(a){if(ta){var b;for(q=new s.Buf32(512),r=new s.Buf32(32),b=0;b<144;)a.lens[b++]=8;for(;b<256;)a.lens[b++]=9;for(;b<280;)a.lens[b++]=7;for(;b<288;)a.lens[b++]=8;for(w(y,a.lens,0,288,q,0,a.work,{bits:9}),b=0;b<32;)a.lens[b++]=5;w(z,a.lens,0,32,r,0,a.work,{bits:5}),ta=!1}a.lencode=q,a.lenbits=9,a.distcode=r,a.distbits=5}function l(a,b,c,d){var e,f=a.state;return null===f.window&&(f.wsize=1<=f.wsize?(s.arraySet(f.window,b,c-f.wsize,f.wsize,0),f.wnext=0,f.whave=f.wsize):(e=f.wsize-f.wnext,e>d&&(e=d),s.arraySet(f.window,b,c-d,e,f.wnext),d-=e,d?(s.arraySet(f.window,b,c-d,d,0),f.wnext=d,f.whave=f.wsize):(f.wnext+=e,f.wnext===f.wsize&&(f.wnext=0),f.whave>>8&255,c.check=u(c.check,Ba,2,0),m=0,n=0,c.mode=M;break}if(c.flags=0,c.head&&(c.head.done=!1),!(1&c.wrap)||(((255&m)<<8)+(m>>8))%31){a.msg="incorrect header check",c.mode=ma;break}if((15&m)!==K){a.msg="unknown compression method",c.mode=ma;break}if(m>>>=4,n-=4,wa=(15&m)+8,0===c.wbits)c.wbits=wa;else if(wa>c.wbits){a.msg="invalid window size",c.mode=ma;break}c.dmax=1<>8&1),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=u(c.check,Ba,2,0)),m=0,n=0,c.mode=N;case N:for(;n<32;){if(0===i)break a;i--,m+=e[g++]<>>8&255,Ba[2]=m>>>16&255,Ba[3]=m>>>24&255,c.check=u(c.check,Ba,4,0)),m=0,n=0,c.mode=O;case O:for(;n<16;){if(0===i)break a;i--,m+=e[g++]<>8),512&c.flags&&(Ba[0]=255&m,Ba[1]=m>>>8&255,c.check=u(c.check,Ba,2,0)),m=0,n=0,c.mode=P;case P:if(1024&c.flags){for(;n<16;){if(0===i)break a;i--,m+=e[g++]<>>8&255,c.check=u(c.check,Ba,2,0)),m=0,n=0}else c.head&&(c.head.extra=null);c.mode=Q;case Q:if(1024&c.flags&&(q=c.length,q>i&&(q=i),q&&(c.head&&(wa=c.head.extra_len-c.length,c.head.extra||(c.head.extra=new Array(c.head.extra_len)),s.arraySet(c.head.extra,e,g,q,wa)),512&c.flags&&(c.check=u(c.check,e,q,g)),i-=q,g+=q,c.length-=q),c.length))break a;c.length=0,c.mode=R;case R:if(2048&c.flags){if(0===i)break a;q=0;do wa=e[g+q++],c.head&&wa&&c.length<65536&&(c.head.name+=String.fromCharCode(wa));while(wa&&q>9&1,c.head.done=!0),a.adler=c.check=0,c.mode=W;break;case U:for(;n<32;){if(0===i)break a;i--,m+=e[g++]<>>=7&n,n-=7&n,c.mode=ja;break}for(;n<3;){if(0===i)break a;i--,m+=e[g++]<>>=1,n-=1,3&m){case 0:c.mode=Y;break;case 1:if(k(c),c.mode=ca,b===C){m>>>=2,n-=2;break a}break;case 2:c.mode=_;break;case 3:a.msg="invalid block type",c.mode=ma}m>>>=2,n-=2;break;case Y:for(m>>>=7&n,n-=7&n;n<32;){if(0===i)break a;i--,m+=e[g++]<>>16^65535)){a.msg="invalid stored block lengths",c.mode=ma;break}if(c.length=65535&m,m=0,n=0,c.mode=Z,b===C)break a;case Z:c.mode=$;case $:if(q=c.length){if(q>i&&(q=i),q>j&&(q=j),0===q)break a;s.arraySet(f,e,g,q,h),i-=q,g+=q,j-=q,h+=q,c.length-=q;break}c.mode=W;break;case _:for(;n<14;){if(0===i)break a;i--,m+=e[g++]<>>=5,n-=5,c.ndist=(31&m)+1,m>>>=5,n-=5,c.ncode=(15&m)+4,m>>>=4,n-=4,c.nlen>286||c.ndist>30){a.msg="too many length or distance symbols",c.mode=ma;break}c.have=0,c.mode=aa;case aa:for(;c.have>>=3,n-=3}for(;c.have<19;)c.lens[Ca[c.have++]]=0;if(c.lencode=c.lendyn,c.lenbits=7,ya={bits:c.lenbits},xa=w(x,c.lens,0,19,c.lencode,0,c.work,ya),c.lenbits=ya.bits,xa){a.msg="invalid code lengths set",c.mode=ma;break}c.have=0,c.mode=ba;case ba:for(;c.have>>24,ra=Aa>>>16&255,sa=65535&Aa,!(qa<=n);){if(0===i)break a;i--,m+=e[g++]<>>=qa,n-=qa,c.lens[c.have++]=sa;else{if(16===sa){for(za=qa+2;n>>=qa,n-=qa,0===c.have){a.msg="invalid bit length repeat",c.mode=ma;break}wa=c.lens[c.have-1],q=3+(3&m),m>>>=2,n-=2}else if(17===sa){for(za=qa+3;n>>=qa,n-=qa,wa=0,q=3+(7&m),m>>>=3,n-=3}else{for(za=qa+7;n>>=qa,n-=qa,wa=0,q=11+(127&m),m>>>=7,n-=7}if(c.have+q>c.nlen+c.ndist){a.msg="invalid bit length repeat",c.mode=ma;break}for(;q--;)c.lens[c.have++]=wa}}if(c.mode===ma)break;if(0===c.lens[256]){a.msg="invalid code -- missing end-of-block",c.mode=ma;break}if(c.lenbits=9,ya={bits:c.lenbits},xa=w(y,c.lens,0,c.nlen,c.lencode,0,c.work,ya),c.lenbits=ya.bits,xa){a.msg="invalid literal/lengths set",c.mode=ma;break}if(c.distbits=6,c.distcode=c.distdyn,ya={bits:c.distbits},xa=w(z,c.lens,c.nlen,c.ndist,c.distcode,0,c.work,ya),c.distbits=ya.bits,xa){a.msg="invalid distances set",c.mode=ma;break}if(c.mode=ca,b===C)break a;case ca:c.mode=da;case da:if(i>=6&&j>=258){a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,v(a,p),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,c.mode===W&&(c.back=-1);break}for(c.back=0;Aa=c.lencode[m&(1<>>24,ra=Aa>>>16&255,sa=65535&Aa,!(qa<=n);){if(0===i)break a;i--,m+=e[g++]<>ta)],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(ta+qa<=n);){if(0===i)break a;i--,m+=e[g++]<>>=ta,n-=ta,c.back+=ta}if(m>>>=qa,n-=qa,c.back+=qa,c.length=sa,0===ra){c.mode=ia;break}if(32&ra){c.back=-1,c.mode=W;break}if(64&ra){a.msg="invalid literal/length code",c.mode=ma;break}c.extra=15&ra,c.mode=ea;case ea:if(c.extra){for(za=c.extra;n>>=c.extra,n-=c.extra,c.back+=c.extra}c.was=c.length,c.mode=fa;case fa:for(;Aa=c.distcode[m&(1<>>24,ra=Aa>>>16&255,sa=65535&Aa,!(qa<=n);){if(0===i)break a;i--,m+=e[g++]<>ta)],qa=Aa>>>24,ra=Aa>>>16&255,sa=65535&Aa,!(ta+qa<=n);){if(0===i)break a;i--,m+=e[g++]<>>=ta,n-=ta,c.back+=ta}if(m>>>=qa,n-=qa,c.back+=qa,64&ra){a.msg="invalid distance code",c.mode=ma;break}c.offset=sa,c.extra=15&ra,c.mode=ga;case ga:if(c.extra){for(za=c.extra;n>>=c.extra,n-=c.extra,c.back+=c.extra}if(c.offset>c.dmax){a.msg="invalid distance too far back",c.mode=ma;break}c.mode=ha;case ha:if(0===j)break a;if(q=p-j,c.offset>q){if(q=c.offset-q,q>c.whave&&c.sane){a.msg="invalid distance too far back",c.mode=ma;break}q>c.wnext?(q-=c.wnext,r=c.wsize-q):r=c.wnext-q,q>c.length&&(q=c.length),pa=c.window}else pa=f,r=h-c.offset,q=c.length;q>j&&(q=j),j-=q,c.length-=q;do f[h++]=pa[r++];while(--q);0===c.length&&(c.mode=da);break;case ia:if(0===j)break a;f[h++]=c.length,j--,c.mode=da;break;case ja:if(c.wrap){for(;n<32;){if(0===i)break a;i--,m|=e[g++]<=1&&0===P[G];G--);if(H>G&&(H=G),0===G)return p[q++]=20971520,p[q++]=20971520,s.bits=1,0;for(F=1;F0&&(a===h||1!==G))return-1;for(Q[1]=0,D=1;Df||a===j&&L>g)return 1;for(var T=0;;){T++,z=D-J,r[E]y?(A=R[S+r[E]],B=N[O+r[E]]):(A=96,B=0),t=1<>J)+u]=z<<24|A<<16|B|0;while(0!==u);for(t=1<>=1;if(0!==t?(M&=t-1,M+=t):M=0,E++,0===--P[D]){if(D===G)break;D=b[c+r[E]]}if(D>H&&(M&w)!==v){for(0===J&&(J=H),x+=F,I=D-J,K=1<f||a===j&&L>g)return 1;v=M&w,p[v]=H<<24|I<<16|x-q|0}}return 0!==M&&(p[x+M]=D-J<<24|64<<16|0),s.bits=H,0}},{"../utils/common":28}],38:[function(a,b,c){"use strict";b.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},{}],39:[function(a,b,c){"use strict";function d(a){for(var b=a.length;--b>=0;)a[b]=0}function e(a,b,c,d,e){this.static_tree=a,this.extra_bits=b,this.extra_base=c,this.elems=d,this.max_length=e,this.has_stree=a&&a.length}function f(a,b){this.dyn_tree=a,this.max_code=0,this.stat_desc=b}function g(a){return a<256?ia[a]:ia[256+(a>>>7)]}function h(a,b){a.pending_buf[a.pending++]=255&b,a.pending_buf[a.pending++]=b>>>8&255}function i(a,b,c){a.bi_valid>X-c?(a.bi_buf|=b<>X-a.bi_valid,a.bi_valid+=c-X):(a.bi_buf|=b<>>=1,c<<=1;while(--b>0);return c>>>1}function l(a){16===a.bi_valid?(h(a,a.bi_buf),a.bi_buf=0,a.bi_valid=0):a.bi_valid>=8&&(a.pending_buf[a.pending++]=255&a.bi_buf,a.bi_buf>>=8,a.bi_valid-=8)}function m(a,b){var c,d,e,f,g,h,i=b.dyn_tree,j=b.max_code,k=b.stat_desc.static_tree,l=b.stat_desc.has_stree,m=b.stat_desc.extra_bits,n=b.stat_desc.extra_base,o=b.stat_desc.max_length,p=0;for(f=0;f<=W;f++)a.bl_count[f]=0;for(i[2*a.heap[a.heap_max]+1]=0,c=a.heap_max+1;co&&(f=o,p++),i[2*d+1]=f,d>j||(a.bl_count[f]++,g=0,d>=n&&(g=m[d-n]),h=i[2*d],a.opt_len+=h*(f+g),l&&(a.static_len+=h*(k[2*d+1]+g)));if(0!==p){do{for(f=o-1;0===a.bl_count[f];)f--;a.bl_count[f]--,a.bl_count[f+1]+=2,a.bl_count[o]--,p-=2}while(p>0);for(f=o;0!==f;f--)for(d=a.bl_count[f];0!==d;)e=a.heap[--c],e>j||(i[2*e+1]!==f&&(a.opt_len+=(f-i[2*e+1])*i[2*e],i[2*e+1]=f),d--)}}function n(a,b,c){var d,e,f=new Array(W+1),g=0;for(d=1;d<=W;d++)f[d]=g=g+c[d-1]<<1;for(e=0;e<=b;e++){var h=a[2*e+1];0!==h&&(a[2*e]=k(f[h]++,h))}}function o(){var a,b,c,d,f,g=new Array(W+1);for(c=0,d=0;d>=7;d8?h(a,a.bi_buf):a.bi_valid>0&&(a.pending_buf[a.pending++]=a.bi_buf),a.bi_buf=0,a.bi_valid=0}function r(a,b,c,d){q(a),d&&(h(a,c),h(a,~c)),G.arraySet(a.pending_buf,a.window,b,c,a.pending),a.pending+=c}function s(a,b,c,d){var e=2*b,f=2*c;return a[e]>1;c>=1;c--)t(a,f,c);e=i;do c=a.heap[1],a.heap[1]=a.heap[a.heap_len--],t(a,f,1),d=a.heap[1],a.heap[--a.heap_max]=c,a.heap[--a.heap_max]=d,f[2*e]=f[2*c]+f[2*d],a.depth[e]=(a.depth[c]>=a.depth[d]?a.depth[c]:a.depth[d])+1,f[2*c+1]=f[2*d+1]=e,a.heap[1]=e++,t(a,f,1);while(a.heap_len>=2);a.heap[--a.heap_max]=a.heap[1],m(a,b),n(f,j,a.bl_count)}function w(a,b,c){var d,e,f=-1,g=b[1],h=0,i=7,j=4;for(0===g&&(i=138,j=3),b[2*(c+1)+1]=65535,d=0;d<=c;d++)e=g,g=b[2*(d+1)+1],++h=3&&0===a.bl_tree[2*ea[b]+1];b--);return a.opt_len+=3*(b+1)+5+5+4,b}function z(a,b,c,d){var e;for(i(a,b-257,5),i(a,c-1,5),i(a,d-4,4),e=0;e>>=1)if(1&c&&0!==a.dyn_ltree[2*b])return I;if(0!==a.dyn_ltree[18]||0!==a.dyn_ltree[20]||0!==a.dyn_ltree[26])return J;for(b=32;b0?(a.strm.data_type===K&&(a.strm.data_type=A(a)),v(a,a.l_desc),v(a,a.d_desc),g=y(a),e=a.opt_len+3+7>>>3,f=a.static_len+3+7>>>3,f<=e&&(e=f)):e=f=c+5,c+4<=e&&b!==-1?C(a,b,c,d):a.strategy===H||f===e?(i(a,(M<<1)+(d?1:0),3),u(a,ga,ha)):(i(a,(N<<1)+(d?1:0),3),z(a,a.l_desc.max_code+1,a.d_desc.max_code+1,g+1),u(a,a.dyn_ltree,a.dyn_dtree)),p(a),d&&q(a)}function F(a,b,c){return a.pending_buf[a.d_buf+2*a.last_lit]=b>>>8&255,a.pending_buf[a.d_buf+2*a.last_lit+1]=255&b,a.pending_buf[a.l_buf+a.last_lit]=255&c,a.last_lit++,0===b?a.dyn_ltree[2*c]++:(a.matches++,b--,a.dyn_ltree[2*(ja[c]+R+1)]++,a.dyn_dtree[2*g(b)]++),a.last_lit===a.lit_bufsize-1}var G=a("../utils/common"),H=4,I=0,J=1,K=2,L=0,M=1,N=2,O=3,P=258,Q=29,R=256,S=R+1+Q,T=30,U=19,V=2*S+1,W=15,X=16,Y=7,Z=256,$=16,_=17,aa=18,ba=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0],ca=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],da=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7],ea=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],fa=512,ga=new Array(2*(S+2));d(ga);var ha=new Array(2*T);d(ha);var ia=new Array(fa);d(ia);var ja=new Array(P-O+1);d(ja);var ka=new Array(Q);d(ka);var la=new Array(T);d(la);var ma,na,oa,pa=!1;c._tr_init=B,c._tr_stored_block=C,c._tr_flush_block=E,c._tr_tally=F,c._tr_align=D},{"../utils/common":28}],40:[function(a,b,c){"use strict";function d(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}b.exports=d},{}]},{},[10])(10)}); \ No newline at end of file diff --git a/plugins/tiddlywiki/jszip/files/tiddlywiki.files b/plugins/tiddlywiki/jszip/files/tiddlywiki.files index a903df3d4..b27f2ffc3 100644 --- a/plugins/tiddlywiki/jszip/files/tiddlywiki.files +++ b/plugins/tiddlywiki/jszip/files/tiddlywiki.files @@ -1,7 +1,7 @@ { "tiddlers": [ { - "file": "jszip.min.v2.5.0.js", + "file": "jszip.min.v2.6.1.js", "fields": { "type": "application/javascript", "title": "$:/plugins/tiddlywiki/jszip/jszip.js", @@ -12,7 +12,7 @@ },{ "file": "LICENSE.markdown", "fields": { - "type": "text/markdown", + "type": "text/plain", "title": "$:/plugins/tiddlywiki/jszip/license" } } diff --git a/plugins/tiddlywiki/katex/files/README.md b/plugins/tiddlywiki/katex/files/README.md index 31cf658d8..a3396c1b1 100644 --- a/plugins/tiddlywiki/katex/files/README.md +++ b/plugins/tiddlywiki/katex/files/README.md @@ -1,23 +1,24 @@ -# [KaTeX](https://khan.github.io/KaTeX/) [![Build Status](https://travis-ci.org/Khan/KaTeX.svg?branch=master)](https://travis-ci.org/Khan/KaTeX) - +# [KaTeX](https://khan.github.io/KaTeX/) +[![Build Status](https://travis-ci.org/Khan/KaTeX.svg?branch=master)](https://travis-ci.org/Khan/KaTeX) +[![codecov](https://codecov.io/gh/Khan/KaTeX/branch/master/graph/badge.svg)](https://codecov.io/gh/Khan/KaTeX) [![Join the chat at https://gitter.im/Khan/KaTeX](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Khan/KaTeX?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) KaTeX is a fast, easy-to-use JavaScript library for TeX math rendering on the web. - * **Fast:** KaTeX renders its math synchronously and doesn't need to reflow the page. See how it compares to a competitor in [this speed test](http://jsperf.com/katex-vs-mathjax/). + * **Fast:** KaTeX renders its math synchronously and doesn't need to reflow the page. See how it compares to a competitor in [this speed test](http://www.intmath.com/cg5/katex-mathjax-comparison.php). * **Print quality:** KaTeX’s layout is based on Donald Knuth’s TeX, the gold standard for math typesetting. * **Self contained:** KaTeX has no dependencies and can easily be bundled with your website resources. * **Server side rendering:** KaTeX produces the same output regardless of browser or environment, so you can pre-render expressions using Node.js and send them as plain HTML. -KaTeX supports all major browsers, including Chrome, Safari, Firefox, Opera, and IE 8 - IE 11. A list of supported commands can be on the [wiki](https://github.com/Khan/KaTeX/wiki/Function-Support-in-KaTeX). +KaTeX supports all major browsers, including Chrome, Safari, Firefox, Opera, Edge, and IE 9 - IE 11. More information can be found on the [list of supported commands](https://khan.github.io/KaTeX/function-support.html) and on the [wiki](https://github.com/khan/katex/wiki). ## Usage You can [download KaTeX](https://github.com/khan/katex/releases) and host it on your server or include the `katex.min.js` and `katex.min.css` files on your page directly from a CDN: ```html - - + + ``` #### In-browser rendering @@ -41,6 +42,26 @@ var html = katex.renderToString("c = \\pm\\sqrt{a^2 + b^2}"); Make sure to include the CSS and font files, but there is no need to include the JavaScript. Like `render`, `renderToString` throws if it can't parse the expression. +#### Security + +Any HTML generated by KaTeX *should* be safe from `` diff --git a/plugins/tiddlywiki/mobiledragdrop/readme.tid b/plugins/tiddlywiki/mobiledragdrop/readme.tid new file mode 100644 index 000000000..ae6181f13 --- /dev/null +++ b/plugins/tiddlywiki/mobiledragdrop/readme.tid @@ -0,0 +1,5 @@ +title: $:/plugins/tiddlywiki/mobiledragdrop/readme + +This plugin provides a "shim" that enables HTML 5 compatible drag and drop operations on mobile browsers, including iOS and Android. The shim was created by Tim Ruffles and is published at https://github.com/timruffles/ios-html5-drag-drop-shim. + +After installing the plugin it is necessary to save the HTML file a second time before it will be fully enabled. diff --git a/plugins/tiddlywiki/mobiledragdrop/startup.js b/plugins/tiddlywiki/mobiledragdrop/startup.js new file mode 100644 index 000000000..6abbbd16d --- /dev/null +++ b/plugins/tiddlywiki/mobiledragdrop/startup.js @@ -0,0 +1,25 @@ +/*\ +title: $:/plugins/tiddlywiki/mobiledragdrop/startup.js +type: application/javascript +module-type: startup + +Startup initialisation + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +// Export name and synchronous status +exports.name = "mobiledragdrop"; +exports.platforms = ["browser"]; +exports.after = ["startup"]; +exports.synchronous = true; + +exports.startup = function() { + window.addEventListener("touchmove", function() {}); +}; + +})(); diff --git a/plugins/tiddlywiki/pluginlibrary/library.template.html.tid b/plugins/tiddlywiki/pluginlibrary/library.template.html.tid index c83ce2575..df3655047 100644 --- a/plugins/tiddlywiki/pluginlibrary/library.template.html.tid +++ b/plugins/tiddlywiki/pluginlibrary/library.template.html.tid @@ -21,7 +21,7 @@ title: $:/plugins/tiddlywiki/pluginlibrary/library.template.html

This is the TiddlyWiki plugin library. It is not intended to be opened directly in the browser.

-

See http://tiddlywiki.com/ for details of how to install plugins.

+

See https://tiddlywiki.com/ for details of how to install plugins.

\ No newline at end of file diff --git a/plugins/tiddlywiki/powered-by-tiddlywiki/banner.tid b/plugins/tiddlywiki/powered-by-tiddlywiki/banner.tid index f79e265ff..cffa17707 100644 --- a/plugins/tiddlywiki/powered-by-tiddlywiki/banner.tid +++ b/plugins/tiddlywiki/powered-by-tiddlywiki/banner.tid @@ -1,6 +1,6 @@ title: $:/plugins/tiddlywiki/powered-by-tiddlywiki/banner tags: $:/tags/PageTemplate - + [img width="160px" class="tc-powered-by-tiddlywiki-banner" [$:/plugins/tiddlywiki/powered-by-tiddlywiki/powered-by-tiddlywiki.svg]] diff --git a/plugins/tiddlywiki/powered-by-tiddlywiki/readme.tid b/plugins/tiddlywiki/powered-by-tiddlywiki/readme.tid index e062c34a9..e815f4c78 100644 --- a/plugins/tiddlywiki/powered-by-tiddlywiki/readme.tid +++ b/plugins/tiddlywiki/powered-by-tiddlywiki/readme.tid @@ -1,5 +1,5 @@ title: $:/plugins/tiddlywiki/powered-by-tiddlywiki/readme -This plugin adds a "Powered by ~TiddlyWiki" banner that links back to http://tiddlywiki.com +This plugin adds a "Powered by ~TiddlyWiki" banner that links back to https://tiddlywiki.com It's very basic at the moment, but the plan is to improve it by making it more customisable. diff --git a/plugins/tiddlywiki/qrcode/MakeContactQR.tid b/plugins/tiddlywiki/qrcode/MakeContactQR.tid new file mode 100644 index 000000000..5eeb2d231 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/MakeContactQR.tid @@ -0,0 +1,27 @@ +title: $:/plugins/tiddlywiki/qrcode/MakeContactQR +tags: $:/tags/MakeQR +caption: Contact + +\define wifi-url() +WIFI:wifi name;T:WPA;S:SSID;P:password; +\end + +\define image(firstname,lastname,address,tel,email) +>/> +\end + +! Enter the contact details + +First name: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/contact/firstname" tag="input" default=""/> + +Last name: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/contact/lastname" tag="input" default=""/> + +Address: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/contact/address" tag="input" default=""/> + +Telephone: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/contact/tel" tag="input" default=""/> + +Email: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/contact/email" tag="input" default=""/> + +! Here is your QR code + +<$macrocall $name="image" firstname={{$:/config/plugins/tiddlywiki/qrcode/contact/firstname}} lastname={{$:/config/plugins/tiddlywiki/qrcode/contact/lastname}} address={{$:/config/plugins/tiddlywiki/qrcode/contact/address}} tel={{$:/config/plugins/tiddlywiki/qrcode/contact/tel}} email={{$:/config/plugins/tiddlywiki/qrcode/contact/email}}/> diff --git a/plugins/tiddlywiki/qrcode/MakeGenericQR.tid b/plugins/tiddlywiki/qrcode/MakeGenericQR.tid new file mode 100644 index 000000000..9f0bcc286 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/MakeGenericQR.tid @@ -0,0 +1,17 @@ +title: $:/plugins/tiddlywiki/qrcode/MakeGenericQR +tags: $:/tags/MakeQR +caption: Generic + +\define image(content) +>/> +\end + +! Enter the details + +You can also use this form to encode URLs. + +<$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/generic" default="" class="tc-edit-texteditor"/> + +! Here is your QR code + +<$macrocall $name="image" content={{$:/config/plugins/tiddlywiki/qrcode/generic}}/> diff --git a/plugins/tiddlywiki/qrcode/MakeWifiQR.tid b/plugins/tiddlywiki/qrcode/MakeWifiQR.tid new file mode 100644 index 000000000..1cc7d1bb6 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/MakeWifiQR.tid @@ -0,0 +1,30 @@ +title: $:/plugins/tiddlywiki/qrcode/MakeWifiQR +tags: $:/tags/MakeQR +caption: Wifi + +\define wifi-url() +WIFI:wifi name;T:WPA;S:SSID;P:password; +\end + +\define image(network,encryption,ssid,password) +>/> +\end + +! Enter the details of your wifi network + +Name of wifi network: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/wifi/network" tag="input" default=""/> + +Encryption: <$select tiddler="$:/config/plugins/tiddlywiki/qrcode/wifi/encryption" default="none"> + + + + + + +SSID: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/wifi/ssid" tag="input" default=""/> + +Password: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/wifi/password" tag="input" default=""/> + +! Here is your QR code + +<$macrocall $name="image" network={{$:/config/plugins/tiddlywiki/qrcode/wifi/network}} encryption={{$:/config/plugins/tiddlywiki/qrcode/wifi/encryption}} ssid={{$:/config/plugins/tiddlywiki/qrcode/wifi/ssid}} password={{$:/config/plugins/tiddlywiki/qrcode/wifi/password}}/> diff --git a/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid new file mode 100644 index 000000000..7b496d812 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid @@ -0,0 +1,58 @@ +title: $:/plugins/tiddlywiki/qrcode/ViewToolbarButton +tags: $:/tags/ViewToolbar +list-before: $:/core/ui/Buttons/close +caption: {{$:/plugins/tiddlywiki/qrcode/icon}} +short-caption: QR code +description: Generate QR code for this tiddler + +\whitespace trim + +<$button popup=<> tooltip={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!description}} aria-label={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!short-caption}} class=<> class=<> selectedClass="tc-selected"> +<$list filter="[prefix[yes]]"> +{{$:/plugins/tiddlywiki/qrcode/icon}} + +<$list filter="[prefix[yes]]"> + +<$text text=" "/> +<$text text={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!short-caption}}/> + + + + +<$reveal state=<> type="popup" position="below" animate="yes"> + +
+ +{{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton||description}} + +<$set name="tv-config-toolbar-icons" value="yes"> + +<$set name="tv-config-toolbar-text" value="yes"> + +<$set name="tv-config-toolbar-class" value="tc-btn-invisible"> + +<$set name="targetTiddler" value=<>> + +<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbarButton/QRcode]!has[draft.of]]"> + +<$button popup=<> class="tc-btn-invisible" selectedClass="tc-selected"> + +<$action-sendmessage $message="tm-modal" $param=<> currentTiddler=<>/> + +<$transclude field="caption" mode="inline"/> + + + + + + + + + + + + + +
+ + diff --git a/plugins/tiddlywiki/qrcode/ViewToolbarButton/Raw.tid b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Raw.tid new file mode 100644 index 000000000..160089407 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Raw.tid @@ -0,0 +1,12 @@ +title: $:/plugins/tiddlywiki/qrcode/ViewToolbarButton/Raw +tags: $:/tags/ViewToolbarButton/QRcode +caption: Raw content of this tiddler +subtitle: QR code of raw tiddler content + +\define image() +>/> +\end + +<$set name="content" value={{!!text}}> +<> + diff --git a/plugins/tiddlywiki/qrcode/ViewToolbarButton/Rendered.tid b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Rendered.tid new file mode 100644 index 000000000..c29f45765 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Rendered.tid @@ -0,0 +1,12 @@ +title: $:/plugins/tiddlywiki/qrcode/ViewToolbarButton/Rendered +tags: $:/tags/ViewToolbarButton/QRcode +caption: Rendered content of this tiddler +subtitle: QR code of rendered tiddler content + +\define image() +>/> +\end + +<$wikify name="content" text={{!!text}} type="text" mode="block" output="formattedtext"> +<> + diff --git a/plugins/tiddlywiki/qrcode/ViewToolbarButton/URL.tid b/plugins/tiddlywiki/qrcode/ViewToolbarButton/URL.tid new file mode 100644 index 000000000..e05a80e84 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/ViewToolbarButton/URL.tid @@ -0,0 +1,14 @@ +title: $:/plugins/tiddlywiki/qrcode/ViewToolbarButton/URL +tags: $:/tags/ViewToolbarButton/QRcode +caption: URL of this tiddler +subtitle: QR code of URL of this tiddler + +\define image() +>/> +\end + +<$set name="url" value={{$:/info/url/full}}> +<$set name="hash" filter="[encodeuricomponent[]]" select="0"> +<> + + diff --git a/plugins/tiddlywiki/qrcode/ViewToolbarButton/styles.tid b/plugins/tiddlywiki/qrcode/ViewToolbarButton/styles.tid new file mode 100644 index 000000000..6889bff06 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/ViewToolbarButton/styles.tid @@ -0,0 +1,9 @@ +title: $:/plugins/tiddlywiki/qrcode/styles +tags: [[$:/tags/Stylesheet]] + +\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline + +.tc-drop-down .tc-qrcode-drop-down img { + width: 100%; + height: 100%; +} diff --git a/plugins/tiddlywiki/qrcode/doc/examples.tid b/plugins/tiddlywiki/qrcode/doc/examples.tid new file mode 100644 index 000000000..5bd19afa8 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/doc/examples.tid @@ -0,0 +1,3 @@ +title: $:/plugins/tiddlywiki/qrcode/examples + +<> \ No newline at end of file diff --git a/plugins/tiddlywiki/qrcode/doc/readme.tid b/plugins/tiddlywiki/qrcode/doc/readme.tid new file mode 100644 index 000000000..89e2427e6 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/doc/readme.tid @@ -0,0 +1,13 @@ +title: $:/plugins/tiddlywiki/qrcode/readme + +The QR code plugin provides a macro that enables any text to be rendered as a [[QR code|https://en.wikipedia.org/wiki/QR_code]]. QR codes are a type of 2-dimensional bar code that encodes arbitrary data: text, numbers, links. QR code readers are available or built-in for smartphones, making them a convenient means to transfer information between devices + +The QR code plugin adds the following features to TiddlyWiki: + +* A new [[makeqr Macro]] that renders specified text as a QR code image that can be displayed or printed +* A new toolbar button that can display several QR code renderings of the content of a tiddler: +** Raw content +** Rendered, formatted content +** URL of tiddler + +The QR code plugin is based on the library [[qrcode.js by Zeno Zeng|https://github.com/zenozeng/node-yaqrcode]]. \ No newline at end of file diff --git a/plugins/tiddlywiki/qrcode/doc/usage.tid b/plugins/tiddlywiki/qrcode/doc/usage.tid new file mode 100644 index 000000000..fb186c901 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/doc/usage.tid @@ -0,0 +1,44 @@ +title: $:/plugins/tiddlywiki/qrcode/usage + +! `makeqr` Macro + +The <<.def makeqr>> [[macro|Macros]] converts text data into an image of the corresponding QR code. The image is returned as [[base64-encoded data URI|https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs]]. + +!! Parameters + +;text +: The text to encode +;size +: The size of the image in pixels (defaults to 500) +;errorCorrectLevel +: Determines the amount of error correction applied to the image; see below (defaults to "M"). +;fallback +: The fallback image to be returned in case of an error (see below) + +The conversion will fail if the text is too long and/or complex and the macro will return the provided fallback image. If no fallback image is provided then an error image is generated. + +The error correction level is a [[QR code feature|http://www.qrcode.com/en/about/error_correction.html]]: + +<<< +QR Code has error correction capability to restore data if the code is dirty or damaged. ... Level Q or H may be selected for factory environment where QR Code get dirty, whereas Level L may be selected for clean environment with the large amount of data. Typically, Level M (15%) is most frequently selected. +<<< + +!! Examples + +Making a QR code for a simple string of text: + +``` +<> +``` + +Making a QR code for the URL field of the current tiddler: + +``` +<$macrocall $name="makeqr" text={{!!url}}/> +``` + +Making a QR code for the URL of the current wiki: + +``` +<$macrocall $name="makeqr" text={{$:/info/url/full}}/> +``` diff --git a/plugins/tiddlywiki/qrcode/files/LICENSE b/plugins/tiddlywiki/qrcode/files/LICENSE new file mode 100755 index 000000000..3fec150fa --- /dev/null +++ b/plugins/tiddlywiki/qrcode/files/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2013 Zeno Zeng + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/plugins/tiddlywiki/qrcode/files/README.md b/plugins/tiddlywiki/qrcode/files/README.md new file mode 100755 index 000000000..8bd65a26b --- /dev/null +++ b/plugins/tiddlywiki/qrcode/files/README.md @@ -0,0 +1,72 @@ +# node-yaqrcode + +Yet another node-qrcode Generator! + +This is a simple and pure javascript wrapper for the QR Code Generator from the d-project. + +No Canvas or Binary needed! + +Note: + +``` +The word 'QR Code' is registered trademark of +DENSO WAVE INCORPORATED +http://www.denso-wave.com/qrcode/faqpatent-e.html +``` + +## Overview + +- Pure Javascript and could work without any requiments + +- Use `RS_BLOCK_TABLE` from http://davidshimjs.github.io/qrcodejs/ to support typeNumber 40 + +- Use the code from http://davidshimjs.github.io/qrcodejs/ to support UTF-8 + +- Return a Base64 Data URI like this + +``` +data:image/gif;base64,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 +``` + +## Usage + +``` +npm install yaqrcode +``` + +```javascript +qrcode = require('yaqrcode'); +base64 = qrcode('hello world'); +``` + +### custom size + +```javascript +qrcode = require('yaqrcode'); +base64 = qrcode('hello world', { + size: 500 +}); +``` + +## License + +The MIT License (MIT) + +Copyright (c) 2013,2015 Zeno Zeng + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/plugins/tiddlywiki/qrcode/files/qrcode.js b/plugins/tiddlywiki/qrcode/files/qrcode.js new file mode 100755 index 000000000..60c978ee6 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/files/qrcode.js @@ -0,0 +1,1587 @@ +//--------------------------------------------------------------------- +// +// QR Code Generator for JavaScript +// +// Copyright (c) 2009 Kazuhiko Arase +// +// URL: http://www.d-project.com/ +// +// Licensed under the MIT license: +// http://www.opensource.org/licenses/mit-license.php +// +// The word 'QR Code' is registered trademark of +// DENSO WAVE INCORPORATED +// http://www.denso-wave.com/qrcode/faqpatent-e.html +// +//--------------------------------------------------------------------- + +//--------------------------------------------------------------------- +// qrcode +//--------------------------------------------------------------------- + +/** + * qrcode + * @param typeNumber 1 to 40 + * @param errorCorrectLevel 'L','M','Q','H' + */ +var qrcode = function(typeNumber, errorCorrectLevel) { + + var PAD0 = 0xEC; + var PAD1 = 0x11; + + var _typeNumber = typeNumber; + var _errorCorrectLevel = QRErrorCorrectLevel[errorCorrectLevel]; + var _modules = null; + var _moduleCount = 0; + var _dataCache = null; + var _dataList = new Array(); + + var _this = {}; + + var makeImpl = function(test, maskPattern) { + + _moduleCount = _typeNumber * 4 + 17; + _modules = function(moduleCount) { + var modules = new Array(moduleCount); + for (var row = 0; row < moduleCount; row += 1) { + modules[row] = new Array(moduleCount); + for (var col = 0; col < moduleCount; col += 1) { + modules[row][col] = null; + } + } + return modules; + }(_moduleCount); + + setupPositionProbePattern(0, 0); + setupPositionProbePattern(_moduleCount - 7, 0); + setupPositionProbePattern(0, _moduleCount - 7); + setupPositionAdjustPattern(); + setupTimingPattern(); + setupTypeInfo(test, maskPattern); + + if (_typeNumber >= 7) { + setupTypeNumber(test); + } + + if (_dataCache == null) { + _dataCache = createData(_typeNumber, _errorCorrectLevel, _dataList); + } + + mapData(_dataCache, maskPattern); + }; + + var setupPositionProbePattern = function(row, col) { + + for (var r = -1; r <= 7; r += 1) { + + if (row + r <= -1 || _moduleCount <= row + r) continue; + + for (var c = -1; c <= 7; c += 1) { + + if (col + c <= -1 || _moduleCount <= col + c) continue; + + if ( (0 <= r && r <= 6 && (c == 0 || c == 6) ) + || (0 <= c && c <= 6 && (r == 0 || r == 6) ) + || (2 <= r && r <= 4 && 2 <= c && c <= 4) ) { + _modules[row + r][col + c] = true; + } else { + _modules[row + r][col + c] = false; + } + } + } + }; + + var getBestMaskPattern = function() { + + var minLostPoint = 0; + var pattern = 0; + + for (var i = 0; i < 8; i += 1) { + + makeImpl(true, i); + + var lostPoint = QRUtil.getLostPoint(_this); + + if (i == 0 || minLostPoint > lostPoint) { + minLostPoint = lostPoint; + pattern = i; + } + } + + return pattern; + }; + + var setupTimingPattern = function() { + + for (var r = 8; r < _moduleCount - 8; r += 1) { + if (_modules[r][6] != null) { + continue; + } + _modules[r][6] = (r % 2 == 0); + } + + for (var c = 8; c < _moduleCount - 8; c += 1) { + if (_modules[6][c] != null) { + continue; + } + _modules[6][c] = (c % 2 == 0); + } + }; + + var setupPositionAdjustPattern = function() { + + var pos = QRUtil.getPatternPosition(_typeNumber); + + for (var i = 0; i < pos.length; i += 1) { + + for (var j = 0; j < pos.length; j += 1) { + + var row = pos[i]; + var col = pos[j]; + + if (_modules[row][col] != null) { + continue; + } + + for (var r = -2; r <= 2; r += 1) { + + for (var c = -2; c <= 2; c += 1) { + + if (r == -2 || r == 2 || c == -2 || c == 2 + || (r == 0 && c == 0) ) { + _modules[row + r][col + c] = true; + } else { + _modules[row + r][col + c] = false; + } + } + } + } + } + }; + + var setupTypeNumber = function(test) { + + var bits = QRUtil.getBCHTypeNumber(_typeNumber); + + for (var i = 0; i < 18; i += 1) { + var mod = (!test && ( (bits >> i) & 1) == 1); + _modules[Math.floor(i / 3)][i % 3 + _moduleCount - 8 - 3] = mod; + } + + for (var i = 0; i < 18; i += 1) { + var mod = (!test && ( (bits >> i) & 1) == 1); + _modules[i % 3 + _moduleCount - 8 - 3][Math.floor(i / 3)] = mod; + } + }; + + var setupTypeInfo = function(test, maskPattern) { + + var data = (_errorCorrectLevel << 3) | maskPattern; + var bits = QRUtil.getBCHTypeInfo(data); + + // vertical + for (var i = 0; i < 15; i += 1) { + + var mod = (!test && ( (bits >> i) & 1) == 1); + + if (i < 6) { + _modules[i][8] = mod; + } else if (i < 8) { + _modules[i + 1][8] = mod; + } else { + _modules[_moduleCount - 15 + i][8] = mod; + } + } + + // horizontal + for (var i = 0; i < 15; i += 1) { + + var mod = (!test && ( (bits >> i) & 1) == 1); + + if (i < 8) { + _modules[8][_moduleCount - i - 1] = mod; + } else if (i < 9) { + _modules[8][15 - i - 1 + 1] = mod; + } else { + _modules[8][15 - i - 1] = mod; + } + } + + // fixed module + _modules[_moduleCount - 8][8] = (!test); + }; + + var mapData = function(data, maskPattern) { + + var inc = -1; + var row = _moduleCount - 1; + var bitIndex = 7; + var byteIndex = 0; + var maskFunc = QRUtil.getMaskFunction(maskPattern); + + for (var col = _moduleCount - 1; col > 0; col -= 2) { + + if (col == 6) col -= 1; + + while (true) { + + for (var c = 0; c < 2; c += 1) { + + if (_modules[row][col - c] == null) { + + var dark = false; + + if (byteIndex < data.length) { + dark = ( ( (data[byteIndex] >>> bitIndex) & 1) == 1); + } + + var mask = maskFunc(row, col - c); + + if (mask) { + dark = !dark; + } + + _modules[row][col - c] = dark; + bitIndex -= 1; + + if (bitIndex == -1) { + byteIndex += 1; + bitIndex = 7; + } + } + } + + row += inc; + + if (row < 0 || _moduleCount <= row) { + row -= inc; + inc = -inc; + break; + } + } + } + }; + + var createBytes = function(buffer, rsBlocks) { + + var offset = 0; + + var maxDcCount = 0; + var maxEcCount = 0; + + var dcdata = new Array(rsBlocks.length); + var ecdata = new Array(rsBlocks.length); + + for (var r = 0; r < rsBlocks.length; r += 1) { + + var dcCount = rsBlocks[r].dataCount; + var ecCount = rsBlocks[r].totalCount - dcCount; + + maxDcCount = Math.max(maxDcCount, dcCount); + maxEcCount = Math.max(maxEcCount, ecCount); + + dcdata[r] = new Array(dcCount); + + for (var i = 0; i < dcdata[r].length; i += 1) { + dcdata[r][i] = 0xff & buffer.getBuffer()[i + offset]; + } + offset += dcCount; + + var rsPoly = QRUtil.getErrorCorrectPolynomial(ecCount); + var rawPoly = qrPolynomial(dcdata[r], rsPoly.getLength() - 1); + + var modPoly = rawPoly.mod(rsPoly); + ecdata[r] = new Array(rsPoly.getLength() - 1); + for (var i = 0; i < ecdata[r].length; i += 1) { + var modIndex = i + modPoly.getLength() - ecdata[r].length; + ecdata[r][i] = (modIndex >= 0)? modPoly.getAt(modIndex) : 0; + } + } + + var totalCodeCount = 0; + for (var i = 0; i < rsBlocks.length; i += 1) { + totalCodeCount += rsBlocks[i].totalCount; + } + + var data = new Array(totalCodeCount); + var index = 0; + + for (var i = 0; i < maxDcCount; i += 1) { + for (var r = 0; r < rsBlocks.length; r += 1) { + if (i < dcdata[r].length) { + data[index] = dcdata[r][i]; + index += 1; + } + } + } + + for (var i = 0; i < maxEcCount; i += 1) { + for (var r = 0; r < rsBlocks.length; r += 1) { + if (i < ecdata[r].length) { + data[index] = ecdata[r][i]; + index += 1; + } + } + } + + return data; + }; + + var createData = function(typeNumber, errorCorrectLevel, dataList) { + + var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, errorCorrectLevel); + + var buffer = qrBitBuffer(); + + for (var i = 0; i < dataList.length; i += 1) { + var data = dataList[i]; + buffer.put(data.getMode(), 4); + buffer.put(data.getLength(), QRUtil.getLengthInBits(data.getMode(), typeNumber) ); + data.write(buffer); + } + + // calc num max data. + var totalDataCount = 0; + for (var i = 0; i < rsBlocks.length; i += 1) { + totalDataCount += rsBlocks[i].dataCount; + } + + if (buffer.getLengthInBits() > totalDataCount * 8) { + throw new Error('code length overflow. (' + + buffer.getLengthInBits() + + '>' + + totalDataCount * 8 + + ')'); + } + + // end code + if (buffer.getLengthInBits() + 4 <= totalDataCount * 8) { + buffer.put(0, 4); + } + + // padding + while (buffer.getLengthInBits() % 8 != 0) { + buffer.putBit(false); + } + + // padding + while (true) { + + if (buffer.getLengthInBits() >= totalDataCount * 8) { + break; + } + buffer.put(PAD0, 8); + + if (buffer.getLengthInBits() >= totalDataCount * 8) { + break; + } + buffer.put(PAD1, 8); + } + + return createBytes(buffer, rsBlocks); + }; + + _this.addData = function(data) { + var newData = qr8BitByte(data); + _dataList.push(newData); + _dataCache = null; + }; + + _this.isDark = function(row, col) { + if (row < 0 || _moduleCount <= row || col < 0 || _moduleCount <= col) { + throw new Error(row + ',' + col); + } + return _modules[row][col]; + }; + + _this.getModuleCount = function() { + return _moduleCount; + }; + + _this.make = function() { + makeImpl(false, getBestMaskPattern() ); + }; + + _this.createTableTag = function(cellSize, margin) { + + cellSize = cellSize || 2; + margin = (typeof margin == 'undefined')? cellSize * 4 : margin; + + var qrHtml = ''; + + qrHtml += ''; + qrHtml += ''; + + for (var r = 0; r < _this.getModuleCount(); r += 1) { + + qrHtml += ''; + + for (var c = 0; c < _this.getModuleCount(); c += 1) { + qrHtml += ''; + } + + qrHtml += ''; + qrHtml += '
'; + } + + qrHtml += '
'; + + return qrHtml; + }; + + _this.createImgTag = function(cellSize, margin, size) { + + cellSize = cellSize || 2; + margin = (typeof margin == 'undefined')? cellSize * 4 : margin; + + var min = margin; + var max = _this.getModuleCount() * cellSize + margin; + + return createImgTag(size, size, function(x, y) { + if (min <= x && x < max && min <= y && y < max) { + var c = Math.floor( (x - min) / cellSize); + var r = Math.floor( (y - min) / cellSize); + return _this.isDark(r, c)? 0 : 1; + } else { + return 1; + } + } ); + }; + + return _this; +}; + +//--------------------------------------------------------------------- +// qrcode.stringToBytes +//--------------------------------------------------------------------- + +qrcode.stringToBytes = function(s) { + var bytes = new Array(); + for (var i = 0; i < s.length; i += 1) { + var c = s.charCodeAt(i); + bytes.push(c & 0xff); + } + return bytes; +}; + +//--------------------------------------------------------------------- +// qrcode.createStringToBytes +//--------------------------------------------------------------------- + +/** + * @param unicodeData base64 string of byte array. + * [16bit Unicode],[16bit Bytes], ... + * @param numChars + */ +qrcode.createStringToBytes = function(unicodeData, numChars) { + + // create conversion map. + + var unicodeMap = function() { + + var bin = base64DecodeInputStream(unicodeData); + var read = function() { + var b = bin.read(); + if (b == -1) throw new Error(); + return b; + }; + + var count = 0; + var unicodeMap = {}; + while (true) { + var b0 = bin.read(); + if (b0 == -1) break; + var b1 = read(); + var b2 = read(); + var b3 = read(); + var k = String.fromCharCode( (b0 << 8) | b1); + var v = (b2 << 8) | b3; + unicodeMap[k] = v; + count += 1; + } + if (count != numChars) { + throw new Error(count + ' != ' + numChars); + } + + return unicodeMap; + }(); + + var unknownChar = '?'.charCodeAt(0); + + return function(s) { + var bytes = new Array(); + for (var i = 0; i < s.length; i += 1) { + var c = s.charCodeAt(i); + if (c < 128) { + bytes.push(c); + } else { + var b = unicodeMap[s.charAt(i)]; + if (typeof b == 'number') { + if ( (b & 0xff) == b) { + // 1byte + bytes.push(b); + } else { + // 2bytes + bytes.push(b >>> 8); + bytes.push(b & 0xff); + } + } else { + bytes.push(unknownChar); + } + } + } + return bytes; + }; +}; + +//--------------------------------------------------------------------- +// QRMode +//--------------------------------------------------------------------- + +var QRMode = { + MODE_NUMBER : 1 << 0, + MODE_ALPHA_NUM : 1 << 1, + MODE_8BIT_BYTE : 1 << 2, + MODE_KANJI : 1 << 3 +}; + +//--------------------------------------------------------------------- +// QRErrorCorrectLevel +//--------------------------------------------------------------------- + +var QRErrorCorrectLevel = { + L : 1, + M : 0, + Q : 3, + H : 2 +}; + +//--------------------------------------------------------------------- +// QRMaskPattern +//--------------------------------------------------------------------- + +var QRMaskPattern = { + PATTERN000 : 0, + PATTERN001 : 1, + PATTERN010 : 2, + PATTERN011 : 3, + PATTERN100 : 4, + PATTERN101 : 5, + PATTERN110 : 6, + PATTERN111 : 7 +}; + +//--------------------------------------------------------------------- +// QRUtil +//--------------------------------------------------------------------- + +var QRUtil = function() { + + var PATTERN_POSITION_TABLE = [ + [], + [6, 18], + [6, 22], + [6, 26], + [6, 30], + [6, 34], + [6, 22, 38], + [6, 24, 42], + [6, 26, 46], + [6, 28, 50], + [6, 30, 54], + [6, 32, 58], + [6, 34, 62], + [6, 26, 46, 66], + [6, 26, 48, 70], + [6, 26, 50, 74], + [6, 30, 54, 78], + [6, 30, 56, 82], + [6, 30, 58, 86], + [6, 34, 62, 90], + [6, 28, 50, 72, 94], + [6, 26, 50, 74, 98], + [6, 30, 54, 78, 102], + [6, 28, 54, 80, 106], + [6, 32, 58, 84, 110], + [6, 30, 58, 86, 114], + [6, 34, 62, 90, 118], + [6, 26, 50, 74, 98, 122], + [6, 30, 54, 78, 102, 126], + [6, 26, 52, 78, 104, 130], + [6, 30, 56, 82, 108, 134], + [6, 34, 60, 86, 112, 138], + [6, 30, 58, 86, 114, 142], + [6, 34, 62, 90, 118, 146], + [6, 30, 54, 78, 102, 126, 150], + [6, 24, 50, 76, 102, 128, 154], + [6, 28, 54, 80, 106, 132, 158], + [6, 32, 58, 84, 110, 136, 162], + [6, 26, 54, 82, 110, 138, 166], + [6, 30, 58, 86, 114, 142, 170] + ]; + var G15 = (1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0); + var G18 = (1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0); + var G15_MASK = (1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1); + + var _this = {}; + + var getBCHDigit = function(data) { + var digit = 0; + while (data != 0) { + digit += 1; + data >>>= 1; + } + return digit; + }; + + _this.getBCHTypeInfo = function(data) { + var d = data << 10; + while (getBCHDigit(d) - getBCHDigit(G15) >= 0) { + d ^= (G15 << (getBCHDigit(d) - getBCHDigit(G15) ) ); + } + return ( (data << 10) | d) ^ G15_MASK; + }; + + _this.getBCHTypeNumber = function(data) { + var d = data << 12; + while (getBCHDigit(d) - getBCHDigit(G18) >= 0) { + d ^= (G18 << (getBCHDigit(d) - getBCHDigit(G18) ) ); + } + return (data << 12) | d; + }; + + _this.getPatternPosition = function(typeNumber) { + return PATTERN_POSITION_TABLE[typeNumber - 1]; + }; + + _this.getMaskFunction = function(maskPattern) { + + switch (maskPattern) { + + case QRMaskPattern.PATTERN000 : + return function(i, j) { return (i + j) % 2 == 0; }; + case QRMaskPattern.PATTERN001 : + return function(i, j) { return i % 2 == 0; }; + case QRMaskPattern.PATTERN010 : + return function(i, j) { return j % 3 == 0; }; + case QRMaskPattern.PATTERN011 : + return function(i, j) { return (i + j) % 3 == 0; }; + case QRMaskPattern.PATTERN100 : + return function(i, j) { return (Math.floor(i / 2) + Math.floor(j / 3) ) % 2 == 0; }; + case QRMaskPattern.PATTERN101 : + return function(i, j) { return (i * j) % 2 + (i * j) % 3 == 0; }; + case QRMaskPattern.PATTERN110 : + return function(i, j) { return ( (i * j) % 2 + (i * j) % 3) % 2 == 0; }; + case QRMaskPattern.PATTERN111 : + return function(i, j) { return ( (i * j) % 3 + (i + j) % 2) % 2 == 0; }; + + default : + throw new Error('bad maskPattern:' + maskPattern); + } + }; + + _this.getErrorCorrectPolynomial = function(errorCorrectLength) { + var a = qrPolynomial([1], 0); + for (var i = 0; i < errorCorrectLength; i += 1) { + a = a.multiply(qrPolynomial([1, QRMath.gexp(i)], 0) ); + } + return a; + }; + + _this.getLengthInBits = function(mode, type) { + + if (1 <= type && type < 10) { + + // 1 - 9 + + switch(mode) { + case QRMode.MODE_NUMBER : return 10; + case QRMode.MODE_ALPHA_NUM : return 9; + case QRMode.MODE_8BIT_BYTE : return 8; + case QRMode.MODE_KANJI : return 8; + default : + throw new Error('mode:' + mode); + } + + } else if (type < 27) { + + // 10 - 26 + + switch(mode) { + case QRMode.MODE_NUMBER : return 12; + case QRMode.MODE_ALPHA_NUM : return 11; + case QRMode.MODE_8BIT_BYTE : return 16; + case QRMode.MODE_KANJI : return 10; + default : + throw new Error('mode:' + mode); + } + + } else if (type < 41) { + + // 27 - 40 + + switch(mode) { + case QRMode.MODE_NUMBER : return 14; + case QRMode.MODE_ALPHA_NUM : return 13; + case QRMode.MODE_8BIT_BYTE : return 16; + case QRMode.MODE_KANJI : return 12; + default : + throw new Error('mode:' + mode); + } + + } else { + throw new Error('type:' + type); + } + }; + + _this.getLostPoint = function(qrcode) { + + var moduleCount = qrcode.getModuleCount(); + + var lostPoint = 0; + + // LEVEL1 + + for (var row = 0; row < moduleCount; row += 1) { + for (var col = 0; col < moduleCount; col += 1) { + + var sameCount = 0; + var dark = qrcode.isDark(row, col); + + for (var r = -1; r <= 1; r += 1) { + + if (row + r < 0 || moduleCount <= row + r) { + continue; + } + + for (var c = -1; c <= 1; c += 1) { + + if (col + c < 0 || moduleCount <= col + c) { + continue; + } + + if (r == 0 && c == 0) { + continue; + } + + if (dark == qrcode.isDark(row + r, col + c) ) { + sameCount += 1; + } + } + } + + if (sameCount > 5) { + lostPoint += (3 + sameCount - 5); + } + } + }; + + // LEVEL2 + + for (var row = 0; row < moduleCount - 1; row += 1) { + for (var col = 0; col < moduleCount - 1; col += 1) { + var count = 0; + if (qrcode.isDark(row, col) ) count += 1; + if (qrcode.isDark(row + 1, col) ) count += 1; + if (qrcode.isDark(row, col + 1) ) count += 1; + if (qrcode.isDark(row + 1, col + 1) ) count += 1; + if (count == 0 || count == 4) { + lostPoint += 3; + } + } + } + + // LEVEL3 + + for (var row = 0; row < moduleCount; row += 1) { + for (var col = 0; col < moduleCount - 6; col += 1) { + if (qrcode.isDark(row, col) + && !qrcode.isDark(row, col + 1) + && qrcode.isDark(row, col + 2) + && qrcode.isDark(row, col + 3) + && qrcode.isDark(row, col + 4) + && !qrcode.isDark(row, col + 5) + && qrcode.isDark(row, col + 6) ) { + lostPoint += 40; + } + } + } + + for (var col = 0; col < moduleCount; col += 1) { + for (var row = 0; row < moduleCount - 6; row += 1) { + if (qrcode.isDark(row, col) + && !qrcode.isDark(row + 1, col) + && qrcode.isDark(row + 2, col) + && qrcode.isDark(row + 3, col) + && qrcode.isDark(row + 4, col) + && !qrcode.isDark(row + 5, col) + && qrcode.isDark(row + 6, col) ) { + lostPoint += 40; + } + } + } + + // LEVEL4 + + var darkCount = 0; + + for (var col = 0; col < moduleCount; col += 1) { + for (var row = 0; row < moduleCount; row += 1) { + if (qrcode.isDark(row, col) ) { + darkCount += 1; + } + } + } + + var ratio = Math.abs(100 * darkCount / moduleCount / moduleCount - 50) / 5; + lostPoint += ratio * 10; + + return lostPoint; + }; + + return _this; +}(); + +//--------------------------------------------------------------------- +// QRMath +//--------------------------------------------------------------------- + +var QRMath = function() { + + var EXP_TABLE = new Array(256); + var LOG_TABLE = new Array(256); + + // initialize tables + for (var i = 0; i < 8; i += 1) { + EXP_TABLE[i] = 1 << i; + } + for (var i = 8; i < 256; i += 1) { + EXP_TABLE[i] = EXP_TABLE[i - 4] + ^ EXP_TABLE[i - 5] + ^ EXP_TABLE[i - 6] + ^ EXP_TABLE[i - 8]; + } + for (var i = 0; i < 255; i += 1) { + LOG_TABLE[EXP_TABLE[i] ] = i; + } + + var _this = {}; + + _this.glog = function(n) { + + if (n < 1) { + throw new Error('glog(' + n + ')'); + } + + return LOG_TABLE[n]; + }; + + _this.gexp = function(n) { + + while (n < 0) { + n += 255; + } + + while (n >= 256) { + n -= 255; + } + + return EXP_TABLE[n]; + }; + + return _this; +}(); + +//--------------------------------------------------------------------- +// qrPolynomial +//--------------------------------------------------------------------- + +function qrPolynomial(num, shift) { + + if (typeof num.length == 'undefined') { + throw new Error(num.length + '/' + shift); + } + + var _num = function() { + var offset = 0; + while (offset < num.length && num[offset] == 0) { + offset += 1; + } + var _num = new Array(num.length - offset + shift); + for (var i = 0; i < num.length - offset; i += 1) { + _num[i] = num[i + offset]; + } + return _num; + }(); + + var _this = {}; + + _this.getAt = function(index) { + return _num[index]; + }; + + _this.getLength = function() { + return _num.length; + }; + + _this.multiply = function(e) { + + var num = new Array(_this.getLength() + e.getLength() - 1); + + for (var i = 0; i < _this.getLength(); i += 1) { + for (var j = 0; j < e.getLength(); j += 1) { + num[i + j] ^= QRMath.gexp(QRMath.glog(_this.getAt(i) ) + QRMath.glog(e.getAt(j) ) ); + } + } + + return qrPolynomial(num, 0); + }; + + _this.mod = function(e) { + + if (_this.getLength() - e.getLength() < 0) { + return _this; + } + + var ratio = QRMath.glog(_this.getAt(0) ) - QRMath.glog(e.getAt(0) ); + + var num = new Array(_this.getLength() ); + for (var i = 0; i < _this.getLength(); i += 1) { + num[i] = _this.getAt(i); + } + + for (var i = 0; i < e.getLength(); i += 1) { + num[i] ^= QRMath.gexp(QRMath.glog(e.getAt(i) ) + ratio); + } + + // recursive call + return qrPolynomial(num, 0).mod(e); + }; + + return _this; +}; + +//--------------------------------------------------------------------- +// QRRSBlock +//--------------------------------------------------------------------- + +var QRRSBlock = function() { + + + // [1: [L, M, Q, H], ..] + var RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]]; + + var qrRSBlock = function(totalCount, dataCount) { + var _this = {}; + _this.totalCount = totalCount; + _this.dataCount = dataCount; + return _this; + }; + + var _this = {}; + + var getRsBlockTable = function(typeNumber, errorCorrectLevel) { + + switch(errorCorrectLevel) { + case QRErrorCorrectLevel.L : + return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 0]; + case QRErrorCorrectLevel.M : + return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 1]; + case QRErrorCorrectLevel.Q : + return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 2]; + case QRErrorCorrectLevel.H : + return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 3]; + default : + return undefined; + } + }; + + _this.getRSBlocks = function(typeNumber, errorCorrectLevel) { + + var rsBlock = getRsBlockTable(typeNumber, errorCorrectLevel); + + if (typeof rsBlock == 'undefined') { + throw new Error('bad rs block @ typeNumber:' + typeNumber + + '/errorCorrectLevel:' + errorCorrectLevel); + } + + var length = rsBlock.length / 3; + + var list = new Array(); + + for (var i = 0; i < length; i += 1) { + + var count = rsBlock[i * 3 + 0]; + var totalCount = rsBlock[i * 3 + 1]; + var dataCount = rsBlock[i * 3 + 2]; + + for (var j = 0; j < count; j += 1) { + list.push(qrRSBlock(totalCount, dataCount) ); + } + } + + return list; + }; + + return _this; +}(); + +//--------------------------------------------------------------------- +// qrBitBuffer +//--------------------------------------------------------------------- + +var qrBitBuffer = function() { + + var _buffer = new Array(); + var _length = 0; + + var _this = {}; + + _this.getBuffer = function() { + return _buffer; + }; + + _this.getAt = function(index) { + var bufIndex = Math.floor(index / 8); + return ( (_buffer[bufIndex] >>> (7 - index % 8) ) & 1) == 1; + }; + + _this.put = function(num, length) { + for (var i = 0; i < length; i += 1) { + _this.putBit( ( (num >>> (length - i - 1) ) & 1) == 1); + } + }; + + _this.getLengthInBits = function() { + return _length; + }; + + _this.putBit = function(bit) { + + var bufIndex = Math.floor(_length / 8); + if (_buffer.length <= bufIndex) { + _buffer.push(0); + } + + if (bit) { + _buffer[bufIndex] |= (0x80 >>> (_length % 8) ); + } + + _length += 1; + }; + + return _this; +}; + +//--------------------------------------------------------------------- +// qr8BitByte +//--------------------------------------------------------------------- + +var qr8BitByte = function(data) { + + var _mode = QRMode.MODE_8BIT_BYTE; + var _data = data; + var _parsedData = []; + + var _this = {}; + + + // Added to support UTF-8 Characters + for (var i = 0, l = _data.length; i < l; i++) { + var byteArray = []; + var code = _data.charCodeAt(i); + + if (code > 0x10000) { + byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18); + byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12); + byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6); + byteArray[3] = 0x80 | (code & 0x3F); + } else if (code > 0x800) { + byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12); + byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6); + byteArray[2] = 0x80 | (code & 0x3F); + } else if (code > 0x80) { + byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6); + byteArray[1] = 0x80 | (code & 0x3F); + } else { + byteArray[0] = code; + } + + // Fix Unicode corruption bug + _parsedData.push(byteArray); + } + + _parsedData = Array.prototype.concat.apply([], _parsedData); + + if (_parsedData.length != _data.length) { + _parsedData.unshift(191); + _parsedData.unshift(187); + _parsedData.unshift(239); + } + + var _bytes = _parsedData; + + _this.getMode = function() { + return _mode; + }; + + _this.getLength = function(buffer) { + return _bytes.length; + }; + + _this.write = function(buffer) { + for (var i = 0; i < _bytes.length; i += 1) { + buffer.put(_bytes[i], 8); + } + }; + + return _this; +}; + +//===================================================================== +// GIF Support etc. +// + +//--------------------------------------------------------------------- +// byteArrayOutputStream +//--------------------------------------------------------------------- + +var byteArrayOutputStream = function() { + + var _bytes = new Array(); + + var _this = {}; + + _this.writeByte = function(b) { + _bytes.push(b & 0xff); + }; + + _this.writeShort = function(i) { + _this.writeByte(i); + _this.writeByte(i >>> 8); + }; + + _this.writeBytes = function(b, off, len) { + off = off || 0; + len = len || b.length; + for (var i = 0; i < len; i += 1) { + _this.writeByte(b[i + off]); + } + }; + + _this.writeString = function(s) { + for (var i = 0; i < s.length; i += 1) { + _this.writeByte(s.charCodeAt(i) ); + } + }; + + _this.toByteArray = function() { + return _bytes; + }; + + _this.toString = function() { + var s = ''; + s += '['; + for (var i = 0; i < _bytes.length; i += 1) { + if (i > 0) { + s += ','; + } + s += _bytes[i]; + } + s += ']'; + return s; + }; + + return _this; +}; + +//--------------------------------------------------------------------- +// base64EncodeOutputStream +//--------------------------------------------------------------------- + +var base64EncodeOutputStream = function() { + + var _buffer = 0; + var _buflen = 0; + var _length = 0; + var _base64 = ''; + + var _this = {}; + + var writeEncoded = function(b) { + _base64 += String.fromCharCode(encode(b & 0x3f) ); + }; + + var encode = function(n) { + if (n < 0) { + // error. + } else if (n < 26) { + return 0x41 + n; + } else if (n < 52) { + return 0x61 + (n - 26); + } else if (n < 62) { + return 0x30 + (n - 52); + } else if (n == 62) { + return 0x2b; + } else if (n == 63) { + return 0x2f; + } + throw new Error('n:' + n); + }; + + _this.writeByte = function(n) { + + _buffer = (_buffer << 8) | (n & 0xff); + _buflen += 8; + _length += 1; + + while (_buflen >= 6) { + writeEncoded(_buffer >>> (_buflen - 6) ); + _buflen -= 6; + } + }; + + _this.flush = function() { + + if (_buflen > 0) { + writeEncoded(_buffer << (6 - _buflen) ); + _buffer = 0; + _buflen = 0; + } + + if (_length % 3 != 0) { + // padding + var padlen = 3 - _length % 3; + for (var i = 0; i < padlen; i += 1) { + _base64 += '='; + } + } + }; + + _this.toString = function() { + return _base64; + }; + + return _this; +}; + +//--------------------------------------------------------------------- +// base64DecodeInputStream +//--------------------------------------------------------------------- + +var base64DecodeInputStream = function(str) { + + var _str = str; + var _pos = 0; + var _buffer = 0; + var _buflen = 0; + + var _this = {}; + + _this.read = function() { + + while (_buflen < 8) { + + if (_pos >= _str.length) { + if (_buflen == 0) { + return -1; + } + throw new Error('unexpected end of file./' + _buflen); + } + + var c = _str.charAt(_pos); + _pos += 1; + + if (c == '=') { + _buflen = 0; + return -1; + } else if (c.match(/^\s$/) ) { + // ignore if whitespace. + continue; + } + + _buffer = (_buffer << 6) | decode(c.charCodeAt(0) ); + _buflen += 6; + } + + var n = (_buffer >>> (_buflen - 8) ) & 0xff; + _buflen -= 8; + return n; + }; + + var decode = function(c) { + if (0x41 <= c && c <= 0x5a) { + return c - 0x41; + } else if (0x61 <= c && c <= 0x7a) { + return c - 0x61 + 26; + } else if (0x30 <= c && c <= 0x39) { + return c - 0x30 + 52; + } else if (c == 0x2b) { + return 62; + } else if (c == 0x2f) { + return 63; + } else { + throw new Error('c:' + c); + } + }; + + return _this; +}; + +//--------------------------------------------------------------------- +// gifImage (B/W) +//--------------------------------------------------------------------- + +var gifImage = function(width, height) { + + var _width = width; + var _height = height; + var _data = new Array(width * height); + + var _this = {}; + + _this.setPixel = function(x, y, pixel) { + _data[y * _width + x] = pixel; + }; + + _this.write = function(out) { + + //--------------------------------- + // GIF Signature + + out.writeString('GIF87a'); + + //--------------------------------- + // Screen Descriptor + + out.writeShort(_width); + out.writeShort(_height); + + out.writeByte(0x80); // 2bit + out.writeByte(0); + out.writeByte(0); + + //--------------------------------- + // Global Color Map + + // black + out.writeByte(0x00); + out.writeByte(0x00); + out.writeByte(0x00); + + // white + out.writeByte(0xff); + out.writeByte(0xff); + out.writeByte(0xff); + + //--------------------------------- + // Image Descriptor + + out.writeString(','); + out.writeShort(0); + out.writeShort(0); + out.writeShort(_width); + out.writeShort(_height); + out.writeByte(0); + + //--------------------------------- + // Local Color Map + + //--------------------------------- + // Raster Data + + var lzwMinCodeSize = 2; + var raster = getLZWRaster(lzwMinCodeSize); + + out.writeByte(lzwMinCodeSize); + + var offset = 0; + + while (raster.length - offset > 255) { + out.writeByte(255); + out.writeBytes(raster, offset, 255); + offset += 255; + } + + out.writeByte(raster.length - offset); + out.writeBytes(raster, offset, raster.length - offset); + out.writeByte(0x00); + + //--------------------------------- + // GIF Terminator + out.writeString(';'); + }; + + var bitOutputStream = function(out) { + + var _out = out; + var _bitLength = 0; + var _bitBuffer = 0; + + var _this = {}; + + _this.write = function(data, length) { + + if ( (data >>> length) != 0) { + throw new Error('length over'); + } + + while (_bitLength + length >= 8) { + _out.writeByte(0xff & ( (data << _bitLength) | _bitBuffer) ); + length -= (8 - _bitLength); + data >>>= (8 - _bitLength); + _bitBuffer = 0; + _bitLength = 0; + } + + _bitBuffer = (data << _bitLength) | _bitBuffer; + _bitLength = _bitLength + length; + }; + + _this.flush = function() { + if (_bitLength > 0) { + _out.writeByte(_bitBuffer); + } + }; + + return _this; + }; + + var getLZWRaster = function(lzwMinCodeSize) { + + var clearCode = 1 << lzwMinCodeSize; + var endCode = (1 << lzwMinCodeSize) + 1; + var bitLength = lzwMinCodeSize + 1; + + // Setup LZWTable + var table = lzwTable(); + + for (var i = 0; i < clearCode; i += 1) { + table.add(String.fromCharCode(i) ); + } + table.add(String.fromCharCode(clearCode) ); + table.add(String.fromCharCode(endCode) ); + + var byteOut = byteArrayOutputStream(); + var bitOut = bitOutputStream(byteOut); + + // clear code + bitOut.write(clearCode, bitLength); + + var dataIndex = 0; + + var s = String.fromCharCode(_data[dataIndex]); + dataIndex += 1; + + while (dataIndex < _data.length) { + + var c = String.fromCharCode(_data[dataIndex]); + dataIndex += 1; + + if (table.contains(s + c) ) { + + s = s + c; + + } else { + + bitOut.write(table.indexOf(s), bitLength); + + if (table.size() < 0xfff) { + + if (table.size() == (1 << bitLength) ) { + bitLength += 1; + } + + table.add(s + c); + } + + s = c; + } + } + + bitOut.write(table.indexOf(s), bitLength); + + // end code + bitOut.write(endCode, bitLength); + + bitOut.flush(); + + return byteOut.toByteArray(); + }; + + var lzwTable = function() { + + var _map = {}; + var _size = 0; + + var _this = {}; + + _this.add = function(key) { + if (_this.contains(key) ) { + throw new Error('dup key:' + key); + } + _map[key] = _size; + _size += 1; + }; + + _this.size = function() { + return _size; + }; + + _this.indexOf = function(key) { + return _map[key]; + }; + + _this.contains = function(key) { + return typeof _map[key] != 'undefined'; + }; + + return _this; + }; + + return _this; +}; + +var createImgTag = function(width, height, getPixel, alt) { + + var gif = gifImage(width, height); + for (var y = 0; y < height; y += 1) { + for (var x = 0; x < width; x += 1) { + gif.setPixel(x, y, getPixel(x, y) ); + } + } + + var b = byteArrayOutputStream(); + gif.write(b); + + var base64 = base64EncodeOutputStream(); + var bytes = b.toByteArray(); + for (var i = 0; i < bytes.length; i += 1) { + base64.writeByte(bytes[i]); + } + base64.flush(); + + var img = ''; + img += 'data:image/gif;base64,'; + img += base64; + + return img; +}; + +//--------------------------------------------------------------------- +// returns qrcode function. + +module.exports = qrcode; diff --git a/plugins/tiddlywiki/qrcode/files/tiddlywiki.files b/plugins/tiddlywiki/qrcode/files/tiddlywiki.files new file mode 100644 index 000000000..91384cd47 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/files/tiddlywiki.files @@ -0,0 +1,18 @@ +{ + "tiddlers": [ + { + "file": "qrcode.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/qrcode/qrcode.js", + "module-type": "library" + } + },{ + "file": "LICENSE", + "fields": { + "type": "text/plain", + "title": "$:/plugins/tiddlywiki/qrcode/license" + } + } + ] +} diff --git a/plugins/tiddlywiki/qrcode/icon.tid b/plugins/tiddlywiki/qrcode/icon.tid new file mode 100644 index 000000000..2ce14d4f5 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/icon.tid @@ -0,0 +1,15 @@ +title: $:/plugins/tiddlywiki/qrcode/icon +tags: $:/tags/Image + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/tiddlywiki/qrcode/makeqr.js b/plugins/tiddlywiki/qrcode/makeqr.js new file mode 100644 index 000000000..561dfb4a5 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/makeqr.js @@ -0,0 +1,74 @@ +/*\ +title: $:/plugins/tiddlywiki/qrcode/makeqr.js +type: application/javascript +module-type: macro + +Macro to convert a string into a QR Code + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Information about this macro +*/ + +var qrcode = require("$:/plugins/tiddlywiki/qrcode/qrcode.js"); + +var QRCODE_GENERATION_ERROR_PREFIX = '', + QRCODE_GENERATION_ERROR_SUFFIX = ''; + +exports.name = "makeqr"; + +exports.params = [ + {name: "text"}, + {name: "size"}, + {name: "errorCorrectLevel"}, + {name: "fallback"} +]; + +/* +Run the macro +*/ +exports.run = function(text,size,errorCorrectLevel,fallback) { + var result; + try { + result = generateQrCode(text,{size: size, errorCorrectLevel: errorCorrectLevel}); + } catch (ex) { + console.log("makeqr error: " + ex); + result = fallback || ("data:image/svg+xml," + encodeURI(QRCODE_GENERATION_ERROR_PREFIX + ex + QRCODE_GENERATION_ERROR_SUFFIX)); + } + return result || ""; +}; + +function generateQrCode(text,options) { + options = options || {}; + var typeNumber = options.typeNumber || 4, + errorCorrectLevel = options.errorCorrectLevel || "M", + size = options.size || 500, + qr; + try { + qr = qrcode(typeNumber,errorCorrectLevel); + qr.addData(text); + qr.make(); + } catch (e) { + if(typeNumber >= 40) { + throw new Error("Text too long to encode"); + } else { + return generateQrCode(text, { + size: size, + errorCorrectLevel: errorCorrectLevel, + typeNumber: typeNumber + 1 + }); + } + } + var cellsize = parseInt(size / qr.getModuleCount()), + margin = parseInt((size - qr.getModuleCount() * cellsize) / 2); + return qr.createImgTag(cellsize, margin, size); +} + + +})(); diff --git a/plugins/tiddlywiki/qrcode/plugin.info b/plugins/tiddlywiki/qrcode/plugin.info new file mode 100644 index 000000000..1be38b1a3 --- /dev/null +++ b/plugins/tiddlywiki/qrcode/plugin.info @@ -0,0 +1,7 @@ +{ + "title": "$:/plugins/tiddlywiki/qrcode", + "description": "QR Code generator", + "author": "Zeno Zeng, adapted by Jeremy Ruston", + "plugin-type": "plugin", + "list": "readme usage examples license" +} diff --git a/plugins/tiddlywiki/savetrail/config/enable-drafts.tid b/plugins/tiddlywiki/savetrail/config/enable-drafts.tid new file mode 100644 index 000000000..5b8e9ed06 --- /dev/null +++ b/plugins/tiddlywiki/savetrail/config/enable-drafts.tid @@ -0,0 +1,3 @@ +title: $:/config/SaveTrailPlugin/enable-drafts + +no \ No newline at end of file diff --git a/plugins/tiddlywiki/savetrail/config/enable.tid b/plugins/tiddlywiki/savetrail/config/enable.tid new file mode 100644 index 000000000..f9231b9ec --- /dev/null +++ b/plugins/tiddlywiki/savetrail/config/enable.tid @@ -0,0 +1,3 @@ +title: $:/config/SaveTrailPlugin/enable + +yes \ No newline at end of file diff --git a/plugins/tiddlywiki/savetrail/config/sync-drafts-filter.tid b/plugins/tiddlywiki/savetrail/config/sync-drafts-filter.tid new file mode 100644 index 000000000..96323912d --- /dev/null +++ b/plugins/tiddlywiki/savetrail/config/sync-drafts-filter.tid @@ -0,0 +1,3 @@ +title: $:/config/SaveTrailPlugin/sync-drafts-filter + +[is[tiddler]has[draft.of]] \ No newline at end of file diff --git a/plugins/tiddlywiki/savetrail/plugin.info b/plugins/tiddlywiki/savetrail/plugin.info new file mode 100644 index 000000000..6e7206434 --- /dev/null +++ b/plugins/tiddlywiki/savetrail/plugin.info @@ -0,0 +1,7 @@ +{ + "title": "$:/plugins/tiddlywiki/savetrail", + "description": "Auto-download modified tiddlers", + "author": "JeremyRuston", + "core-version": ">=5.0.0", + "list": "readme settings" +} diff --git a/plugins/tiddlywiki/savetrail/readme.tid b/plugins/tiddlywiki/savetrail/readme.tid new file mode 100644 index 000000000..5f7705012 --- /dev/null +++ b/plugins/tiddlywiki/savetrail/readme.tid @@ -0,0 +1,23 @@ +title: $:/plugins/tiddlywiki/savetrail/readme + +This plugin causes TiddlyWiki to continuously download (as a JSON file) the contents of any tiddler that is manually changed by any of several means: + +* Confirming an edit +* Deleting tiddlers +* Imports +* Renames/relinks +* Optionally, typing in draft tiddlers can trigger a download + +Where appropriate, separate 'before' and 'after' files are downloaded. Configured correctly, the browser will download the files silently in the background, and they can be used as a backup in case of accidental data loss. + +''CAUTION'': Using this plugin will generate a //lot// of files in your downloads folder! Some points to watch: + +* This plugin is pretty much unusable unless your browser is set up to download files automatically, without prompting for the location +* Automatic file downloading doesn't work in all browsers - in particular, Safari and Internet Explorer do not currently support the [[necessary HTML5 feature|http://caniuse.com/download]] +* Be aware of the privacy implications of leaving a plaintext trail of all of your edits. You should only enable this plugin on computers that your trust and with content that is not sensitive +* The plugin uses the tiddler title plus a timestamp to generate a filename for the downloaded file, but some browsers ignore the specified title and generate their own title for each downloaded file + +Other points to note: + +* By default, after a draft tiddler has been modified the plugin waits until at least one second has elapsed since the last typing before it attempts to download the tiddler. This reduces the number of times that rapidly changing tiddlers are saved +* This plugin can be used with both the single file HTML configuration and under Node.js because it is independent of the usual saving and syncing processes diff --git a/plugins/tiddlywiki/savetrail/savetrail.js b/plugins/tiddlywiki/savetrail/savetrail.js new file mode 100644 index 000000000..69ef752a7 --- /dev/null +++ b/plugins/tiddlywiki/savetrail/savetrail.js @@ -0,0 +1,153 @@ +/*\ +title: $:/plugins/tiddlywiki/savetrail/savetrail.js +type: application/javascript +module-type: startup + +A startup module to download every changed tiddler as a JSON file + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +// Export name and synchronous status +exports.name = "savetrail"; +exports.platforms = ["browser"]; +exports.after = ["startup"]; +exports.synchronous = true; + +// Favicon tiddler +var ENABLE_TIDDLER_TITLE = "$:/config/SaveTrailPlugin/enable", + ENABLE_DRAFTS_TIDDLER_TITLE = "$:/config/SaveTrailPlugin/enable-drafts", + SYNC_DRAFTS_FILTER_TIDDLER_TITLE = "$:/config/SaveTrailPlugin/sync-drafts-filter"; + +exports.startup = function() { + $tw.savetrail = $tw.savetrail || {}; + // Create a syncer to handle autosaving + $tw.savetrail.syncadaptor = new SaveTrailSyncAdaptor(); + $tw.savetrail.syncer = new $tw.Syncer({ + wiki: $tw.wiki, + syncadaptor: $tw.savetrail.syncadaptor, + titleSyncFilter: SYNC_DRAFTS_FILTER_TIDDLER_TITLE, + logging: false, + disableUI: true + }); + // Add hooks for trapping user actions + $tw.hooks.addHook("th-saving-tiddler",function(tiddler) { + if($tw.wiki.checkTiddlerText(ENABLE_TIDDLER_TITLE,"yes")) { + var oldTiddler = $tw.wiki.getTiddler(tiddler.fields.title); + if(oldTiddler) { + saveTiddlerFile(oldTiddler,{reason: "overwritten"}); + } + saveTiddlerFile(tiddler,{reason: "saved"}); + } + return tiddler; + }); + $tw.hooks.addHook("th-renaming-tiddler",function(newTiddler,oldTiddler) { + if($tw.wiki.checkTiddlerText(ENABLE_TIDDLER_TITLE,"yes")) { + if(oldTiddler) { + saveTiddlerFile(oldTiddler,{reason: "deleted"}); + } + saveTiddlerFile(newTiddler,{reason: "renamed"}); + } + return newTiddler; + }); + $tw.hooks.addHook("th-relinking-tiddler",function(newTiddler,oldTiddler) { + if($tw.wiki.checkTiddlerText(ENABLE_TIDDLER_TITLE,"yes")) { + if(oldTiddler) { + saveTiddlerFile(oldTiddler,{reason: "overwritten"}); + } + saveTiddlerFile(newTiddler,{reason: "relinked"}); + } + return newTiddler; + }); + $tw.hooks.addHook("th-importing-tiddler",function(tiddler) { + if($tw.wiki.checkTiddlerText(ENABLE_TIDDLER_TITLE,"yes")) { + var oldTiddler = $tw.wiki.getTiddler(tiddler.fields.title); + if(oldTiddler) { + saveTiddlerFile(oldTiddler,{reason: "overwritten"}); + } + saveTiddlerFile(tiddler,{reason: "imported"}); + } + return tiddler; + }); + $tw.hooks.addHook("th-deleting-tiddler",function(tiddler) { + if($tw.wiki.checkTiddlerText(ENABLE_TIDDLER_TITLE,"yes")) { + saveTiddlerFile(tiddler,{reason: "deleted"}); + } + return tiddler; + }); +}; + +function SaveTrailSyncAdaptor(options) { + this.logger = new $tw.utils.Logger("SaveTrail"); +} + +SaveTrailSyncAdaptor.prototype.name = "savetrail"; + +SaveTrailSyncAdaptor.prototype.isReady = function() { + // The savetrail adaptor is always ready + return true; +}; + +SaveTrailSyncAdaptor.prototype.getTiddlerInfo = function(tiddler) { + return {}; +}; + +/* +Save a tiddler and invoke the callback with (err,adaptorInfo,revision) +*/ +SaveTrailSyncAdaptor.prototype.saveTiddler = function(tiddler,callback) { + if($tw.wiki.checkTiddlerText(ENABLE_TIDDLER_TITLE,"yes")) { + var isDraft = $tw.utils.hop(tiddler.fields,"draft.of"); + if(!isDraft || $tw.wiki.checkTiddlerText(ENABLE_DRAFTS_TIDDLER_TITLE,"yes")) { + saveTiddlerFile(tiddler,{reason: "modified"}); + } + } + callback(null); +}; + +/* +Load a tiddler and invoke the callback with (err,tiddlerFields) +*/ +SaveTrailSyncAdaptor.prototype.loadTiddler = function(title,callback) { + callback(null,null); +}; + +/* +Delete a tiddler and invoke the callback with (err) +*/ +SaveTrailSyncAdaptor.prototype.deleteTiddler = function(title,callback,options) { + callback(null); +}; + +function saveTiddlerFile(tiddler,options) { + options = options || {}; + var reason = options.reason || "changed", + illegalFilenameCharacters = /<|>|\:|\"|\/|\\|\||\?|\*|\^|\s/g, + fixedTitle = $tw.utils.transliterate(tiddler.fields.title).replace(illegalFilenameCharacters,"_"), + formattedDate = $tw.utils.stringifyDate(new Date()), + filename = fixedTitle + "." + formattedDate + "." + reason + ".json", + fields = new Object(); + for(var field in tiddler.fields) { + fields[field] = tiddler.getFieldString(field); + } + var text = JSON.stringify([fields],null,$tw.config.preferences.jsonSpaces), + link = document.createElement("a"); + link.setAttribute("target","_blank"); + link.setAttribute("rel","noopener noreferrer"); + if(Blob !== undefined) { + var blob = new Blob([text], {type: "text/plain"}); + link.setAttribute("href", URL.createObjectURL(blob)); + } else { + link.setAttribute("href","data:text/plain," + encodeURIComponent(text)); + } + link.setAttribute("download",filename); + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); +} + +})(); diff --git a/plugins/tiddlywiki/savetrail/settings.tid b/plugins/tiddlywiki/savetrail/settings.tid new file mode 100644 index 000000000..c11ef649a --- /dev/null +++ b/plugins/tiddlywiki/savetrail/settings.tid @@ -0,0 +1,6 @@ +title: $:/plugins/tiddlywiki/savetrail/settings + + +<$checkbox tiddler="$:/config/SaveTrailPlugin/enable" field="text" checked="yes" unchecked="no"> Enable automatic saving of modified tiddlers + +<$checkbox tiddler="$:/config/SaveTrailPlugin/enable-drafts" field="text" checked="yes" unchecked="no"> Include automatic saving of draft tiddlers (warning: generates a lot of download files) diff --git a/plugins/tiddlywiki/sax/files/LICENSE b/plugins/tiddlywiki/sax/files/LICENSE new file mode 100644 index 000000000..ccffa082c --- /dev/null +++ b/plugins/tiddlywiki/sax/files/LICENSE @@ -0,0 +1,41 @@ +The ISC License + +Copyright (c) Isaac Z. Schlueter and Contributors + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +==== + +`String.fromCodePoint` by Mathias Bynens used according to terms of MIT +License, as follows: + + Copyright Mathias Bynens + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/plugins/tiddlywiki/sax/files/README.md b/plugins/tiddlywiki/sax/files/README.md new file mode 100644 index 000000000..afcd3f3dd --- /dev/null +++ b/plugins/tiddlywiki/sax/files/README.md @@ -0,0 +1,225 @@ +# sax js + +A sax-style parser for XML and HTML. + +Designed with [node](http://nodejs.org/) in mind, but should work fine in +the browser or other CommonJS implementations. + +## What This Is + +* A very simple tool to parse through an XML string. +* A stepping stone to a streaming HTML parser. +* A handy way to deal with RSS and other mostly-ok-but-kinda-broken XML + docs. + +## What This Is (probably) Not + +* An HTML Parser - That's a fine goal, but this isn't it. It's just + XML. +* A DOM Builder - You can use it to build an object model out of XML, + but it doesn't do that out of the box. +* XSLT - No DOM = no querying. +* 100% Compliant with (some other SAX implementation) - Most SAX + implementations are in Java and do a lot more than this does. +* An XML Validator - It does a little validation when in strict mode, but + not much. +* A Schema-Aware XSD Thing - Schemas are an exercise in fetishistic + masochism. +* A DTD-aware Thing - Fetching DTDs is a much bigger job. + +## Regarding `Hello, world!').close(); + +// stream usage +// takes the same options as the parser +var saxStream = require("sax").createStream(strict, options) +saxStream.on("error", function (e) { + // unhandled errors will throw, since this is a proper node + // event emitter. + console.error("error!", e) + // clear the error + this._parser.error = null + this._parser.resume() +}) +saxStream.on("opentag", function (node) { + // same object as above +}) +// pipe is supported, and it's readable/writable +// same chunks coming in also go out. +fs.createReadStream("file.xml") + .pipe(saxStream) + .pipe(fs.createWriteStream("file-copy.xml")) +``` + + +## Arguments + +Pass the following arguments to the parser function. All are optional. + +`strict` - Boolean. Whether or not to be a jerk. Default: `false`. + +`opt` - Object bag of settings regarding string formatting. All default to `false`. + +Settings supported: + +* `trim` - Boolean. Whether or not to trim text and comment nodes. +* `normalize` - Boolean. If true, then turn any whitespace into a single + space. +* `lowercase` - Boolean. If true, then lowercase tag names and attribute names + in loose mode, rather than uppercasing them. +* `xmlns` - Boolean. If true, then namespaces are supported. +* `position` - Boolean. If false, then don't track line/col/position. +* `strictEntities` - Boolean. If true, only parse [predefined XML + entities](http://www.w3.org/TR/REC-xml/#sec-predefined-ent) + (`&`, `'`, `>`, `<`, and `"`) + +## Methods + +`write` - Write bytes onto the stream. You don't have to do this all at +once. You can keep writing as much as you want. + +`close` - Close the stream. Once closed, no more data may be written until +it is done processing the buffer, which is signaled by the `end` event. + +`resume` - To gracefully handle errors, assign a listener to the `error` +event. Then, when the error is taken care of, you can call `resume` to +continue parsing. Otherwise, the parser will not continue while in an error +state. + +## Members + +At all times, the parser object will have the following members: + +`line`, `column`, `position` - Indications of the position in the XML +document where the parser currently is looking. + +`startTagPosition` - Indicates the position where the current tag starts. + +`closed` - Boolean indicating whether or not the parser can be written to. +If it's `true`, then wait for the `ready` event to write again. + +`strict` - Boolean indicating whether or not the parser is a jerk. + +`opt` - Any options passed into the constructor. + +`tag` - The current tag being dealt with. + +And a bunch of other stuff that you probably shouldn't touch. + +## Events + +All events emit with a single argument. To listen to an event, assign a +function to `on`. Functions get executed in the this-context of +the parser object. The list of supported events are also in the exported +`EVENTS` array. + +When using the stream interface, assign handlers using the EventEmitter +`on` function in the normal fashion. + +`error` - Indication that something bad happened. The error will be hanging +out on `parser.error`, and must be deleted before parsing can continue. By +listening to this event, you can keep an eye on that kind of stuff. Note: +this happens *much* more in strict mode. Argument: instance of `Error`. + +`text` - Text node. Argument: string of text. + +`doctype` - The ``. Argument: +object with `name` and `body` members. Attributes are not parsed, as +processing instructions have implementation dependent semantics. + +`sgmldeclaration` - Random SGML declarations. Stuff like `` +would trigger this kind of event. This is a weird thing to support, so it +might go away at some point. SAX isn't intended to be used to parse SGML, +after all. + +`opentagstart` - Emitted immediately when the tag name is available, +but before any attributes are encountered. Argument: object with a +`name` field and an empty `attributes` set. Note that this is the +same object that will later be emitted in the `opentag` event. + +`opentag` - An opening tag. Argument: object with `name` and `attributes`. +In non-strict mode, tag names are uppercased, unless the `lowercase` +option is set. If the `xmlns` option is set, then it will contain +namespace binding information on the `ns` member, and will have a +`local`, `prefix`, and `uri` member. + +`closetag` - A closing tag. In loose mode, tags are auto-closed if their +parent closes. In strict mode, well-formedness is enforced. Note that +self-closing tags will have `closeTag` emitted immediately after `openTag`. +Argument: tag name. + +`attribute` - An attribute node. Argument: object with `name` and `value`. +In non-strict mode, attribute names are uppercased, unless the `lowercase` +option is set. If the `xmlns` option is set, it will also contains namespace +information. + +`comment` - A comment node. Argument: the string of the comment. + +`opencdata` - The opening tag of a ``) of a `` tags trigger a `"script"` +event, and their contents are not checked for special xml characters. +If you pass `noscript: true`, then this behavior is suppressed. + +## Reporting Problems + +It's best to write a failing test if you find an issue. I will always +accept pull requests with failing tests if they demonstrate intended +behavior, but it is very hard to figure out what issue you're describing +without a test. Writing a test is also the best way for you yourself +to figure out if you really understand the issue you think you have with +sax-js. diff --git a/plugins/tiddlywiki/sax/files/lib/sax.js b/plugins/tiddlywiki/sax/files/lib/sax.js new file mode 100644 index 000000000..795d607ef --- /dev/null +++ b/plugins/tiddlywiki/sax/files/lib/sax.js @@ -0,0 +1,1565 @@ +;(function (sax) { // wrapper for non-node envs + sax.parser = function (strict, opt) { return new SAXParser(strict, opt) } + sax.SAXParser = SAXParser + sax.SAXStream = SAXStream + sax.createStream = createStream + + // When we pass the MAX_BUFFER_LENGTH position, start checking for buffer overruns. + // When we check, schedule the next check for MAX_BUFFER_LENGTH - (max(buffer lengths)), + // since that's the earliest that a buffer overrun could occur. This way, checks are + // as rare as required, but as often as necessary to ensure never crossing this bound. + // Furthermore, buffers are only tested at most once per write(), so passing a very + // large string into write() might have undesirable effects, but this is manageable by + // the caller, so it is assumed to be safe. Thus, a call to write() may, in the extreme + // edge case, result in creating at most one complete copy of the string passed in. + // Set to Infinity to have unlimited buffers. + sax.MAX_BUFFER_LENGTH = 64 * 1024 + + var buffers = [ + 'comment', 'sgmlDecl', 'textNode', 'tagName', 'doctype', + 'procInstName', 'procInstBody', 'entity', 'attribName', + 'attribValue', 'cdata', 'script' + ] + + sax.EVENTS = [ + 'text', + 'processinginstruction', + 'sgmldeclaration', + 'doctype', + 'comment', + 'opentagstart', + 'attribute', + 'opentag', + 'closetag', + 'opencdata', + 'cdata', + 'closecdata', + 'error', + 'end', + 'ready', + 'script', + 'opennamespace', + 'closenamespace' + ] + + function SAXParser (strict, opt) { + if (!(this instanceof SAXParser)) { + return new SAXParser(strict, opt) + } + + var parser = this + clearBuffers(parser) + parser.q = parser.c = '' + parser.bufferCheckPosition = sax.MAX_BUFFER_LENGTH + parser.opt = opt || {} + parser.opt.lowercase = parser.opt.lowercase || parser.opt.lowercasetags + parser.looseCase = parser.opt.lowercase ? 'toLowerCase' : 'toUpperCase' + parser.tags = [] + parser.closed = parser.closedRoot = parser.sawRoot = false + parser.tag = parser.error = null + parser.strict = !!strict + parser.noscript = !!(strict || parser.opt.noscript) + parser.state = S.BEGIN + parser.strictEntities = parser.opt.strictEntities + parser.ENTITIES = parser.strictEntities ? Object.create(sax.XML_ENTITIES) : Object.create(sax.ENTITIES) + parser.attribList = [] + + // namespaces form a prototype chain. + // it always points at the current tag, + // which protos to its parent tag. + if (parser.opt.xmlns) { + parser.ns = Object.create(rootNS) + } + + // mostly just for error reporting + parser.trackPosition = parser.opt.position !== false + if (parser.trackPosition) { + parser.position = parser.line = parser.column = 0 + } + emit(parser, 'onready') + } + + if (!Object.create) { + Object.create = function (o) { + function F () {} + F.prototype = o + var newf = new F() + return newf + } + } + + if (!Object.keys) { + Object.keys = function (o) { + var a = [] + for (var i in o) if (o.hasOwnProperty(i)) a.push(i) + return a + } + } + + function checkBufferLength (parser) { + var maxAllowed = Math.max(sax.MAX_BUFFER_LENGTH, 10) + var maxActual = 0 + for (var i = 0, l = buffers.length; i < l; i++) { + var len = parser[buffers[i]].length + if (len > maxAllowed) { + // Text/cdata nodes can get big, and since they're buffered, + // we can get here under normal conditions. + // Avoid issues by emitting the text node now, + // so at least it won't get any bigger. + switch (buffers[i]) { + case 'textNode': + closeText(parser) + break + + case 'cdata': + emitNode(parser, 'oncdata', parser.cdata) + parser.cdata = '' + break + + case 'script': + emitNode(parser, 'onscript', parser.script) + parser.script = '' + break + + default: + error(parser, 'Max buffer length exceeded: ' + buffers[i]) + } + } + maxActual = Math.max(maxActual, len) + } + // schedule the next check for the earliest possible buffer overrun. + var m = sax.MAX_BUFFER_LENGTH - maxActual + parser.bufferCheckPosition = m + parser.position + } + + function clearBuffers (parser) { + for (var i = 0, l = buffers.length; i < l; i++) { + parser[buffers[i]] = '' + } + } + + function flushBuffers (parser) { + closeText(parser) + if (parser.cdata !== '') { + emitNode(parser, 'oncdata', parser.cdata) + parser.cdata = '' + } + if (parser.script !== '') { + emitNode(parser, 'onscript', parser.script) + parser.script = '' + } + } + + SAXParser.prototype = { + end: function () { end(this) }, + write: write, + resume: function () { this.error = null; return this }, + close: function () { return this.write(null) }, + flush: function () { flushBuffers(this) } + } + + var Stream + try { + Stream = require('stream').Stream + } catch (ex) { + Stream = function () {} + } + + var streamWraps = sax.EVENTS.filter(function (ev) { + return ev !== 'error' && ev !== 'end' + }) + + function createStream (strict, opt) { + return new SAXStream(strict, opt) + } + + function SAXStream (strict, opt) { + if (!(this instanceof SAXStream)) { + return new SAXStream(strict, opt) + } + + Stream.apply(this) + + this._parser = new SAXParser(strict, opt) + this.writable = true + this.readable = true + + var me = this + + this._parser.onend = function () { + me.emit('end') + } + + this._parser.onerror = function (er) { + me.emit('error', er) + + // if didn't throw, then means error was handled. + // go ahead and clear error, so we can write again. + me._parser.error = null + } + + this._decoder = null + + streamWraps.forEach(function (ev) { + Object.defineProperty(me, 'on' + ev, { + get: function () { + return me._parser['on' + ev] + }, + set: function (h) { + if (!h) { + me.removeAllListeners(ev) + me._parser['on' + ev] = h + return h + } + me.on(ev, h) + }, + enumerable: true, + configurable: false + }) + }) + } + + SAXStream.prototype = Object.create(Stream.prototype, { + constructor: { + value: SAXStream + } + }) + + SAXStream.prototype.write = function (data) { + if (typeof Buffer === 'function' && + typeof Buffer.isBuffer === 'function' && + Buffer.isBuffer(data)) { + if (!this._decoder) { + var SD = require('string_decoder').StringDecoder + this._decoder = new SD('utf8') + } + data = this._decoder.write(data) + } + + this._parser.write(data.toString()) + this.emit('data', data) + return true + } + + SAXStream.prototype.end = function (chunk) { + if (chunk && chunk.length) { + this.write(chunk) + } + this._parser.end() + return true + } + + SAXStream.prototype.on = function (ev, handler) { + var me = this + if (!me._parser['on' + ev] && streamWraps.indexOf(ev) !== -1) { + me._parser['on' + ev] = function () { + var args = arguments.length === 1 ? [arguments[0]] : Array.apply(null, arguments) + args.splice(0, 0, ev) + me.emit.apply(me, args) + } + } + + return Stream.prototype.on.call(me, ev, handler) + } + + // this really needs to be replaced with character classes. + // XML allows all manner of ridiculous numbers and digits. + var CDATA = '[CDATA[' + var DOCTYPE = 'DOCTYPE' + var XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace' + var XMLNS_NAMESPACE = 'http://www.w3.org/2000/xmlns/' + var rootNS = { xml: XML_NAMESPACE, xmlns: XMLNS_NAMESPACE } + + // http://www.w3.org/TR/REC-xml/#NT-NameStartChar + // This implementation works on strings, a single character at a time + // as such, it cannot ever support astral-plane characters (10000-EFFFF) + // without a significant breaking change to either this parser, or the + // JavaScript language. Implementation of an emoji-capable xml parser + // is left as an exercise for the reader. + var nameStart = /[:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/ + + var nameBody = /[:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u00B7\u0300-\u036F\u203F-\u2040.\d-]/ + + var entityStart = /[#:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/ + var entityBody = /[#:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u00B7\u0300-\u036F\u203F-\u2040.\d-]/ + + function isWhitespace (c) { + return c === ' ' || c === '\n' || c === '\r' || c === '\t' + } + + function isQuote (c) { + return c === '"' || c === '\'' + } + + function isAttribEnd (c) { + return c === '>' || isWhitespace(c) + } + + function isMatch (regex, c) { + return regex.test(c) + } + + function notMatch (regex, c) { + return !isMatch(regex, c) + } + + var S = 0 + sax.STATE = { + BEGIN: S++, // leading byte order mark or whitespace + BEGIN_WHITESPACE: S++, // leading whitespace + TEXT: S++, // general stuff + TEXT_ENTITY: S++, // & and such. + OPEN_WAKA: S++, // < + SGML_DECL: S++, // + SCRIPT: S++, // \ No newline at end of file diff --git a/plugins/tiddlywiki/twitter/readme.tid b/plugins/tiddlywiki/twitter/readme.tid new file mode 100644 index 000000000..8cd471583 --- /dev/null +++ b/plugins/tiddlywiki/twitter/readme.tid @@ -0,0 +1,9 @@ +title: $:/plugins/tiddlywiki/twitter/readme + +This plugin provides a `<$twitter>` widget that can embed various entities from Twitter's service: + +* Individual tweets and conversations +* Buttons for tweeting/mentioning, sharing, following +* Various types of timeline: profile, likes, list, collection, url and widget + +The widget only works in the browser, and not in generated static HTML pages. diff --git a/plugins/tiddlywiki/twitter/twitter-widget.js b/plugins/tiddlywiki/twitter/twitter-widget.js new file mode 100644 index 000000000..0046b7139 --- /dev/null +++ b/plugins/tiddlywiki/twitter/twitter-widget.js @@ -0,0 +1,144 @@ +/*\ +title: $:/plugins/tiddlywiki/twitter/widget.js +type: application/javascript +module-type: widget + +Twitter widget + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +var Widget = require("$:/core/modules/widgets/widget.js").widget; + +var TwitterWidget = function(parseTreeNode,options) { + this.initialise(parseTreeNode,options); +}; + +/* +Inherit from the base widget class +*/ +TwitterWidget.prototype = new Widget(); + +var optionAttributes = "align ariaPolite borderColor cards chrome conversation count dnt hashtags height height lang linkColor related size text theme tweetLimit via width".split(" "), + otherAttributes = "hashtag id ownerScreenName screenName slug tweetID type url userId widgetId".split(" "), + allAttributes = Array.prototype.slice.call(optionAttributes,0).concat(otherAttributes); + +/* +Render this widget into the DOM +*/ +TwitterWidget.prototype.render = function(parent,nextSibling) { + var self = this; + // Housekeeping + this.parentDomNode = parent; + this.computeAttributes(); + // Compose the arguments for the tweet call + var method, + arg, + options = {}; + $tw.utils.each(optionAttributes,function(attr) { + options[attr] = self.getAttribute(attr); + }); + switch(this.getAttribute("type")) { + case "shareButton": + method = "createShareButton"; + arg = this.getAttribute("url"); + break; + case "followButton": + method = "createFollowButton"; + arg = this.getAttribute("screenName"); + break; + case "hashtagButton": + method = "createHashtagButton"; + arg = this.getAttribute("hashtag"); + break; + case "mentionButton": + method = "createMentionButton"; + arg = this.getAttribute("screenName"); + break; + case "tweet": + method = "createTweet"; + arg = this.getAttribute("tweetID"); + break; + case "timelineProfile": + method = "createTimeline"; + arg = { + sourceType: "profile", + screenName: this.getAttribute("screenName"), + userId: this.getAttribute("userId") + }; + break; + case "timelineLikes": + method = "createTimeline"; + arg = { + sourceType: "likes", + screenName: this.getAttribute("screenName"), + userId: this.getAttribute("userId") + }; + break; + case "timelineList": + method = "createTimeline"; + arg = { + sourceType: "list", + ownerScreenName: this.getAttribute("ownerScreenName"), + slug: this.getAttribute("slug"), + id: this.getAttribute("id") + }; + break; + case "timelineCollection": + method = "createTimeline"; + arg = { + sourceType: "collection", + id: this.getAttribute("id") + }; + break; + case "timelineUrl": + method = "createTimeline"; + arg = { + sourceType: "url", + url: this.getAttribute("url") + }; + break; + case "timelineWidget": + method = "createTimeline"; + arg = { + sourceType: "widget", + widgetId: this.getAttribute("widgetId") + }; + break; + } + // Render the tweet into a div + var div = this.document.createElement("div"); + if(!this.document.isTiddlyWikiFakeDom && window.twttr && method) { + twttr.ready(function(twttr) { + window.twttr.widgets[method](arg,div,options); + }); + } else { + div.appendChild(this.document.createTextNode("Can't render tweet")); + } + // Insert it into the DOM + parent.insertBefore(div,nextSibling); + this.domNodes.push(div); +}; + +/* +Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering +*/ +TwitterWidget.prototype.refresh = function(changedTiddlers) { + var changedAttributes = this.computeAttributes(); + if(allAttributes.find(function(attr) { + return $tw.utils.hop(changedAttributes,attr); + })) { + this.refreshSelf(); + return true; + } else { + return false; + } +}; + +exports.twitter = TwitterWidget; + +})(); diff --git a/plugins/tiddlywiki/twitter/usage.tid b/plugins/tiddlywiki/twitter/usage.tid new file mode 100644 index 000000000..976f2d0c7 --- /dev/null +++ b/plugins/tiddlywiki/twitter/usage.tid @@ -0,0 +1,5 @@ +title: $:/plugins/tiddlywiki/twitter/usage + +The `<$twitter>` widget can be used to embed several different entities: + +<$macrocall $name="tabs" state=<> tabsList="[all[tiddlers+shadows]tag[$:/tags/TwitterUsage]]" default="$:/plugins/tiddlywiki/twitter/usage/tweet" class="tc-vertical"/> diff --git a/plugins/tiddlywiki/twitter/usage/collectiontimeline.tid b/plugins/tiddlywiki/twitter/usage/collectiontimeline.tid new file mode 100644 index 000000000..2f53409ca --- /dev/null +++ b/plugins/tiddlywiki/twitter/usage/collectiontimeline.tid @@ -0,0 +1,27 @@ +title: $:/plugins/tiddlywiki/twitter/usage/collectiontimeline +tags: $:/tags/TwitterUsage +caption: Collection Timeline + +!! Embedding Collection Timelines + +|!Attribute |!Values |!Default |!Notes | +|''type'' |"timelineCollection" |none |"timelineCollection" | +|''id'' |ID of the collection |none | | +|''chrome'' |"noheader", "nofooter", "noborders", "transparent", "noscrollbar" |none |Toggle the display of design elements in the widget. This parameter is a space-separated list of values | +|''height'' |Positive integer |600 |Set a fixed height of the embedded widget | +|''tweetLimit'' |Range: 1-20 |none |Render a timeline statically, displaying only n number of Tweets | +|''borderColor'' |Hexadecimal color |Varies by theme |Adjust the color of borders inside the widget | +|''ariaPolite'' |"polite", "assertive", "rude" |"polite" |Apply the specified aria-polite behavior to the rendered timeline. New Tweets may be added to the top of a timeline, affecting screen readers | +|''conversation'' |"none", "all" |"all" |Tweets in response to another Tweet will display a compact version of the previous Tweet by default. Use "none" to hide the parent Tweet in the conversation | +|''cards'' |"hidden", "visible"|visible |Hide photos, videos, and link previews powered by Twitter Cards | +|''width'' |Positive integer |"auto", derived from container size |Set the maximum width of the embedded Tweet | +|''align'' |"left", "right", "center" |none |Float the embedded Tweet to the left or right so that text wraps around it, or align center so it floats in the middle of a paragraph | +|''theme'' |"dark", "light" |"light" |Toggle the default color scheme of the embedded Tweet | +|''linkColor'' |Hexadecimal color |"#2b7bb9" |Adjust the color of links, including hashtags and @mentions, inside the widget | +|''lang'' |An ISO 639-1 language code |en |The language in which to render a widget, if supported | +|''dnt'' |"true", "false" |false |Enable Do Not Track for this widget | +|''related'' |Any comma-separated list of valid Twitter screen names |none |A list of Twitter screen names to be suggested for following after a Tweet or Tweet action is posted | +|''via'' |Any valid Twitter screen name |none |A Twitter user mentioned in the default Tweet text as via @user where appropriate | + +< +""">> diff --git a/plugins/tiddlywiki/twitter/usage/followbutton.tid b/plugins/tiddlywiki/twitter/usage/followbutton.tid new file mode 100644 index 000000000..8cd80a559 --- /dev/null +++ b/plugins/tiddlywiki/twitter/usage/followbutton.tid @@ -0,0 +1,21 @@ +title: $:/plugins/tiddlywiki/twitter/usage/followbutton +tags: $:/tags/TwitterUsage +caption: Follow Button + +!! Embedding Follow Buttons + +|!Attribute |!Values |!Default |!Notes | +|''type'' |"followButton" |none |"followButton" | +|''screenName'' |Screen name of the account to be followed |none | | +|''count'' |"none", "horizontal" |"horizontal" | | +|''text'' |Any string |none |The default, highlighted text a user sees in the Tweet web intent | +|''hashtags'' |A comma-separated list of hashtags |none |A list of hashtags to be appended to default Tweet text where appropriate | +|''align'' |"left", "right" |locale dependent (left or right, depending on the text direction of the language) |The alignment of the button within an iframe; use this to ensure flush layout when aligning buttons | +|''size'' |"medium", "large" |medium |Size of button | +|''lang'' |An ISO 639-1 language code |en |The language in which to render a widget, if supported | +|''dnt'' |"true", "false" |false |Enable Do Not Track for this widget | +|''related'' |Any comma-separated list of valid Twitter screen names |none |A list of Twitter screen names to be suggested for following after a Tweet or Tweet action is posted | +|''via'' |Any valid Twitter screen name |none |A Twitter user mentioned in the default Tweet text as via @user where appropriate | + +< +""">> diff --git a/plugins/tiddlywiki/twitter/usage/hashtagbutton.tid b/plugins/tiddlywiki/twitter/usage/hashtagbutton.tid new file mode 100644 index 000000000..6ed038a5c --- /dev/null +++ b/plugins/tiddlywiki/twitter/usage/hashtagbutton.tid @@ -0,0 +1,19 @@ +title: $:/plugins/tiddlywiki/twitter/usage/hashtagbutton +tags: $:/tags/TwitterUsage +caption: Hashtag Button + +!! Embedding Hashtag Buttons + +|!Attribute |!Values |!Default |!Notes | +|''type'' |"hashtagButton" |none |"hashtagButton" | +|''hashtag'' |Hashtag to be tweeted and displayed on the button |none | | +|''text'' |Any string |none |The default, highlighted text a user sees in the Tweet web intent | +|''align'' |"left", "right" |locale dependent (left or right, depending on the text direction of the language) |The alignment of the button within an iframe; use this to ensure flush layout when aligning buttons | +|''size'' |"medium", "large" |medium |Size of button | +|''lang'' |An ISO 639-1 language code |en |The language in which to render a widget, if supported | +|''dnt'' |"true", "false" |false |Enable Do Not Track for this widget | +|''related'' |Any comma-separated list of valid Twitter screen names |none |A list of Twitter screen names to be suggested for following after a Tweet or Tweet action is posted | +|''via'' |Any valid Twitter screen name |none |A Twitter user mentioned in the default Tweet text as via @user where appropriate | + +< +""">> diff --git a/plugins/tiddlywiki/twitter/usage/likestimeline.tid b/plugins/tiddlywiki/twitter/usage/likestimeline.tid new file mode 100644 index 000000000..2f7f83784 --- /dev/null +++ b/plugins/tiddlywiki/twitter/usage/likestimeline.tid @@ -0,0 +1,28 @@ +title: $:/plugins/tiddlywiki/twitter/usage/likestimeline +tags: $:/tags/TwitterUsage +caption: Likes Timeline + +!! Embedding Likes Timelines + +|!Attribute |!Values |!Default |!Notes | +|''type'' |"timelineLikes" |none |"timelineLikes" | +|''screenName'' |Screen name of the account |none |Either ''screenName'' or ''userId'' must be provided | +|''userId'' |User ID of the account |none |~| +|''chrome'' |"noheader", "nofooter", "noborders", "transparent", "noscrollbar" |none |Toggle the display of design elements in the widget. This parameter is a space-separated list of values | +|''height'' |Positive integer |600 |Set a fixed height of the embedded widget | +|''tweetLimit'' |Range: 1-20 |none |Render a timeline statically, displaying only n number of Tweets | +|''borderColor'' |Hexadecimal color |Varies by theme |Adjust the color of borders inside the widget | +|''ariaPolite'' |"polite", "assertive", "rude" |"polite" |Apply the specified aria-polite behavior to the rendered timeline. New Tweets may be added to the top of a timeline, affecting screen readers | +|''conversation'' |"none", "all" |"all" |Tweets in response to another Tweet will display a compact version of the previous Tweet by default. Use "none" to hide the parent Tweet in the conversation | +|''cards'' |"hidden", "visible"|visible |Hide photos, videos, and link previews powered by Twitter Cards | +|''width'' |Positive integer |"auto", derived from container size |Set the maximum width of the embedded Tweet | +|''align'' |"left", "right", "center" |none |Float the embedded Tweet to the left or right so that text wraps around it, or align center so it floats in the middle of a paragraph | +|''theme'' |"dark", "light" |"light" |Toggle the default color scheme of the embedded Tweet | +|''linkColor'' |Hexadecimal color |"#2b7bb9" |Adjust the color of links, including hashtags and @mentions, inside the widget | +|''lang'' |An ISO 639-1 language code |en |The language in which to render a widget, if supported | +|''dnt'' |"true", "false" |false |Enable Do Not Track for this widget | +|''related'' |Any comma-separated list of valid Twitter screen names |none |A list of Twitter screen names to be suggested for following after a Tweet or Tweet action is posted | +|''via'' |Any valid Twitter screen name |none |A Twitter user mentioned in the default Tweet text as via @user where appropriate | + +< +""">> diff --git a/plugins/tiddlywiki/twitter/usage/listtimeline.tid b/plugins/tiddlywiki/twitter/usage/listtimeline.tid new file mode 100644 index 000000000..49e7c3d3a --- /dev/null +++ b/plugins/tiddlywiki/twitter/usage/listtimeline.tid @@ -0,0 +1,29 @@ +title: $:/plugins/tiddlywiki/twitter/usage/listtimeline +tags: $:/tags/TwitterUsage +caption: List Timeline + +!! Embedding List Timelines + +|!Attribute |!Values |!Default |!Notes | +|''type'' |"timelineList" |none |"timelineList" | +|''ownerScreenName'' |Screen name of the account |none |Either both ''ownerScreenName'' and ''slug'' must be provided, or just ''id'' | +|''slug'' |The string identifier for a list |none |~| +|''id'' |ID of the list |none |~| +|''chrome'' |"noheader", "nofooter", "noborders", "transparent", "noscrollbar" |none |Toggle the display of design elements in the widget. This parameter is a space-separated list of values | +|''height'' |Positive integer |600 |Set a fixed height of the embedded widget | +|''tweetLimit'' |Range: 1-20 |none |Render a timeline statically, displaying only n number of Tweets | +|''borderColor'' |Hexadecimal color |Varies by theme |Adjust the color of borders inside the widget | +|''ariaPolite'' |"polite", "assertive", "rude" |"polite" |Apply the specified aria-polite behavior to the rendered timeline. New Tweets may be added to the top of a timeline, affecting screen readers | +|''conversation'' |"none", "all" |"all" |Tweets in response to another Tweet will display a compact version of the previous Tweet by default. Use "none" to hide the parent Tweet in the conversation | +|''cards'' |"hidden", "visible"|visible |Hide photos, videos, and link previews powered by Twitter Cards | +|''width'' |Positive integer |"auto", derived from container size |Set the maximum width of the embedded Tweet | +|''align'' |"left", "right", "center" |none |Float the embedded Tweet to the left or right so that text wraps around it, or align center so it floats in the middle of a paragraph | +|''theme'' |"dark", "light" |"light" |Toggle the default color scheme of the embedded Tweet | +|''linkColor'' |Hexadecimal color |"#2b7bb9" |Adjust the color of links, including hashtags and @mentions, inside the widget | +|''lang'' |An ISO 639-1 language code |en |The language in which to render a widget, if supported | +|''dnt'' |"true", "false" |false |Enable Do Not Track for this widget | +|''related'' |Any comma-separated list of valid Twitter screen names |none |A list of Twitter screen names to be suggested for following after a Tweet or Tweet action is posted | +|''via'' |Any valid Twitter screen name |none |A Twitter user mentioned in the default Tweet text as via @user where appropriate | + +< +""">> diff --git a/plugins/tiddlywiki/twitter/usage/mentionbutton.tid b/plugins/tiddlywiki/twitter/usage/mentionbutton.tid new file mode 100644 index 000000000..6265639d0 --- /dev/null +++ b/plugins/tiddlywiki/twitter/usage/mentionbutton.tid @@ -0,0 +1,20 @@ +title: $:/plugins/tiddlywiki/twitter/usage/mentionbutton +tags: $:/tags/TwitterUsage +caption: Mention Button + +!! Embedding Mention Buttons + +|!Attribute |!Values |!Default |!Notes | +|''type'' |"mentionButton" |none |"mentionButton" | +|''screenName'' |Screen name of the account to be mentioned |none | | +|''text'' |Any string |none |The default, highlighted text a user sees in the Tweet web intent | +|''hashtags'' |A comma-separated list of hashtags |none |A list of hashtags to be appended to default Tweet text where appropriate | +|''align'' |"left", "right" |locale dependent (left or right, depending on the text direction of the language) |The alignment of the button within an iframe; use this to ensure flush layout when aligning buttons | +|''size'' |"medium", "large" |medium |Size of button | +|''lang'' |An ISO 639-1 language code |en |The language in which to render a widget, if supported | +|''dnt'' |"true", "false" |false |Enable Do Not Track for this widget | +|''related'' |Any comma-separated list of valid Twitter screen names |none |A list of Twitter screen names to be suggested for following after a Tweet or Tweet action is posted | +|''via'' |Any valid Twitter screen name |none |A Twitter user mentioned in the default Tweet text as via @user where appropriate | + +< +""">> \ No newline at end of file diff --git a/plugins/tiddlywiki/twitter/usage/profiletimeline.tid b/plugins/tiddlywiki/twitter/usage/profiletimeline.tid new file mode 100644 index 000000000..a347b479f --- /dev/null +++ b/plugins/tiddlywiki/twitter/usage/profiletimeline.tid @@ -0,0 +1,29 @@ +title: $:/plugins/tiddlywiki/twitter/usage/profiletimeline +tags: $:/tags/TwitterUsage +caption: Profile Timeline + +!! Embedding Profile Timelines + +|!Attribute |!Values |!Default |!Notes | +|''type'' |"timelineProfile" |none |"timelineProfile" | +|''screenName'' |Screen name of the account |none |Either ''screenName'' or ''userId'' must be provided | +|''userId'' |User ID of the account |none |~| +|''chrome'' |"noheader", "nofooter", "noborders", "transparent", "noscrollbar" |none |Toggle the display of design elements in the widget. This parameter is a space-separated list of values | +|''height'' |Positive integer |600 |Set a fixed height of the embedded widget | +|''tweetLimit'' |Range: 1-20 |none |Render a timeline statically, displaying only n number of Tweets | +|''borderColor'' |Hexadecimal color |Varies by theme |Adjust the color of borders inside the widget | +|''ariaPolite'' |"polite", "assertive", "rude" |"polite" |Apply the specified aria-polite behavior to the rendered timeline. New Tweets may be added to the top of a timeline, affecting screen readers | +|''conversation'' |"none", "all" |"all" |Tweets in response to another Tweet will display a compact version of the previous Tweet by default. Use "none" to hide the parent Tweet in the conversation | +|''cards'' |"hidden", "visible"|visible |Hide photos, videos, and link previews powered by Twitter Cards | +|''width'' |Positive integer |"auto", derived from container size |Set the maximum width of the embedded Tweet | +|''align'' |"left", "right", "center" |none |Float the embedded Tweet to the left or right so that text wraps around it, or align center so it floats in the middle of a paragraph | +|''theme'' |"dark", "light" |"light" |Toggle the default color scheme of the embedded Tweet | +|''linkColor'' |Hexadecimal color |"#2b7bb9" |Adjust the color of links, including hashtags and @mentions, inside the widget | +|''lang'' |An ISO 639-1 language code |en |The language in which to render a widget, if supported | +|''dnt'' |"true", "false" |false |Enable Do Not Track for this widget | +|''related'' |Any comma-separated list of valid Twitter screen names |none |A list of Twitter screen names to be suggested for following after a Tweet or Tweet action is posted | +|''via'' |Any valid Twitter screen name |none |A Twitter user mentioned in the default Tweet text as via @user where appropriate | + +< +""">> + diff --git a/plugins/tiddlywiki/twitter/usage/sharebutton.tid b/plugins/tiddlywiki/twitter/usage/sharebutton.tid new file mode 100644 index 000000000..ca8a082da --- /dev/null +++ b/plugins/tiddlywiki/twitter/usage/sharebutton.tid @@ -0,0 +1,20 @@ +title: $:/plugins/tiddlywiki/twitter/usage/sharebutton +tags: $:/tags/TwitterUsage +caption: Share Button + +!! Embedding Share Buttons + +|!Attribute |!Values |!Default |!Notes | +|''type'' |"shareButton" |none |"shareButton" | +|''url'' |The URL to be shared |none | | +|''text'' |Any string |none |The default, highlighted text a user sees in the Tweet web intent | +|''hashtags'' |A comma-separated list of hashtags |none |A list of hashtags to be appended to default Tweet text where appropriate | +|''align'' |"left", "right" |locale dependent (left or right, depending on the text direction of the language) |The alignment of the button within an iframe; use this to ensure flush layout when aligning buttons | +|''size'' |"medium", "large" |medium |Size of button | +|''lang'' |An ISO 639-1 language code |en |The language in which to render a widget, if supported | +|''dnt'' |"true", "false" |false |Enable Do Not Track for this widget | +|''related'' |Any comma-separated list of valid Twitter screen names |none |A list of Twitter screen names to be suggested for following after a Tweet or Tweet action is posted | +|''via'' |Any valid Twitter screen name |none |A Twitter user mentioned in the default Tweet text as via @user where appropriate | + +< +""">> diff --git a/plugins/tiddlywiki/twitter/usage/tweet.tid b/plugins/tiddlywiki/twitter/usage/tweet.tid new file mode 100644 index 000000000..89340ccb8 --- /dev/null +++ b/plugins/tiddlywiki/twitter/usage/tweet.tid @@ -0,0 +1,22 @@ +title: $:/plugins/tiddlywiki/twitter/usage/tweet +tags: $:/tags/TwitterUsage +caption: Tweet + +!! Embedding Tweets + +|!Attribute |!Values |!Default |!Notes | +|''type'' |"tweet" |none |"tweet" | +|''tweetID'' |ID of the tweet to render |none | | +|''conversation'' |"none", "all" |"all" |Tweets in response to another Tweet will display a compact version of the previous Tweet by default. Use "none" to hide the parent Tweet in the conversation | +|''cards'' |"hidden", "visible"|visible |Hide photos, videos, and link previews powered by Twitter Cards | +|''width'' |Positive integer |"auto", derived from container size |Set the maximum width of the embedded Tweet | +|''align'' |"left", "right", "center" |none |Float the embedded Tweet to the left or right so that text wraps around it, or align center so it floats in the middle of a paragraph | +|''theme'' |"dark", "light" |"light" |Toggle the default color scheme of the embedded Tweet | +|''linkColor'' |Hexadecimal color |"#2b7bb9" |Adjust the color of links, including hashtags and @mentions, inside the widget | +|''lang'' |An ISO 639-1 language code |en |The language in which to render a widget, if supported | +|''dnt'' |true, false |false |Enable Do Not Track for this widget | +|''related'' |Any comma-separated list of valid Twitter screen names |none |A list of Twitter screen names to be suggested for following after a Tweet or Tweet action is posted | +|''via'' |Any valid Twitter screen name |none |A Twitter user mentioned in the default Tweet text as via @user where appropriate | + +< +""">> diff --git a/plugins/tiddlywiki/twitter/usage/urltimeline.tid b/plugins/tiddlywiki/twitter/usage/urltimeline.tid new file mode 100644 index 000000000..3a7cbb1df --- /dev/null +++ b/plugins/tiddlywiki/twitter/usage/urltimeline.tid @@ -0,0 +1,27 @@ +title: $:/plugins/tiddlywiki/twitter/usage/urltimeline +tags: $:/tags/TwitterUsage +caption: Url Timeline + +!! Embedding Profile Timelines + +|!Attribute |!Values |!Default |!Notes | +|''type'' |"timelineUrl" |none |"timelineUrl" | +|''url'' |Absolute URL of a Twitter profile, likes, list, or collection |none | | +|''chrome'' |"noheader", "nofooter", "noborders", "transparent", "noscrollbar" |none |Toggle the display of design elements in the widget. This parameter is a space-separated list of values | +|''height'' |Positive integer |600 |Set a fixed height of the embedded widget | +|''tweetLimit'' |Range: 1-20 |none |Render a timeline statically, displaying only n number of Tweets | +|''borderColor'' |Hexadecimal color |Varies by theme |Adjust the color of borders inside the widget | +|''ariaPolite'' |"polite", "assertive", "rude" |"polite" |Apply the specified aria-polite behavior to the rendered timeline. New Tweets may be added to the top of a timeline, affecting screen readers | +|''conversation'' |"none", "all" |"all" |Tweets in response to another Tweet will display a compact version of the previous Tweet by default. Use "none" to hide the parent Tweet in the conversation | +|''cards'' |"hidden", "visible"|visible |Hide photos, videos, and link previews powered by Twitter Cards | +|''width'' |Positive integer |"auto", derived from container size |Set the maximum width of the embedded Tweet | +|''align'' |"left", "right", "center" |none |Float the embedded Tweet to the left or right so that text wraps around it, or align center so it floats in the middle of a paragraph | +|''theme'' |"dark", "light" |"light" |Toggle the default color scheme of the embedded Tweet | +|''linkColor'' |Hexadecimal color |"#2b7bb9" |Adjust the color of links, including hashtags and @mentions, inside the widget | +|''lang'' |An ISO 639-1 language code |en |The language in which to render a widget, if supported | +|''dnt'' |"true", "false" |false |Enable Do Not Track for this widget | +|''related'' |Any comma-separated list of valid Twitter screen names |none |A list of Twitter screen names to be suggested for following after a Tweet or Tweet action is posted | +|''via'' |Any valid Twitter screen name |none |A Twitter user mentioned in the default Tweet text as via @user where appropriate | + +< +""">> diff --git a/plugins/tiddlywiki/twitter/usage/widgettimeline.tid b/plugins/tiddlywiki/twitter/usage/widgettimeline.tid new file mode 100644 index 000000000..8b2287b73 --- /dev/null +++ b/plugins/tiddlywiki/twitter/usage/widgettimeline.tid @@ -0,0 +1,29 @@ +title: $:/plugins/tiddlywiki/twitter/usage/widgettimeline +tags: $:/tags/TwitterUsage +caption: Widget Timeline + +!! Embedding Widget Timelines + +To power an embedded timeline with a widget configuration generated at https://twitter.com/settings/widgets. + +|!Attribute |!Values |!Default |!Notes | +|''type'' |"timelineWidget" |none |"timelineWidget" | +|''widgetId'' |ID of the widget |none |~| +|''chrome'' |"noheader", "nofooter", "noborders", "transparent", "noscrollbar" |none |Toggle the display of design elements in the widget. This parameter is a space-separated list of values | +|''height'' |Positive integer |600 |Set a fixed height of the embedded widget | +|''tweetLimit'' |Range: 1-20 |none |Render a timeline statically, displaying only n number of Tweets | +|''borderColor'' |Hexadecimal color |Varies by theme |Adjust the color of borders inside the widget | +|''ariaPolite'' |"polite", "assertive", "rude" |"polite" |Apply the specified aria-polite behavior to the rendered timeline. New Tweets may be added to the top of a timeline, affecting screen readers | +|''conversation'' |"none", "all" |"all" |Tweets in response to another Tweet will display a compact version of the previous Tweet by default. Use "none" to hide the parent Tweet in the conversation | +|''cards'' |"hidden", "visible"|visible |Hide photos, videos, and link previews powered by Twitter Cards | +|''width'' |Positive integer |"auto", derived from container size |Set the maximum width of the embedded Tweet | +|''align'' |"left", "right", "center" |none |Float the embedded Tweet to the left or right so that text wraps around it, or align center so it floats in the middle of a paragraph | +|''theme'' |"dark", "light" |"light" |Toggle the default color scheme of the embedded Tweet | +|''linkColor'' |Hexadecimal color |"#2b7bb9" |Adjust the color of links, including hashtags and @mentions, inside the widget | +|''lang'' |An ISO 639-1 language code |en |The language in which to render a widget, if supported | +|''dnt'' |"true", "false" |false |Enable Do Not Track for this widget | +|''related'' |Any comma-separated list of valid Twitter screen names |none |A list of Twitter screen names to be suggested for following after a Tweet or Tweet action is posted | +|''via'' |Any valid Twitter screen name |none |A Twitter user mentioned in the default Tweet text as via @user where appropriate | + +< +""">> diff --git a/plugins/tiddlywiki/upgrade/readme.tid b/plugins/tiddlywiki/upgrade/readme.tid index 2d52f702d..e959a2fa0 100644 --- a/plugins/tiddlywiki/upgrade/readme.tid +++ b/plugins/tiddlywiki/upgrade/readme.tid @@ -1,5 +1,5 @@ title: $:/plugins/tiddlywiki/upgrade/readme -This plugin contains the user interface components used to build the special [[upgrade edition|http://tiddlywiki.com/upgrade.html]]. +This plugin contains the user interface components used to build the special [[upgrade edition|https://tiddlywiki.com/upgrade.html]]. [[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/upgrade]] diff --git a/plugins/tiddlywiki/xlsx-utils/controls.tid b/plugins/tiddlywiki/xlsx-utils/controls.tid new file mode 100644 index 000000000..339237062 --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/controls.tid @@ -0,0 +1,374 @@ +title: $:/plugins/tiddlywiki/xlsx-utils/controls +caption: XLSX Utilities +tags: $:/tags/ControlPanel + +\define help-button(state) +<$button popup="""$:/state/expand-help/$state$""" class="tc-btn-invisible tc-popup-keep"> +{{$:/core/images/help}} + +\end + +\define help-content(type,state) +<$reveal tag="span" state="""$:/state/expand-help/$state$""" type="popup" position="below"> +
+<$transclude tiddler="""$:/plugins/tiddlywiki/xlsx-utils/docs/$type$""" mode="block"/> +
+ +\end + +\define renameProxyTitle() +$:/state/plugins/tiddlywiki/xlsx-utils/rename-$(currentTiddler)$ +\end + +\define rename-current-tiddler() +<$edit-text tag="input" tiddler=<> placeholder="Rename" default=<> size="50"/> +<$reveal type="nomatch" state="""$(renameProxyTitle)$""" text=<> default=<> tag="span"> +<$button> +<$action-deletetiddler $tiddler=<>/> +cancel + +<$button> +<$action-sendmessage $message="tm-rename-tiddler" from=<> to={{$(renameProxyTitle)$}}/> +<$action-deletetiddler $tiddler=<>/> +rename + +<$set name="proxy-title" value={{$(renameProxyTitle)$}}> +<$list filter="""[is[tiddler]]"""> +Warning: tiddler already exists + + + +\end + +\define expand-collapse-button(state) +<$reveal state="""$:/state/expand/$state$""" type="match" text="yes" default="no" tag="span"> +<$button class="tc-btn-invisible"> +<$action-setfield $tiddler="""$:/state/expand/$state$""" $value="no"/> +{{$:/core/images/down-arrow}} + + +<$reveal state="""$:/state/expand/$state$""" type="nomatch" text="yes" default="no" tag="span"> +<$button class="tc-btn-invisible"> +<$action-setfield $tiddler="""$:/state/expand/$state$""" $value="yes"/> +{{$:/core/images/right-arrow}} + + +\end + +\define expand-collapse-content(state,content,class) +<$reveal state="""$:/state/expand/$state$""" type="match" text="yes" default="no" tag="div" class="""$class$""" animate="yes" retain="yes"> +$content$ + +\end + +\define up-down-buttons(parent,child) +<$list filter="[list<$parent$>butfirst[]field:title<$child$>limit[1]]" variable="listItem"> +<$button class="tc-btn-invisible"> +<$action-listops $tiddler=<<$parent$>> $subfilter="+[move:-1<$child$>]"/> +{{$:/core/images/chevron-up}} + + +<$list filter="[list<$parent$>butlast[]field:title<$child$>limit[1]]" variable="listItem"> +<$button class="tc-btn-invisible"> +<$action-listops $tiddler=<<$parent$>> $subfilter="+[move:1<$child$>]"/> +{{$:/core/images/chevron-down}} + + +\end + +\define edit-button(state) +<$reveal state="""$:/state/edit/$state$""" type="nomatch" text="yes" default="no" tag="span"> +<$button class="tc-btn-invisible"> +<$action-setfield $tiddler="""$:/state/edit/$state$""" $value="yes"/> +<$action-setfield $tiddler="""$:/state/expand/$state$""" $value="yes"/> +{{$:/core/images/edit-button}} + + +<$reveal state="""$:/state/edit/$state$""" type="match" text="yes" default="no" tag="span"> +<$button class="tc-btn-invisible"> +<$action-setfield $tiddler="""$:/state/edit/$state$""" $value="no"/> +{{$:/core/images/done-button}} Finish editing + + +\end + +\define delete-item-button(filter,parent,title,prompt) +<$button class="tc-btn-invisible"> +<$action-deletetiddler $filter="""$filter$"""/> +<$action-listops $tiddler="""$parent$""" $subfilter="-[[$title$]]"/> +{{$:/core/images/delete-button}}$prompt$ + +\end + +\define edit-field() +<$select tiddler=<> field="import-field-list-op" default="none"> + + + +<$edit-text tiddler=<> field="import-field-name" size="10" tag="input" placeholder="field name"default=""/> +<$reveal state="""$(field)$!!import-field-list-op""" type="match" text="none" default="none" tag="span"> +to + +<$reveal state="""$(field)$!!import-field-list-op""" type="match" text="append" default="none" tag="span"> +the + +<$select tiddler=<> field="import-field-type" default="string"> + + + +<$select tiddler=<> field="import-field-source" default="column"> + + + +<$reveal state="""$(field)$!!import-field-source""" type="match" text="column" default="column" tag="span"> +<$edit-text tiddler=<> field="import-field-column" tag="input" placeholder="column" default=""/> +prefixed +<$edit-text tiddler=<> field="import-field-prefix" tag="input" placeholder="prefix" default=""/>, +suffixed +<$edit-text tiddler=<> field="import-field-suffix" tag="input" placeholder="suffix" default=""/> + +<$reveal state="""$(field)$!!import-field-source""" type="match" text="constant" default="column" tag="span"> +<$edit-text tiddler=<> field="import-field-value" tag="input" placeholder="constant" default=""/> + +<$checkbox tiddler=<> field="import-field-skip-tiddler-if-blank" checked="yes" unchecked="no" default="no"> +Skip this tiddler when field blank +
+Title: +<$tiddler tiddler=<>> +<> + +\end + +\define view-field() +<$link to=<>> +<$list filter="[!has[import-field-list-op]]" variable="listItem"> +Set field ''<$view tiddler=<> field="import-field-name"/>'' to + +<$list filter="[get[import-field-list-op]prefix[append]]" variable="listItem"> +Append to list field ''<$view tiddler=<> field="import-field-name"/>'' + +<$list filter="[has[import-field-prefix]]" variable="listItem"> +''<$view tiddler=<> field="import-field-prefix"/>'' + + +<$list filter="[get[import-field-type]prefix[date]]" variable="listItem"> +date + +<$list filter="[get[import-field-source]prefix[column]]" variable="listItem"> +value from column ''<$view tiddler=<> field="import-field-column"/>'' + +<$list filter="[get[import-field-source]prefix[constant]]" variable="listItem"> +constant ''<$view tiddler=<> field="import-field-value"/>'' + +<$list filter="[has[import-field-suffix]]" variable="listItem"> ++ ''<$view tiddler=<> field="import-field-suffix"/>'' + + +\end + +\define list-fields() +
    +<$list filter="[list]" variable="field" emptyMessage="
    (No field import specifiers)
    "> +
  • +<$reveal state="""$:/state/edit/$(row)$""" type="match" text="yes" default="no" tag="span"> +<> +<> +<$macrocall $name="delete-item-button" filter="[]" parent=<> title=<>/> + +<$reveal state="""$:/state/edit/$(row)$""" type="nomatch" text="yes" default="no" tag="span"> +<> + +
    • + +
+\end + +\define view-row-content() +<$reveal state="""$:/state/edit/$(row)$""" type="match" text="yes" default="no" tag="ul" class="tc-import-spec-row-controls" animate="yes" retain="yes"> +
  • +<$macrocall $name="delete-item-button" filter="[] [getlist[]]" parent=<> title=<> prompt=" Delete this row"/> +
    • +
  • +Title: +<$tiddler tiddler=<>> +<> + +
    • +
  • +Row type: +<$select tiddler=<> field="import-row-type" default="by-field"> + + + +
    • +
  • +<$button class="tc-btn-invisible"> +<$action-createtiddler $basetitle="$:/_ExcelImporter/ImportSpecifiers/Field" $savetitle="$:/temp/newtiddler" import-spec-role="field" import-field-name="fieldname" import-field-type="string" import-field-source="column" import-field-column="Column Name" /> +<$action-listops $tiddler=<> $subfilter="[{$:/temp/newtiddler}] +[putfirst[]]"/> +{{$:/core/images/new-button}} Add new field + +
    • + +<> +\end + +\define view-row() +
    +
    +<$macrocall $name="expand-collapse-button" state=<>/> +Each row: <$list filter="[listimport-field-name[title]]" variable="field" emptyMessage=" +<$link to=<>>(title field not set)"><> +<$macrocall $name="edit-button" state=<>/> +<> +<$macrocall $name="help-button" state=<>/> +
    +<$macrocall $name="help-content" type="row" state=<>/> +<$macrocall $name="expand-collapse-content" state=<> content=<> class="tc-import-spec-row"/> +
    +\end + +\define list-rows() +
    +<$list filter="[list]" variable="row" emptyMessage="
    (No row import specifiers)
    "> +<> + +\end + +\define view-sheet-content() +<$reveal state="""$:/state/edit/$(sheet)$""" type="match" text="yes" default="no" tag="ul" class="tc-import-spec-sheet-controls" animate="yes" retain="yes"> +
  • +<$macrocall $name="delete-item-button" filter="[] [getlist[]] [getlist[]getlist[]]" parent=<> title=<> prompt=" Delete this sheet"/> +
    • +
  • +Title: +<$tiddler tiddler=<>> +<> + +
    • +
  • +Import sheet name: +<$edit-text tiddler=<> field="import-sheet-name" size="50"/> +
    • +
  • +<$button class="tc-btn-invisible"> +<$action-createtiddler $basetitle="$:/_ExcelImporter/ImportSpecifiers/Row" $savetitle="$:/temp/newtiddler" import-spec-role="row"/> +<$action-listops $tiddler=<> $subfilter="[{$:/temp/newtiddler}] +[putfirst[]]"/> +<$action-setfield $tiddler={{{ [{$:/temp/newtiddler}addprefix[$:/state/edit/]] }}} $value="yes"/> +<$action-setfield $tiddler={{{ [{$:/temp/newtiddler}addprefix[$:/state/expand/]] }}} $value="yes"/> +{{$:/core/images/new-button}} Add new row + +
    • + +<> +\end + +\define view-sheet() +
    +

    +<$macrocall $name="expand-collapse-button" state=<>/> +Sheet: <$link to=<>><$view tiddler=<> field="import-sheet-name"/> +<$macrocall $name="edit-button" state=<>/> +<> +<$macrocall $name="help-button" state=<>/> +

    +<$macrocall $name="help-content" type="sheet" state=<>/> +<$macrocall $name="expand-collapse-content" state=<> content=<> class="tc-import-spec-sheet"/> +
    +\end + +\define list-sheets() +
    +<$list filter="[list]" variable="sheet" emptyMessage="
    (No sheet import specifiers)
    "> +<> + +
    +\end + +\define view-workbook-content() +<$reveal state="""$:/state/edit/$(workbook)$""" type="match" text="yes" default="no" tag="ul" class="tc-import-spec-workbook-controls" animate="yes" retain="yes"> +
  • +<$macrocall $name="delete-item-button" filter="[] [getlist[]] [getlist[]getlist[]] [getlist[]getlist[]getlist[]]" prompt=" Delete this workbook"/> +
    • +
  • +Title: +<$tiddler tiddler=<>> +<> + +
    • +
  • +Caption: +<$edit-text tiddler=<> field="caption" size="50"/> +
    • +
  • +<$button class="tc-btn-invisible"> +<$action-createtiddler $basetitle="$:/_ExcelImporter/ImportSpecifiers/Sheet" $savetitle="$:/temp/newtiddler" import-spec-role="sheet" import-sheet-name="Sheet name"/> +<$action-listops $tiddler=<> $subfilter="[{$:/temp/newtiddler}] +[putfirst[]]"/> +<$action-setfield $tiddler={{{ [{$:/temp/newtiddler}addprefix[$:/state/edit/]] }}} $value="yes"/> +<$action-setfield $tiddler={{{ [{$:/temp/newtiddler}addprefix[$:/state/expand/]] }}} $value="yes"/> +{{$:/core/images/new-button}} Add new sheet + +
    • + +<> +\end + +\define view-workbook() +
    +

    +<$macrocall $name="expand-collapse-button" state=<>/> +Workbook: <$link to=<>><$view tiddler=<> field="caption"/> +<$macrocall $name="edit-button" state=<>/> +<$macrocall $name="help-button" state=<>/> +

    +<$macrocall $name="help-content" type="workbook" state=<>/> +<$macrocall $name="expand-collapse-content" state=<> content=<> class="tc-import-spec-workbook"/> +
    +\end + +\define list-workbooks() +
      +
    • +<$button class="tc-btn-invisible"> +<$action-createtiddler $basetitle="$:/_ExcelImporter/ImportSpecifiers/Workbook" $savetitle="$:/temp/newtiddler" import-spec-role="workbook" caption="New workbook"/> +<$action-setfield $tiddler={{{ [{$:/temp/newtiddler}addprefix[$:/state/edit/]] }}} $value="yes"/> +<$action-setfield $tiddler={{{ [{$:/temp/newtiddler}addprefix[$:/state/expand/]] }}} $value="yes"/> +{{$:/core/images/new-button}} Add new workbook + +
      • +
    +
    +<$list filter="[all[shadows+tiddlers]import-spec-role[workbook]sort[caption]]" variable="workbook"> +<> + +
    +\end + +

    +Controls for XLSX Spreadsheet Utilities +

    + +
    +

    +Current Import Specification +

    +<$list filter="[all[shadows+tiddlers]import-spec-role[workbook]limit[1]]" emptyMessage=""" +There are no import specifications available. Use the controls below to create one +"""> +This is the import specification that will be used for the next import of an `.XLSX` file +<$select tiddler="$:/config/plugins/tiddlywiki/xlsx-utils/default-import-spec"> +<$list filter="[all[shadows+tiddlers]import-spec-role[workbook]sort[caption]]"> + + + + +
    + +
    +

    + Import Specifications +<$macrocall $name="help-button" state=""/> +

    +<$macrocall $name="help-content" type="editor" state=""/> +
    +<> +
    +
    diff --git a/plugins/tiddlywiki/xlsx-utils/deserializer.js b/plugins/tiddlywiki/xlsx-utils/deserializer.js new file mode 100644 index 000000000..94a4249dc --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/deserializer.js @@ -0,0 +1,29 @@ +/*\ +title: $:/plugins/tiddlywiki/xlsx-utils/deserializer.js +type: application/javascript +module-type: tiddlerdeserializer + +XLSX file deserializer + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Parse an XLSX file into tiddlers +*/ +exports["application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"] = function(text,fields) { + // Collect output tiddlers in an array + var results = [], + XLSXImporter = require("$:/plugins/tiddlywiki/xlsx-utils/importer.js").XLSXImporter, + importer = new XLSXImporter({ + text: text + }); + // Return the output tiddlers + return importer.getResults(); +}; + +})(); diff --git a/plugins/tiddlywiki/xlsx-utils/docs/editor.tid b/plugins/tiddlywiki/xlsx-utils/docs/editor.tid new file mode 100644 index 000000000..a69bbb921 --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/docs/editor.tid @@ -0,0 +1,7 @@ +title: $:/plugins/tiddlywiki/xlsx-utils/docs/editor + +!!! Import Specifications + +Import specifications govern how spreadsheets are converted into individual tiddlers. + +Each "workbook" describes how spreadsheets of a particular format should be converted. diff --git a/plugins/tiddlywiki/xlsx-utils/docs/row.tid b/plugins/tiddlywiki/xlsx-utils/docs/row.tid new file mode 100644 index 000000000..d456b999a --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/docs/row.tid @@ -0,0 +1,20 @@ +title: $:/plugins/tiddlywiki/xlsx-utils/docs/row + +!!! Row Import Specifications + +Each row import specification describes how one tiddler should be extracted from each row of the current sheet. + +Note that using multiple row import specifications within a sheet enables multiple tiddlers to be created from each row of the sheet. + +Rows contain a list of field import specifications that describe how each field of the tiddler should be created. + +!!! Field Import Specifications + +Field import specifications describe the value given to a particular field of a tiddler. + +They follow a rich syntax for describing how each field of the tiddler is created. For example: + +* Set field `title` to string from column `Organization` +* Set field `role` to string constant `organization` +* Append to list field `list` the string from column `Country` prefixed with `Map:` + diff --git a/plugins/tiddlywiki/xlsx-utils/docs/sheet.tid b/plugins/tiddlywiki/xlsx-utils/docs/sheet.tid new file mode 100644 index 000000000..cbf22ef95 --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/docs/sheet.tid @@ -0,0 +1,11 @@ +title: $:/plugins/tiddlywiki/xlsx-utils/docs/sheet + +!!! Sheet Import Specifications + +Each sheet import specification describes how a named sheet within a workbook should be converted into individual tiddlers. + +Sheets contain a list of row import specifications that describe how individual rows of the sheet should be handled. + +Each sheet has the name of the sheet that it handles. + +Note that the first row of each sheet is interpreted as the title of each column. diff --git a/plugins/tiddlywiki/xlsx-utils/docs/workbook.tid b/plugins/tiddlywiki/xlsx-utils/docs/workbook.tid new file mode 100644 index 000000000..6cc564b37 --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/docs/workbook.tid @@ -0,0 +1,11 @@ +title: $:/plugins/tiddlywiki/xlsx-utils/docs/workbook + +!!! Workbook Import Specifications + +Each workbook import specification describes how spreadsheets of a particular format should be converted into individual tiddlers. + +Create a new workbook for each type of spreadsheet that you will be working with. + +Workbooks contain a list of sheet import specifications that describe how individual sheets of the workbook should be handled. + +Each workbook has a caption that you can use to describe its purpose. diff --git a/plugins/tiddlywiki/xlsx-utils/files/LICENSE b/plugins/tiddlywiki/xlsx-utils/files/LICENSE new file mode 100755 index 000000000..f769c2c75 --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/files/LICENSE @@ -0,0 +1,17 @@ +Copyright (C) 2012-2015 SheetJS + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +Except where noted, this license applies to any and all software programs and associated documentation files created by the Original Author and distributed with the Software: + +'jszip.js' is a modified version of JSZip, Copyright (c) Stuart Knightley, David Duponchel, Franz Buchinger, Ant'onio Afonso. JSZip is dual licensed and is used according to the terms of the MIT License. diff --git a/plugins/tiddlywiki/xlsx-utils/files/cpexcel.js b/plugins/tiddlywiki/xlsx-utils/files/cpexcel.js new file mode 100755 index 000000000..f821c7a56 --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/files/cpexcel.js @@ -0,0 +1,1324 @@ +/* cpexcel.js (C) 2013-2014 SheetJS -- http://sheetjs.com */ +/*jshint -W100 */ +var cptable = {version:"1.3.7"}; +cptable[874] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€����…�����������‘’“”•–—�������� กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู����฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛����", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +cptable[932] = (function(){ var d = [], e = {}, D = [], j; +D[0] = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~���������������������������������｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ��������������������������������".split(""); +for(j = 0; j != D[0].length; ++j) if(D[0][j].charCodeAt(0) !== 0xFFFD) { e[D[0][j]] = 0 + j; d[0 + j] = D[0][j];} +D[129] = "����������������������������������������������������������������　、。，．・：；？！゛゜´｀¨＾￣＿ヽヾゝゞ〃仝々〆〇ー―‐／＼～∥｜…‥‘’“”（）〔〕［］｛｝〈〉《》「」『』【】＋－±×�÷＝≠＜＞≦≧∞∴♂♀°′″℃￥＄￠￡％＃＆＊＠§☆★○●◎◇◆□■△▲▽▼※〒→←↑↓〓�����������∈∋⊆⊇⊂⊃∪∩��������∧∨￢⇒⇔∀∃�����������∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬�������ʼn♯♭♪†‡¶����◯���".split(""); +for(j = 0; j != D[129].length; ++j) if(D[129][j].charCodeAt(0) !== 0xFFFD) { e[D[129][j]] = 33024 + j; d[33024 + j] = D[129][j];} +D[130] = "�������������������������������������������������������������������������������０１２３４５６７８９�������ＡＢＣＤＥＦＧＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ�������ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏｐｑｒｓｔｕｖｗｘｙｚ����ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのはばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをん��������������".split(""); +for(j = 0; j != D[130].length; ++j) if(D[130][j].charCodeAt(0) !== 0xFFFD) { e[D[130][j]] = 33280 + j; d[33280 + j] = D[130][j];} +D[131] = "����������������������������������������������������������������ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハバパヒビピフブプヘベペホボポマミ�ムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ��������ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩ��������αβγδεζηθικλμνξοπρστυφχψω�����������������������������������������".split(""); +for(j = 0; j != D[131].length; ++j) if(D[131][j].charCodeAt(0) !== 0xFFFD) { e[D[131][j]] = 33536 + j; d[33536 + j] = D[131][j];} +D[132] = "����������������������������������������������������������������АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ���������������абвгдеёжзийклмн�опрстуфхцчшщъыьэюя�������������─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳┫┻╋┠┯┨┷┿┝┰┥┸╂�����������������������������������������������������������������".split(""); +for(j = 0; j != D[132].length; ++j) if(D[132][j].charCodeAt(0) !== 0xFFFD) { e[D[132][j]] = 33792 + j; d[33792 + j] = D[132][j];} +D[135] = "����������������������������������������������������������������①②③④⑤⑥⑦⑧⑨⑩⑪⑫⑬⑭⑮⑯⑰⑱⑲⑳ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩ�㍉㌔㌢㍍㌘㌧㌃㌶㍑㍗㌍㌦㌣㌫㍊㌻㎜㎝㎞㎎㎏㏄㎡��������㍻�〝〟№㏍℡㊤㊥㊦㊧㊨㈱㈲㈹㍾㍽㍼≒≡∫∮∑√⊥∠∟⊿∵∩∪���������������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[135].length; ++j) if(D[135][j].charCodeAt(0) !== 0xFFFD) { e[D[135][j]] = 34560 + j; d[34560 + j] = D[135][j];} +D[136] = "���������������������������������������������������������������������������������������������������������������������������������������������������������������亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸稲茨芋鰯允印咽員因姻引飲淫胤蔭���".split(""); +for(j = 0; j != D[136].length; ++j) if(D[136][j].charCodeAt(0) !== 0xFFFD) { e[D[136][j]] = 34816 + j; d[34816 + j] = D[136][j];} +D[137] = "����������������������������������������������������������������院陰隠韻吋右宇烏羽迂雨卯鵜窺丑碓臼渦嘘唄欝蔚鰻姥厩浦瓜閏噂云運雲荏餌叡営嬰影映曳栄永泳洩瑛盈穎頴英衛詠鋭液疫益駅悦謁越閲榎厭円�園堰奄宴延怨掩援沿演炎焔煙燕猿縁艶苑薗遠鉛鴛塩於汚甥凹央奥往応押旺横欧殴王翁襖鴬鴎黄岡沖荻億屋憶臆桶牡乙俺卸恩温穏音下化仮何伽価佳加可嘉夏嫁家寡科暇果架歌河火珂禍禾稼箇花苛茄荷華菓蝦課嘩貨迦過霞蚊俄峨我牙画臥芽蛾賀雅餓駕介会解回塊壊廻快怪悔恢懐戒拐改���".split(""); +for(j = 0; j != D[137].length; ++j) if(D[137][j].charCodeAt(0) !== 0xFFFD) { e[D[137][j]] = 35072 + j; d[35072 + j] = D[137][j];} +D[138] = "����������������������������������������������������������������魁晦械海灰界皆絵芥蟹開階貝凱劾外咳害崖慨概涯碍蓋街該鎧骸浬馨蛙垣柿蛎鈎劃嚇各廓拡撹格核殻獲確穫覚角赫較郭閣隔革学岳楽額顎掛笠樫�橿梶鰍潟割喝恰括活渇滑葛褐轄且鰹叶椛樺鞄株兜竃蒲釜鎌噛鴨栢茅萱粥刈苅瓦乾侃冠寒刊勘勧巻喚堪姦完官寛干幹患感慣憾換敢柑桓棺款歓汗漢澗潅環甘監看竿管簡緩缶翰肝艦莞観諌貫還鑑間閑関陥韓館舘丸含岸巌玩癌眼岩翫贋雁頑顔願企伎危喜器基奇嬉寄岐希幾忌揮机旗既期棋棄���".split(""); +for(j = 0; j != D[138].length; ++j) if(D[138][j].charCodeAt(0) !== 0xFFFD) { e[D[138][j]] = 35328 + j; d[35328 + j] = D[138][j];} +D[139] = "����������������������������������������������������������������機帰毅気汽畿祈季稀紀徽規記貴起軌輝飢騎鬼亀偽儀妓宜戯技擬欺犠疑祇義蟻誼議掬菊鞠吉吃喫桔橘詰砧杵黍却客脚虐逆丘久仇休及吸宮弓急救�朽求汲泣灸球究窮笈級糾給旧牛去居巨拒拠挙渠虚許距鋸漁禦魚亨享京供侠僑兇競共凶協匡卿叫喬境峡強彊怯恐恭挟教橋況狂狭矯胸脅興蕎郷鏡響饗驚仰凝尭暁業局曲極玉桐粁僅勤均巾錦斤欣欽琴禁禽筋緊芹菌衿襟謹近金吟銀九倶句区狗玖矩苦躯駆駈駒具愚虞喰空偶寓遇隅串櫛釧屑屈���".split(""); +for(j = 0; j != D[139].length; ++j) if(D[139][j].charCodeAt(0) !== 0xFFFD) { e[D[139][j]] = 35584 + j; d[35584 + j] = D[139][j];} +D[140] = "����������������������������������������������������������������掘窟沓靴轡窪熊隈粂栗繰桑鍬勲君薫訓群軍郡卦袈祁係傾刑兄啓圭珪型契形径恵慶慧憩掲携敬景桂渓畦稽系経継繋罫茎荊蛍計詣警軽頚鶏芸迎鯨�劇戟撃激隙桁傑欠決潔穴結血訣月件倹倦健兼券剣喧圏堅嫌建憲懸拳捲検権牽犬献研硯絹県肩見謙賢軒遣鍵険顕験鹸元原厳幻弦減源玄現絃舷言諺限乎個古呼固姑孤己庫弧戸故枯湖狐糊袴股胡菰虎誇跨鈷雇顧鼓五互伍午呉吾娯後御悟梧檎瑚碁語誤護醐乞鯉交佼侯候倖光公功効勾厚口向���".split(""); +for(j = 0; j != D[140].length; ++j) if(D[140][j].charCodeAt(0) !== 0xFFFD) { e[D[140][j]] = 35840 + j; d[35840 + j] = D[140][j];} +D[141] = "����������������������������������������������������������������后喉坑垢好孔孝宏工巧巷幸広庚康弘恒慌抗拘控攻昂晃更杭校梗構江洪浩港溝甲皇硬稿糠紅紘絞綱耕考肯肱腔膏航荒行衡講貢購郊酵鉱砿鋼閤降�項香高鴻剛劫号合壕拷濠豪轟麹克刻告国穀酷鵠黒獄漉腰甑忽惚骨狛込此頃今困坤墾婚恨懇昏昆根梱混痕紺艮魂些佐叉唆嵯左差査沙瑳砂詐鎖裟坐座挫債催再最哉塞妻宰彩才採栽歳済災采犀砕砦祭斎細菜裁載際剤在材罪財冴坂阪堺榊肴咲崎埼碕鷺作削咋搾昨朔柵窄策索錯桜鮭笹匙冊刷���".split(""); +for(j = 0; j != D[141].length; ++j) if(D[141][j].charCodeAt(0) !== 0xFFFD) { e[D[141][j]] = 36096 + j; d[36096 + j] = D[141][j];} +D[142] = "����������������������������������������������������������������察拶撮擦札殺薩雑皐鯖捌錆鮫皿晒三傘参山惨撒散桟燦珊産算纂蚕讃賛酸餐斬暫残仕仔伺使刺司史嗣四士始姉姿子屍市師志思指支孜斯施旨枝止�死氏獅祉私糸紙紫肢脂至視詞詩試誌諮資賜雌飼歯事似侍児字寺慈持時次滋治爾璽痔磁示而耳自蒔辞汐鹿式識鴫竺軸宍雫七叱執失嫉室悉湿漆疾質実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮社紗者謝車遮蛇邪借勺尺杓灼爵酌釈錫若寂弱惹主取守手朱殊狩珠種腫趣酒首儒受呪寿授樹綬需囚収周���".split(""); +for(j = 0; j != D[142].length; ++j) if(D[142][j].charCodeAt(0) !== 0xFFFD) { e[D[142][j]] = 36352 + j; d[36352 + j] = D[142][j];} +D[143] = "����������������������������������������������������������������宗就州修愁拾洲秀秋終繍習臭舟蒐衆襲讐蹴輯週酋酬集醜什住充十従戎柔汁渋獣縦重銃叔夙宿淑祝縮粛塾熟出術述俊峻春瞬竣舜駿准循旬楯殉淳�準潤盾純巡遵醇順処初所暑曙渚庶緒署書薯藷諸助叙女序徐恕鋤除傷償勝匠升召哨商唱嘗奨妾娼宵将小少尚庄床廠彰承抄招掌捷昇昌昭晶松梢樟樵沼消渉湘焼焦照症省硝礁祥称章笑粧紹肖菖蒋蕉衝裳訟証詔詳象賞醤鉦鍾鐘障鞘上丈丞乗冗剰城場壌嬢常情擾条杖浄状畳穣蒸譲醸錠嘱埴飾���".split(""); +for(j = 0; j != D[143].length; ++j) if(D[143][j].charCodeAt(0) !== 0xFFFD) { e[D[143][j]] = 36608 + j; d[36608 + j] = D[143][j];} +D[144] = "����������������������������������������������������������������拭植殖燭織職色触食蝕辱尻伸信侵唇娠寝審心慎振新晋森榛浸深申疹真神秦紳臣芯薪親診身辛進針震人仁刃塵壬尋甚尽腎訊迅陣靭笥諏須酢図厨�逗吹垂帥推水炊睡粋翠衰遂酔錐錘随瑞髄崇嵩数枢趨雛据杉椙菅頗雀裾澄摺寸世瀬畝是凄制勢姓征性成政整星晴棲栖正清牲生盛精聖声製西誠誓請逝醒青静斉税脆隻席惜戚斥昔析石積籍績脊責赤跡蹟碩切拙接摂折設窃節説雪絶舌蝉仙先千占宣専尖川戦扇撰栓栴泉浅洗染潜煎煽旋穿箭線���".split(""); +for(j = 0; j != D[144].length; ++j) if(D[144][j].charCodeAt(0) !== 0xFFFD) { e[D[144][j]] = 36864 + j; d[36864 + j] = D[144][j];} +D[145] = "����������������������������������������������������������������繊羨腺舛船薦詮賎践選遷銭銑閃鮮前善漸然全禅繕膳糎噌塑岨措曾曽楚狙疏疎礎祖租粗素組蘇訴阻遡鼠僧創双叢倉喪壮奏爽宋層匝惣想捜掃挿掻�操早曹巣槍槽漕燥争痩相窓糟総綜聡草荘葬蒼藻装走送遭鎗霜騒像増憎臓蔵贈造促側則即息捉束測足速俗属賊族続卒袖其揃存孫尊損村遜他多太汰詑唾堕妥惰打柁舵楕陀駄騨体堆対耐岱帯待怠態戴替泰滞胎腿苔袋貸退逮隊黛鯛代台大第醍題鷹滝瀧卓啄宅托択拓沢濯琢託鐸濁諾茸凧蛸只���".split(""); +for(j = 0; j != D[145].length; ++j) if(D[145][j].charCodeAt(0) !== 0xFFFD) { e[D[145][j]] = 37120 + j; d[37120 + j] = D[145][j];} +D[146] = "����������������������������������������������������������������叩但達辰奪脱巽竪辿棚谷狸鱈樽誰丹単嘆坦担探旦歎淡湛炭短端箪綻耽胆蛋誕鍛団壇弾断暖檀段男談値知地弛恥智池痴稚置致蜘遅馳築畜竹筑蓄�逐秩窒茶嫡着中仲宙忠抽昼柱注虫衷註酎鋳駐樗瀦猪苧著貯丁兆凋喋寵帖帳庁弔張彫徴懲挑暢朝潮牒町眺聴脹腸蝶調諜超跳銚長頂鳥勅捗直朕沈珍賃鎮陳津墜椎槌追鎚痛通塚栂掴槻佃漬柘辻蔦綴鍔椿潰坪壷嬬紬爪吊釣鶴亭低停偵剃貞呈堤定帝底庭廷弟悌抵挺提梯汀碇禎程締艇訂諦蹄逓���".split(""); +for(j = 0; j != D[146].length; ++j) if(D[146][j].charCodeAt(0) !== 0xFFFD) { e[D[146][j]] = 37376 + j; d[37376 + j] = D[146][j];} +D[147] = "����������������������������������������������������������������邸鄭釘鼎泥摘擢敵滴的笛適鏑溺哲徹撤轍迭鉄典填天展店添纏甜貼転顛点伝殿澱田電兎吐堵塗妬屠徒斗杜渡登菟賭途都鍍砥砺努度土奴怒倒党冬�凍刀唐塔塘套宕島嶋悼投搭東桃梼棟盗淘湯涛灯燈当痘祷等答筒糖統到董蕩藤討謄豆踏逃透鐙陶頭騰闘働動同堂導憧撞洞瞳童胴萄道銅峠鴇匿得徳涜特督禿篤毒独読栃橡凸突椴届鳶苫寅酉瀞噸屯惇敦沌豚遁頓呑曇鈍奈那内乍凪薙謎灘捺鍋楢馴縄畷南楠軟難汝二尼弐迩匂賑肉虹廿日乳入���".split(""); +for(j = 0; j != D[147].length; ++j) if(D[147][j].charCodeAt(0) !== 0xFFFD) { e[D[147][j]] = 37632 + j; d[37632 + j] = D[147][j];} +D[148] = "����������������������������������������������������������������如尿韮任妊忍認濡禰祢寧葱猫熱年念捻撚燃粘乃廼之埜嚢悩濃納能脳膿農覗蚤巴把播覇杷波派琶破婆罵芭馬俳廃拝排敗杯盃牌背肺輩配倍培媒梅�楳煤狽買売賠陪這蝿秤矧萩伯剥博拍柏泊白箔粕舶薄迫曝漠爆縛莫駁麦函箱硲箸肇筈櫨幡肌畑畠八鉢溌発醗髪伐罰抜筏閥鳩噺塙蛤隼伴判半反叛帆搬斑板氾汎版犯班畔繁般藩販範釆煩頒飯挽晩番盤磐蕃蛮匪卑否妃庇彼悲扉批披斐比泌疲皮碑秘緋罷肥被誹費避非飛樋簸備尾微枇毘琵眉美���".split(""); +for(j = 0; j != D[148].length; ++j) if(D[148][j].charCodeAt(0) !== 0xFFFD) { e[D[148][j]] = 37888 + j; d[37888 + j] = D[148][j];} +D[149] = "����������������������������������������������������������������鼻柊稗匹疋髭彦膝菱肘弼必畢筆逼桧姫媛紐百謬俵彪標氷漂瓢票表評豹廟描病秒苗錨鋲蒜蛭鰭品彬斌浜瀕貧賓頻敏瓶不付埠夫婦富冨布府怖扶敷�斧普浮父符腐膚芙譜負賦赴阜附侮撫武舞葡蕪部封楓風葺蕗伏副復幅服福腹複覆淵弗払沸仏物鮒分吻噴墳憤扮焚奮粉糞紛雰文聞丙併兵塀幣平弊柄並蔽閉陛米頁僻壁癖碧別瞥蔑箆偏変片篇編辺返遍便勉娩弁鞭保舗鋪圃捕歩甫補輔穂募墓慕戊暮母簿菩倣俸包呆報奉宝峰峯崩庖抱捧放方朋���".split(""); +for(j = 0; j != D[149].length; ++j) if(D[149][j].charCodeAt(0) !== 0xFFFD) { e[D[149][j]] = 38144 + j; d[38144 + j] = D[149][j];} +D[150] = "����������������������������������������������������������������法泡烹砲縫胞芳萌蓬蜂褒訪豊邦鋒飽鳳鵬乏亡傍剖坊妨帽忘忙房暴望某棒冒紡肪膨謀貌貿鉾防吠頬北僕卜墨撲朴牧睦穆釦勃没殆堀幌奔本翻凡盆�摩磨魔麻埋妹昧枚毎哩槙幕膜枕鮪柾鱒桝亦俣又抹末沫迄侭繭麿万慢満漫蔓味未魅巳箕岬密蜜湊蓑稔脈妙粍民眠務夢無牟矛霧鵡椋婿娘冥名命明盟迷銘鳴姪牝滅免棉綿緬面麺摸模茂妄孟毛猛盲網耗蒙儲木黙目杢勿餅尤戻籾貰問悶紋門匁也冶夜爺耶野弥矢厄役約薬訳躍靖柳薮鑓愉愈油癒���".split(""); +for(j = 0; j != D[150].length; ++j) if(D[150][j].charCodeAt(0) !== 0xFFFD) { e[D[150][j]] = 38400 + j; d[38400 + j] = D[150][j];} +D[151] = "����������������������������������������������������������������諭輸唯佑優勇友宥幽悠憂揖有柚湧涌猶猷由祐裕誘遊邑郵雄融夕予余与誉輿預傭幼妖容庸揚揺擁曜楊様洋溶熔用窯羊耀葉蓉要謡踊遥陽養慾抑欲�沃浴翌翼淀羅螺裸来莱頼雷洛絡落酪乱卵嵐欄濫藍蘭覧利吏履李梨理璃痢裏裡里離陸律率立葎掠略劉流溜琉留硫粒隆竜龍侶慮旅虜了亮僚両凌寮料梁涼猟療瞭稜糧良諒遼量陵領力緑倫厘林淋燐琳臨輪隣鱗麟瑠塁涙累類令伶例冷励嶺怜玲礼苓鈴隷零霊麗齢暦歴列劣烈裂廉恋憐漣煉簾練聯���".split(""); +for(j = 0; j != D[151].length; ++j) if(D[151][j].charCodeAt(0) !== 0xFFFD) { e[D[151][j]] = 38656 + j; d[38656 + j] = D[151][j];} +D[152] = "����������������������������������������������������������������蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑枠鷲亙亘鰐詫藁蕨椀湾碗腕��������������������������������������������弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆偃假會偕偐偈做偖偬偸傀傚傅傴傲���".split(""); +for(j = 0; j != D[152].length; ++j) if(D[152][j].charCodeAt(0) !== 0xFFFD) { e[D[152][j]] = 38912 + j; d[38912 + j] = D[152][j];} +D[153] = "����������������������������������������������������������������僉僊傳僂僖僞僥僭僣僮價僵儉儁儂儖儕儔儚儡儺儷儼儻儿兀兒兌兔兢竸兩兪兮冀冂囘册冉冏冑冓冕冖冤冦冢冩冪冫决冱冲冰况冽凅凉凛几處凩凭�凰凵凾刄刋刔刎刧刪刮刳刹剏剄剋剌剞剔剪剴剩剳剿剽劍劔劒剱劈劑辨辧劬劭劼劵勁勍勗勞勣勦飭勠勳勵勸勹匆匈甸匍匐匏匕匚匣匯匱匳匸區卆卅丗卉卍凖卞卩卮夘卻卷厂厖厠厦厥厮厰厶參簒雙叟曼燮叮叨叭叺吁吽呀听吭吼吮吶吩吝呎咏呵咎呟呱呷呰咒呻咀呶咄咐咆哇咢咸咥咬哄哈咨���".split(""); +for(j = 0; j != D[153].length; ++j) if(D[153][j].charCodeAt(0) !== 0xFFFD) { e[D[153][j]] = 39168 + j; d[39168 + j] = D[153][j];} +D[154] = "����������������������������������������������������������������咫哂咤咾咼哘哥哦唏唔哽哮哭哺哢唹啀啣啌售啜啅啖啗唸唳啝喙喀咯喊喟啻啾喘喞單啼喃喩喇喨嗚嗅嗟嗄嗜嗤嗔嘔嗷嘖嗾嗽嘛嗹噎噐營嘴嘶嘲嘸�噫噤嘯噬噪嚆嚀嚊嚠嚔嚏嚥嚮嚶嚴囂嚼囁囃囀囈囎囑囓囗囮囹圀囿圄圉圈國圍圓團圖嗇圜圦圷圸坎圻址坏坩埀垈坡坿垉垓垠垳垤垪垰埃埆埔埒埓堊埖埣堋堙堝塲堡塢塋塰毀塒堽塹墅墹墟墫墺壞墻墸墮壅壓壑壗壙壘壥壜壤壟壯壺壹壻壼壽夂夊夐夛梦夥夬夭夲夸夾竒奕奐奎奚奘奢奠奧奬奩���".split(""); +for(j = 0; j != D[154].length; ++j) if(D[154][j].charCodeAt(0) !== 0xFFFD) { e[D[154][j]] = 39424 + j; d[39424 + j] = D[154][j];} +D[155] = "����������������������������������������������������������������奸妁妝佞侫妣妲姆姨姜妍姙姚娥娟娑娜娉娚婀婬婉娵娶婢婪媚媼媾嫋嫂媽嫣嫗嫦嫩嫖嫺嫻嬌嬋嬖嬲嫐嬪嬶嬾孃孅孀孑孕孚孛孥孩孰孳孵學斈孺宀�它宦宸寃寇寉寔寐寤實寢寞寥寫寰寶寳尅將專對尓尠尢尨尸尹屁屆屎屓屐屏孱屬屮乢屶屹岌岑岔妛岫岻岶岼岷峅岾峇峙峩峽峺峭嶌峪崋崕崗嵜崟崛崑崔崢崚崙崘嵌嵒嵎嵋嵬嵳嵶嶇嶄嶂嶢嶝嶬嶮嶽嶐嶷嶼巉巍巓巒巖巛巫已巵帋帚帙帑帛帶帷幄幃幀幎幗幔幟幢幤幇幵并幺麼广庠廁廂廈廐廏���".split(""); +for(j = 0; j != D[155].length; ++j) if(D[155][j].charCodeAt(0) !== 0xFFFD) { e[D[155][j]] = 39680 + j; d[39680 + j] = D[155][j];} +D[156] = "����������������������������������������������������������������廖廣廝廚廛廢廡廨廩廬廱廳廰廴廸廾弃弉彝彜弋弑弖弩弭弸彁彈彌彎弯彑彖彗彙彡彭彳彷徃徂彿徊很徑徇從徙徘徠徨徭徼忖忻忤忸忱忝悳忿怡恠�怙怐怩怎怱怛怕怫怦怏怺恚恁恪恷恟恊恆恍恣恃恤恂恬恫恙悁悍惧悃悚悄悛悖悗悒悧悋惡悸惠惓悴忰悽惆悵惘慍愕愆惶惷愀惴惺愃愡惻惱愍愎慇愾愨愧慊愿愼愬愴愽慂慄慳慷慘慙慚慫慴慯慥慱慟慝慓慵憙憖憇憬憔憚憊憑憫憮懌懊應懷懈懃懆憺懋罹懍懦懣懶懺懴懿懽懼懾戀戈戉戍戌戔戛���".split(""); +for(j = 0; j != D[156].length; ++j) if(D[156][j].charCodeAt(0) !== 0xFFFD) { e[D[156][j]] = 39936 + j; d[39936 + j] = D[156][j];} +D[157] = "����������������������������������������������������������������戞戡截戮戰戲戳扁扎扞扣扛扠扨扼抂抉找抒抓抖拔抃抔拗拑抻拏拿拆擔拈拜拌拊拂拇抛拉挌拮拱挧挂挈拯拵捐挾捍搜捏掖掎掀掫捶掣掏掉掟掵捫�捩掾揩揀揆揣揉插揶揄搖搴搆搓搦搶攝搗搨搏摧摯摶摎攪撕撓撥撩撈撼據擒擅擇撻擘擂擱擧舉擠擡抬擣擯攬擶擴擲擺攀擽攘攜攅攤攣攫攴攵攷收攸畋效敖敕敍敘敞敝敲數斂斃變斛斟斫斷旃旆旁旄旌旒旛旙无旡旱杲昊昃旻杳昵昶昴昜晏晄晉晁晞晝晤晧晨晟晢晰暃暈暎暉暄暘暝曁暹曉暾暼���".split(""); +for(j = 0; j != D[157].length; ++j) if(D[157][j].charCodeAt(0) !== 0xFFFD) { e[D[157][j]] = 40192 + j; d[40192 + j] = D[157][j];} +D[158] = "����������������������������������������������������������������曄暸曖曚曠昿曦曩曰曵曷朏朖朞朦朧霸朮朿朶杁朸朷杆杞杠杙杣杤枉杰枩杼杪枌枋枦枡枅枷柯枴柬枳柩枸柤柞柝柢柮枹柎柆柧檜栞框栩桀桍栲桎�梳栫桙档桷桿梟梏梭梔條梛梃檮梹桴梵梠梺椏梍桾椁棊椈棘椢椦棡椌棍棔棧棕椶椒椄棗棣椥棹棠棯椨椪椚椣椡棆楹楷楜楸楫楔楾楮椹楴椽楙椰楡楞楝榁楪榲榮槐榿槁槓榾槎寨槊槝榻槃榧樮榑榠榜榕榴槞槨樂樛槿權槹槲槧樅榱樞槭樔槫樊樒櫁樣樓橄樌橲樶橸橇橢橙橦橈樸樢檐檍檠檄檢檣���".split(""); +for(j = 0; j != D[158].length; ++j) if(D[158][j].charCodeAt(0) !== 0xFFFD) { e[D[158][j]] = 40448 + j; d[40448 + j] = D[158][j];} +D[159] = "����������������������������������������������������������������檗蘗檻櫃櫂檸檳檬櫞櫑櫟檪櫚櫪櫻欅蘖櫺欒欖鬱欟欸欷盜欹飮歇歃歉歐歙歔歛歟歡歸歹歿殀殄殃殍殘殕殞殤殪殫殯殲殱殳殷殼毆毋毓毟毬毫毳毯�麾氈氓气氛氤氣汞汕汢汪沂沍沚沁沛汾汨汳沒沐泄泱泓沽泗泅泝沮沱沾沺泛泯泙泪洟衍洶洫洽洸洙洵洳洒洌浣涓浤浚浹浙涎涕濤涅淹渕渊涵淇淦涸淆淬淞淌淨淒淅淺淙淤淕淪淮渭湮渮渙湲湟渾渣湫渫湶湍渟湃渺湎渤滿渝游溂溪溘滉溷滓溽溯滄溲滔滕溏溥滂溟潁漑灌滬滸滾漿滲漱滯漲滌���".split(""); +for(j = 0; j != D[159].length; ++j) if(D[159][j].charCodeAt(0) !== 0xFFFD) { e[D[159][j]] = 40704 + j; d[40704 + j] = D[159][j];} +D[224] = "����������������������������������������������������������������漾漓滷澆潺潸澁澀潯潛濳潭澂潼潘澎澑濂潦澳澣澡澤澹濆澪濟濕濬濔濘濱濮濛瀉瀋濺瀑瀁瀏濾瀛瀚潴瀝瀘瀟瀰瀾瀲灑灣炙炒炯烱炬炸炳炮烟烋烝�烙焉烽焜焙煥煕熈煦煢煌煖煬熏燻熄熕熨熬燗熹熾燒燉燔燎燠燬燧燵燼燹燿爍爐爛爨爭爬爰爲爻爼爿牀牆牋牘牴牾犂犁犇犒犖犢犧犹犲狃狆狄狎狒狢狠狡狹狷倏猗猊猜猖猝猴猯猩猥猾獎獏默獗獪獨獰獸獵獻獺珈玳珎玻珀珥珮珞璢琅瑯琥珸琲琺瑕琿瑟瑙瑁瑜瑩瑰瑣瑪瑶瑾璋璞璧瓊瓏瓔珱���".split(""); +for(j = 0; j != D[224].length; ++j) if(D[224][j].charCodeAt(0) !== 0xFFFD) { e[D[224][j]] = 57344 + j; d[57344 + j] = D[224][j];} +D[225] = "����������������������������������������������������������������瓠瓣瓧瓩瓮瓲瓰瓱瓸瓷甄甃甅甌甎甍甕甓甞甦甬甼畄畍畊畉畛畆畚畩畤畧畫畭畸當疆疇畴疊疉疂疔疚疝疥疣痂疳痃疵疽疸疼疱痍痊痒痙痣痞痾痿�痼瘁痰痺痲痳瘋瘍瘉瘟瘧瘠瘡瘢瘤瘴瘰瘻癇癈癆癜癘癡癢癨癩癪癧癬癰癲癶癸發皀皃皈皋皎皖皓皙皚皰皴皸皹皺盂盍盖盒盞盡盥盧盪蘯盻眈眇眄眩眤眞眥眦眛眷眸睇睚睨睫睛睥睿睾睹瞎瞋瞑瞠瞞瞰瞶瞹瞿瞼瞽瞻矇矍矗矚矜矣矮矼砌砒礦砠礪硅碎硴碆硼碚碌碣碵碪碯磑磆磋磔碾碼磅磊磬���".split(""); +for(j = 0; j != D[225].length; ++j) if(D[225][j].charCodeAt(0) !== 0xFFFD) { e[D[225][j]] = 57600 + j; d[57600 + j] = D[225][j];} +D[226] = "����������������������������������������������������������������磧磚磽磴礇礒礑礙礬礫祀祠祗祟祚祕祓祺祿禊禝禧齋禪禮禳禹禺秉秕秧秬秡秣稈稍稘稙稠稟禀稱稻稾稷穃穗穉穡穢穩龝穰穹穽窈窗窕窘窖窩竈窰�窶竅竄窿邃竇竊竍竏竕竓站竚竝竡竢竦竭竰笂笏笊笆笳笘笙笞笵笨笶筐筺笄筍笋筌筅筵筥筴筧筰筱筬筮箝箘箟箍箜箚箋箒箏筝箙篋篁篌篏箴篆篝篩簑簔篦篥籠簀簇簓篳篷簗簍篶簣簧簪簟簷簫簽籌籃籔籏籀籐籘籟籤籖籥籬籵粃粐粤粭粢粫粡粨粳粲粱粮粹粽糀糅糂糘糒糜糢鬻糯糲糴糶糺紆���".split(""); +for(j = 0; j != D[226].length; ++j) if(D[226][j].charCodeAt(0) !== 0xFFFD) { e[D[226][j]] = 57856 + j; d[57856 + j] = D[226][j];} +D[227] = "����������������������������������������������������������������紂紜紕紊絅絋紮紲紿紵絆絳絖絎絲絨絮絏絣經綉絛綏絽綛綺綮綣綵緇綽綫總綢綯緜綸綟綰緘緝緤緞緻緲緡縅縊縣縡縒縱縟縉縋縢繆繦縻縵縹繃縷�縲縺繧繝繖繞繙繚繹繪繩繼繻纃緕繽辮繿纈纉續纒纐纓纔纖纎纛纜缸缺罅罌罍罎罐网罕罔罘罟罠罨罩罧罸羂羆羃羈羇羌羔羞羝羚羣羯羲羹羮羶羸譱翅翆翊翕翔翡翦翩翳翹飜耆耄耋耒耘耙耜耡耨耿耻聊聆聒聘聚聟聢聨聳聲聰聶聹聽聿肄肆肅肛肓肚肭冐肬胛胥胙胝胄胚胖脉胯胱脛脩脣脯腋���".split(""); +for(j = 0; j != D[227].length; ++j) if(D[227][j].charCodeAt(0) !== 0xFFFD) { e[D[227][j]] = 58112 + j; d[58112 + j] = D[227][j];} +D[228] = "����������������������������������������������������������������隋腆脾腓腑胼腱腮腥腦腴膃膈膊膀膂膠膕膤膣腟膓膩膰膵膾膸膽臀臂膺臉臍臑臙臘臈臚臟臠臧臺臻臾舁舂舅與舊舍舐舖舩舫舸舳艀艙艘艝艚艟艤�艢艨艪艫舮艱艷艸艾芍芒芫芟芻芬苡苣苟苒苴苳苺莓范苻苹苞茆苜茉苙茵茴茖茲茱荀茹荐荅茯茫茗茘莅莚莪莟莢莖茣莎莇莊荼莵荳荵莠莉莨菴萓菫菎菽萃菘萋菁菷萇菠菲萍萢萠莽萸蔆菻葭萪萼蕚蒄葷葫蒭葮蒂葩葆萬葯葹萵蓊葢蒹蒿蒟蓙蓍蒻蓚蓐蓁蓆蓖蒡蔡蓿蓴蔗蔘蔬蔟蔕蔔蓼蕀蕣蕘蕈���".split(""); +for(j = 0; j != D[228].length; ++j) if(D[228][j].charCodeAt(0) !== 0xFFFD) { e[D[228][j]] = 58368 + j; d[58368 + j] = D[228][j];} +D[229] = "����������������������������������������������������������������蕁蘂蕋蕕薀薤薈薑薊薨蕭薔薛藪薇薜蕷蕾薐藉薺藏薹藐藕藝藥藜藹蘊蘓蘋藾藺蘆蘢蘚蘰蘿虍乕虔號虧虱蚓蚣蚩蚪蚋蚌蚶蚯蛄蛆蚰蛉蠣蚫蛔蛞蛩蛬�蛟蛛蛯蜒蜆蜈蜀蜃蛻蜑蜉蜍蛹蜊蜴蜿蜷蜻蜥蜩蜚蝠蝟蝸蝌蝎蝴蝗蝨蝮蝙蝓蝣蝪蠅螢螟螂螯蟋螽蟀蟐雖螫蟄螳蟇蟆螻蟯蟲蟠蠏蠍蟾蟶蟷蠎蟒蠑蠖蠕蠢蠡蠱蠶蠹蠧蠻衄衂衒衙衞衢衫袁衾袞衵衽袵衲袂袗袒袮袙袢袍袤袰袿袱裃裄裔裘裙裝裹褂裼裴裨裲褄褌褊褓襃褞褥褪褫襁襄褻褶褸襌褝襠襞���".split(""); +for(j = 0; j != D[229].length; ++j) if(D[229][j].charCodeAt(0) !== 0xFFFD) { e[D[229][j]] = 58624 + j; d[58624 + j] = D[229][j];} +D[230] = "����������������������������������������������������������������襦襤襭襪襯襴襷襾覃覈覊覓覘覡覩覦覬覯覲覺覽覿觀觚觜觝觧觴觸訃訖訐訌訛訝訥訶詁詛詒詆詈詼詭詬詢誅誂誄誨誡誑誥誦誚誣諄諍諂諚諫諳諧�諤諱謔諠諢諷諞諛謌謇謚諡謖謐謗謠謳鞫謦謫謾謨譁譌譏譎證譖譛譚譫譟譬譯譴譽讀讌讎讒讓讖讙讚谺豁谿豈豌豎豐豕豢豬豸豺貂貉貅貊貍貎貔豼貘戝貭貪貽貲貳貮貶賈賁賤賣賚賽賺賻贄贅贊贇贏贍贐齎贓賍贔贖赧赭赱赳趁趙跂趾趺跏跚跖跌跛跋跪跫跟跣跼踈踉跿踝踞踐踟蹂踵踰踴蹊���".split(""); +for(j = 0; j != D[230].length; ++j) if(D[230][j].charCodeAt(0) !== 0xFFFD) { e[D[230][j]] = 58880 + j; d[58880 + j] = D[230][j];} +D[231] = "����������������������������������������������������������������蹇蹉蹌蹐蹈蹙蹤蹠踪蹣蹕蹶蹲蹼躁躇躅躄躋躊躓躑躔躙躪躡躬躰軆躱躾軅軈軋軛軣軼軻軫軾輊輅輕輒輙輓輜輟輛輌輦輳輻輹轅轂輾轌轉轆轎轗轜�轢轣轤辜辟辣辭辯辷迚迥迢迪迯邇迴逅迹迺逑逕逡逍逞逖逋逧逶逵逹迸遏遐遑遒逎遉逾遖遘遞遨遯遶隨遲邂遽邁邀邊邉邏邨邯邱邵郢郤扈郛鄂鄒鄙鄲鄰酊酖酘酣酥酩酳酲醋醉醂醢醫醯醪醵醴醺釀釁釉釋釐釖釟釡釛釼釵釶鈞釿鈔鈬鈕鈑鉞鉗鉅鉉鉤鉈銕鈿鉋鉐銜銖銓銛鉚鋏銹銷鋩錏鋺鍄錮���".split(""); +for(j = 0; j != D[231].length; ++j) if(D[231][j].charCodeAt(0) !== 0xFFFD) { e[D[231][j]] = 59136 + j; d[59136 + j] = D[231][j];} +D[232] = "����������������������������������������������������������������錙錢錚錣錺錵錻鍜鍠鍼鍮鍖鎰鎬鎭鎔鎹鏖鏗鏨鏥鏘鏃鏝鏐鏈鏤鐚鐔鐓鐃鐇鐐鐶鐫鐵鐡鐺鑁鑒鑄鑛鑠鑢鑞鑪鈩鑰鑵鑷鑽鑚鑼鑾钁鑿閂閇閊閔閖閘閙�閠閨閧閭閼閻閹閾闊濶闃闍闌闕闔闖關闡闥闢阡阨阮阯陂陌陏陋陷陜陞陝陟陦陲陬隍隘隕隗險隧隱隲隰隴隶隸隹雎雋雉雍襍雜霍雕雹霄霆霈霓霎霑霏霖霙霤霪霰霹霽霾靄靆靈靂靉靜靠靤靦靨勒靫靱靹鞅靼鞁靺鞆鞋鞏鞐鞜鞨鞦鞣鞳鞴韃韆韈韋韜韭齏韲竟韶韵頏頌頸頤頡頷頽顆顏顋顫顯顰���".split(""); +for(j = 0; j != D[232].length; ++j) if(D[232][j].charCodeAt(0) !== 0xFFFD) { e[D[232][j]] = 59392 + j; d[59392 + j] = D[232][j];} +D[233] = "����������������������������������������������������������������顱顴顳颪颯颱颶飄飃飆飩飫餃餉餒餔餘餡餝餞餤餠餬餮餽餾饂饉饅饐饋饑饒饌饕馗馘馥馭馮馼駟駛駝駘駑駭駮駱駲駻駸騁騏騅駢騙騫騷驅驂驀驃�騾驕驍驛驗驟驢驥驤驩驫驪骭骰骼髀髏髑髓體髞髟髢髣髦髯髫髮髴髱髷髻鬆鬘鬚鬟鬢鬣鬥鬧鬨鬩鬪鬮鬯鬲魄魃魏魍魎魑魘魴鮓鮃鮑鮖鮗鮟鮠鮨鮴鯀鯊鮹鯆鯏鯑鯒鯣鯢鯤鯔鯡鰺鯲鯱鯰鰕鰔鰉鰓鰌鰆鰈鰒鰊鰄鰮鰛鰥鰤鰡鰰鱇鰲鱆鰾鱚鱠鱧鱶鱸鳧鳬鳰鴉鴈鳫鴃鴆鴪鴦鶯鴣鴟鵄鴕鴒鵁鴿鴾鵆鵈���".split(""); +for(j = 0; j != D[233].length; ++j) if(D[233][j].charCodeAt(0) !== 0xFFFD) { e[D[233][j]] = 59648 + j; d[59648 + j] = D[233][j];} +D[234] = "����������������������������������������������������������������鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝黠黥黨黯�黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠堯槇遙瑤凜熙�������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[234].length; ++j) if(D[234][j].charCodeAt(0) !== 0xFFFD) { e[D[234][j]] = 59904 + j; d[59904 + j] = D[234][j];} +D[237] = "����������������������������������������������������������������纊褜鍈銈蓜俉炻昱棈鋹曻彅丨仡仼伀伃伹佖侒侊侚侔俍偀倢俿倞偆偰偂傔僴僘兊兤冝冾凬刕劜劦勀勛匀匇匤卲厓厲叝﨎咜咊咩哿喆坙坥垬埈埇﨏�塚增墲夋奓奛奝奣妤妺孖寀甯寘寬尞岦岺峵崧嵓﨑嵂嵭嶸嶹巐弡弴彧德忞恝悅悊惞惕愠惲愑愷愰憘戓抦揵摠撝擎敎昀昕昻昉昮昞昤晥晗晙晴晳暙暠暲暿曺朎朗杦枻桒柀栁桄棏﨓楨﨔榘槢樰橫橆橳橾櫢櫤毖氿汜沆汯泚洄涇浯涖涬淏淸淲淼渹湜渧渼溿澈澵濵瀅瀇瀨炅炫焏焄煜煆煇凞燁燾犱���".split(""); +for(j = 0; j != D[237].length; ++j) if(D[237][j].charCodeAt(0) !== 0xFFFD) { e[D[237][j]] = 60672 + j; d[60672 + j] = D[237][j];} +D[238] = "����������������������������������������������������������������犾猤猪獷玽珉珖珣珒琇珵琦琪琩琮瑢璉璟甁畯皂皜皞皛皦益睆劯砡硎硤硺礰礼神祥禔福禛竑竧靖竫箞精絈絜綷綠緖繒罇羡羽茁荢荿菇菶葈蒴蕓蕙�蕫﨟薰蘒﨡蠇裵訒訷詹誧誾諟諸諶譓譿賰賴贒赶﨣軏﨤逸遧郞都鄕鄧釚釗釞釭釮釤釥鈆鈐鈊鈺鉀鈼鉎鉙鉑鈹鉧銧鉷鉸鋧鋗鋙鋐﨧鋕鋠鋓錥錡鋻﨨錞鋿錝錂鍰鍗鎤鏆鏞鏸鐱鑅鑈閒隆﨩隝隯霳霻靃靍靏靑靕顗顥飯飼餧館馞驎髙髜魵魲鮏鮱鮻鰀鵰鵫鶴鸙黑��ⅰⅱⅲⅳⅴⅵⅶⅷⅸⅹ￢￤＇＂���".split(""); +for(j = 0; j != D[238].length; ++j) if(D[238][j].charCodeAt(0) !== 0xFFFD) { e[D[238][j]] = 60928 + j; d[60928 + j] = D[238][j];} +D[250] = "����������������������������������������������������������������ⅰⅱⅲⅳⅴⅵⅶⅷⅸⅹⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩ￢￤＇＂㈱№℡∵纊褜鍈銈蓜俉炻昱棈鋹曻彅丨仡仼伀伃伹佖侒侊侚侔俍偀倢俿倞偆偰偂傔僴僘兊�兤冝冾凬刕劜劦勀勛匀匇匤卲厓厲叝﨎咜咊咩哿喆坙坥垬埈埇﨏塚增墲夋奓奛奝奣妤妺孖寀甯寘寬尞岦岺峵崧嵓﨑嵂嵭嶸嶹巐弡弴彧德忞恝悅悊惞惕愠惲愑愷愰憘戓抦揵摠撝擎敎昀昕昻昉昮昞昤晥晗晙晴晳暙暠暲暿曺朎朗杦枻桒柀栁桄棏﨓楨﨔榘槢樰橫橆橳橾櫢櫤毖氿汜沆汯泚洄涇浯���".split(""); +for(j = 0; j != D[250].length; ++j) if(D[250][j].charCodeAt(0) !== 0xFFFD) { e[D[250][j]] = 64000 + j; d[64000 + j] = D[250][j];} +D[251] = "����������������������������������������������������������������涖涬淏淸淲淼渹湜渧渼溿澈澵濵瀅瀇瀨炅炫焏焄煜煆煇凞燁燾犱犾猤猪獷玽珉珖珣珒琇珵琦琪琩琮瑢璉璟甁畯皂皜皞皛皦益睆劯砡硎硤硺礰礼神�祥禔福禛竑竧靖竫箞精絈絜綷綠緖繒罇羡羽茁荢荿菇菶葈蒴蕓蕙蕫﨟薰蘒﨡蠇裵訒訷詹誧誾諟諸諶譓譿賰賴贒赶﨣軏﨤逸遧郞都鄕鄧釚釗釞釭釮釤釥鈆鈐鈊鈺鉀鈼鉎鉙鉑鈹鉧銧鉷鉸鋧鋗鋙鋐﨧鋕鋠鋓錥錡鋻﨨錞鋿錝錂鍰鍗鎤鏆鏞鏸鐱鑅鑈閒隆﨩隝隯霳霻靃靍靏靑靕顗顥飯飼餧館馞驎髙���".split(""); +for(j = 0; j != D[251].length; ++j) if(D[251][j].charCodeAt(0) !== 0xFFFD) { e[D[251][j]] = 64256 + j; d[64256 + j] = D[251][j];} +D[252] = "����������������������������������������������������������������髜魵魲鮏鮱鮻鰀鵰鵫鶴鸙黑������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[252].length; ++j) if(D[252][j].charCodeAt(0) !== 0xFFFD) { e[D[252][j]] = 64512 + j; d[64512 + j] = D[252][j];} +return {"enc": e, "dec": d }; })(); +cptable[936] = (function(){ var d = [], e = {}, D = [], j; +D[0] = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�������������������������������������������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[0].length; ++j) if(D[0][j].charCodeAt(0) !== 0xFFFD) { e[D[0][j]] = 0 + j; d[0 + j] = D[0][j];} +D[129] = "����������������������������������������������������������������丂丄丅丆丏丒丗丟丠両丣並丩丮丯丱丳丵丷丼乀乁乂乄乆乊乑乕乗乚乛乢乣乤乥乧乨乪乫乬乭乮乯乲乴乵乶乷乸乹乺乻乼乽乿亀亁亂亃亄亅亇亊�亐亖亗亙亜亝亞亣亪亯亰亱亴亶亷亸亹亼亽亾仈仌仏仐仒仚仛仜仠仢仦仧仩仭仮仯仱仴仸仹仺仼仾伀伂伃伄伅伆伇伈伋伌伒伓伔伕伖伜伝伡伣伨伩伬伭伮伱伳伵伷伹伻伾伿佀佁佂佄佅佇佈佉佊佋佌佒佔佖佡佢佦佨佪佫佭佮佱佲併佷佸佹佺佽侀侁侂侅來侇侊侌侎侐侒侓侕侖侘侙侚侜侞侟価侢�".split(""); +for(j = 0; j != D[129].length; ++j) if(D[129][j].charCodeAt(0) !== 0xFFFD) { e[D[129][j]] = 33024 + j; d[33024 + j] = D[129][j];} +D[130] = "����������������������������������������������������������������侤侫侭侰侱侲侳侴侶侷侸侹侺侻侼侽侾俀俁係俆俇俈俉俋俌俍俒俓俔俕俖俙俛俠俢俤俥俧俫俬俰俲俴俵俶俷俹俻俼俽俿倀倁倂倃倄倅倆倇倈倉倊�個倎倐們倓倕倖倗倛倝倞倠倢倣値倧倫倯倰倱倲倳倴倵倶倷倸倹倻倽倿偀偁偂偄偅偆偉偊偋偍偐偑偒偓偔偖偗偘偙偛偝偞偟偠偡偢偣偤偦偧偨偩偪偫偭偮偯偰偱偲偳側偵偸偹偺偼偽傁傂傃傄傆傇傉傊傋傌傎傏傐傑傒傓傔傕傖傗傘備傚傛傜傝傞傟傠傡傢傤傦傪傫傭傮傯傰傱傳傴債傶傷傸傹傼�".split(""); +for(j = 0; j != D[130].length; ++j) if(D[130][j].charCodeAt(0) !== 0xFFFD) { e[D[130][j]] = 33280 + j; d[33280 + j] = D[130][j];} +D[131] = "����������������������������������������������������������������傽傾傿僀僁僂僃僄僅僆僇僈僉僊僋僌働僎僐僑僒僓僔僕僗僘僙僛僜僝僞僟僠僡僢僣僤僥僨僩僪僫僯僰僱僲僴僶僷僸價僺僼僽僾僿儀儁儂儃億儅儈�儉儊儌儍儎儏儐儑儓儔儕儖儗儘儙儚儛儜儝儞償儠儢儣儤儥儦儧儨儩優儫儬儭儮儯儰儱儲儳儴儵儶儷儸儹儺儻儼儽儾兂兇兊兌兎兏児兒兓兗兘兙兛兝兞兟兠兡兣兤兦內兩兪兯兲兺兾兿冃冄円冇冊冋冎冏冐冑冓冔冘冚冝冞冟冡冣冦冧冨冩冪冭冮冴冸冹冺冾冿凁凂凃凅凈凊凍凎凐凒凓凔凕凖凗�".split(""); +for(j = 0; j != D[131].length; ++j) if(D[131][j].charCodeAt(0) !== 0xFFFD) { e[D[131][j]] = 33536 + j; d[33536 + j] = D[131][j];} +D[132] = "����������������������������������������������������������������凘凙凚凜凞凟凢凣凥処凧凨凩凪凬凮凱凲凴凷凾刄刅刉刋刌刏刐刓刔刕刜刞刟刡刢刣別刦刧刪刬刯刱刲刴刵刼刾剄剅剆則剈剉剋剎剏剒剓剕剗剘�剙剚剛剝剟剠剢剣剤剦剨剫剬剭剮剰剱剳剴創剶剷剸剹剺剻剼剾劀劃劄劅劆劇劉劊劋劌劍劎劏劑劒劔劕劖劗劘劙劚劜劤劥劦劧劮劯劰労劵劶劷劸効劺劻劼劽勀勁勂勄勅勆勈勊勌勍勎勏勑勓勔動勗務勚勛勜勝勞勠勡勢勣勥勦勧勨勩勪勫勬勭勮勯勱勲勳勴勵勶勷勸勻勼勽匁匂匃匄匇匉匊匋匌匎�".split(""); +for(j = 0; j != D[132].length; ++j) if(D[132][j].charCodeAt(0) !== 0xFFFD) { e[D[132][j]] = 33792 + j; d[33792 + j] = D[132][j];} +D[133] = "����������������������������������������������������������������匑匒匓匔匘匛匜匞匟匢匤匥匧匨匩匫匬匭匯匰匱匲匳匴匵匶匷匸匼匽區卂卄卆卋卌卍卐協単卙卛卝卥卨卪卬卭卲卶卹卻卼卽卾厀厁厃厇厈厊厎厏�厐厑厒厓厔厖厗厙厛厜厞厠厡厤厧厪厫厬厭厯厰厱厲厳厴厵厷厸厹厺厼厽厾叀參叄叅叆叇収叏叐叒叓叕叚叜叝叞叡叢叧叴叺叾叿吀吂吅吇吋吔吘吙吚吜吢吤吥吪吰吳吶吷吺吽吿呁呂呄呅呇呉呌呍呎呏呑呚呝呞呟呠呡呣呥呧呩呪呫呬呭呮呯呰呴呹呺呾呿咁咃咅咇咈咉咊咍咑咓咗咘咜咞咟咠咡�".split(""); +for(j = 0; j != D[133].length; ++j) if(D[133][j].charCodeAt(0) !== 0xFFFD) { e[D[133][j]] = 34048 + j; d[34048 + j] = D[133][j];} +D[134] = "����������������������������������������������������������������咢咥咮咰咲咵咶咷咹咺咼咾哃哅哊哋哖哘哛哠員哢哣哤哫哬哯哰哱哴哵哶哷哸哹哻哾唀唂唃唄唅唈唊唋唌唍唎唒唓唕唖唗唘唙唚唜唝唞唟唡唥唦�唨唩唫唭唲唴唵唶唸唹唺唻唽啀啂啅啇啈啋啌啍啎問啑啒啓啔啗啘啙啚啛啝啞啟啠啢啣啨啩啫啯啰啱啲啳啴啹啺啽啿喅喆喌喍喎喐喒喓喕喖喗喚喛喞喠喡喢喣喤喥喦喨喩喪喫喬喭單喯喰喲喴営喸喺喼喿嗀嗁嗂嗃嗆嗇嗈嗊嗋嗎嗏嗐嗕嗗嗘嗙嗚嗛嗞嗠嗢嗧嗩嗭嗮嗰嗱嗴嗶嗸嗹嗺嗻嗼嗿嘂嘃嘄嘅�".split(""); +for(j = 0; j != D[134].length; ++j) if(D[134][j].charCodeAt(0) !== 0xFFFD) { e[D[134][j]] = 34304 + j; d[34304 + j] = D[134][j];} +D[135] = "����������������������������������������������������������������嘆嘇嘊嘋嘍嘐嘑嘒嘓嘔嘕嘖嘗嘙嘚嘜嘝嘠嘡嘢嘥嘦嘨嘩嘪嘫嘮嘯嘰嘳嘵嘷嘸嘺嘼嘽嘾噀噁噂噃噄噅噆噇噈噉噊噋噏噐噑噒噓噕噖噚噛噝噞噟噠噡�噣噥噦噧噭噮噯噰噲噳噴噵噷噸噹噺噽噾噿嚀嚁嚂嚃嚄嚇嚈嚉嚊嚋嚌嚍嚐嚑嚒嚔嚕嚖嚗嚘嚙嚚嚛嚜嚝嚞嚟嚠嚡嚢嚤嚥嚦嚧嚨嚩嚪嚫嚬嚭嚮嚰嚱嚲嚳嚴嚵嚶嚸嚹嚺嚻嚽嚾嚿囀囁囂囃囄囅囆囇囈囉囋囌囍囎囏囐囑囒囓囕囖囘囙囜団囥囦囧囨囩囪囬囮囯囲図囶囷囸囻囼圀圁圂圅圇國圌圍圎圏圐圑�".split(""); +for(j = 0; j != D[135].length; ++j) if(D[135][j].charCodeAt(0) !== 0xFFFD) { e[D[135][j]] = 34560 + j; d[34560 + j] = D[135][j];} +D[136] = "����������������������������������������������������������������園圓圔圕圖圗團圙圚圛圝圞圠圡圢圤圥圦圧圫圱圲圴圵圶圷圸圼圽圿坁坃坄坅坆坈坉坋坒坓坔坕坖坘坙坢坣坥坧坬坮坰坱坲坴坵坸坹坺坽坾坿垀�垁垇垈垉垊垍垎垏垐垑垔垕垖垗垘垙垚垜垝垞垟垥垨垪垬垯垰垱垳垵垶垷垹垺垻垼垽垾垿埀埁埄埅埆埇埈埉埊埌埍埐埑埓埖埗埛埜埞埡埢埣埥埦埧埨埩埪埫埬埮埰埱埲埳埵埶執埻埼埾埿堁堃堄堅堈堉堊堌堎堏堐堒堓堔堖堗堘堚堛堜堝堟堢堣堥堦堧堨堩堫堬堭堮堯報堲堳場堶堷堸堹堺堻堼堽�".split(""); +for(j = 0; j != D[136].length; ++j) if(D[136][j].charCodeAt(0) !== 0xFFFD) { e[D[136][j]] = 34816 + j; d[34816 + j] = D[136][j];} +D[137] = "����������������������������������������������������������������堾堿塀塁塂塃塅塆塇塈塉塊塋塎塏塐塒塓塕塖塗塙塚塛塜塝塟塠塡塢塣塤塦塧塨塩塪塭塮塯塰塱塲塳塴塵塶塷塸塹塺塻塼塽塿墂墄墆墇墈墊墋墌�墍墎墏墐墑墔墕墖増墘墛墜墝墠墡墢墣墤墥墦墧墪墫墬墭墮墯墰墱墲墳墴墵墶墷墸墹墺墻墽墾墿壀壂壃壄壆壇壈壉壊壋壌壍壎壏壐壒壓壔壖壗壘壙壚壛壜壝壞壟壠壡壢壣壥壦壧壨壩壪壭壯壱売壴壵壷壸壺壻壼壽壾壿夀夁夃夅夆夈変夊夋夌夎夐夑夒夓夗夘夛夝夞夠夡夢夣夦夨夬夰夲夳夵夶夻�".split(""); +for(j = 0; j != D[137].length; ++j) if(D[137][j].charCodeAt(0) !== 0xFFFD) { e[D[137][j]] = 35072 + j; d[35072 + j] = D[137][j];} +D[138] = "����������������������������������������������������������������夽夾夿奀奃奅奆奊奌奍奐奒奓奙奛奜奝奞奟奡奣奤奦奧奨奩奪奫奬奭奮奯奰奱奲奵奷奺奻奼奾奿妀妅妉妋妌妎妏妐妑妔妕妘妚妛妜妝妟妠妡妢妦�妧妬妭妰妱妳妴妵妶妷妸妺妼妽妿姀姁姂姃姄姅姇姈姉姌姍姎姏姕姖姙姛姞姟姠姡姢姤姦姧姩姪姫姭姮姯姰姱姲姳姴姵姶姷姸姺姼姽姾娀娂娊娋娍娎娏娐娒娔娕娖娗娙娚娛娝娞娡娢娤娦娧娨娪娫娬娭娮娯娰娳娵娷娸娹娺娻娽娾娿婁婂婃婄婅婇婈婋婌婍婎婏婐婑婒婓婔婖婗婘婙婛婜婝婞婟婠�".split(""); +for(j = 0; j != D[138].length; ++j) if(D[138][j].charCodeAt(0) !== 0xFFFD) { e[D[138][j]] = 35328 + j; d[35328 + j] = D[138][j];} +D[139] = "����������������������������������������������������������������婡婣婤婥婦婨婩婫婬婭婮婯婰婱婲婳婸婹婻婼婽婾媀媁媂媃媄媅媆媇媈媉媊媋媌媍媎媏媐媑媓媔媕媖媗媘媙媜媝媞媟媠媡媢媣媤媥媦媧媨媩媫媬�媭媮媯媰媱媴媶媷媹媺媻媼媽媿嫀嫃嫄嫅嫆嫇嫈嫊嫋嫍嫎嫏嫐嫑嫓嫕嫗嫙嫚嫛嫝嫞嫟嫢嫤嫥嫧嫨嫪嫬嫭嫮嫯嫰嫲嫳嫴嫵嫶嫷嫸嫹嫺嫻嫼嫽嫾嫿嬀嬁嬂嬃嬄嬅嬆嬇嬈嬊嬋嬌嬍嬎嬏嬐嬑嬒嬓嬔嬕嬘嬙嬚嬛嬜嬝嬞嬟嬠嬡嬢嬣嬤嬥嬦嬧嬨嬩嬪嬫嬬嬭嬮嬯嬰嬱嬳嬵嬶嬸嬹嬺嬻嬼嬽嬾嬿孁孂孃孄孅孆孇�".split(""); +for(j = 0; j != D[139].length; ++j) if(D[139][j].charCodeAt(0) !== 0xFFFD) { e[D[139][j]] = 35584 + j; d[35584 + j] = D[139][j];} +D[140] = "����������������������������������������������������������������孈孉孊孋孌孍孎孏孒孖孞孠孡孧孨孫孭孮孯孲孴孶孷學孹孻孼孾孿宂宆宊宍宎宐宑宒宔宖実宧宨宩宬宭宮宯宱宲宷宺宻宼寀寁寃寈寉寊寋寍寎寏�寑寔寕寖寗寘寙寚寛寜寠寢寣實寧審寪寫寬寭寯寱寲寳寴寵寶寷寽対尀専尃尅將專尋尌對導尐尒尓尗尙尛尞尟尠尡尣尦尨尩尪尫尭尮尯尰尲尳尵尶尷屃屄屆屇屌屍屒屓屔屖屗屘屚屛屜屝屟屢層屧屨屩屪屫屬屭屰屲屳屴屵屶屷屸屻屼屽屾岀岃岄岅岆岇岉岊岋岎岏岒岓岕岝岞岟岠岡岤岥岦岧岨�".split(""); +for(j = 0; j != D[140].length; ++j) if(D[140][j].charCodeAt(0) !== 0xFFFD) { e[D[140][j]] = 35840 + j; d[35840 + j] = D[140][j];} +D[141] = "����������������������������������������������������������������岪岮岯岰岲岴岶岹岺岻岼岾峀峂峃峅峆峇峈峉峊峌峍峎峏峐峑峓峔峕峖峗峘峚峛峜峝峞峟峠峢峣峧峩峫峬峮峯峱峲峳峴峵島峷峸峹峺峼峽峾峿崀�崁崄崅崈崉崊崋崌崍崏崐崑崒崓崕崗崘崙崚崜崝崟崠崡崢崣崥崨崪崫崬崯崰崱崲崳崵崶崷崸崹崺崻崼崿嵀嵁嵂嵃嵄嵅嵆嵈嵉嵍嵎嵏嵐嵑嵒嵓嵔嵕嵖嵗嵙嵚嵜嵞嵟嵠嵡嵢嵣嵤嵥嵦嵧嵨嵪嵭嵮嵰嵱嵲嵳嵵嵶嵷嵸嵹嵺嵻嵼嵽嵾嵿嶀嶁嶃嶄嶅嶆嶇嶈嶉嶊嶋嶌嶍嶎嶏嶐嶑嶒嶓嶔嶕嶖嶗嶘嶚嶛嶜嶞嶟嶠�".split(""); +for(j = 0; j != D[141].length; ++j) if(D[141][j].charCodeAt(0) !== 0xFFFD) { e[D[141][j]] = 36096 + j; d[36096 + j] = D[141][j];} +D[142] = "����������������������������������������������������������������嶡嶢嶣嶤嶥嶦嶧嶨嶩嶪嶫嶬嶭嶮嶯嶰嶱嶲嶳嶴嶵嶶嶸嶹嶺嶻嶼嶽嶾嶿巀巁巂巃巄巆巇巈巉巊巋巌巎巏巐巑巒巓巔巕巖巗巘巙巚巜巟巠巣巤巪巬巭�巰巵巶巸巹巺巻巼巿帀帄帇帉帊帋帍帎帒帓帗帞帟帠帡帢帣帤帥帨帩帪師帬帯帰帲帳帴帵帶帹帺帾帿幀幁幃幆幇幈幉幊幋幍幎幏幐幑幒幓幖幗幘幙幚幜幝幟幠幣幤幥幦幧幨幩幪幫幬幭幮幯幰幱幵幷幹幾庁庂広庅庈庉庌庍庎庒庘庛庝庡庢庣庤庨庩庪庫庬庮庯庰庱庲庴庺庻庼庽庿廀廁廂廃廄廅�".split(""); +for(j = 0; j != D[142].length; ++j) if(D[142][j].charCodeAt(0) !== 0xFFFD) { e[D[142][j]] = 36352 + j; d[36352 + j] = D[142][j];} +D[143] = "����������������������������������������������������������������廆廇廈廋廌廍廎廏廐廔廕廗廘廙廚廜廝廞廟廠廡廢廣廤廥廦廧廩廫廬廭廮廯廰廱廲廳廵廸廹廻廼廽弅弆弇弉弌弍弎弐弒弔弖弙弚弜弝弞弡弢弣弤�弨弫弬弮弰弲弳弴張弶強弸弻弽弾弿彁彂彃彄彅彆彇彈彉彊彋彌彍彎彏彑彔彙彚彛彜彞彟彠彣彥彧彨彫彮彯彲彴彵彶彸彺彽彾彿徃徆徍徎徏徑従徔徖徚徛徝從徟徠徢徣徤徥徦徧復徫徬徯徰徱徲徳徴徶徸徹徺徻徾徿忀忁忂忇忈忊忋忎忓忔忕忚忛応忞忟忢忣忥忦忨忩忬忯忰忲忳忴忶忷忹忺忼怇�".split(""); +for(j = 0; j != D[143].length; ++j) if(D[143][j].charCodeAt(0) !== 0xFFFD) { e[D[143][j]] = 36608 + j; d[36608 + j] = D[143][j];} +D[144] = "����������������������������������������������������������������怈怉怋怌怐怑怓怗怘怚怞怟怢怣怤怬怭怮怰怱怲怳怴怶怷怸怹怺怽怾恀恄恅恆恇恈恉恊恌恎恏恑恓恔恖恗恘恛恜恞恟恠恡恥恦恮恱恲恴恵恷恾悀�悁悂悅悆悇悈悊悋悎悏悐悑悓悕悗悘悙悜悞悡悢悤悥悧悩悪悮悰悳悵悶悷悹悺悽悾悿惀惁惂惃惄惇惈惉惌惍惎惏惐惒惓惔惖惗惙惛惞惡惢惣惤惥惪惱惲惵惷惸惻惼惽惾惿愂愃愄愅愇愊愋愌愐愑愒愓愔愖愗愘愙愛愜愝愞愡愢愥愨愩愪愬愭愮愯愰愱愲愳愴愵愶愷愸愹愺愻愼愽愾慀慁慂慃慄慅慆�".split(""); +for(j = 0; j != D[144].length; ++j) if(D[144][j].charCodeAt(0) !== 0xFFFD) { e[D[144][j]] = 36864 + j; d[36864 + j] = D[144][j];} +D[145] = "����������������������������������������������������������������慇慉態慍慏慐慒慓慔慖慗慘慙慚慛慜慞慟慠慡慣慤慥慦慩慪慫慬慭慮慯慱慲慳慴慶慸慹慺慻慼慽慾慿憀憁憂憃憄憅憆憇憈憉憊憌憍憏憐憑憒憓憕�憖憗憘憙憚憛憜憞憟憠憡憢憣憤憥憦憪憫憭憮憯憰憱憲憳憴憵憶憸憹憺憻憼憽憿懀懁懃懄懅懆懇應懌懍懎懏懐懓懕懖懗懘懙懚懛懜懝懞懟懠懡懢懣懤懥懧懨懩懪懫懬懭懮懯懰懱懲懳懴懶懷懸懹懺懻懼懽懾戀戁戂戃戄戅戇戉戓戔戙戜戝戞戠戣戦戧戨戩戫戭戯戰戱戲戵戶戸戹戺戻戼扂扄扅扆扊�".split(""); +for(j = 0; j != D[145].length; ++j) if(D[145][j].charCodeAt(0) !== 0xFFFD) { e[D[145][j]] = 37120 + j; d[37120 + j] = D[145][j];} +D[146] = "����������������������������������������������������������������扏扐払扖扗扙扚扜扝扞扟扠扡扢扤扥扨扱扲扴扵扷扸扺扻扽抁抂抃抅抆抇抈抋抌抍抎抏抐抔抙抜抝択抣抦抧抩抪抭抮抯抰抲抳抴抶抷抸抺抾拀拁�拃拋拏拑拕拝拞拠拡拤拪拫拰拲拵拸拹拺拻挀挃挄挅挆挊挋挌挍挏挐挒挓挔挕挗挘挙挜挦挧挩挬挭挮挰挱挳挴挵挶挷挸挻挼挾挿捀捁捄捇捈捊捑捒捓捔捖捗捘捙捚捛捜捝捠捤捥捦捨捪捫捬捯捰捲捳捴捵捸捹捼捽捾捿掁掃掄掅掆掋掍掑掓掔掕掗掙掚掛掜掝掞掟採掤掦掫掯掱掲掵掶掹掻掽掿揀�".split(""); +for(j = 0; j != D[146].length; ++j) if(D[146][j].charCodeAt(0) !== 0xFFFD) { e[D[146][j]] = 37376 + j; d[37376 + j] = D[146][j];} +D[147] = "����������������������������������������������������������������揁揂揃揅揇揈揊揋揌揑揓揔揕揗揘揙揚換揜揝揟揢揤揥揦揧揨揫揬揮揯揰揱揳揵揷揹揺揻揼揾搃搄搆搇搈搉搊損搎搑搒搕搖搗搘搙搚搝搟搢搣搤�搥搧搨搩搫搮搯搰搱搲搳搵搶搷搸搹搻搼搾摀摂摃摉摋摌摍摎摏摐摑摓摕摖摗摙摚摛摜摝摟摠摡摢摣摤摥摦摨摪摫摬摮摯摰摱摲摳摴摵摶摷摻摼摽摾摿撀撁撃撆撈撉撊撋撌撍撎撏撐撓撔撗撘撚撛撜撝撟撠撡撢撣撥撦撧撨撪撫撯撱撲撳撴撶撹撻撽撾撿擁擃擄擆擇擈擉擊擋擌擏擑擓擔擕擖擙據�".split(""); +for(j = 0; j != D[147].length; ++j) if(D[147][j].charCodeAt(0) !== 0xFFFD) { e[D[147][j]] = 37632 + j; d[37632 + j] = D[147][j];} +D[148] = "����������������������������������������������������������������擛擜擝擟擠擡擣擥擧擨擩擪擫擬擭擮擯擰擱擲擳擴擵擶擷擸擹擺擻擼擽擾擿攁攂攃攄攅攆攇攈攊攋攌攍攎攏攐攑攓攔攕攖攗攙攚攛攜攝攞攟攠攡�攢攣攤攦攧攨攩攪攬攭攰攱攲攳攷攺攼攽敀敁敂敃敄敆敇敊敋敍敎敐敒敓敔敗敘敚敜敟敠敡敤敥敧敨敩敪敭敮敯敱敳敵敶數敹敺敻敼敽敾敿斀斁斂斃斄斅斆斈斉斊斍斎斏斒斔斕斖斘斚斝斞斠斢斣斦斨斪斬斮斱斲斳斴斵斶斷斸斺斻斾斿旀旂旇旈旉旊旍旐旑旓旔旕旘旙旚旛旜旝旞旟旡旣旤旪旫�".split(""); +for(j = 0; j != D[148].length; ++j) if(D[148][j].charCodeAt(0) !== 0xFFFD) { e[D[148][j]] = 37888 + j; d[37888 + j] = D[148][j];} +D[149] = "����������������������������������������������������������������旲旳旴旵旸旹旻旼旽旾旿昁昄昅昇昈昉昋昍昐昑昒昖昗昘昚昛昜昞昡昢昣昤昦昩昪昫昬昮昰昲昳昷昸昹昺昻昽昿晀時晄晅晆晇晈晉晊晍晎晐晑晘�晙晛晜晝晞晠晢晣晥晧晩晪晫晬晭晱晲晳晵晸晹晻晼晽晿暀暁暃暅暆暈暉暊暋暍暎暏暐暒暓暔暕暘暙暚暛暜暞暟暠暡暢暣暤暥暦暩暪暫暬暭暯暰暱暲暳暵暶暷暸暺暻暼暽暿曀曁曂曃曄曅曆曇曈曉曊曋曌曍曎曏曐曑曒曓曔曕曖曗曘曚曞曟曠曡曢曣曤曥曧曨曪曫曬曭曮曯曱曵曶書曺曻曽朁朂會�".split(""); +for(j = 0; j != D[149].length; ++j) if(D[149][j].charCodeAt(0) !== 0xFFFD) { e[D[149][j]] = 38144 + j; d[38144 + j] = D[149][j];} +D[150] = "����������������������������������������������������������������朄朅朆朇朌朎朏朑朒朓朖朘朙朚朜朞朠朡朢朣朤朥朧朩朮朰朲朳朶朷朸朹朻朼朾朿杁杄杅杇杊杋杍杒杔杕杗杘杙杚杛杝杢杣杤杦杧杫杬杮東杴杶�杸杹杺杻杽枀枂枃枅枆枈枊枌枍枎枏枑枒枓枔枖枙枛枟枠枡枤枦枩枬枮枱枲枴枹枺枻枼枽枾枿柀柂柅柆柇柈柉柊柋柌柍柎柕柖柗柛柟柡柣柤柦柧柨柪柫柭柮柲柵柶柷柸柹柺査柼柾栁栂栃栄栆栍栐栒栔栕栘栙栚栛栜栞栟栠栢栣栤栥栦栧栨栫栬栭栮栯栰栱栴栵栶栺栻栿桇桋桍桏桒桖桗桘桙桚桛�".split(""); +for(j = 0; j != D[150].length; ++j) if(D[150][j].charCodeAt(0) !== 0xFFFD) { e[D[150][j]] = 38400 + j; d[38400 + j] = D[150][j];} +D[151] = "����������������������������������������������������������������桜桝桞桟桪桬桭桮桯桰桱桲桳桵桸桹桺桻桼桽桾桿梀梂梄梇梈梉梊梋梌梍梎梐梑梒梔梕梖梘梙梚梛梜條梞梟梠梡梣梤梥梩梪梫梬梮梱梲梴梶梷梸�梹梺梻梼梽梾梿棁棃棄棅棆棇棈棊棌棎棏棐棑棓棔棖棗棙棛棜棝棞棟棡棢棤棥棦棧棨棩棪棫棬棭棯棲棳棴棶棷棸棻棽棾棿椀椂椃椄椆椇椈椉椊椌椏椑椓椔椕椖椗椘椙椚椛検椝椞椡椢椣椥椦椧椨椩椪椫椬椮椯椱椲椳椵椶椷椸椺椻椼椾楀楁楃楄楅楆楇楈楉楊楋楌楍楎楏楐楑楒楓楕楖楘楙楛楜楟�".split(""); +for(j = 0; j != D[151].length; ++j) if(D[151][j].charCodeAt(0) !== 0xFFFD) { e[D[151][j]] = 38656 + j; d[38656 + j] = D[151][j];} +D[152] = "����������������������������������������������������������������楡楢楤楥楧楨楩楪楬業楯楰楲楳楴極楶楺楻楽楾楿榁榃榅榊榋榌榎榏榐榑榒榓榖榗榙榚榝榞榟榠榡榢榣榤榥榦榩榪榬榮榯榰榲榳榵榶榸榹榺榼榽�榾榿槀槂槃槄槅槆槇槈槉構槍槏槑槒槓槕槖槗様槙槚槜槝槞槡槢槣槤槥槦槧槨槩槪槫槬槮槯槰槱槳槴槵槶槷槸槹槺槻槼槾樀樁樂樃樄樅樆樇樈樉樋樌樍樎樏樐樑樒樓樔樕樖標樚樛樜樝樞樠樢樣樤樥樦樧権樫樬樭樮樰樲樳樴樶樷樸樹樺樻樼樿橀橁橂橃橅橆橈橉橊橋橌橍橎橏橑橒橓橔橕橖橗橚�".split(""); +for(j = 0; j != D[152].length; ++j) if(D[152][j].charCodeAt(0) !== 0xFFFD) { e[D[152][j]] = 38912 + j; d[38912 + j] = D[152][j];} +D[153] = "����������������������������������������������������������������橜橝橞機橠橢橣橤橦橧橨橩橪橫橬橭橮橯橰橲橳橴橵橶橷橸橺橻橽橾橿檁檂檃檅檆檇檈檉檊檋檌檍檏檒檓檔檕檖檘檙檚檛檜檝檞檟檡檢檣檤檥檦�檧檨檪檭檮檯檰檱檲檳檴檵檶檷檸檹檺檻檼檽檾檿櫀櫁櫂櫃櫄櫅櫆櫇櫈櫉櫊櫋櫌櫍櫎櫏櫐櫑櫒櫓櫔櫕櫖櫗櫘櫙櫚櫛櫜櫝櫞櫟櫠櫡櫢櫣櫤櫥櫦櫧櫨櫩櫪櫫櫬櫭櫮櫯櫰櫱櫲櫳櫴櫵櫶櫷櫸櫹櫺櫻櫼櫽櫾櫿欀欁欂欃欄欅欆欇欈欉權欋欌欍欎欏欐欑欒欓欔欕欖欗欘欙欚欛欜欝欞欟欥欦欨欩欪欫欬欭欮�".split(""); +for(j = 0; j != D[153].length; ++j) if(D[153][j].charCodeAt(0) !== 0xFFFD) { e[D[153][j]] = 39168 + j; d[39168 + j] = D[153][j];} +D[154] = "����������������������������������������������������������������欯欰欱欳欴欵欶欸欻欼欽欿歀歁歂歄歅歈歊歋歍歎歏歐歑歒歓歔歕歖歗歘歚歛歜歝歞歟歠歡歨歩歫歬歭歮歯歰歱歲歳歴歵歶歷歸歺歽歾歿殀殅殈�殌殎殏殐殑殔殕殗殘殙殜殝殞殟殠殢殣殤殥殦殧殨殩殫殬殭殮殯殰殱殲殶殸殹殺殻殼殽殾毀毃毄毆毇毈毉毊毌毎毐毑毘毚毜毝毞毟毠毢毣毤毥毦毧毨毩毬毭毮毰毱毲毴毶毷毸毺毻毼毾毿氀氁氂氃氄氈氉氊氋氌氎氒気氜氝氞氠氣氥氫氬氭氱氳氶氷氹氺氻氼氾氿汃汄汅汈汋汌汍汎汏汑汒汓汖汘�".split(""); +for(j = 0; j != D[154].length; ++j) if(D[154][j].charCodeAt(0) !== 0xFFFD) { e[D[154][j]] = 39424 + j; d[39424 + j] = D[154][j];} +D[155] = "����������������������������������������������������������������汙汚汢汣汥汦汧汫汬汭汮汯汱汳汵汷汸決汻汼汿沀沄沇沊沋沍沎沑沒沕沖沗沘沚沜沝沞沠沢沨沬沯沰沴沵沶沷沺泀況泂泃泆泇泈泋泍泎泏泑泒泘�泙泚泜泝泟泤泦泧泩泬泭泲泴泹泿洀洂洃洅洆洈洉洊洍洏洐洑洓洔洕洖洘洜洝洟洠洡洢洣洤洦洨洩洬洭洯洰洴洶洷洸洺洿浀浂浄浉浌浐浕浖浗浘浛浝浟浡浢浤浥浧浨浫浬浭浰浱浲浳浵浶浹浺浻浽浾浿涀涁涃涄涆涇涊涋涍涏涐涒涖涗涘涙涚涜涢涥涬涭涰涱涳涴涶涷涹涺涻涼涽涾淁淂淃淈淉淊�".split(""); +for(j = 0; j != D[155].length; ++j) if(D[155][j].charCodeAt(0) !== 0xFFFD) { e[D[155][j]] = 39680 + j; d[39680 + j] = D[155][j];} +D[156] = "����������������������������������������������������������������淍淎淏淐淒淓淔淕淗淚淛淜淟淢淣淥淧淨淩淪淭淯淰淲淴淵淶淸淺淽淾淿渀渁渂渃渄渆渇済渉渋渏渒渓渕渘渙減渜渞渟渢渦渧渨渪測渮渰渱渳渵�渶渷渹渻渼渽渾渿湀湁湂湅湆湇湈湉湊湋湌湏湐湑湒湕湗湙湚湜湝湞湠湡湢湣湤湥湦湧湨湩湪湬湭湯湰湱湲湳湴湵湶湷湸湹湺湻湼湽満溁溂溄溇溈溊溋溌溍溎溑溒溓溔溕準溗溙溚溛溝溞溠溡溣溤溦溨溩溫溬溭溮溰溳溵溸溹溼溾溿滀滃滄滅滆滈滉滊滌滍滎滐滒滖滘滙滛滜滝滣滧滪滫滬滭滮滯�".split(""); +for(j = 0; j != D[156].length; ++j) if(D[156][j].charCodeAt(0) !== 0xFFFD) { e[D[156][j]] = 39936 + j; d[39936 + j] = D[156][j];} +D[157] = "����������������������������������������������������������������滰滱滲滳滵滶滷滸滺滻滼滽滾滿漀漁漃漄漅漇漈漊漋漌漍漎漐漑漒漖漗漘漙漚漛漜漝漞漟漡漢漣漥漦漧漨漬漮漰漲漴漵漷漸漹漺漻漼漽漿潀潁潂�潃潄潅潈潉潊潌潎潏潐潑潒潓潔潕潖潗潙潚潛潝潟潠潡潣潤潥潧潨潩潪潫潬潯潰潱潳潵潶潷潹潻潽潾潿澀澁澂澃澅澆澇澊澋澏澐澑澒澓澔澕澖澗澘澙澚澛澝澞澟澠澢澣澤澥澦澨澩澪澫澬澭澮澯澰澱澲澴澵澷澸澺澻澼澽澾澿濁濃濄濅濆濇濈濊濋濌濍濎濏濐濓濔濕濖濗濘濙濚濛濜濝濟濢濣濤濥�".split(""); +for(j = 0; j != D[157].length; ++j) if(D[157][j].charCodeAt(0) !== 0xFFFD) { e[D[157][j]] = 40192 + j; d[40192 + j] = D[157][j];} +D[158] = "����������������������������������������������������������������濦濧濨濩濪濫濬濭濰濱濲濳濴濵濶濷濸濹濺濻濼濽濾濿瀀瀁瀂瀃瀄瀅瀆瀇瀈瀉瀊瀋瀌瀍瀎瀏瀐瀒瀓瀔瀕瀖瀗瀘瀙瀜瀝瀞瀟瀠瀡瀢瀤瀥瀦瀧瀨瀩瀪�瀫瀬瀭瀮瀯瀰瀱瀲瀳瀴瀶瀷瀸瀺瀻瀼瀽瀾瀿灀灁灂灃灄灅灆灇灈灉灊灋灍灎灐灑灒灓灔灕灖灗灘灙灚灛灜灝灟灠灡灢灣灤灥灦灧灨灩灪灮灱灲灳灴灷灹灺灻災炁炂炃炄炆炇炈炋炌炍炏炐炑炓炗炘炚炛炞炟炠炡炢炣炤炥炦炧炨炩炪炰炲炴炵炶為炾炿烄烅烆烇烉烋烌烍烎烏烐烑烒烓烔烕烖烗烚�".split(""); +for(j = 0; j != D[158].length; ++j) if(D[158][j].charCodeAt(0) !== 0xFFFD) { e[D[158][j]] = 40448 + j; d[40448 + j] = D[158][j];} +D[159] = "����������������������������������������������������������������烜烝烞烠烡烢烣烥烪烮烰烱烲烳烴烵烶烸烺烻烼烾烿焀焁焂焃焄焅焆焇焈焋焌焍焎焏焑焒焔焗焛焜焝焞焟焠無焢焣焤焥焧焨焩焪焫焬焭焮焲焳焴�焵焷焸焹焺焻焼焽焾焿煀煁煂煃煄煆煇煈煉煋煍煏煐煑煒煓煔煕煖煗煘煙煚煛煝煟煠煡煢煣煥煩煪煫煬煭煯煰煱煴煵煶煷煹煻煼煾煿熀熁熂熃熅熆熇熈熉熋熌熍熎熐熑熒熓熕熖熗熚熛熜熝熞熡熢熣熤熥熦熧熩熪熫熭熮熯熰熱熲熴熶熷熸熺熻熼熽熾熿燀燁燂燄燅燆燇燈燉燊燋燌燍燏燐燑燒燓�".split(""); +for(j = 0; j != D[159].length; ++j) if(D[159][j].charCodeAt(0) !== 0xFFFD) { e[D[159][j]] = 40704 + j; d[40704 + j] = D[159][j];} +D[160] = "����������������������������������������������������������������燖燗燘燙燚燛燜燝燞營燡燢燣燤燦燨燩燪燫燬燭燯燰燱燲燳燴燵燶燷燸燺燻燼燽燾燿爀爁爂爃爄爅爇爈爉爊爋爌爍爎爏爐爑爒爓爔爕爖爗爘爙爚�爛爜爞爟爠爡爢爣爤爥爦爧爩爫爭爮爯爲爳爴爺爼爾牀牁牂牃牄牅牆牉牊牋牎牏牐牑牓牔牕牗牘牚牜牞牠牣牤牥牨牪牫牬牭牰牱牳牴牶牷牸牻牼牽犂犃犅犆犇犈犉犌犎犐犑犓犔犕犖犗犘犙犚犛犜犝犞犠犡犢犣犤犥犦犧犨犩犪犫犮犱犲犳犵犺犻犼犽犾犿狀狅狆狇狉狊狋狌狏狑狓狔狕狖狘狚狛�".split(""); +for(j = 0; j != D[160].length; ++j) if(D[160][j].charCodeAt(0) !== 0xFFFD) { e[D[160][j]] = 40960 + j; d[40960 + j] = D[160][j];} +D[161] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������　、。·ˉˇ¨〃々—～‖…‘’“”〔〕〈〉《》「」『』〖〗【】±×÷∶∧∨∑∏∪∩∈∷√⊥∥∠⌒⊙∫∮≡≌≈∽∝≠≮≯≤≥∞∵∴♂♀°′″℃＄¤￠￡‰§№☆★○●◎◇◆□■△▲※→←↑↓〓�".split(""); +for(j = 0; j != D[161].length; ++j) if(D[161][j].charCodeAt(0) !== 0xFFFD) { e[D[161][j]] = 41216 + j; d[41216 + j] = D[161][j];} +D[162] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������ⅰⅱⅲⅳⅴⅵⅶⅷⅸⅹ������⒈⒉⒊⒋⒌⒍⒎⒏⒐⒑⒒⒓⒔⒕⒖⒗⒘⒙⒚⒛⑴⑵⑶⑷⑸⑹⑺⑻⑼⑽⑾⑿⒀⒁⒂⒃⒄⒅⒆⒇①②③④⑤⑥⑦⑧⑨⑩��㈠㈡㈢㈣㈤㈥㈦㈧㈨㈩��ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩⅪⅫ���".split(""); +for(j = 0; j != D[162].length; ++j) if(D[162][j].charCodeAt(0) !== 0xFFFD) { e[D[162][j]] = 41472 + j; d[41472 + j] = D[162][j];} +D[163] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������！＂＃￥％＆＇（）＊＋，－．／０１２３４５６７８９：；＜＝＞？＠ＡＢＣＤＥＦＧＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ［＼］＾＿｀ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏｐｑｒｓｔｕｖｗｘｙｚ｛｜｝￣�".split(""); +for(j = 0; j != D[163].length; ++j) if(D[163][j].charCodeAt(0) !== 0xFFFD) { e[D[163][j]] = 41728 + j; d[41728 + j] = D[163][j];} +D[164] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのはばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをん������������".split(""); +for(j = 0; j != D[164].length; ++j) if(D[164][j].charCodeAt(0) !== 0xFFFD) { e[D[164][j]] = 41984 + j; d[41984 + j] = D[164][j];} +D[165] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハバパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ���������".split(""); +for(j = 0; j != D[165].length; ++j) if(D[165][j].charCodeAt(0) !== 0xFFFD) { e[D[165][j]] = 42240 + j; d[42240 + j] = D[165][j];} +D[166] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩ��������αβγδεζηθικλμνξοπρστυφχψω�������︵︶︹︺︿﹀︽︾﹁﹂﹃﹄��︻︼︷︸︱�︳︴����������".split(""); +for(j = 0; j != D[166].length; ++j) if(D[166][j].charCodeAt(0) !== 0xFFFD) { e[D[166][j]] = 42496 + j; d[42496 + j] = D[166][j];} +D[167] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ���������������абвгдеёжзийклмнопрстуфхцчшщъыьэюя��������������".split(""); +for(j = 0; j != D[167].length; ++j) if(D[167][j].charCodeAt(0) !== 0xFFFD) { e[D[167][j]] = 42752 + j; d[42752 + j] = D[167][j];} +D[168] = "����������������������������������������������������������������ˊˋ˙–―‥‵℅℉↖↗↘↙∕∟∣≒≦≧⊿═║╒╓╔╕╖╗╘╙╚╛╜╝╞╟╠╡╢╣╤╥╦╧╨╩╪╫╬╭╮╯╰╱╲╳▁▂▃▄▅▆▇�█▉▊▋▌▍▎▏▓▔▕▼▽◢◣◤◥☉⊕〒〝〞�����������āáǎàēéěèīíǐìōóǒòūúǔùǖǘǚǜüêɑ�ńň�ɡ����ㄅㄆㄇㄈㄉㄊㄋㄌㄍㄎㄏㄐㄑㄒㄓㄔㄕㄖㄗㄘㄙㄚㄛㄜㄝㄞㄟㄠㄡㄢㄣㄤㄥㄦㄧㄨㄩ����������������������".split(""); +for(j = 0; j != D[168].length; ++j) if(D[168][j].charCodeAt(0) !== 0xFFFD) { e[D[168][j]] = 43008 + j; d[43008 + j] = D[168][j];} +D[169] = "����������������������������������������������������������������〡〢〣〤〥〦〧〨〩㊣㎎㎏㎜㎝㎞㎡㏄㏎㏑㏒㏕︰￢￤�℡㈱�‐���ー゛゜ヽヾ〆ゝゞ﹉﹊﹋﹌﹍﹎﹏﹐﹑﹒﹔﹕﹖﹗﹙﹚﹛﹜﹝﹞﹟﹠﹡�﹢﹣﹤﹥﹦﹨﹩﹪﹫�������������〇�������������─━│┃┄┅┆┇┈┉┊┋┌┍┎┏┐┑┒┓└┕┖┗┘┙┚┛├┝┞┟┠┡┢┣┤┥┦┧┨┩┪┫┬┭┮┯┰┱┲┳┴┵┶┷┸┹┺┻┼┽┾┿╀╁╂╃╄╅╆╇╈╉╊╋����������������".split(""); +for(j = 0; j != D[169].length; ++j) if(D[169][j].charCodeAt(0) !== 0xFFFD) { e[D[169][j]] = 43264 + j; d[43264 + j] = D[169][j];} +D[170] = "����������������������������������������������������������������狜狝狟狢狣狤狥狦狧狪狫狵狶狹狽狾狿猀猂猄猅猆猇猈猉猋猌猍猏猐猑猒猔猘猙猚猟猠猣猤猦猧猨猭猯猰猲猳猵猶猺猻猼猽獀獁獂獃獄獅獆獇獈�獉獊獋獌獎獏獑獓獔獕獖獘獙獚獛獜獝獞獟獡獢獣獤獥獦獧獨獩獪獫獮獰獱�����������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[170].length; ++j) if(D[170][j].charCodeAt(0) !== 0xFFFD) { e[D[170][j]] = 43520 + j; d[43520 + j] = D[170][j];} +D[171] = "����������������������������������������������������������������獲獳獴獵獶獷獸獹獺獻獼獽獿玀玁玂玃玅玆玈玊玌玍玏玐玒玓玔玕玗玘玙玚玜玝玞玠玡玣玤玥玦玧玨玪玬玭玱玴玵玶玸玹玼玽玾玿珁珃珄珅珆珇�珋珌珎珒珓珔珕珖珗珘珚珛珜珝珟珡珢珣珤珦珨珪珫珬珮珯珰珱珳珴珵珶珷�����������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[171].length; ++j) if(D[171][j].charCodeAt(0) !== 0xFFFD) { e[D[171][j]] = 43776 + j; d[43776 + j] = D[171][j];} +D[172] = "����������������������������������������������������������������珸珹珺珻珼珽現珿琀琁琂琄琇琈琋琌琍琎琑琒琓琔琕琖琗琘琙琜琝琞琟琠琡琣琤琧琩琫琭琯琱琲琷琸琹琺琻琽琾琿瑀瑂瑃瑄瑅瑆瑇瑈瑉瑊瑋瑌瑍�瑎瑏瑐瑑瑒瑓瑔瑖瑘瑝瑠瑡瑢瑣瑤瑥瑦瑧瑨瑩瑪瑫瑬瑮瑯瑱瑲瑳瑴瑵瑸瑹瑺�����������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[172].length; ++j) if(D[172][j].charCodeAt(0) !== 0xFFFD) { e[D[172][j]] = 44032 + j; d[44032 + j] = D[172][j];} +D[173] = "����������������������������������������������������������������瑻瑼瑽瑿璂璄璅璆璈璉璊璌璍璏璑璒璓璔璕璖璗璘璙璚璛璝璟璠璡璢璣璤璥璦璪璫璬璭璮璯環璱璲璳璴璵璶璷璸璹璻璼璽璾璿瓀瓁瓂瓃瓄瓅瓆瓇�瓈瓉瓊瓋瓌瓍瓎瓏瓐瓑瓓瓔瓕瓖瓗瓘瓙瓚瓛瓝瓟瓡瓥瓧瓨瓩瓪瓫瓬瓭瓰瓱瓲�����������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[173].length; ++j) if(D[173][j].charCodeAt(0) !== 0xFFFD) { e[D[173][j]] = 44288 + j; d[44288 + j] = D[173][j];} +D[174] = "����������������������������������������������������������������瓳瓵瓸瓹瓺瓻瓼瓽瓾甀甁甂甃甅甆甇甈甉甊甋甌甎甐甒甔甕甖甗甛甝甞甠甡產産甤甦甧甪甮甴甶甹甼甽甿畁畂畃畄畆畇畉畊畍畐畑畒畓畕畖畗畘�畝畞畟畠畡畢畣畤畧畨畩畫畬畭畮畯異畱畳畵當畷畺畻畼畽畾疀疁疂疄疅疇�����������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[174].length; ++j) if(D[174][j].charCodeAt(0) !== 0xFFFD) { e[D[174][j]] = 44544 + j; d[44544 + j] = D[174][j];} +D[175] = "����������������������������������������������������������������疈疉疊疌疍疎疐疓疕疘疛疜疞疢疦疧疨疩疪疭疶疷疺疻疿痀痁痆痋痌痎痏痐痑痓痗痙痚痜痝痟痠痡痥痩痬痭痮痯痲痳痵痶痷痸痺痻痽痾瘂瘄瘆瘇�瘈瘉瘋瘍瘎瘏瘑瘒瘓瘔瘖瘚瘜瘝瘞瘡瘣瘧瘨瘬瘮瘯瘱瘲瘶瘷瘹瘺瘻瘽癁療癄�����������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[175].length; ++j) if(D[175][j].charCodeAt(0) !== 0xFFFD) { e[D[175][j]] = 44800 + j; d[44800 + j] = D[175][j];} +D[176] = "����������������������������������������������������������������癅癆癇癈癉癊癋癎癏癐癑癒癓癕癗癘癙癚癛癝癟癠癡癢癤癥癦癧癨癩癪癬癭癮癰癱癲癳癴癵癶癷癹発發癿皀皁皃皅皉皊皌皍皏皐皒皔皕皗皘皚皛�皜皝皞皟皠皡皢皣皥皦皧皨皩皪皫皬皭皯皰皳皵皶皷皸皹皺皻皼皽皾盀盁盃啊阿埃挨哎唉哀皑癌蔼矮艾碍爱隘鞍氨安俺按暗岸胺案肮昂盎凹敖熬翱袄傲奥懊澳芭捌扒叭吧笆八疤巴拔跋靶把耙坝霸罢爸白柏百摆佰败拜稗斑班搬扳般颁板版扮拌伴瓣半办绊邦帮梆榜膀绑棒磅蚌镑傍谤苞胞包褒剥�".split(""); +for(j = 0; j != D[176].length; ++j) if(D[176][j].charCodeAt(0) !== 0xFFFD) { e[D[176][j]] = 45056 + j; d[45056 + j] = D[176][j];} +D[177] = "����������������������������������������������������������������盄盇盉盋盌盓盕盙盚盜盝盞盠盡盢監盤盦盧盨盩盪盫盬盭盰盳盵盶盷盺盻盽盿眀眂眃眅眆眊県眎眏眐眑眒眓眔眕眖眗眘眛眜眝眞眡眣眤眥眧眪眫�眬眮眰眱眲眳眴眹眻眽眾眿睂睄睅睆睈睉睊睋睌睍睎睏睒睓睔睕睖睗睘睙睜薄雹保堡饱宝抱报暴豹鲍爆杯碑悲卑北辈背贝钡倍狈备惫焙被奔苯本笨崩绷甭泵蹦迸逼鼻比鄙笔彼碧蓖蔽毕毙毖币庇痹闭敝弊必辟壁臂避陛鞭边编贬扁便变卞辨辩辫遍标彪膘表鳖憋别瘪彬斌濒滨宾摈兵冰柄丙秉饼炳�".split(""); +for(j = 0; j != D[177].length; ++j) if(D[177][j].charCodeAt(0) !== 0xFFFD) { e[D[177][j]] = 45312 + j; d[45312 + j] = D[177][j];} +D[178] = "����������������������������������������������������������������睝睞睟睠睤睧睩睪睭睮睯睰睱睲睳睴睵睶睷睸睺睻睼瞁瞂瞃瞆瞇瞈瞉瞊瞋瞏瞐瞓瞔瞕瞖瞗瞘瞙瞚瞛瞜瞝瞞瞡瞣瞤瞦瞨瞫瞭瞮瞯瞱瞲瞴瞶瞷瞸瞹瞺�瞼瞾矀矁矂矃矄矅矆矇矈矉矊矋矌矎矏矐矑矒矓矔矕矖矘矙矚矝矞矟矠矡矤病并玻菠播拨钵波博勃搏铂箔伯帛舶脖膊渤泊驳捕卜哺补埠不布步簿部怖擦猜裁材才财睬踩采彩菜蔡餐参蚕残惭惨灿苍舱仓沧藏操糙槽曹草厕策侧册测层蹭插叉茬茶查碴搽察岔差诧拆柴豺搀掺蝉馋谗缠铲产阐颤昌猖�".split(""); +for(j = 0; j != D[178].length; ++j) if(D[178][j].charCodeAt(0) !== 0xFFFD) { e[D[178][j]] = 45568 + j; d[45568 + j] = D[178][j];} +D[179] = "����������������������������������������������������������������矦矨矪矯矰矱矲矴矵矷矹矺矻矼砃砄砅砆砇砈砊砋砎砏砐砓砕砙砛砞砠砡砢砤砨砪砫砮砯砱砲砳砵砶砽砿硁硂硃硄硆硈硉硊硋硍硏硑硓硔硘硙硚�硛硜硞硟硠硡硢硣硤硥硦硧硨硩硯硰硱硲硳硴硵硶硸硹硺硻硽硾硿碀碁碂碃场尝常长偿肠厂敞畅唱倡超抄钞朝嘲潮巢吵炒车扯撤掣彻澈郴臣辰尘晨忱沉陈趁衬撑称城橙成呈乘程惩澄诚承逞骋秤吃痴持匙池迟弛驰耻齿侈尺赤翅斥炽充冲虫崇宠抽酬畴踌稠愁筹仇绸瞅丑臭初出橱厨躇锄雏滁除楚�".split(""); +for(j = 0; j != D[179].length; ++j) if(D[179][j].charCodeAt(0) !== 0xFFFD) { e[D[179][j]] = 45824 + j; d[45824 + j] = D[179][j];} +D[180] = "����������������������������������������������������������������碄碅碆碈碊碋碏碐碒碔碕碖碙碝碞碠碢碤碦碨碩碪碫碬碭碮碯碵碶碷碸確碻碼碽碿磀磂磃磄磆磇磈磌磍磎磏磑磒磓磖磗磘磚磛磜磝磞磟磠磡磢磣�磤磥磦磧磩磪磫磭磮磯磰磱磳磵磶磸磹磻磼磽磾磿礀礂礃礄礆礇礈礉礊礋礌础储矗搐触处揣川穿椽传船喘串疮窗幢床闯创吹炊捶锤垂春椿醇唇淳纯蠢戳绰疵茨磁雌辞慈瓷词此刺赐次聪葱囱匆从丛凑粗醋簇促蹿篡窜摧崔催脆瘁粹淬翠村存寸磋撮搓措挫错搭达答瘩打大呆歹傣戴带殆代贷袋待逮�".split(""); +for(j = 0; j != D[180].length; ++j) if(D[180][j].charCodeAt(0) !== 0xFFFD) { e[D[180][j]] = 46080 + j; d[46080 + j] = D[180][j];} +D[181] = "����������������������������������������������������������������礍礎礏礐礑礒礔礕礖礗礘礙礚礛礜礝礟礠礡礢礣礥礦礧礨礩礪礫礬礭礮礯礰礱礲礳礵礶礷礸礹礽礿祂祃祄祅祇祊祋祌祍祎祏祐祑祒祔祕祘祙祡祣�祤祦祩祪祫祬祮祰祱祲祳祴祵祶祹祻祼祽祾祿禂禃禆禇禈禉禋禌禍禎禐禑禒怠耽担丹单郸掸胆旦氮但惮淡诞弹蛋当挡党荡档刀捣蹈倒岛祷导到稻悼道盗德得的蹬灯登等瞪凳邓堤低滴迪敌笛狄涤翟嫡抵底地蒂第帝弟递缔颠掂滇碘点典靛垫电佃甸店惦奠淀殿碉叼雕凋刁掉吊钓调跌爹碟蝶迭谍叠�".split(""); +for(j = 0; j != D[181].length; ++j) if(D[181][j].charCodeAt(0) !== 0xFFFD) { e[D[181][j]] = 46336 + j; d[46336 + j] = D[181][j];} +D[182] = "����������������������������������������������������������������禓禔禕禖禗禘禙禛禜禝禞禟禠禡禢禣禤禥禦禨禩禪禫禬禭禮禯禰禱禲禴禵禶禷禸禼禿秂秄秅秇秈秊秌秎秏秐秓秔秖秗秙秚秛秜秝秞秠秡秢秥秨秪�秬秮秱秲秳秴秵秶秷秹秺秼秾秿稁稄稅稇稈稉稊稌稏稐稑稒稓稕稖稘稙稛稜丁盯叮钉顶鼎锭定订丢东冬董懂动栋侗恫冻洞兜抖斗陡豆逗痘都督毒犊独读堵睹赌杜镀肚度渡妒端短锻段断缎堆兑队对墩吨蹲敦顿囤钝盾遁掇哆多夺垛躲朵跺舵剁惰堕蛾峨鹅俄额讹娥恶厄扼遏鄂饿恩而儿耳尔饵洱二�".split(""); +for(j = 0; j != D[182].length; ++j) if(D[182][j].charCodeAt(0) !== 0xFFFD) { e[D[182][j]] = 46592 + j; d[46592 + j] = D[182][j];} +D[183] = "����������������������������������������������������������������稝稟稡稢稤稥稦稧稨稩稪稫稬稭種稯稰稱稲稴稵稶稸稺稾穀穁穂穃穄穅穇穈穉穊穋穌積穎穏穐穒穓穔穕穖穘穙穚穛穜穝穞穟穠穡穢穣穤穥穦穧穨�穩穪穫穬穭穮穯穱穲穳穵穻穼穽穾窂窅窇窉窊窋窌窎窏窐窓窔窙窚窛窞窡窢贰发罚筏伐乏阀法珐藩帆番翻樊矾钒繁凡烦反返范贩犯饭泛坊芳方肪房防妨仿访纺放菲非啡飞肥匪诽吠肺废沸费芬酚吩氛分纷坟焚汾粉奋份忿愤粪丰封枫蜂峰锋风疯烽逢冯缝讽奉凤佛否夫敷肤孵扶拂辐幅氟符伏俘服�".split(""); +for(j = 0; j != D[183].length; ++j) if(D[183][j].charCodeAt(0) !== 0xFFFD) { e[D[183][j]] = 46848 + j; d[46848 + j] = D[183][j];} +D[184] = "����������������������������������������������������������������窣窤窧窩窪窫窮窯窰窱窲窴窵窶窷窸窹窺窻窼窽窾竀竁竂竃竄竅竆竇竈竉竊竌竍竎竏竐竑竒竓竔竕竗竘竚竛竜竝竡竢竤竧竨竩竪竫竬竮竰竱竲竳�竴竵競竷竸竻竼竾笀笁笂笅笇笉笌笍笎笐笒笓笖笗笘笚笜笝笟笡笢笣笧笩笭浮涪福袱弗甫抚辅俯釜斧脯腑府腐赴副覆赋复傅付阜父腹负富讣附妇缚咐噶嘎该改概钙盖溉干甘杆柑竿肝赶感秆敢赣冈刚钢缸肛纲岗港杠篙皋高膏羔糕搞镐稿告哥歌搁戈鸽胳疙割革葛格蛤阁隔铬个各给根跟耕更庚羹�".split(""); +for(j = 0; j != D[184].length; ++j) if(D[184][j].charCodeAt(0) !== 0xFFFD) { e[D[184][j]] = 47104 + j; d[47104 + j] = D[184][j];} +D[185] = "����������������������������������������������������������������笯笰笲笴笵笶笷笹笻笽笿筀筁筂筃筄筆筈筊筍筎筓筕筗筙筜筞筟筡筣筤筥筦筧筨筩筪筫筬筭筯筰筳筴筶筸筺筼筽筿箁箂箃箄箆箇箈箉箊箋箌箎箏�箑箒箓箖箘箙箚箛箞箟箠箣箤箥箮箯箰箲箳箵箶箷箹箺箻箼箽箾箿節篂篃範埂耿梗工攻功恭龚供躬公宫弓巩汞拱贡共钩勾沟苟狗垢构购够辜菇咕箍估沽孤姑鼓古蛊骨谷股故顾固雇刮瓜剐寡挂褂乖拐怪棺关官冠观管馆罐惯灌贯光广逛瑰规圭硅归龟闺轨鬼诡癸桂柜跪贵刽辊滚棍锅郭国果裹过哈�".split(""); +for(j = 0; j != D[185].length; ++j) if(D[185][j].charCodeAt(0) !== 0xFFFD) { e[D[185][j]] = 47360 + j; d[47360 + j] = D[185][j];} +D[186] = "����������������������������������������������������������������篅篈築篊篋篍篎篏篐篒篔篕篖篗篘篛篜篞篟篠篢篣篤篧篨篩篫篬篭篯篰篲篳篴篵篶篸篹篺篻篽篿簀簁簂簃簄簅簆簈簉簊簍簎簐簑簒簓簔簕簗簘簙�簚簛簜簝簞簠簡簢簣簤簥簨簩簫簬簭簮簯簰簱簲簳簴簵簶簷簹簺簻簼簽簾籂骸孩海氦亥害骇酣憨邯韩含涵寒函喊罕翰撼捍旱憾悍焊汗汉夯杭航壕嚎豪毫郝好耗号浩呵喝荷菏核禾和何合盒貉阂河涸赫褐鹤贺嘿黑痕很狠恨哼亨横衡恒轰哄烘虹鸿洪宏弘红喉侯猴吼厚候后呼乎忽瑚壶葫胡蝴狐糊湖�".split(""); +for(j = 0; j != D[186].length; ++j) if(D[186][j].charCodeAt(0) !== 0xFFFD) { e[D[186][j]] = 47616 + j; d[47616 + j] = D[186][j];} +D[187] = "����������������������������������������������������������������籃籄籅籆籇籈籉籊籋籌籎籏籐籑籒籓籔籕籖籗籘籙籚籛籜籝籞籟籠籡籢籣籤籥籦籧籨籩籪籫籬籭籮籯籰籱籲籵籶籷籸籹籺籾籿粀粁粂粃粄粅粆粇�粈粊粋粌粍粎粏粐粓粔粖粙粚粛粠粡粣粦粧粨粩粫粬粭粯粰粴粵粶粷粸粺粻弧虎唬护互沪户花哗华猾滑画划化话槐徊怀淮坏欢环桓还缓换患唤痪豢焕涣宦幻荒慌黄磺蝗簧皇凰惶煌晃幌恍谎灰挥辉徽恢蛔回毁悔慧卉惠晦贿秽会烩汇讳诲绘荤昏婚魂浑混豁活伙火获或惑霍货祸击圾基机畸稽积箕�".split(""); +for(j = 0; j != D[187].length; ++j) if(D[187][j].charCodeAt(0) !== 0xFFFD) { e[D[187][j]] = 47872 + j; d[47872 + j] = D[187][j];} +D[188] = "����������������������������������������������������������������粿糀糂糃糄糆糉糋糎糏糐糑糒糓糔糘糚糛糝糞糡糢糣糤糥糦糧糩糪糫糬糭糮糰糱糲糳糴糵糶糷糹糺糼糽糾糿紀紁紂紃約紅紆紇紈紉紋紌納紎紏紐�紑紒紓純紕紖紗紘紙級紛紜紝紞紟紡紣紤紥紦紨紩紪紬紭紮細紱紲紳紴紵紶肌饥迹激讥鸡姬绩缉吉极棘辑籍集及急疾汲即嫉级挤几脊己蓟技冀季伎祭剂悸济寄寂计记既忌际妓继纪嘉枷夹佳家加荚颊贾甲钾假稼价架驾嫁歼监坚尖笺间煎兼肩艰奸缄茧检柬碱硷拣捡简俭剪减荐槛鉴践贱见键箭件�".split(""); +for(j = 0; j != D[188].length; ++j) if(D[188][j].charCodeAt(0) !== 0xFFFD) { e[D[188][j]] = 48128 + j; d[48128 + j] = D[188][j];} +D[189] = "����������������������������������������������������������������紷紸紹紺紻紼紽紾紿絀絁終絃組絅絆絇絈絉絊絋経絍絎絏結絑絒絓絔絕絖絗絘絙絚絛絜絝絞絟絠絡絢絣絤絥給絧絨絩絪絫絬絭絯絰統絲絳絴絵絶�絸絹絺絻絼絽絾絿綀綁綂綃綄綅綆綇綈綉綊綋綌綍綎綏綐綑綒經綔綕綖綗綘健舰剑饯渐溅涧建僵姜将浆江疆蒋桨奖讲匠酱降蕉椒礁焦胶交郊浇骄娇嚼搅铰矫侥脚狡角饺缴绞剿教酵轿较叫窖揭接皆秸街阶截劫节桔杰捷睫竭洁结解姐戒藉芥界借介疥诫届巾筋斤金今津襟紧锦仅谨进靳晋禁近烬浸�".split(""); +for(j = 0; j != D[189].length; ++j) if(D[189][j].charCodeAt(0) !== 0xFFFD) { e[D[189][j]] = 48384 + j; d[48384 + j] = D[189][j];} +D[190] = "����������������������������������������������������������������継続綛綜綝綞綟綠綡綢綣綤綥綧綨綩綪綫綬維綯綰綱網綳綴綵綶綷綸綹綺綻綼綽綾綿緀緁緂緃緄緅緆緇緈緉緊緋緌緍緎総緐緑緒緓緔緕緖緗緘緙�線緛緜緝緞緟締緡緢緣緤緥緦緧編緩緪緫緬緭緮緯緰緱緲緳練緵緶緷緸緹緺尽劲荆兢茎睛晶鲸京惊精粳经井警景颈静境敬镜径痉靖竟竞净炯窘揪究纠玖韭久灸九酒厩救旧臼舅咎就疚鞠拘狙疽居驹菊局咀矩举沮聚拒据巨具距踞锯俱句惧炬剧捐鹃娟倦眷卷绢撅攫抉掘倔爵觉决诀绝均菌钧军君峻�".split(""); +for(j = 0; j != D[190].length; ++j) if(D[190][j].charCodeAt(0) !== 0xFFFD) { e[D[190][j]] = 48640 + j; d[48640 + j] = D[190][j];} +D[191] = "����������������������������������������������������������������緻緼緽緾緿縀縁縂縃縄縅縆縇縈縉縊縋縌縍縎縏縐縑縒縓縔縕縖縗縘縙縚縛縜縝縞縟縠縡縢縣縤縥縦縧縨縩縪縫縬縭縮縯縰縱縲縳縴縵縶縷縸縹�縺縼總績縿繀繂繃繄繅繆繈繉繊繋繌繍繎繏繐繑繒繓織繕繖繗繘繙繚繛繜繝俊竣浚郡骏喀咖卡咯开揩楷凯慨刊堪勘坎砍看康慷糠扛抗亢炕考拷烤靠坷苛柯棵磕颗科壳咳可渴克刻客课肯啃垦恳坑吭空恐孔控抠口扣寇枯哭窟苦酷库裤夸垮挎跨胯块筷侩快宽款匡筐狂框矿眶旷况亏盔岿窥葵奎魁傀�".split(""); +for(j = 0; j != D[191].length; ++j) if(D[191][j].charCodeAt(0) !== 0xFFFD) { e[D[191][j]] = 48896 + j; d[48896 + j] = D[191][j];} +D[192] = "����������������������������������������������������������������繞繟繠繡繢繣繤繥繦繧繨繩繪繫繬繭繮繯繰繱繲繳繴繵繶繷繸繹繺繻繼繽繾繿纀纁纃纄纅纆纇纈纉纊纋續纍纎纏纐纑纒纓纔纕纖纗纘纙纚纜纝纞�纮纴纻纼绖绤绬绹缊缐缞缷缹缻缼缽缾缿罀罁罃罆罇罈罉罊罋罌罍罎罏罒罓馈愧溃坤昆捆困括扩廓阔垃拉喇蜡腊辣啦莱来赖蓝婪栏拦篮阑兰澜谰揽览懒缆烂滥琅榔狼廊郎朗浪捞劳牢老佬姥酪烙涝勒乐雷镭蕾磊累儡垒擂肋类泪棱楞冷厘梨犁黎篱狸离漓理李里鲤礼莉荔吏栗丽厉励砾历利傈例俐�".split(""); +for(j = 0; j != D[192].length; ++j) if(D[192][j].charCodeAt(0) !== 0xFFFD) { e[D[192][j]] = 49152 + j; d[49152 + j] = D[192][j];} +D[193] = "����������������������������������������������������������������罖罙罛罜罝罞罠罣罤罥罦罧罫罬罭罯罰罳罵罶罷罸罺罻罼罽罿羀羂羃羄羅羆羇羈羉羋羍羏羐羑羒羓羕羖羗羘羙羛羜羠羢羣羥羦羨義羪羫羬羭羮羱�羳羴羵羶羷羺羻羾翀翂翃翄翆翇翈翉翋翍翏翐翑習翓翖翗翙翚翛翜翝翞翢翣痢立粒沥隶力璃哩俩联莲连镰廉怜涟帘敛脸链恋炼练粮凉梁粱良两辆量晾亮谅撩聊僚疗燎寥辽潦了撂镣廖料列裂烈劣猎琳林磷霖临邻鳞淋凛赁吝拎玲菱零龄铃伶羚凌灵陵岭领另令溜琉榴硫馏留刘瘤流柳六龙聋咙笼窿�".split(""); +for(j = 0; j != D[193].length; ++j) if(D[193][j].charCodeAt(0) !== 0xFFFD) { e[D[193][j]] = 49408 + j; d[49408 + j] = D[193][j];} +D[194] = "����������������������������������������������������������������翤翧翨翪翫翬翭翯翲翴翵翶翷翸翹翺翽翾翿耂耇耈耉耊耎耏耑耓耚耛耝耞耟耡耣耤耫耬耭耮耯耰耲耴耹耺耼耾聀聁聄聅聇聈聉聎聏聐聑聓聕聖聗�聙聛聜聝聞聟聠聡聢聣聤聥聦聧聨聫聬聭聮聯聰聲聳聴聵聶職聸聹聺聻聼聽隆垄拢陇楼娄搂篓漏陋芦卢颅庐炉掳卤虏鲁麓碌露路赂鹿潞禄录陆戮驴吕铝侣旅履屡缕虑氯律率滤绿峦挛孪滦卵乱掠略抡轮伦仑沦纶论萝螺罗逻锣箩骡裸落洛骆络妈麻玛码蚂马骂嘛吗埋买麦卖迈脉瞒馒蛮满蔓曼慢漫�".split(""); +for(j = 0; j != D[194].length; ++j) if(D[194][j].charCodeAt(0) !== 0xFFFD) { e[D[194][j]] = 49664 + j; d[49664 + j] = D[194][j];} +D[195] = "����������������������������������������������������������������聾肁肂肅肈肊肍肎肏肐肑肒肔肕肗肙肞肣肦肧肨肬肰肳肵肶肸肹肻胅胇胈胉胊胋胏胐胑胒胓胔胕胘胟胠胢胣胦胮胵胷胹胻胾胿脀脁脃脄脅脇脈脋�脌脕脗脙脛脜脝脟脠脡脢脣脤脥脦脧脨脩脪脫脭脮脰脳脴脵脷脹脺脻脼脽脿谩芒茫盲氓忙莽猫茅锚毛矛铆卯茂冒帽貌贸么玫枚梅酶霉煤没眉媒镁每美昧寐妹媚门闷们萌蒙檬盟锰猛梦孟眯醚靡糜迷谜弥米秘觅泌蜜密幂棉眠绵冕免勉娩缅面苗描瞄藐秒渺庙妙蔑灭民抿皿敏悯闽明螟鸣铭名命谬摸�".split(""); +for(j = 0; j != D[195].length; ++j) if(D[195][j].charCodeAt(0) !== 0xFFFD) { e[D[195][j]] = 49920 + j; d[49920 + j] = D[195][j];} +D[196] = "����������������������������������������������������������������腀腁腂腃腄腅腇腉腍腎腏腒腖腗腘腛腜腝腞腟腡腢腣腤腦腨腪腫腬腯腲腳腵腶腷腸膁膃膄膅膆膇膉膋膌膍膎膐膒膓膔膕膖膗膙膚膞膟膠膡膢膤膥�膧膩膫膬膭膮膯膰膱膲膴膵膶膷膸膹膼膽膾膿臄臅臇臈臉臋臍臎臏臐臑臒臓摹蘑模膜磨摩魔抹末莫墨默沫漠寞陌谋牟某拇牡亩姆母墓暮幕募慕木目睦牧穆拿哪呐钠那娜纳氖乃奶耐奈南男难囊挠脑恼闹淖呢馁内嫩能妮霓倪泥尼拟你匿腻逆溺蔫拈年碾撵捻念娘酿鸟尿捏聂孽啮镊镍涅您柠狞凝宁�".split(""); +for(j = 0; j != D[196].length; ++j) if(D[196][j].charCodeAt(0) !== 0xFFFD) { e[D[196][j]] = 50176 + j; d[50176 + j] = D[196][j];} +D[197] = "����������������������������������������������������������������臔臕臖臗臘臙臚臛臜臝臞臟臠臡臢臤臥臦臨臩臫臮臯臰臱臲臵臶臷臸臹臺臽臿舃與興舉舊舋舎舏舑舓舕舖舗舘舙舚舝舠舤舥舦舧舩舮舲舺舼舽舿�艀艁艂艃艅艆艈艊艌艍艎艐艑艒艓艔艕艖艗艙艛艜艝艞艠艡艢艣艤艥艦艧艩拧泞牛扭钮纽脓浓农弄奴努怒女暖虐疟挪懦糯诺哦欧鸥殴藕呕偶沤啪趴爬帕怕琶拍排牌徘湃派攀潘盘磐盼畔判叛乓庞旁耪胖抛咆刨炮袍跑泡呸胚培裴赔陪配佩沛喷盆砰抨烹澎彭蓬棚硼篷膨朋鹏捧碰坯砒霹批披劈琵毗�".split(""); +for(j = 0; j != D[197].length; ++j) if(D[197][j].charCodeAt(0) !== 0xFFFD) { e[D[197][j]] = 50432 + j; d[50432 + j] = D[197][j];} +D[198] = "����������������������������������������������������������������艪艫艬艭艱艵艶艷艸艻艼芀芁芃芅芆芇芉芌芐芓芔芕芖芚芛芞芠芢芣芧芲芵芶芺芻芼芿苀苂苃苅苆苉苐苖苙苚苝苢苧苨苩苪苬苭苮苰苲苳苵苶苸�苺苼苽苾苿茀茊茋茍茐茒茓茖茘茙茝茞茟茠茡茢茣茤茥茦茩茪茮茰茲茷茻茽啤脾疲皮匹痞僻屁譬篇偏片骗飘漂瓢票撇瞥拼频贫品聘乒坪苹萍平凭瓶评屏坡泼颇婆破魄迫粕剖扑铺仆莆葡菩蒲埔朴圃普浦谱曝瀑期欺栖戚妻七凄漆柒沏其棋奇歧畦崎脐齐旗祈祁骑起岂乞企启契砌器气迄弃汽泣讫掐�".split(""); +for(j = 0; j != D[198].length; ++j) if(D[198][j].charCodeAt(0) !== 0xFFFD) { e[D[198][j]] = 50688 + j; d[50688 + j] = D[198][j];} +D[199] = "����������������������������������������������������������������茾茿荁荂荄荅荈荊荋荌荍荎荓荕荖荗荘荙荝荢荰荱荲荳荴荵荶荹荺荾荿莀莁莂莃莄莇莈莊莋莌莍莏莐莑莔莕莖莗莙莚莝莟莡莢莣莤莥莦莧莬莭莮�莯莵莻莾莿菂菃菄菆菈菉菋菍菎菐菑菒菓菕菗菙菚菛菞菢菣菤菦菧菨菫菬菭恰洽牵扦钎铅千迁签仟谦乾黔钱钳前潜遣浅谴堑嵌欠歉枪呛腔羌墙蔷强抢橇锹敲悄桥瞧乔侨巧鞘撬翘峭俏窍切茄且怯窃钦侵亲秦琴勤芹擒禽寝沁青轻氢倾卿清擎晴氰情顷请庆琼穷秋丘邱球求囚酋泅趋区蛆曲躯屈驱渠�".split(""); +for(j = 0; j != D[199].length; ++j) if(D[199][j].charCodeAt(0) !== 0xFFFD) { e[D[199][j]] = 50944 + j; d[50944 + j] = D[199][j];} +D[200] = "����������������������������������������������������������������菮華菳菴菵菶菷菺菻菼菾菿萀萂萅萇萈萉萊萐萒萓萔萕萖萗萙萚萛萞萟萠萡萢萣萩萪萫萬萭萮萯萰萲萳萴萵萶萷萹萺萻萾萿葀葁葂葃葄葅葇葈葉�葊葋葌葍葎葏葐葒葓葔葕葖葘葝葞葟葠葢葤葥葦葧葨葪葮葯葰葲葴葷葹葻葼取娶龋趣去圈颧权醛泉全痊拳犬券劝缺炔瘸却鹊榷确雀裙群然燃冉染瓤壤攘嚷让饶扰绕惹热壬仁人忍韧任认刃妊纫扔仍日戎茸蓉荣融熔溶容绒冗揉柔肉茹蠕儒孺如辱乳汝入褥软阮蕊瑞锐闰润若弱撒洒萨腮鳃塞赛三叁�".split(""); +for(j = 0; j != D[200].length; ++j) if(D[200][j].charCodeAt(0) !== 0xFFFD) { e[D[200][j]] = 51200 + j; d[51200 + j] = D[200][j];} +D[201] = "����������������������������������������������������������������葽葾葿蒀蒁蒃蒄蒅蒆蒊蒍蒏蒐蒑蒒蒓蒔蒕蒖蒘蒚蒛蒝蒞蒟蒠蒢蒣蒤蒥蒦蒧蒨蒩蒪蒫蒬蒭蒮蒰蒱蒳蒵蒶蒷蒻蒼蒾蓀蓂蓃蓅蓆蓇蓈蓋蓌蓎蓏蓒蓔蓕蓗�蓘蓙蓚蓛蓜蓞蓡蓢蓤蓧蓨蓩蓪蓫蓭蓮蓯蓱蓲蓳蓴蓵蓶蓷蓸蓹蓺蓻蓽蓾蔀蔁蔂伞散桑嗓丧搔骚扫嫂瑟色涩森僧莎砂杀刹沙纱傻啥煞筛晒珊苫杉山删煽衫闪陕擅赡膳善汕扇缮墒伤商赏晌上尚裳梢捎稍烧芍勺韶少哨邵绍奢赊蛇舌舍赦摄射慑涉社设砷申呻伸身深娠绅神沈审婶甚肾慎渗声生甥牲升绳�".split(""); +for(j = 0; j != D[201].length; ++j) if(D[201][j].charCodeAt(0) !== 0xFFFD) { e[D[201][j]] = 51456 + j; d[51456 + j] = D[201][j];} +D[202] = "����������������������������������������������������������������蔃蔄蔅蔆蔇蔈蔉蔊蔋蔍蔎蔏蔐蔒蔔蔕蔖蔘蔙蔛蔜蔝蔞蔠蔢蔣蔤蔥蔦蔧蔨蔩蔪蔭蔮蔯蔰蔱蔲蔳蔴蔵蔶蔾蔿蕀蕁蕂蕄蕅蕆蕇蕋蕌蕍蕎蕏蕐蕑蕒蕓蕔蕕�蕗蕘蕚蕛蕜蕝蕟蕠蕡蕢蕣蕥蕦蕧蕩蕪蕫蕬蕭蕮蕯蕰蕱蕳蕵蕶蕷蕸蕼蕽蕿薀薁省盛剩胜圣师失狮施湿诗尸虱十石拾时什食蚀实识史矢使屎驶始式示士世柿事拭誓逝势是嗜噬适仕侍释饰氏市恃室视试收手首守寿授售受瘦兽蔬枢梳殊抒输叔舒淑疏书赎孰熟薯暑曙署蜀黍鼠属术述树束戍竖墅庶数漱�".split(""); +for(j = 0; j != D[202].length; ++j) if(D[202][j].charCodeAt(0) !== 0xFFFD) { e[D[202][j]] = 51712 + j; d[51712 + j] = D[202][j];} +D[203] = "����������������������������������������������������������������薂薃薆薈薉薊薋薌薍薎薐薑薒薓薔薕薖薗薘薙薚薝薞薟薠薡薢薣薥薦薧薩薫薬薭薱薲薳薴薵薶薸薺薻薼薽薾薿藀藂藃藄藅藆藇藈藊藋藌藍藎藑藒�藔藖藗藘藙藚藛藝藞藟藠藡藢藣藥藦藧藨藪藫藬藭藮藯藰藱藲藳藴藵藶藷藸恕刷耍摔衰甩帅栓拴霜双爽谁水睡税吮瞬顺舜说硕朔烁斯撕嘶思私司丝死肆寺嗣四伺似饲巳松耸怂颂送宋讼诵搜艘擞嗽苏酥俗素速粟僳塑溯宿诉肃酸蒜算虽隋随绥髓碎岁穗遂隧祟孙损笋蓑梭唆缩琐索锁所塌他它她塔�".split(""); +for(j = 0; j != D[203].length; ++j) if(D[203][j].charCodeAt(0) !== 0xFFFD) { e[D[203][j]] = 51968 + j; d[51968 + j] = D[203][j];} +D[204] = "����������������������������������������������������������������藹藺藼藽藾蘀蘁蘂蘃蘄蘆蘇蘈蘉蘊蘋蘌蘍蘎蘏蘐蘒蘓蘔蘕蘗蘘蘙蘚蘛蘜蘝蘞蘟蘠蘡蘢蘣蘤蘥蘦蘨蘪蘫蘬蘭蘮蘯蘰蘱蘲蘳蘴蘵蘶蘷蘹蘺蘻蘽蘾蘿虀�虁虂虃虄虅虆虇虈虉虊虋虌虒虓處虖虗虘虙虛虜虝號虠虡虣虤虥虦虧虨虩虪獭挞蹋踏胎苔抬台泰酞太态汰坍摊贪瘫滩坛檀痰潭谭谈坦毯袒碳探叹炭汤塘搪堂棠膛唐糖倘躺淌趟烫掏涛滔绦萄桃逃淘陶讨套特藤腾疼誊梯剔踢锑提题蹄啼体替嚏惕涕剃屉天添填田甜恬舔腆挑条迢眺跳贴铁帖厅听烃�".split(""); +for(j = 0; j != D[204].length; ++j) if(D[204][j].charCodeAt(0) !== 0xFFFD) { e[D[204][j]] = 52224 + j; d[52224 + j] = D[204][j];} +D[205] = "����������������������������������������������������������������虭虯虰虲虳虴虵虶虷虸蚃蚄蚅蚆蚇蚈蚉蚎蚏蚐蚑蚒蚔蚖蚗蚘蚙蚚蚛蚞蚟蚠蚡蚢蚥蚦蚫蚭蚮蚲蚳蚷蚸蚹蚻蚼蚽蚾蚿蛁蛂蛃蛅蛈蛌蛍蛒蛓蛕蛖蛗蛚蛜�蛝蛠蛡蛢蛣蛥蛦蛧蛨蛪蛫蛬蛯蛵蛶蛷蛺蛻蛼蛽蛿蜁蜄蜅蜆蜋蜌蜎蜏蜐蜑蜔蜖汀廷停亭庭挺艇通桐酮瞳同铜彤童桶捅筒统痛偷投头透凸秃突图徒途涂屠土吐兔湍团推颓腿蜕褪退吞屯臀拖托脱鸵陀驮驼椭妥拓唾挖哇蛙洼娃瓦袜歪外豌弯湾玩顽丸烷完碗挽晚皖惋宛婉万腕汪王亡枉网往旺望忘妄威�".split(""); +for(j = 0; j != D[205].length; ++j) if(D[205][j].charCodeAt(0) !== 0xFFFD) { e[D[205][j]] = 52480 + j; d[52480 + j] = D[205][j];} +D[206] = "����������������������������������������������������������������蜙蜛蜝蜟蜠蜤蜦蜧蜨蜪蜫蜬蜭蜯蜰蜲蜳蜵蜶蜸蜹蜺蜼蜽蝀蝁蝂蝃蝄蝅蝆蝊蝋蝍蝏蝐蝑蝒蝔蝕蝖蝘蝚蝛蝜蝝蝞蝟蝡蝢蝦蝧蝨蝩蝪蝫蝬蝭蝯蝱蝲蝳蝵�蝷蝸蝹蝺蝿螀螁螄螆螇螉螊螌螎螏螐螑螒螔螕螖螘螙螚螛螜螝螞螠螡螢螣螤巍微危韦违桅围唯惟为潍维苇萎委伟伪尾纬未蔚味畏胃喂魏位渭谓尉慰卫瘟温蚊文闻纹吻稳紊问嗡翁瓮挝蜗涡窝我斡卧握沃巫呜钨乌污诬屋无芜梧吾吴毋武五捂午舞伍侮坞戊雾晤物勿务悟误昔熙析西硒矽晰嘻吸锡牺�".split(""); +for(j = 0; j != D[206].length; ++j) if(D[206][j].charCodeAt(0) !== 0xFFFD) { e[D[206][j]] = 52736 + j; d[52736 + j] = D[206][j];} +D[207] = "����������������������������������������������������������������螥螦螧螩螪螮螰螱螲螴螶螷螸螹螻螼螾螿蟁蟂蟃蟄蟅蟇蟈蟉蟌蟍蟎蟏蟐蟔蟕蟖蟗蟘蟙蟚蟜蟝蟞蟟蟡蟢蟣蟤蟦蟧蟨蟩蟫蟬蟭蟯蟰蟱蟲蟳蟴蟵蟶蟷蟸�蟺蟻蟼蟽蟿蠀蠁蠂蠄蠅蠆蠇蠈蠉蠋蠌蠍蠎蠏蠐蠑蠒蠔蠗蠘蠙蠚蠜蠝蠞蠟蠠蠣稀息希悉膝夕惜熄烯溪汐犀檄袭席习媳喜铣洗系隙戏细瞎虾匣霞辖暇峡侠狭下厦夏吓掀锨先仙鲜纤咸贤衔舷闲涎弦嫌显险现献县腺馅羡宪陷限线相厢镶香箱襄湘乡翔祥详想响享项巷橡像向象萧硝霄削哮嚣销消宵淆晓�".split(""); +for(j = 0; j != D[207].length; ++j) if(D[207][j].charCodeAt(0) !== 0xFFFD) { e[D[207][j]] = 52992 + j; d[52992 + j] = D[207][j];} +D[208] = "����������������������������������������������������������������蠤蠥蠦蠧蠨蠩蠪蠫蠬蠭蠮蠯蠰蠱蠳蠴蠵蠶蠷蠸蠺蠻蠽蠾蠿衁衂衃衆衇衈衉衊衋衎衏衐衑衒術衕衖衘衚衛衜衝衞衟衠衦衧衪衭衯衱衳衴衵衶衸衹衺�衻衼袀袃袆袇袉袊袌袎袏袐袑袓袔袕袗袘袙袚袛袝袞袟袠袡袣袥袦袧袨袩袪小孝校肖啸笑效楔些歇蝎鞋协挟携邪斜胁谐写械卸蟹懈泄泻谢屑薪芯锌欣辛新忻心信衅星腥猩惺兴刑型形邢行醒幸杏性姓兄凶胸匈汹雄熊休修羞朽嗅锈秀袖绣墟戌需虚嘘须徐许蓄酗叙旭序畜恤絮婿绪续轩喧宣悬旋玄�".split(""); +for(j = 0; j != D[208].length; ++j) if(D[208][j].charCodeAt(0) !== 0xFFFD) { e[D[208][j]] = 53248 + j; d[53248 + j] = D[208][j];} +D[209] = "����������������������������������������������������������������袬袮袯袰袲袳袴袵袶袸袹袺袻袽袾袿裀裃裄裇裈裊裋裌裍裏裐裑裓裖裗裚裛補裝裞裠裡裦裧裩裪裫裬裭裮裯裲裵裶裷裺裻製裿褀褁褃褄褅褆複褈�褉褋褌褍褎褏褑褔褕褖褗褘褜褝褞褟褠褢褣褤褦褧褨褩褬褭褮褯褱褲褳褵褷选癣眩绚靴薛学穴雪血勋熏循旬询寻驯巡殉汛训讯逊迅压押鸦鸭呀丫芽牙蚜崖衙涯雅哑亚讶焉咽阉烟淹盐严研蜒岩延言颜阎炎沿奄掩眼衍演艳堰燕厌砚雁唁彦焰宴谚验殃央鸯秧杨扬佯疡羊洋阳氧仰痒养样漾邀腰妖瑶�".split(""); +for(j = 0; j != D[209].length; ++j) if(D[209][j].charCodeAt(0) !== 0xFFFD) { e[D[209][j]] = 53504 + j; d[53504 + j] = D[209][j];} +D[210] = "����������������������������������������������������������������褸褹褺褻褼褽褾褿襀襂襃襅襆襇襈襉襊襋襌襍襎襏襐襑襒襓襔襕襖襗襘襙襚襛襜襝襠襡襢襣襤襥襧襨襩襪襫襬襭襮襯襰襱襲襳襴襵襶襷襸襹襺襼�襽襾覀覂覄覅覇覈覉覊見覌覍覎規覐覑覒覓覔覕視覗覘覙覚覛覜覝覞覟覠覡摇尧遥窑谣姚咬舀药要耀椰噎耶爷野冶也页掖业叶曳腋夜液一壹医揖铱依伊衣颐夷遗移仪胰疑沂宜姨彝椅蚁倚已乙矣以艺抑易邑屹亿役臆逸肄疫亦裔意毅忆义益溢诣议谊译异翼翌绎茵荫因殷音阴姻吟银淫寅饮尹引隐�".split(""); +for(j = 0; j != D[210].length; ++j) if(D[210][j].charCodeAt(0) !== 0xFFFD) { e[D[210][j]] = 53760 + j; d[53760 + j] = D[210][j];} +D[211] = "����������������������������������������������������������������覢覣覤覥覦覧覨覩親覫覬覭覮覯覰覱覲観覴覵覶覷覸覹覺覻覼覽覾覿觀觃觍觓觔觕觗觘觙觛觝觟觠觡觢觤觧觨觩觪觬觭觮觰觱觲觴觵觶觷觸觹觺�觻觼觽觾觿訁訂訃訄訅訆計訉訊訋訌訍討訏訐訑訒訓訔訕訖託記訙訚訛訜訝印英樱婴鹰应缨莹萤营荧蝇迎赢盈影颖硬映哟拥佣臃痈庸雍踊蛹咏泳涌永恿勇用幽优悠忧尤由邮铀犹油游酉有友右佑釉诱又幼迂淤于盂榆虞愚舆余俞逾鱼愉渝渔隅予娱雨与屿禹宇语羽玉域芋郁吁遇喻峪御愈欲狱育誉�".split(""); +for(j = 0; j != D[211].length; ++j) if(D[211][j].charCodeAt(0) !== 0xFFFD) { e[D[211][j]] = 54016 + j; d[54016 + j] = D[211][j];} +D[212] = "����������������������������������������������������������������訞訟訠訡訢訣訤訥訦訧訨訩訪訫訬設訮訯訰許訲訳訴訵訶訷訸訹診註証訽訿詀詁詂詃詄詅詆詇詉詊詋詌詍詎詏詐詑詒詓詔評詖詗詘詙詚詛詜詝詞�詟詠詡詢詣詤詥試詧詨詩詪詫詬詭詮詯詰話該詳詴詵詶詷詸詺詻詼詽詾詿誀浴寓裕预豫驭鸳渊冤元垣袁原援辕园员圆猿源缘远苑愿怨院曰约越跃钥岳粤月悦阅耘云郧匀陨允运蕴酝晕韵孕匝砸杂栽哉灾宰载再在咱攒暂赞赃脏葬遭糟凿藻枣早澡蚤躁噪造皂灶燥责择则泽贼怎增憎曾赠扎喳渣札轧�".split(""); +for(j = 0; j != D[212].length; ++j) if(D[212][j].charCodeAt(0) !== 0xFFFD) { e[D[212][j]] = 54272 + j; d[54272 + j] = D[212][j];} +D[213] = "����������������������������������������������������������������誁誂誃誄誅誆誇誈誋誌認誎誏誐誑誒誔誕誖誗誘誙誚誛誜誝語誟誠誡誢誣誤誥誦誧誨誩說誫説読誮誯誰誱課誳誴誵誶誷誸誹誺誻誼誽誾調諀諁諂�諃諄諅諆談諈諉諊請諌諍諎諏諐諑諒諓諔諕論諗諘諙諚諛諜諝諞諟諠諡諢諣铡闸眨栅榨咋乍炸诈摘斋宅窄债寨瞻毡詹粘沾盏斩辗崭展蘸栈占战站湛绽樟章彰漳张掌涨杖丈帐账仗胀瘴障招昭找沼赵照罩兆肇召遮折哲蛰辙者锗蔗这浙珍斟真甄砧臻贞针侦枕疹诊震振镇阵蒸挣睁征狰争怔整拯正政�".split(""); +for(j = 0; j != D[213].length; ++j) if(D[213][j].charCodeAt(0) !== 0xFFFD) { e[D[213][j]] = 54528 + j; d[54528 + j] = D[213][j];} +D[214] = "����������������������������������������������������������������諤諥諦諧諨諩諪諫諬諭諮諯諰諱諲諳諴諵諶諷諸諹諺諻諼諽諾諿謀謁謂謃謄謅謆謈謉謊謋謌謍謎謏謐謑謒謓謔謕謖謗謘謙謚講謜謝謞謟謠謡謢謣�謤謥謧謨謩謪謫謬謭謮謯謰謱謲謳謴謵謶謷謸謹謺謻謼謽謾謿譀譁譂譃譄譅帧症郑证芝枝支吱蜘知肢脂汁之织职直植殖执值侄址指止趾只旨纸志挚掷至致置帜峙制智秩稚质炙痔滞治窒中盅忠钟衷终种肿重仲众舟周州洲诌粥轴肘帚咒皱宙昼骤珠株蛛朱猪诸诛逐竹烛煮拄瞩嘱主著柱助蛀贮铸筑�".split(""); +for(j = 0; j != D[214].length; ++j) if(D[214][j].charCodeAt(0) !== 0xFFFD) { e[D[214][j]] = 54784 + j; d[54784 + j] = D[214][j];} +D[215] = "����������������������������������������������������������������譆譇譈證譊譋譌譍譎譏譐譑譒譓譔譕譖譗識譙譚譛譜譝譞譟譠譡譢譣譤譥譧譨譩譪譫譭譮譯議譱譲譳譴譵譶護譸譹譺譻譼譽譾譿讀讁讂讃讄讅讆�讇讈讉變讋讌讍讎讏讐讑讒讓讔讕讖讗讘讙讚讛讜讝讞讟讬讱讻诇诐诪谉谞住注祝驻抓爪拽专砖转撰赚篆桩庄装妆撞壮状椎锥追赘坠缀谆准捉拙卓桌琢茁酌啄着灼浊兹咨资姿滋淄孜紫仔籽滓子自渍字鬃棕踪宗综总纵邹走奏揍租足卒族祖诅阻组钻纂嘴醉最罪尊遵昨左佐柞做作坐座������".split(""); +for(j = 0; j != D[215].length; ++j) if(D[215][j].charCodeAt(0) !== 0xFFFD) { e[D[215][j]] = 55040 + j; d[55040 + j] = D[215][j];} +D[216] = "����������������������������������������������������������������谸谹谺谻谼谽谾谿豀豂豃豄豅豈豊豋豍豎豏豐豑豒豓豔豖豗豘豙豛豜豝豞豟豠豣豤豥豦豧豨豩豬豭豮豯豰豱豲豴豵豶豷豻豼豽豾豿貀貁貃貄貆貇�貈貋貍貎貏貐貑貒貓貕貖貗貙貚貛貜貝貞貟負財貢貣貤貥貦貧貨販貪貫責貭亍丌兀丐廿卅丕亘丞鬲孬噩丨禺丿匕乇夭爻卮氐囟胤馗毓睾鼗丶亟鼐乜乩亓芈孛啬嘏仄厍厝厣厥厮靥赝匚叵匦匮匾赜卦卣刂刈刎刭刳刿剀剌剞剡剜蒯剽劂劁劐劓冂罔亻仃仉仂仨仡仫仞伛仳伢佤仵伥伧伉伫佞佧攸佚佝�".split(""); +for(j = 0; j != D[216].length; ++j) if(D[216][j].charCodeAt(0) !== 0xFFFD) { e[D[216][j]] = 55296 + j; d[55296 + j] = D[216][j];} +D[217] = "����������������������������������������������������������������貮貯貰貱貲貳貴貵貶買貸貹貺費貼貽貾貿賀賁賂賃賄賅賆資賈賉賊賋賌賍賎賏賐賑賒賓賔賕賖賗賘賙賚賛賜賝賞賟賠賡賢賣賤賥賦賧賨賩質賫賬�賭賮賯賰賱賲賳賴賵賶賷賸賹賺賻購賽賾賿贀贁贂贃贄贅贆贇贈贉贊贋贌贍佟佗伲伽佶佴侑侉侃侏佾佻侪佼侬侔俦俨俪俅俚俣俜俑俟俸倩偌俳倬倏倮倭俾倜倌倥倨偾偃偕偈偎偬偻傥傧傩傺僖儆僭僬僦僮儇儋仝氽佘佥俎龠汆籴兮巽黉馘冁夔勹匍訇匐凫夙兕亠兖亳衮袤亵脔裒禀嬴蠃羸冫冱冽冼�".split(""); +for(j = 0; j != D[217].length; ++j) if(D[217][j].charCodeAt(0) !== 0xFFFD) { e[D[217][j]] = 55552 + j; d[55552 + j] = D[217][j];} +D[218] = "����������������������������������������������������������������贎贏贐贑贒贓贔贕贖贗贘贙贚贛贜贠赑赒赗赟赥赨赩赪赬赮赯赱赲赸赹赺赻赼赽赾赿趀趂趃趆趇趈趉趌趍趎趏趐趒趓趕趖趗趘趙趚趛趜趝趞趠趡�趢趤趥趦趧趨趩趪趫趬趭趮趯趰趲趶趷趹趻趽跀跁跂跅跇跈跉跊跍跐跒跓跔凇冖冢冥讠讦讧讪讴讵讷诂诃诋诏诎诒诓诔诖诘诙诜诟诠诤诨诩诮诰诳诶诹诼诿谀谂谄谇谌谏谑谒谔谕谖谙谛谘谝谟谠谡谥谧谪谫谮谯谲谳谵谶卩卺阝阢阡阱阪阽阼陂陉陔陟陧陬陲陴隈隍隗隰邗邛邝邙邬邡邴邳邶邺�".split(""); +for(j = 0; j != D[218].length; ++j) if(D[218][j].charCodeAt(0) !== 0xFFFD) { e[D[218][j]] = 55808 + j; d[55808 + j] = D[218][j];} +D[219] = "����������������������������������������������������������������跕跘跙跜跠跡跢跥跦跧跩跭跮跰跱跲跴跶跼跾跿踀踁踂踃踄踆踇踈踋踍踎踐踑踒踓踕踖踗踘踙踚踛踜踠踡踤踥踦踧踨踫踭踰踲踳踴踶踷踸踻踼踾�踿蹃蹅蹆蹌蹍蹎蹏蹐蹓蹔蹕蹖蹗蹘蹚蹛蹜蹝蹞蹟蹠蹡蹢蹣蹤蹥蹧蹨蹪蹫蹮蹱邸邰郏郅邾郐郄郇郓郦郢郜郗郛郫郯郾鄄鄢鄞鄣鄱鄯鄹酃酆刍奂劢劬劭劾哿勐勖勰叟燮矍廴凵凼鬯厶弁畚巯坌垩垡塾墼壅壑圩圬圪圳圹圮圯坜圻坂坩垅坫垆坼坻坨坭坶坳垭垤垌垲埏垧垴垓垠埕埘埚埙埒垸埴埯埸埤埝�".split(""); +for(j = 0; j != D[219].length; ++j) if(D[219][j].charCodeAt(0) !== 0xFFFD) { e[D[219][j]] = 56064 + j; d[56064 + j] = D[219][j];} +D[220] = "����������������������������������������������������������������蹳蹵蹷蹸蹹蹺蹻蹽蹾躀躂躃躄躆躈躉躊躋躌躍躎躑躒躓躕躖躗躘躙躚躛躝躟躠躡躢躣躤躥躦躧躨躩躪躭躮躰躱躳躴躵躶躷躸躹躻躼躽躾躿軀軁軂�軃軄軅軆軇軈軉車軋軌軍軏軐軑軒軓軔軕軖軗軘軙軚軛軜軝軞軟軠軡転軣軤堋堍埽埭堀堞堙塄堠塥塬墁墉墚墀馨鼙懿艹艽艿芏芊芨芄芎芑芗芙芫芸芾芰苈苊苣芘芷芮苋苌苁芩芴芡芪芟苄苎芤苡茉苷苤茏茇苜苴苒苘茌苻苓茑茚茆茔茕苠苕茜荑荛荜茈莒茼茴茱莛荞茯荏荇荃荟荀茗荠茭茺茳荦荥�".split(""); +for(j = 0; j != D[220].length; ++j) if(D[220][j].charCodeAt(0) !== 0xFFFD) { e[D[220][j]] = 56320 + j; d[56320 + j] = D[220][j];} +D[221] = "����������������������������������������������������������������軥軦軧軨軩軪軫軬軭軮軯軰軱軲軳軴軵軶軷軸軹軺軻軼軽軾軿輀輁輂較輄輅輆輇輈載輊輋輌輍輎輏輐輑輒輓輔輕輖輗輘輙輚輛輜輝輞輟輠輡輢輣�輤輥輦輧輨輩輪輫輬輭輮輯輰輱輲輳輴輵輶輷輸輹輺輻輼輽輾輿轀轁轂轃轄荨茛荩荬荪荭荮莰荸莳莴莠莪莓莜莅荼莶莩荽莸荻莘莞莨莺莼菁萁菥菘堇萘萋菝菽菖萜萸萑萆菔菟萏萃菸菹菪菅菀萦菰菡葜葑葚葙葳蒇蒈葺蒉葸萼葆葩葶蒌蒎萱葭蓁蓍蓐蓦蒽蓓蓊蒿蒺蓠蒡蒹蒴蒗蓥蓣蔌甍蔸蓰蔹蔟蔺�".split(""); +for(j = 0; j != D[221].length; ++j) if(D[221][j].charCodeAt(0) !== 0xFFFD) { e[D[221][j]] = 56576 + j; d[56576 + j] = D[221][j];} +D[222] = "����������������������������������������������������������������轅轆轇轈轉轊轋轌轍轎轏轐轑轒轓轔轕轖轗轘轙轚轛轜轝轞轟轠轡轢轣轤轥轪辀辌辒辝辠辡辢辤辥辦辧辪辬辭辮辯農辳辴辵辷辸辺辻込辿迀迃迆�迉迊迋迌迍迏迒迖迗迚迠迡迣迧迬迯迱迲迴迵迶迺迻迼迾迿逇逈逌逎逓逕逘蕖蔻蓿蓼蕙蕈蕨蕤蕞蕺瞢蕃蕲蕻薤薨薇薏蕹薮薜薅薹薷薰藓藁藜藿蘧蘅蘩蘖蘼廾弈夼奁耷奕奚奘匏尢尥尬尴扌扪抟抻拊拚拗拮挢拶挹捋捃掭揶捱捺掎掴捭掬掊捩掮掼揲揸揠揿揄揞揎摒揆掾摅摁搋搛搠搌搦搡摞撄摭撖�".split(""); +for(j = 0; j != D[222].length; ++j) if(D[222][j].charCodeAt(0) !== 0xFFFD) { e[D[222][j]] = 56832 + j; d[56832 + j] = D[222][j];} +D[223] = "����������������������������������������������������������������這逜連逤逥逧逨逩逪逫逬逰週進逳逴逷逹逺逽逿遀遃遅遆遈遉遊運遌過達違遖遙遚遜遝遞遟遠遡遤遦遧適遪遫遬遯遰遱遲遳遶遷選遹遺遻遼遾邁�還邅邆邇邉邊邌邍邎邏邐邒邔邖邘邚邜邞邟邠邤邥邧邨邩邫邭邲邷邼邽邿郀摺撷撸撙撺擀擐擗擤擢攉攥攮弋忒甙弑卟叱叽叩叨叻吒吖吆呋呒呓呔呖呃吡呗呙吣吲咂咔呷呱呤咚咛咄呶呦咝哐咭哂咴哒咧咦哓哔呲咣哕咻咿哌哙哚哜咩咪咤哝哏哞唛哧唠哽唔哳唢唣唏唑唧唪啧喏喵啉啭啁啕唿啐唼�".split(""); +for(j = 0; j != D[223].length; ++j) if(D[223][j].charCodeAt(0) !== 0xFFFD) { e[D[223][j]] = 57088 + j; d[57088 + j] = D[223][j];} +D[224] = "����������������������������������������������������������������郂郃郆郈郉郋郌郍郒郔郕郖郘郙郚郞郟郠郣郤郥郩郪郬郮郰郱郲郳郵郶郷郹郺郻郼郿鄀鄁鄃鄅鄆鄇鄈鄉鄊鄋鄌鄍鄎鄏鄐鄑鄒鄓鄔鄕鄖鄗鄘鄚鄛鄜�鄝鄟鄠鄡鄤鄥鄦鄧鄨鄩鄪鄫鄬鄭鄮鄰鄲鄳鄴鄵鄶鄷鄸鄺鄻鄼鄽鄾鄿酀酁酂酄唷啖啵啶啷唳唰啜喋嗒喃喱喹喈喁喟啾嗖喑啻嗟喽喾喔喙嗪嗷嗉嘟嗑嗫嗬嗔嗦嗝嗄嗯嗥嗲嗳嗌嗍嗨嗵嗤辔嘞嘈嘌嘁嘤嘣嗾嘀嘧嘭噘嘹噗嘬噍噢噙噜噌噔嚆噤噱噫噻噼嚅嚓嚯囔囗囝囡囵囫囹囿圄圊圉圜帏帙帔帑帱帻帼�".split(""); +for(j = 0; j != D[224].length; ++j) if(D[224][j].charCodeAt(0) !== 0xFFFD) { e[D[224][j]] = 57344 + j; d[57344 + j] = D[224][j];} +D[225] = "����������������������������������������������������������������酅酇酈酑酓酔酕酖酘酙酛酜酟酠酦酧酨酫酭酳酺酻酼醀醁醂醃醄醆醈醊醎醏醓醔醕醖醗醘醙醜醝醞醟醠醡醤醥醦醧醨醩醫醬醰醱醲醳醶醷醸醹醻�醼醽醾醿釀釁釂釃釄釅釆釈釋釐釒釓釔釕釖釗釘釙釚釛針釞釟釠釡釢釣釤釥帷幄幔幛幞幡岌屺岍岐岖岈岘岙岑岚岜岵岢岽岬岫岱岣峁岷峄峒峤峋峥崂崃崧崦崮崤崞崆崛嵘崾崴崽嵬嵛嵯嵝嵫嵋嵊嵩嵴嶂嶙嶝豳嶷巅彳彷徂徇徉後徕徙徜徨徭徵徼衢彡犭犰犴犷犸狃狁狎狍狒狨狯狩狲狴狷猁狳猃狺�".split(""); +for(j = 0; j != D[225].length; ++j) if(D[225][j].charCodeAt(0) !== 0xFFFD) { e[D[225][j]] = 57600 + j; d[57600 + j] = D[225][j];} +D[226] = "����������������������������������������������������������������釦釧釨釩釪釫釬釭釮釯釰釱釲釳釴釵釶釷釸釹釺釻釼釽釾釿鈀鈁鈂鈃鈄鈅鈆鈇鈈鈉鈊鈋鈌鈍鈎鈏鈐鈑鈒鈓鈔鈕鈖鈗鈘鈙鈚鈛鈜鈝鈞鈟鈠鈡鈢鈣鈤�鈥鈦鈧鈨鈩鈪鈫鈬鈭鈮鈯鈰鈱鈲鈳鈴鈵鈶鈷鈸鈹鈺鈻鈼鈽鈾鈿鉀鉁鉂鉃鉄鉅狻猗猓猡猊猞猝猕猢猹猥猬猸猱獐獍獗獠獬獯獾舛夥飧夤夂饣饧饨饩饪饫饬饴饷饽馀馄馇馊馍馐馑馓馔馕庀庑庋庖庥庠庹庵庾庳赓廒廑廛廨廪膺忄忉忖忏怃忮怄忡忤忾怅怆忪忭忸怙怵怦怛怏怍怩怫怊怿怡恸恹恻恺恂�".split(""); +for(j = 0; j != D[226].length; ++j) if(D[226][j].charCodeAt(0) !== 0xFFFD) { e[D[226][j]] = 57856 + j; d[57856 + j] = D[226][j];} +D[227] = "����������������������������������������������������������������鉆鉇鉈鉉鉊鉋鉌鉍鉎鉏鉐鉑鉒鉓鉔鉕鉖鉗鉘鉙鉚鉛鉜鉝鉞鉟鉠鉡鉢鉣鉤鉥鉦鉧鉨鉩鉪鉫鉬鉭鉮鉯鉰鉱鉲鉳鉵鉶鉷鉸鉹鉺鉻鉼鉽鉾鉿銀銁銂銃銄銅�銆銇銈銉銊銋銌銍銏銐銑銒銓銔銕銖銗銘銙銚銛銜銝銞銟銠銡銢銣銤銥銦銧恪恽悖悚悭悝悃悒悌悛惬悻悱惝惘惆惚悴愠愦愕愣惴愀愎愫慊慵憬憔憧憷懔懵忝隳闩闫闱闳闵闶闼闾阃阄阆阈阊阋阌阍阏阒阕阖阗阙阚丬爿戕氵汔汜汊沣沅沐沔沌汨汩汴汶沆沩泐泔沭泷泸泱泗沲泠泖泺泫泮沱泓泯泾�".split(""); +for(j = 0; j != D[227].length; ++j) if(D[227][j].charCodeAt(0) !== 0xFFFD) { e[D[227][j]] = 58112 + j; d[58112 + j] = D[227][j];} +D[228] = "����������������������������������������������������������������銨銩銪銫銬銭銯銰銱銲銳銴銵銶銷銸銹銺銻銼銽銾銿鋀鋁鋂鋃鋄鋅鋆鋇鋉鋊鋋鋌鋍鋎鋏鋐鋑鋒鋓鋔鋕鋖鋗鋘鋙鋚鋛鋜鋝鋞鋟鋠鋡鋢鋣鋤鋥鋦鋧鋨�鋩鋪鋫鋬鋭鋮鋯鋰鋱鋲鋳鋴鋵鋶鋷鋸鋹鋺鋻鋼鋽鋾鋿錀錁錂錃錄錅錆錇錈錉洹洧洌浃浈洇洄洙洎洫浍洮洵洚浏浒浔洳涑浯涞涠浞涓涔浜浠浼浣渚淇淅淞渎涿淠渑淦淝淙渖涫渌涮渫湮湎湫溲湟溆湓湔渲渥湄滟溱溘滠漭滢溥溧溽溻溷滗溴滏溏滂溟潢潆潇漤漕滹漯漶潋潴漪漉漩澉澍澌潸潲潼潺濑�".split(""); +for(j = 0; j != D[228].length; ++j) if(D[228][j].charCodeAt(0) !== 0xFFFD) { e[D[228][j]] = 58368 + j; d[58368 + j] = D[228][j];} +D[229] = "����������������������������������������������������������������錊錋錌錍錎錏錐錑錒錓錔錕錖錗錘錙錚錛錜錝錞錟錠錡錢錣錤錥錦錧錨錩錪錫錬錭錮錯錰錱録錳錴錵錶錷錸錹錺錻錼錽錿鍀鍁鍂鍃鍄鍅鍆鍇鍈鍉�鍊鍋鍌鍍鍎鍏鍐鍑鍒鍓鍔鍕鍖鍗鍘鍙鍚鍛鍜鍝鍞鍟鍠鍡鍢鍣鍤鍥鍦鍧鍨鍩鍫濉澧澹澶濂濡濮濞濠濯瀚瀣瀛瀹瀵灏灞宀宄宕宓宥宸甯骞搴寤寮褰寰蹇謇辶迓迕迥迮迤迩迦迳迨逅逄逋逦逑逍逖逡逵逶逭逯遄遑遒遐遨遘遢遛暹遴遽邂邈邃邋彐彗彖彘尻咫屐屙孱屣屦羼弪弩弭艴弼鬻屮妁妃妍妩妪妣�".split(""); +for(j = 0; j != D[229].length; ++j) if(D[229][j].charCodeAt(0) !== 0xFFFD) { e[D[229][j]] = 58624 + j; d[58624 + j] = D[229][j];} +D[230] = "����������������������������������������������������������������鍬鍭鍮鍯鍰鍱鍲鍳鍴鍵鍶鍷鍸鍹鍺鍻鍼鍽鍾鍿鎀鎁鎂鎃鎄鎅鎆鎇鎈鎉鎊鎋鎌鎍鎎鎐鎑鎒鎓鎔鎕鎖鎗鎘鎙鎚鎛鎜鎝鎞鎟鎠鎡鎢鎣鎤鎥鎦鎧鎨鎩鎪鎫�鎬鎭鎮鎯鎰鎱鎲鎳鎴鎵鎶鎷鎸鎹鎺鎻鎼鎽鎾鎿鏀鏁鏂鏃鏄鏅鏆鏇鏈鏉鏋鏌鏍妗姊妫妞妤姒妲妯姗妾娅娆姝娈姣姘姹娌娉娲娴娑娣娓婀婧婊婕娼婢婵胬媪媛婷婺媾嫫媲嫒嫔媸嫠嫣嫱嫖嫦嫘嫜嬉嬗嬖嬲嬷孀尕尜孚孥孳孑孓孢驵驷驸驺驿驽骀骁骅骈骊骐骒骓骖骘骛骜骝骟骠骢骣骥骧纟纡纣纥纨纩�".split(""); +for(j = 0; j != D[230].length; ++j) if(D[230][j].charCodeAt(0) !== 0xFFFD) { e[D[230][j]] = 58880 + j; d[58880 + j] = D[230][j];} +D[231] = "����������������������������������������������������������������鏎鏏鏐鏑鏒鏓鏔鏕鏗鏘鏙鏚鏛鏜鏝鏞鏟鏠鏡鏢鏣鏤鏥鏦鏧鏨鏩鏪鏫鏬鏭鏮鏯鏰鏱鏲鏳鏴鏵鏶鏷鏸鏹鏺鏻鏼鏽鏾鏿鐀鐁鐂鐃鐄鐅鐆鐇鐈鐉鐊鐋鐌鐍�鐎鐏鐐鐑鐒鐓鐔鐕鐖鐗鐘鐙鐚鐛鐜鐝鐞鐟鐠鐡鐢鐣鐤鐥鐦鐧鐨鐩鐪鐫鐬鐭鐮纭纰纾绀绁绂绉绋绌绐绔绗绛绠绡绨绫绮绯绱绲缍绶绺绻绾缁缂缃缇缈缋缌缏缑缒缗缙缜缛缟缡缢缣缤缥缦缧缪缫缬缭缯缰缱缲缳缵幺畿巛甾邕玎玑玮玢玟珏珂珑玷玳珀珉珈珥珙顼琊珩珧珞玺珲琏琪瑛琦琥琨琰琮琬�".split(""); +for(j = 0; j != D[231].length; ++j) if(D[231][j].charCodeAt(0) !== 0xFFFD) { e[D[231][j]] = 59136 + j; d[59136 + j] = D[231][j];} +D[232] = "����������������������������������������������������������������鐯鐰鐱鐲鐳鐴鐵鐶鐷鐸鐹鐺鐻鐼鐽鐿鑀鑁鑂鑃鑄鑅鑆鑇鑈鑉鑊鑋鑌鑍鑎鑏鑐鑑鑒鑓鑔鑕鑖鑗鑘鑙鑚鑛鑜鑝鑞鑟鑠鑡鑢鑣鑤鑥鑦鑧鑨鑩鑪鑬鑭鑮鑯�鑰鑱鑲鑳鑴鑵鑶鑷鑸鑹鑺鑻鑼鑽鑾鑿钀钁钂钃钄钑钖钘铇铏铓铔铚铦铻锜锠琛琚瑁瑜瑗瑕瑙瑷瑭瑾璜璎璀璁璇璋璞璨璩璐璧瓒璺韪韫韬杌杓杞杈杩枥枇杪杳枘枧杵枨枞枭枋杷杼柰栉柘栊柩枰栌柙枵柚枳柝栀柃枸柢栎柁柽栲栳桠桡桎桢桄桤梃栝桕桦桁桧桀栾桊桉栩梵梏桴桷梓桫棂楮棼椟椠棹�".split(""); +for(j = 0; j != D[232].length; ++j) if(D[232][j].charCodeAt(0) !== 0xFFFD) { e[D[232][j]] = 59392 + j; d[59392 + j] = D[232][j];} +D[233] = "����������������������������������������������������������������锧锳锽镃镈镋镕镚镠镮镴镵長镸镹镺镻镼镽镾門閁閂閃閄閅閆閇閈閉閊開閌閍閎閏閐閑閒間閔閕閖閗閘閙閚閛閜閝閞閟閠閡関閣閤閥閦閧閨閩閪�閫閬閭閮閯閰閱閲閳閴閵閶閷閸閹閺閻閼閽閾閿闀闁闂闃闄闅闆闇闈闉闊闋椤棰椋椁楗棣椐楱椹楠楂楝榄楫榀榘楸椴槌榇榈槎榉楦楣楹榛榧榻榫榭槔榱槁槊槟榕槠榍槿樯槭樗樘橥槲橄樾檠橐橛樵檎橹樽樨橘橼檑檐檩檗檫猷獒殁殂殇殄殒殓殍殚殛殡殪轫轭轱轲轳轵轶轸轷轹轺轼轾辁辂辄辇辋�".split(""); +for(j = 0; j != D[233].length; ++j) if(D[233][j].charCodeAt(0) !== 0xFFFD) { e[D[233][j]] = 59648 + j; d[59648 + j] = D[233][j];} +D[234] = "����������������������������������������������������������������闌闍闎闏闐闑闒闓闔闕闖闗闘闙闚闛關闝闞闟闠闡闢闣闤闥闦闧闬闿阇阓阘阛阞阠阣阤阥阦阧阨阩阫阬阭阯阰阷阸阹阺阾陁陃陊陎陏陑陒陓陖陗�陘陙陚陜陝陞陠陣陥陦陫陭陮陯陰陱陳陸陹険陻陼陽陾陿隀隁隂隃隄隇隉隊辍辎辏辘辚軎戋戗戛戟戢戡戥戤戬臧瓯瓴瓿甏甑甓攴旮旯旰昊昙杲昃昕昀炅曷昝昴昱昶昵耆晟晔晁晏晖晡晗晷暄暌暧暝暾曛曜曦曩贲贳贶贻贽赀赅赆赈赉赇赍赕赙觇觊觋觌觎觏觐觑牮犟牝牦牯牾牿犄犋犍犏犒挈挲掰�".split(""); +for(j = 0; j != D[234].length; ++j) if(D[234][j].charCodeAt(0) !== 0xFFFD) { e[D[234][j]] = 59904 + j; d[59904 + j] = D[234][j];} +D[235] = "����������������������������������������������������������������隌階隑隒隓隕隖隚際隝隞隟隠隡隢隣隤隥隦隨隩險隫隬隭隮隯隱隲隴隵隷隸隺隻隿雂雃雈雊雋雐雑雓雔雖雗雘雙雚雛雜雝雞雟雡離難雤雥雦雧雫�雬雭雮雰雱雲雴雵雸雺電雼雽雿霂霃霅霊霋霌霐霑霒霔霕霗霘霙霚霛霝霟霠搿擘耄毪毳毽毵毹氅氇氆氍氕氘氙氚氡氩氤氪氲攵敕敫牍牒牖爰虢刖肟肜肓肼朊肽肱肫肭肴肷胧胨胩胪胛胂胄胙胍胗朐胝胫胱胴胭脍脎胲胼朕脒豚脶脞脬脘脲腈腌腓腴腙腚腱腠腩腼腽腭腧塍媵膈膂膑滕膣膪臌朦臊膻�".split(""); +for(j = 0; j != D[235].length; ++j) if(D[235][j].charCodeAt(0) !== 0xFFFD) { e[D[235][j]] = 60160 + j; d[60160 + j] = D[235][j];} +D[236] = "����������������������������������������������������������������霡霢霣霤霥霦霧霨霩霫霬霮霯霱霳霴霵霶霷霺霻霼霽霿靀靁靂靃靄靅靆靇靈靉靊靋靌靍靎靏靐靑靔靕靗靘靚靜靝靟靣靤靦靧靨靪靫靬靭靮靯靰靱�靲靵靷靸靹靺靻靽靾靿鞀鞁鞂鞃鞄鞆鞇鞈鞉鞊鞌鞎鞏鞐鞓鞕鞖鞗鞙鞚鞛鞜鞝臁膦欤欷欹歃歆歙飑飒飓飕飙飚殳彀毂觳斐齑斓於旆旄旃旌旎旒旖炀炜炖炝炻烀炷炫炱烨烊焐焓焖焯焱煳煜煨煅煲煊煸煺熘熳熵熨熠燠燔燧燹爝爨灬焘煦熹戾戽扃扈扉礻祀祆祉祛祜祓祚祢祗祠祯祧祺禅禊禚禧禳忑忐�".split(""); +for(j = 0; j != D[236].length; ++j) if(D[236][j].charCodeAt(0) !== 0xFFFD) { e[D[236][j]] = 60416 + j; d[60416 + j] = D[236][j];} +D[237] = "����������������������������������������������������������������鞞鞟鞡鞢鞤鞥鞦鞧鞨鞩鞪鞬鞮鞰鞱鞳鞵鞶鞷鞸鞹鞺鞻鞼鞽鞾鞿韀韁韂韃韄韅韆韇韈韉韊韋韌韍韎韏韐韑韒韓韔韕韖韗韘韙韚韛韜韝韞韟韠韡韢韣�韤韥韨韮韯韰韱韲韴韷韸韹韺韻韼韽韾響頀頁頂頃頄項順頇須頉頊頋頌頍頎怼恝恚恧恁恙恣悫愆愍慝憩憝懋懑戆肀聿沓泶淼矶矸砀砉砗砘砑斫砭砜砝砹砺砻砟砼砥砬砣砩硎硭硖硗砦硐硇硌硪碛碓碚碇碜碡碣碲碹碥磔磙磉磬磲礅磴礓礤礞礴龛黹黻黼盱眄眍盹眇眈眚眢眙眭眦眵眸睐睑睇睃睚睨�".split(""); +for(j = 0; j != D[237].length; ++j) if(D[237][j].charCodeAt(0) !== 0xFFFD) { e[D[237][j]] = 60672 + j; d[60672 + j] = D[237][j];} +D[238] = "����������������������������������������������������������������頏預頑頒頓頔頕頖頗領頙頚頛頜頝頞頟頠頡頢頣頤頥頦頧頨頩頪頫頬頭頮頯頰頱頲頳頴頵頶頷頸頹頺頻頼頽頾頿顀顁顂顃顄顅顆顇顈顉顊顋題額�顎顏顐顑顒顓顔顕顖顗願顙顚顛顜顝類顟顠顡顢顣顤顥顦顧顨顩顪顫顬顭顮睢睥睿瞍睽瞀瞌瞑瞟瞠瞰瞵瞽町畀畎畋畈畛畲畹疃罘罡罟詈罨罴罱罹羁罾盍盥蠲钅钆钇钋钊钌钍钏钐钔钗钕钚钛钜钣钤钫钪钭钬钯钰钲钴钶钷钸钹钺钼钽钿铄铈铉铊铋铌铍铎铐铑铒铕铖铗铙铘铛铞铟铠铢铤铥铧铨铪�".split(""); +for(j = 0; j != D[238].length; ++j) if(D[238][j].charCodeAt(0) !== 0xFFFD) { e[D[238][j]] = 60928 + j; d[60928 + j] = D[238][j];} +D[239] = "����������������������������������������������������������������顯顰顱顲顳顴颋颎颒颕颙颣風颩颪颫颬颭颮颯颰颱颲颳颴颵颶颷颸颹颺颻颼颽颾颿飀飁飂飃飄飅飆飇飈飉飊飋飌飍飏飐飔飖飗飛飜飝飠飡飢飣飤�飥飦飩飪飫飬飭飮飯飰飱飲飳飴飵飶飷飸飹飺飻飼飽飾飿餀餁餂餃餄餅餆餇铩铫铮铯铳铴铵铷铹铼铽铿锃锂锆锇锉锊锍锎锏锒锓锔锕锖锘锛锝锞锟锢锪锫锩锬锱锲锴锶锷锸锼锾锿镂锵镄镅镆镉镌镎镏镒镓镔镖镗镘镙镛镞镟镝镡镢镤镥镦镧镨镩镪镫镬镯镱镲镳锺矧矬雉秕秭秣秫稆嵇稃稂稞稔�".split(""); +for(j = 0; j != D[239].length; ++j) if(D[239][j].charCodeAt(0) !== 0xFFFD) { e[D[239][j]] = 61184 + j; d[61184 + j] = D[239][j];} +D[240] = "����������������������������������������������������������������餈餉養餋餌餎餏餑餒餓餔餕餖餗餘餙餚餛餜餝餞餟餠餡餢餣餤餥餦餧館餩餪餫餬餭餯餰餱餲餳餴餵餶餷餸餹餺餻餼餽餾餿饀饁饂饃饄饅饆饇饈饉�饊饋饌饍饎饏饐饑饒饓饖饗饘饙饚饛饜饝饞饟饠饡饢饤饦饳饸饹饻饾馂馃馉稹稷穑黏馥穰皈皎皓皙皤瓞瓠甬鸠鸢鸨鸩鸪鸫鸬鸲鸱鸶鸸鸷鸹鸺鸾鹁鹂鹄鹆鹇鹈鹉鹋鹌鹎鹑鹕鹗鹚鹛鹜鹞鹣鹦鹧鹨鹩鹪鹫鹬鹱鹭鹳疒疔疖疠疝疬疣疳疴疸痄疱疰痃痂痖痍痣痨痦痤痫痧瘃痱痼痿瘐瘀瘅瘌瘗瘊瘥瘘瘕瘙�".split(""); +for(j = 0; j != D[240].length; ++j) if(D[240][j].charCodeAt(0) !== 0xFFFD) { e[D[240][j]] = 61440 + j; d[61440 + j] = D[240][j];} +D[241] = "����������������������������������������������������������������馌馎馚馛馜馝馞馟馠馡馢馣馤馦馧馩馪馫馬馭馮馯馰馱馲馳馴馵馶馷馸馹馺馻馼馽馾馿駀駁駂駃駄駅駆駇駈駉駊駋駌駍駎駏駐駑駒駓駔駕駖駗駘�駙駚駛駜駝駞駟駠駡駢駣駤駥駦駧駨駩駪駫駬駭駮駯駰駱駲駳駴駵駶駷駸駹瘛瘼瘢瘠癀瘭瘰瘿瘵癃瘾瘳癍癞癔癜癖癫癯翊竦穸穹窀窆窈窕窦窠窬窨窭窳衤衩衲衽衿袂袢裆袷袼裉裢裎裣裥裱褚裼裨裾裰褡褙褓褛褊褴褫褶襁襦襻疋胥皲皴矜耒耔耖耜耠耢耥耦耧耩耨耱耋耵聃聆聍聒聩聱覃顸颀颃�".split(""); +for(j = 0; j != D[241].length; ++j) if(D[241][j].charCodeAt(0) !== 0xFFFD) { e[D[241][j]] = 61696 + j; d[61696 + j] = D[241][j];} +D[242] = "����������������������������������������������������������������駺駻駼駽駾駿騀騁騂騃騄騅騆騇騈騉騊騋騌騍騎騏騐騑騒験騔騕騖騗騘騙騚騛騜騝騞騟騠騡騢騣騤騥騦騧騨騩騪騫騬騭騮騯騰騱騲騳騴騵騶騷騸�騹騺騻騼騽騾騿驀驁驂驃驄驅驆驇驈驉驊驋驌驍驎驏驐驑驒驓驔驕驖驗驘驙颉颌颍颏颔颚颛颞颟颡颢颥颦虍虔虬虮虿虺虼虻蚨蚍蚋蚬蚝蚧蚣蚪蚓蚩蚶蛄蚵蛎蚰蚺蚱蚯蛉蛏蚴蛩蛱蛲蛭蛳蛐蜓蛞蛴蛟蛘蛑蜃蜇蛸蜈蜊蜍蜉蜣蜻蜞蜥蜮蜚蜾蝈蜴蜱蜩蜷蜿螂蜢蝽蝾蝻蝠蝰蝌蝮螋蝓蝣蝼蝤蝙蝥螓螯螨蟒�".split(""); +for(j = 0; j != D[242].length; ++j) if(D[242][j].charCodeAt(0) !== 0xFFFD) { e[D[242][j]] = 61952 + j; d[61952 + j] = D[242][j];} +D[243] = "����������������������������������������������������������������驚驛驜驝驞驟驠驡驢驣驤驥驦驧驨驩驪驫驲骃骉骍骎骔骕骙骦骩骪骫骬骭骮骯骲骳骴骵骹骻骽骾骿髃髄髆髇髈髉髊髍髎髏髐髒體髕髖髗髙髚髛髜�髝髞髠髢髣髤髥髧髨髩髪髬髮髰髱髲髳髴髵髶髷髸髺髼髽髾髿鬀鬁鬂鬄鬅鬆蟆螈螅螭螗螃螫蟥螬螵螳蟋蟓螽蟑蟀蟊蟛蟪蟠蟮蠖蠓蟾蠊蠛蠡蠹蠼缶罂罄罅舐竺竽笈笃笄笕笊笫笏筇笸笪笙笮笱笠笥笤笳笾笞筘筚筅筵筌筝筠筮筻筢筲筱箐箦箧箸箬箝箨箅箪箜箢箫箴篑篁篌篝篚篥篦篪簌篾篼簏簖簋�".split(""); +for(j = 0; j != D[243].length; ++j) if(D[243][j].charCodeAt(0) !== 0xFFFD) { e[D[243][j]] = 62208 + j; d[62208 + j] = D[243][j];} +D[244] = "����������������������������������������������������������������鬇鬉鬊鬋鬌鬍鬎鬐鬑鬒鬔鬕鬖鬗鬘鬙鬚鬛鬜鬝鬞鬠鬡鬢鬤鬥鬦鬧鬨鬩鬪鬫鬬鬭鬮鬰鬱鬳鬴鬵鬶鬷鬸鬹鬺鬽鬾鬿魀魆魊魋魌魎魐魒魓魕魖魗魘魙魚�魛魜魝魞魟魠魡魢魣魤魥魦魧魨魩魪魫魬魭魮魯魰魱魲魳魴魵魶魷魸魹魺魻簟簪簦簸籁籀臾舁舂舄臬衄舡舢舣舭舯舨舫舸舻舳舴舾艄艉艋艏艚艟艨衾袅袈裘裟襞羝羟羧羯羰羲籼敉粑粝粜粞粢粲粼粽糁糇糌糍糈糅糗糨艮暨羿翎翕翥翡翦翩翮翳糸絷綦綮繇纛麸麴赳趄趔趑趱赧赭豇豉酊酐酎酏酤�".split(""); +for(j = 0; j != D[244].length; ++j) if(D[244][j].charCodeAt(0) !== 0xFFFD) { e[D[244][j]] = 62464 + j; d[62464 + j] = D[244][j];} +D[245] = "����������������������������������������������������������������魼魽魾魿鮀鮁鮂鮃鮄鮅鮆鮇鮈鮉鮊鮋鮌鮍鮎鮏鮐鮑鮒鮓鮔鮕鮖鮗鮘鮙鮚鮛鮜鮝鮞鮟鮠鮡鮢鮣鮤鮥鮦鮧鮨鮩鮪鮫鮬鮭鮮鮯鮰鮱鮲鮳鮴鮵鮶鮷鮸鮹鮺�鮻鮼鮽鮾鮿鯀鯁鯂鯃鯄鯅鯆鯇鯈鯉鯊鯋鯌鯍鯎鯏鯐鯑鯒鯓鯔鯕鯖鯗鯘鯙鯚鯛酢酡酰酩酯酽酾酲酴酹醌醅醐醍醑醢醣醪醭醮醯醵醴醺豕鹾趸跫踅蹙蹩趵趿趼趺跄跖跗跚跞跎跏跛跆跬跷跸跣跹跻跤踉跽踔踝踟踬踮踣踯踺蹀踹踵踽踱蹉蹁蹂蹑蹒蹊蹰蹶蹼蹯蹴躅躏躔躐躜躞豸貂貊貅貘貔斛觖觞觚觜�".split(""); +for(j = 0; j != D[245].length; ++j) if(D[245][j].charCodeAt(0) !== 0xFFFD) { e[D[245][j]] = 62720 + j; d[62720 + j] = D[245][j];} +D[246] = "����������������������������������������������������������������鯜鯝鯞鯟鯠鯡鯢鯣鯤鯥鯦鯧鯨鯩鯪鯫鯬鯭鯮鯯鯰鯱鯲鯳鯴鯵鯶鯷鯸鯹鯺鯻鯼鯽鯾鯿鰀鰁鰂鰃鰄鰅鰆鰇鰈鰉鰊鰋鰌鰍鰎鰏鰐鰑鰒鰓鰔鰕鰖鰗鰘鰙鰚�鰛鰜鰝鰞鰟鰠鰡鰢鰣鰤鰥鰦鰧鰨鰩鰪鰫鰬鰭鰮鰯鰰鰱鰲鰳鰴鰵鰶鰷鰸鰹鰺鰻觥觫觯訾謦靓雩雳雯霆霁霈霏霎霪霭霰霾龀龃龅龆龇龈龉龊龌黾鼋鼍隹隼隽雎雒瞿雠銎銮鋈錾鍪鏊鎏鐾鑫鱿鲂鲅鲆鲇鲈稣鲋鲎鲐鲑鲒鲔鲕鲚鲛鲞鲟鲠鲡鲢鲣鲥鲦鲧鲨鲩鲫鲭鲮鲰鲱鲲鲳鲴鲵鲶鲷鲺鲻鲼鲽鳄鳅鳆鳇鳊鳋�".split(""); +for(j = 0; j != D[246].length; ++j) if(D[246][j].charCodeAt(0) !== 0xFFFD) { e[D[246][j]] = 62976 + j; d[62976 + j] = D[246][j];} +D[247] = "����������������������������������������������������������������鰼鰽鰾鰿鱀鱁鱂鱃鱄鱅鱆鱇鱈鱉鱊鱋鱌鱍鱎鱏鱐鱑鱒鱓鱔鱕鱖鱗鱘鱙鱚鱛鱜鱝鱞鱟鱠鱡鱢鱣鱤鱥鱦鱧鱨鱩鱪鱫鱬鱭鱮鱯鱰鱱鱲鱳鱴鱵鱶鱷鱸鱹鱺�鱻鱽鱾鲀鲃鲄鲉鲊鲌鲏鲓鲖鲗鲘鲙鲝鲪鲬鲯鲹鲾鲿鳀鳁鳂鳈鳉鳑鳒鳚鳛鳠鳡鳌鳍鳎鳏鳐鳓鳔鳕鳗鳘鳙鳜鳝鳟鳢靼鞅鞑鞒鞔鞯鞫鞣鞲鞴骱骰骷鹘骶骺骼髁髀髅髂髋髌髑魅魃魇魉魈魍魑飨餍餮饕饔髟髡髦髯髫髻髭髹鬈鬏鬓鬟鬣麽麾縻麂麇麈麋麒鏖麝麟黛黜黝黠黟黢黩黧黥黪黯鼢鼬鼯鼹鼷鼽鼾齄�".split(""); +for(j = 0; j != D[247].length; ++j) if(D[247][j].charCodeAt(0) !== 0xFFFD) { e[D[247][j]] = 63232 + j; d[63232 + j] = D[247][j];} +D[248] = "����������������������������������������������������������������鳣鳤鳥鳦鳧鳨鳩鳪鳫鳬鳭鳮鳯鳰鳱鳲鳳鳴鳵鳶鳷鳸鳹鳺鳻鳼鳽鳾鳿鴀鴁鴂鴃鴄鴅鴆鴇鴈鴉鴊鴋鴌鴍鴎鴏鴐鴑鴒鴓鴔鴕鴖鴗鴘鴙鴚鴛鴜鴝鴞鴟鴠鴡�鴢鴣鴤鴥鴦鴧鴨鴩鴪鴫鴬鴭鴮鴯鴰鴱鴲鴳鴴鴵鴶鴷鴸鴹鴺鴻鴼鴽鴾鴿鵀鵁鵂�����������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[248].length; ++j) if(D[248][j].charCodeAt(0) !== 0xFFFD) { e[D[248][j]] = 63488 + j; d[63488 + j] = D[248][j];} +D[249] = "����������������������������������������������������������������鵃鵄鵅鵆鵇鵈鵉鵊鵋鵌鵍鵎鵏鵐鵑鵒鵓鵔鵕鵖鵗鵘鵙鵚鵛鵜鵝鵞鵟鵠鵡鵢鵣鵤鵥鵦鵧鵨鵩鵪鵫鵬鵭鵮鵯鵰鵱鵲鵳鵴鵵鵶鵷鵸鵹鵺鵻鵼鵽鵾鵿鶀鶁�鶂鶃鶄鶅鶆鶇鶈鶉鶊鶋鶌鶍鶎鶏鶐鶑鶒鶓鶔鶕鶖鶗鶘鶙鶚鶛鶜鶝鶞鶟鶠鶡鶢�����������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[249].length; ++j) if(D[249][j].charCodeAt(0) !== 0xFFFD) { e[D[249][j]] = 63744 + j; d[63744 + j] = D[249][j];} +D[250] = "����������������������������������������������������������������鶣鶤鶥鶦鶧鶨鶩鶪鶫鶬鶭鶮鶯鶰鶱鶲鶳鶴鶵鶶鶷鶸鶹鶺鶻鶼鶽鶾鶿鷀鷁鷂鷃鷄鷅鷆鷇鷈鷉鷊鷋鷌鷍鷎鷏鷐鷑鷒鷓鷔鷕鷖鷗鷘鷙鷚鷛鷜鷝鷞鷟鷠鷡�鷢鷣鷤鷥鷦鷧鷨鷩鷪鷫鷬鷭鷮鷯鷰鷱鷲鷳鷴鷵鷶鷷鷸鷹鷺鷻鷼鷽鷾鷿鸀鸁鸂�����������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[250].length; ++j) if(D[250][j].charCodeAt(0) !== 0xFFFD) { e[D[250][j]] = 64000 + j; d[64000 + j] = D[250][j];} +D[251] = "����������������������������������������������������������������鸃鸄鸅鸆鸇鸈鸉鸊鸋鸌鸍鸎鸏鸐鸑鸒鸓鸔鸕鸖鸗鸘鸙鸚鸛鸜鸝鸞鸤鸧鸮鸰鸴鸻鸼鹀鹍鹐鹒鹓鹔鹖鹙鹝鹟鹠鹡鹢鹥鹮鹯鹲鹴鹵鹶鹷鹸鹹鹺鹻鹼鹽麀�麁麃麄麅麆麉麊麌麍麎麏麐麑麔麕麖麗麘麙麚麛麜麞麠麡麢麣麤麥麧麨麩麪�����������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[251].length; ++j) if(D[251][j].charCodeAt(0) !== 0xFFFD) { e[D[251][j]] = 64256 + j; d[64256 + j] = D[251][j];} +D[252] = "����������������������������������������������������������������麫麬麭麮麯麰麱麲麳麵麶麷麹麺麼麿黀黁黂黃黅黆黇黈黊黋黌黐黒黓黕黖黗黙黚點黡黣黤黦黨黫黬黭黮黰黱黲黳黴黵黶黷黸黺黽黿鼀鼁鼂鼃鼄鼅�鼆鼇鼈鼉鼊鼌鼏鼑鼒鼔鼕鼖鼘鼚鼛鼜鼝鼞鼟鼡鼣鼤鼥鼦鼧鼨鼩鼪鼫鼭鼮鼰鼱�����������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[252].length; ++j) if(D[252][j].charCodeAt(0) !== 0xFFFD) { e[D[252][j]] = 64512 + j; d[64512 + j] = D[252][j];} +D[253] = "����������������������������������������������������������������鼲鼳鼴鼵鼶鼸鼺鼼鼿齀齁齂齃齅齆齇齈齉齊齋齌齍齎齏齒齓齔齕齖齗齘齙齚齛齜齝齞齟齠齡齢齣齤齥齦齧齨齩齪齫齬齭齮齯齰齱齲齳齴齵齶齷齸�齹齺齻齼齽齾龁龂龍龎龏龐龑龒龓龔龕龖龗龘龜龝龞龡龢龣龤龥郎凉秊裏隣�����������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[253].length; ++j) if(D[253][j].charCodeAt(0) !== 0xFFFD) { e[D[253][j]] = 64768 + j; d[64768 + j] = D[253][j];} +D[254] = "����������������������������������������������������������������兀嗀﨎﨏﨑﨓﨔礼﨟蘒﨡﨣﨤﨧﨨﨩��������������������������������������������������������������������������������������������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[254].length; ++j) if(D[254][j].charCodeAt(0) !== 0xFFFD) { e[D[254][j]] = 65024 + j; d[65024 + j] = D[254][j];} +return {"enc": e, "dec": d }; })(); +cptable[949] = (function(){ var d = [], e = {}, D = [], j; +D[0] = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~��������������������������������������������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[0].length; ++j) if(D[0][j].charCodeAt(0) !== 0xFFFD) { e[D[0][j]] = 0 + j; d[0 + j] = D[0][j];} +D[129] = "�����������������������������������������������������������������갂갃갅갆갋갌갍갎갏갘갞갟갡갢갣갥갦갧갨갩갪갫갮갲갳갴������갵갶갷갺갻갽갾갿걁걂걃걄걅걆걇걈걉걊걌걎걏걐걑걒걓걕������걖걗걙걚걛걝걞걟걠걡걢걣걤걥걦걧걨걩걪걫걬걭걮걯걲걳걵걶걹걻걼걽걾걿겂겇겈겍겎겏겑겒겓겕겖겗겘겙겚겛겞겢겣겤겥겦겧겫겭겮겱겲겳겴겵겶겷겺겾겿곀곂곃곅곆곇곉곊곋곍곎곏곐곑곒곓곔곖곘곙곚곛곜곝곞곟곢곣곥곦곩곫곭곮곲곴곷곸곹곺곻곾곿괁괂괃괅괇괈괉괊괋괎괐괒괓�".split(""); +for(j = 0; j != D[129].length; ++j) if(D[129][j].charCodeAt(0) !== 0xFFFD) { e[D[129][j]] = 33024 + j; d[33024 + j] = D[129][j];} +D[130] = "�����������������������������������������������������������������괔괕괖괗괙괚괛괝괞괟괡괢괣괤괥괦괧괨괪괫괮괯괰괱괲괳������괶괷괹괺괻괽괾괿굀굁굂굃굆굈굊굋굌굍굎굏굑굒굓굕굖굗������굙굚굛굜굝굞굟굠굢굤굥굦굧굨굩굪굫굮굯굱굲굷굸굹굺굾궀궃궄궅궆궇궊궋궍궎궏궑궒궓궔궕궖궗궘궙궚궛궞궟궠궡궢궣궥궦궧궨궩궪궫궬궭궮궯궰궱궲궳궴궵궶궸궹궺궻궼궽궾궿귂귃귅귆귇귉귊귋귌귍귎귏귒귔귕귖귗귘귙귚귛귝귞귟귡귢귣귥귦귧귨귩귪귫귬귭귮귯귰귱귲귳귴귵귶귷�".split(""); +for(j = 0; j != D[130].length; ++j) if(D[130][j].charCodeAt(0) !== 0xFFFD) { e[D[130][j]] = 33280 + j; d[33280 + j] = D[130][j];} +D[131] = "�����������������������������������������������������������������귺귻귽귾긂긃긄긅긆긇긊긌긎긏긐긑긒긓긕긖긗긘긙긚긛긜������긝긞긟긠긡긢긣긤긥긦긧긨긩긪긫긬긭긮긯긲긳긵긶긹긻긼������긽긾긿깂깄깇깈깉깋깏깑깒깓깕깗깘깙깚깛깞깢깣깤깦깧깪깫깭깮깯깱깲깳깴깵깶깷깺깾깿꺀꺁꺂꺃꺆꺇꺈꺉꺊꺋꺍꺎꺏꺐꺑꺒꺓꺔꺕꺖꺗꺘꺙꺚꺛꺜꺝꺞꺟꺠꺡꺢꺣꺤꺥꺦꺧꺨꺩꺪꺫꺬꺭꺮꺯꺰꺱꺲꺳꺴꺵꺶꺷꺸꺹꺺꺻꺿껁껂껃껅껆껇껈껉껊껋껎껒껓껔껕껖껗껚껛껝껞껟껠껡껢껣껤껥�".split(""); +for(j = 0; j != D[131].length; ++j) if(D[131][j].charCodeAt(0) !== 0xFFFD) { e[D[131][j]] = 33536 + j; d[33536 + j] = D[131][j];} +D[132] = "�����������������������������������������������������������������껦껧껩껪껬껮껯껰껱껲껳껵껶껷껹껺껻껽껾껿꼀꼁꼂꼃꼄꼅������꼆꼉꼊꼋꼌꼎꼏꼑꼒꼓꼔꼕꼖꼗꼘꼙꼚꼛꼜꼝꼞꼟꼠꼡꼢꼣������꼤꼥꼦꼧꼨꼩꼪꼫꼮꼯꼱꼳꼵꼶꼷꼸꼹꼺꼻꼾꽀꽄꽅꽆꽇꽊꽋꽌꽍꽎꽏꽑꽒꽓꽔꽕꽖꽗꽘꽙꽚꽛꽞꽟꽠꽡꽢꽣꽦꽧꽨꽩꽪꽫꽬꽭꽮꽯꽰꽱꽲꽳꽴꽵꽶꽷꽸꽺꽻꽼꽽꽾꽿꾁꾂꾃꾅꾆꾇꾉꾊꾋꾌꾍꾎꾏꾒꾓꾔꾖꾗꾘꾙꾚꾛꾝꾞꾟꾠꾡꾢꾣꾤꾥꾦꾧꾨꾩꾪꾫꾬꾭꾮꾯꾰꾱꾲꾳꾴꾵꾶꾷꾺꾻꾽꾾�".split(""); +for(j = 0; j != D[132].length; ++j) if(D[132][j].charCodeAt(0) !== 0xFFFD) { e[D[132][j]] = 33792 + j; d[33792 + j] = D[132][j];} +D[133] = "�����������������������������������������������������������������꾿꿁꿂꿃꿄꿅꿆꿊꿌꿏꿐꿑꿒꿓꿕꿖꿗꿘꿙꿚꿛꿝꿞꿟꿠꿡������꿢꿣꿤꿥꿦꿧꿪꿫꿬꿭꿮꿯꿲꿳꿵꿶꿷꿹꿺꿻꿼꿽꿾꿿뀂뀃������뀅뀆뀇뀈뀉뀊뀋뀍뀎뀏뀑뀒뀓뀕뀖뀗뀘뀙뀚뀛뀞뀟뀠뀡뀢뀣뀤뀥뀦뀧뀩뀪뀫뀬뀭뀮뀯뀰뀱뀲뀳뀴뀵뀶뀷뀸뀹뀺뀻뀼뀽뀾뀿끀끁끂끃끆끇끉끋끍끏끐끑끒끖끘끚끛끜끞끟끠끡끢끣끤끥끦끧끨끩끪끫끬끭끮끯끰끱끲끳끴끵끶끷끸끹끺끻끾끿낁낂낃낅낆낇낈낉낊낋낎낐낒낓낔낕낖낗낛낝낞낣낤�".split(""); +for(j = 0; j != D[133].length; ++j) if(D[133][j].charCodeAt(0) !== 0xFFFD) { e[D[133][j]] = 34048 + j; d[34048 + j] = D[133][j];} +D[134] = "�����������������������������������������������������������������낥낦낧낪낰낲낶낷낹낺낻낽낾낿냀냁냂냃냆냊냋냌냍냎냏냒������냓냕냖냗냙냚냛냜냝냞냟냡냢냣냤냦냧냨냩냪냫냬냭냮냯냰������냱냲냳냴냵냶냷냸냹냺냻냼냽냾냿넀넁넂넃넄넅넆넇넊넍넎넏넑넔넕넖넗넚넞넟넠넡넢넦넧넩넪넫넭넮넯넰넱넲넳넶넺넻넼넽넾넿녂녃녅녆녇녉녊녋녌녍녎녏녒녓녖녗녙녚녛녝녞녟녡녢녣녤녥녦녧녨녩녪녫녬녭녮녯녰녱녲녳녴녵녶녷녺녻녽녾녿놁놃놄놅놆놇놊놌놎놏놐놑놕놖놗놙놚놛놝�".split(""); +for(j = 0; j != D[134].length; ++j) if(D[134][j].charCodeAt(0) !== 0xFFFD) { e[D[134][j]] = 34304 + j; d[34304 + j] = D[134][j];} +D[135] = "�����������������������������������������������������������������놞놟놠놡놢놣놤놥놦놧놩놪놫놬놭놮놯놰놱놲놳놴놵놶놷놸������놹놺놻놼놽놾놿뇀뇁뇂뇃뇄뇅뇆뇇뇈뇉뇊뇋뇍뇎뇏뇑뇒뇓뇕������뇖뇗뇘뇙뇚뇛뇞뇠뇡뇢뇣뇤뇥뇦뇧뇪뇫뇭뇮뇯뇱뇲뇳뇴뇵뇶뇷뇸뇺뇼뇾뇿눀눁눂눃눆눇눉눊눍눎눏눐눑눒눓눖눘눚눛눜눝눞눟눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눵눶눷눸눹눺눻눽눾눿뉀뉁뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌뉍뉎뉏뉐뉑뉒뉓뉔뉕뉖뉗뉙뉚뉛뉝뉞뉟뉡뉢뉣뉤뉥뉦뉧뉪뉫뉬뉭뉮�".split(""); +for(j = 0; j != D[135].length; ++j) if(D[135][j].charCodeAt(0) !== 0xFFFD) { e[D[135][j]] = 34560 + j; d[34560 + j] = D[135][j];} +D[136] = "�����������������������������������������������������������������뉯뉰뉱뉲뉳뉶뉷뉸뉹뉺뉻뉽뉾뉿늀늁늂늃늆늇늈늊늋늌늍늎������늏늒늓늕늖늗늛늜늝늞늟늢늤늧늨늩늫늭늮늯늱늲늳늵늶늷������늸늹늺늻늼늽늾늿닀닁닂닃닄닅닆닇닊닋닍닎닏닑닓닔닕닖닗닚닜닞닟닠닡닣닧닩닪닰닱닲닶닼닽닾댂댃댅댆댇댉댊댋댌댍댎댏댒댖댗댘댙댚댛댝댞댟댠댡댢댣댤댥댦댧댨댩댪댫댬댭댮댯댰댱댲댳댴댵댶댷댸댹댺댻댼댽댾댿덀덁덂덃덄덅덆덇덈덉덊덋덌덍덎덏덐덑덒덓덗덙덚덝덠덡덢덣�".split(""); +for(j = 0; j != D[136].length; ++j) if(D[136][j].charCodeAt(0) !== 0xFFFD) { e[D[136][j]] = 34816 + j; d[34816 + j] = D[136][j];} +D[137] = "�����������������������������������������������������������������덦덨덪덬덭덯덲덳덵덶덷덹덺덻덼덽덾덿뎂뎆뎇뎈뎉뎊뎋뎍������뎎뎏뎑뎒뎓뎕뎖뎗뎘뎙뎚뎛뎜뎝뎞뎟뎢뎣뎤뎥뎦뎧뎩뎪뎫뎭������뎮뎯뎰뎱뎲뎳뎴뎵뎶뎷뎸뎹뎺뎻뎼뎽뎾뎿돀돁돂돃돆돇돉돊돍돏돑돒돓돖돘돚돜돞돟돡돢돣돥돦돧돩돪돫돬돭돮돯돰돱돲돳돴돵돶돷돸돹돺돻돽돾돿됀됁됂됃됄됅됆됇됈됉됊됋됌됍됎됏됑됒됓됔됕됖됗됙됚됛됝됞됟됡됢됣됤됥됦됧됪됬됭됮됯됰됱됲됳됵됶됷됸됹됺됻됼됽됾됿둀둁둂둃둄�".split(""); +for(j = 0; j != D[137].length; ++j) if(D[137][j].charCodeAt(0) !== 0xFFFD) { e[D[137][j]] = 35072 + j; d[35072 + j] = D[137][j];} +D[138] = "�����������������������������������������������������������������둅둆둇둈둉둊둋둌둍둎둏둒둓둕둖둗둙둚둛둜둝둞둟둢둤둦������둧둨둩둪둫둭둮둯둰둱둲둳둴둵둶둷둸둹둺둻둼둽둾둿뒁뒂������뒃뒄뒅뒆뒇뒉뒊뒋뒌뒍뒎뒏뒐뒑뒒뒓뒔뒕뒖뒗뒘뒙뒚뒛뒜뒞뒟뒠뒡뒢뒣뒥뒦뒧뒩뒪뒫뒭뒮뒯뒰뒱뒲뒳뒴뒶뒸뒺뒻뒼뒽뒾뒿듁듂듃듅듆듇듉듊듋듌듍듎듏듑듒듓듔듖듗듘듙듚듛듞듟듡듢듥듧듨듩듪듫듮듰듲듳듴듵듶듷듹듺듻듼듽듾듿딀딁딂딃딄딅딆딇딈딉딊딋딌딍딎딏딐딑딒딓딖딗딙딚딝�".split(""); +for(j = 0; j != D[138].length; ++j) if(D[138][j].charCodeAt(0) !== 0xFFFD) { e[D[138][j]] = 35328 + j; d[35328 + j] = D[138][j];} +D[139] = "�����������������������������������������������������������������딞딟딠딡딢딣딦딫딬딭딮딯딲딳딵딶딷딹딺딻딼딽딾딿땂땆������땇땈땉땊땎땏땑땒땓땕땖땗땘땙땚땛땞땢땣땤땥땦땧땨땩땪������땫땬땭땮땯땰땱땲땳땴땵땶땷땸땹땺땻땼땽땾땿떀떁떂떃떄떅떆떇떈떉떊떋떌떍떎떏떐떑떒떓떔떕떖떗떘떙떚떛떜떝떞떟떢떣떥떦떧떩떬떭떮떯떲떶떷떸떹떺떾떿뗁뗂뗃뗅뗆뗇뗈뗉뗊뗋뗎뗒뗓뗔뗕뗖뗗뗙뗚뗛뗜뗝뗞뗟뗠뗡뗢뗣뗤뗥뗦뗧뗨뗩뗪뗫뗭뗮뗯뗰뗱뗲뗳뗴뗵뗶뗷뗸뗹뗺뗻뗼뗽뗾뗿�".split(""); +for(j = 0; j != D[139].length; ++j) if(D[139][j].charCodeAt(0) !== 0xFFFD) { e[D[139][j]] = 35584 + j; d[35584 + j] = D[139][j];} +D[140] = "�����������������������������������������������������������������똀똁똂똃똄똅똆똇똈똉똊똋똌똍똎똏똒똓똕똖똗똙똚똛똜똝������똞똟똠똡똢똣똤똦똧똨똩똪똫똭똮똯똰똱똲똳똵똶똷똸똹똺������똻똼똽똾똿뙀뙁뙂뙃뙄뙅뙆뙇뙉뙊뙋뙌뙍뙎뙏뙐뙑뙒뙓뙔뙕뙖뙗뙘뙙뙚뙛뙜뙝뙞뙟뙠뙡뙢뙣뙥뙦뙧뙩뙪뙫뙬뙭뙮뙯뙰뙱뙲뙳뙴뙵뙶뙷뙸뙹뙺뙻뙼뙽뙾뙿뚀뚁뚂뚃뚄뚅뚆뚇뚈뚉뚊뚋뚌뚍뚎뚏뚐뚑뚒뚓뚔뚕뚖뚗뚘뚙뚚뚛뚞뚟뚡뚢뚣뚥뚦뚧뚨뚩뚪뚭뚮뚯뚰뚲뚳뚴뚵뚶뚷뚸뚹뚺뚻뚼뚽뚾뚿뛀뛁뛂�".split(""); +for(j = 0; j != D[140].length; ++j) if(D[140][j].charCodeAt(0) !== 0xFFFD) { e[D[140][j]] = 35840 + j; d[35840 + j] = D[140][j];} +D[141] = "�����������������������������������������������������������������뛃뛄뛅뛆뛇뛈뛉뛊뛋뛌뛍뛎뛏뛐뛑뛒뛓뛕뛖뛗뛘뛙뛚뛛뛜뛝������뛞뛟뛠뛡뛢뛣뛤뛥뛦뛧뛨뛩뛪뛫뛬뛭뛮뛯뛱뛲뛳뛵뛶뛷뛹뛺������뛻뛼뛽뛾뛿뜂뜃뜄뜆뜇뜈뜉뜊뜋뜌뜍뜎뜏뜐뜑뜒뜓뜔뜕뜖뜗뜘뜙뜚뜛뜜뜝뜞뜟뜠뜡뜢뜣뜤뜥뜦뜧뜪뜫뜭뜮뜱뜲뜳뜴뜵뜶뜷뜺뜼뜽뜾뜿띀띁띂띃띅띆띇띉띊띋띍띎띏띐띑띒띓띖띗띘띙띚띛띜띝띞띟띡띢띣띥띦띧띩띪띫띬띭띮띯띲띴띶띷띸띹띺띻띾띿랁랂랃랅랆랇랈랉랊랋랎랓랔랕랚랛랝랞�".split(""); +for(j = 0; j != D[141].length; ++j) if(D[141][j].charCodeAt(0) !== 0xFFFD) { e[D[141][j]] = 36096 + j; d[36096 + j] = D[141][j];} +D[142] = "�����������������������������������������������������������������랟랡랢랣랤랥랦랧랪랮랯랰랱랲랳랶랷랹랺랻랼랽랾랿럀럁������럂럃럄럅럆럈럊럋럌럍럎럏럐럑럒럓럔럕럖럗럘럙럚럛럜럝������럞럟럠럡럢럣럤럥럦럧럨럩럪럫럮럯럱럲럳럵럶럷럸럹럺럻럾렂렃렄렅렆렊렋렍렎렏렑렒렓렔렕렖렗렚렜렞렟렠렡렢렣렦렧렩렪렫렭렮렯렰렱렲렳렶렺렻렼렽렾렿롁롂롃롅롆롇롈롉롊롋롌롍롎롏롐롒롔롕롖롗롘롙롚롛롞롟롡롢롣롥롦롧롨롩롪롫롮롰롲롳롴롵롶롷롹롺롻롽롾롿뢀뢁뢂뢃뢄�".split(""); +for(j = 0; j != D[142].length; ++j) if(D[142][j].charCodeAt(0) !== 0xFFFD) { e[D[142][j]] = 36352 + j; d[36352 + j] = D[142][j];} +D[143] = "�����������������������������������������������������������������뢅뢆뢇뢈뢉뢊뢋뢌뢎뢏뢐뢑뢒뢓뢔뢕뢖뢗뢘뢙뢚뢛뢜뢝뢞뢟������뢠뢡뢢뢣뢤뢥뢦뢧뢩뢪뢫뢬뢭뢮뢯뢱뢲뢳뢵뢶뢷뢹뢺뢻뢼뢽������뢾뢿룂룄룆룇룈룉룊룋룍룎룏룑룒룓룕룖룗룘룙룚룛룜룞룠룢룣룤룥룦룧룪룫룭룮룯룱룲룳룴룵룶룷룺룼룾룿뤀뤁뤂뤃뤅뤆뤇뤈뤉뤊뤋뤌뤍뤎뤏뤐뤑뤒뤓뤔뤕뤖뤗뤙뤚뤛뤜뤝뤞뤟뤡뤢뤣뤤뤥뤦뤧뤨뤩뤪뤫뤬뤭뤮뤯뤰뤱뤲뤳뤴뤵뤶뤷뤸뤹뤺뤻뤾뤿륁륂륃륅륆륇륈륉륊륋륍륎륐륒륓륔륕륖륗�".split(""); +for(j = 0; j != D[143].length; ++j) if(D[143][j].charCodeAt(0) !== 0xFFFD) { e[D[143][j]] = 36608 + j; d[36608 + j] = D[143][j];} +D[144] = "�����������������������������������������������������������������륚륛륝륞륟륡륢륣륤륥륦륧륪륬륮륯륰륱륲륳륶륷륹륺륻륽������륾륿릀릁릂릃릆릈릋릌릏릐릑릒릓릔릕릖릗릘릙릚릛릜릝릞������릟릠릡릢릣릤릥릦릧릨릩릪릫릮릯릱릲릳릵릶릷릸릹릺릻릾맀맂맃맄맅맆맇맊맋맍맓맔맕맖맗맚맜맟맠맢맦맧맩맪맫맭맮맯맰맱맲맳맶맻맼맽맾맿먂먃먄먅먆먇먉먊먋먌먍먎먏먐먑먒먓먔먖먗먘먙먚먛먜먝먞먟먠먡먢먣먤먥먦먧먨먩먪먫먬먭먮먯먰먱먲먳먴먵먶먷먺먻먽먾먿멁멃멄멅멆�".split(""); +for(j = 0; j != D[144].length; ++j) if(D[144][j].charCodeAt(0) !== 0xFFFD) { e[D[144][j]] = 36864 + j; d[36864 + j] = D[144][j];} +D[145] = "�����������������������������������������������������������������멇멊멌멏멐멑멒멖멗멙멚멛멝멞멟멠멡멢멣멦멪멫멬멭멮멯������멲멳멵멶멷멹멺멻멼멽멾멿몀몁몂몆몈몉몊몋몍몎몏몐몑몒������몓몔몕몖몗몘몙몚몛몜몝몞몟몠몡몢몣몤몥몦몧몪몭몮몯몱몳몴몵몶몷몺몼몾몿뫀뫁뫂뫃뫅뫆뫇뫉뫊뫋뫌뫍뫎뫏뫐뫑뫒뫓뫔뫕뫖뫗뫚뫛뫜뫝뫞뫟뫠뫡뫢뫣뫤뫥뫦뫧뫨뫩뫪뫫뫬뫭뫮뫯뫰뫱뫲뫳뫴뫵뫶뫷뫸뫹뫺뫻뫽뫾뫿묁묂묃묅묆묇묈묉묊묋묌묎묐묒묓묔묕묖묗묙묚묛묝묞묟묡묢묣묤묥묦묧�".split(""); +for(j = 0; j != D[145].length; ++j) if(D[145][j].charCodeAt(0) !== 0xFFFD) { e[D[145][j]] = 37120 + j; d[37120 + j] = D[145][j];} +D[146] = "�����������������������������������������������������������������묨묪묬묭묮묯묰묱묲묳묷묹묺묿뭀뭁뭂뭃뭆뭈뭊뭋뭌뭎뭑뭒������뭓뭕뭖뭗뭙뭚뭛뭜뭝뭞뭟뭠뭢뭤뭥뭦뭧뭨뭩뭪뭫뭭뭮뭯뭰뭱������뭲뭳뭴뭵뭶뭷뭸뭹뭺뭻뭼뭽뭾뭿뮀뮁뮂뮃뮄뮅뮆뮇뮉뮊뮋뮍뮎뮏뮑뮒뮓뮔뮕뮖뮗뮘뮙뮚뮛뮜뮝뮞뮟뮠뮡뮢뮣뮥뮦뮧뮩뮪뮫뮭뮮뮯뮰뮱뮲뮳뮵뮶뮸뮹뮺뮻뮼뮽뮾뮿믁믂믃믅믆믇믉믊믋믌믍믎믏믑믒믔믕믖믗믘믙믚믛믜믝믞믟믠믡믢믣믤믥믦믧믨믩믪믫믬믭믮믯믰믱믲믳믴믵믶믷믺믻믽믾밁�".split(""); +for(j = 0; j != D[146].length; ++j) if(D[146][j].charCodeAt(0) !== 0xFFFD) { e[D[146][j]] = 37376 + j; d[37376 + j] = D[146][j];} +D[147] = "�����������������������������������������������������������������밃밄밅밆밇밊밎밐밒밓밙밚밠밡밢밣밦밨밪밫밬밮밯밲밳밵������밶밷밹밺밻밼밽밾밿뱂뱆뱇뱈뱊뱋뱎뱏뱑뱒뱓뱔뱕뱖뱗뱘뱙������뱚뱛뱜뱞뱟뱠뱡뱢뱣뱤뱥뱦뱧뱨뱩뱪뱫뱬뱭뱮뱯뱰뱱뱲뱳뱴뱵뱶뱷뱸뱹뱺뱻뱼뱽뱾뱿벀벁벂벃벆벇벉벊벍벏벐벑벒벓벖벘벛벜벝벞벟벢벣벥벦벩벪벫벬벭벮벯벲벶벷벸벹벺벻벾벿볁볂볃볅볆볇볈볉볊볋볌볎볒볓볔볖볗볙볚볛볝볞볟볠볡볢볣볤볥볦볧볨볩볪볫볬볭볮볯볰볱볲볳볷볹볺볻볽�".split(""); +for(j = 0; j != D[147].length; ++j) if(D[147][j].charCodeAt(0) !== 0xFFFD) { e[D[147][j]] = 37632 + j; d[37632 + j] = D[147][j];} +D[148] = "�����������������������������������������������������������������볾볿봀봁봂봃봆봈봊봋봌봍봎봏봑봒봓봕봖봗봘봙봚봛봜봝������봞봟봠봡봢봣봥봦봧봨봩봪봫봭봮봯봰봱봲봳봴봵봶봷봸봹������봺봻봼봽봾봿뵁뵂뵃뵄뵅뵆뵇뵊뵋뵍뵎뵏뵑뵒뵓뵔뵕뵖뵗뵚뵛뵜뵝뵞뵟뵠뵡뵢뵣뵥뵦뵧뵩뵪뵫뵬뵭뵮뵯뵰뵱뵲뵳뵴뵵뵶뵷뵸뵹뵺뵻뵼뵽뵾뵿붂붃붅붆붋붌붍붎붏붒붔붖붗붘붛붝붞붟붠붡붢붣붥붦붧붨붩붪붫붬붭붮붯붱붲붳붴붵붶붷붹붺붻붼붽붾붿뷀뷁뷂뷃뷄뷅뷆뷇뷈뷉뷊뷋뷌뷍뷎뷏뷐뷑�".split(""); +for(j = 0; j != D[148].length; ++j) if(D[148][j].charCodeAt(0) !== 0xFFFD) { e[D[148][j]] = 37888 + j; d[37888 + j] = D[148][j];} +D[149] = "�����������������������������������������������������������������뷒뷓뷖뷗뷙뷚뷛뷝뷞뷟뷠뷡뷢뷣뷤뷥뷦뷧뷨뷪뷫뷬뷭뷮뷯뷱������뷲뷳뷵뷶뷷뷹뷺뷻뷼뷽뷾뷿븁븂븄븆븇븈븉븊븋븎븏븑븒븓������븕븖븗븘븙븚븛븞븠븡븢븣븤븥븦븧븨븩븪븫븬븭븮븯븰븱븲븳븴븵븶븷븸븹븺븻븼븽븾븿빀빁빂빃빆빇빉빊빋빍빏빐빑빒빓빖빘빜빝빞빟빢빣빥빦빧빩빫빬빭빮빯빲빶빷빸빹빺빾빿뺁뺂뺃뺅뺆뺇뺈뺉뺊뺋뺎뺒뺓뺔뺕뺖뺗뺚뺛뺜뺝뺞뺟뺠뺡뺢뺣뺤뺥뺦뺧뺩뺪뺫뺬뺭뺮뺯뺰뺱뺲뺳뺴뺵뺶뺷�".split(""); +for(j = 0; j != D[149].length; ++j) if(D[149][j].charCodeAt(0) !== 0xFFFD) { e[D[149][j]] = 38144 + j; d[38144 + j] = D[149][j];} +D[150] = "�����������������������������������������������������������������뺸뺹뺺뺻뺼뺽뺾뺿뻀뻁뻂뻃뻄뻅뻆뻇뻈뻉뻊뻋뻌뻍뻎뻏뻒뻓������뻕뻖뻙뻚뻛뻜뻝뻞뻟뻡뻢뻦뻧뻨뻩뻪뻫뻭뻮뻯뻰뻱뻲뻳뻴뻵������뻶뻷뻸뻹뻺뻻뻼뻽뻾뻿뼀뼂뼃뼄뼅뼆뼇뼊뼋뼌뼍뼎뼏뼐뼑뼒뼓뼔뼕뼖뼗뼚뼞뼟뼠뼡뼢뼣뼤뼥뼦뼧뼨뼩뼪뼫뼬뼭뼮뼯뼰뼱뼲뼳뼴뼵뼶뼷뼸뼹뼺뼻뼼뼽뼾뼿뽂뽃뽅뽆뽇뽉뽊뽋뽌뽍뽎뽏뽒뽓뽔뽖뽗뽘뽙뽚뽛뽜뽝뽞뽟뽠뽡뽢뽣뽤뽥뽦뽧뽨뽩뽪뽫뽬뽭뽮뽯뽰뽱뽲뽳뽴뽵뽶뽷뽸뽹뽺뽻뽼뽽뽾뽿뾀뾁뾂�".split(""); +for(j = 0; j != D[150].length; ++j) if(D[150][j].charCodeAt(0) !== 0xFFFD) { e[D[150][j]] = 38400 + j; d[38400 + j] = D[150][j];} +D[151] = "�����������������������������������������������������������������뾃뾄뾅뾆뾇뾈뾉뾊뾋뾌뾍뾎뾏뾐뾑뾒뾓뾕뾖뾗뾘뾙뾚뾛뾜뾝������뾞뾟뾠뾡뾢뾣뾤뾥뾦뾧뾨뾩뾪뾫뾬뾭뾮뾯뾱뾲뾳뾴뾵뾶뾷뾸������뾹뾺뾻뾼뾽뾾뾿뿀뿁뿂뿃뿄뿆뿇뿈뿉뿊뿋뿎뿏뿑뿒뿓뿕뿖뿗뿘뿙뿚뿛뿝뿞뿠뿢뿣뿤뿥뿦뿧뿨뿩뿪뿫뿬뿭뿮뿯뿰뿱뿲뿳뿴뿵뿶뿷뿸뿹뿺뿻뿼뿽뿾뿿쀀쀁쀂쀃쀄쀅쀆쀇쀈쀉쀊쀋쀌쀍쀎쀏쀐쀑쀒쀓쀔쀕쀖쀗쀘쀙쀚쀛쀜쀝쀞쀟쀠쀡쀢쀣쀤쀥쀦쀧쀨쀩쀪쀫쀬쀭쀮쀯쀰쀱쀲쀳쀴쀵쀶쀷쀸쀹쀺쀻쀽쀾쀿�".split(""); +for(j = 0; j != D[151].length; ++j) if(D[151][j].charCodeAt(0) !== 0xFFFD) { e[D[151][j]] = 38656 + j; d[38656 + j] = D[151][j];} +D[152] = "�����������������������������������������������������������������쁀쁁쁂쁃쁄쁅쁆쁇쁈쁉쁊쁋쁌쁍쁎쁏쁐쁒쁓쁔쁕쁖쁗쁙쁚쁛������쁝쁞쁟쁡쁢쁣쁤쁥쁦쁧쁪쁫쁬쁭쁮쁯쁰쁱쁲쁳쁴쁵쁶쁷쁸쁹������쁺쁻쁼쁽쁾쁿삀삁삂삃삄삅삆삇삈삉삊삋삌삍삎삏삒삓삕삖삗삙삚삛삜삝삞삟삢삤삦삧삨삩삪삫삮삱삲삷삸삹삺삻삾샂샃샄샆샇샊샋샍샎샏샑샒샓샔샕샖샗샚샞샟샠샡샢샣샦샧샩샪샫샭샮샯샰샱샲샳샶샸샺샻샼샽샾샿섁섂섃섅섆섇섉섊섋섌섍섎섏섑섒섓섔섖섗섘섙섚섛섡섢섥섨섩섪섫섮�".split(""); +for(j = 0; j != D[152].length; ++j) if(D[152][j].charCodeAt(0) !== 0xFFFD) { e[D[152][j]] = 38912 + j; d[38912 + j] = D[152][j];} +D[153] = "�����������������������������������������������������������������섲섳섴섵섷섺섻섽섾섿셁셂셃셄셅셆셇셊셎셏셐셑셒셓셖셗������셙셚셛셝셞셟셠셡셢셣셦셪셫셬셭셮셯셱셲셳셵셶셷셹셺셻������셼셽셾셿솀솁솂솃솄솆솇솈솉솊솋솏솑솒솓솕솗솘솙솚솛솞솠솢솣솤솦솧솪솫솭솮솯솱솲솳솴솵솶솷솸솹솺솻솼솾솿쇀쇁쇂쇃쇅쇆쇇쇉쇊쇋쇍쇎쇏쇐쇑쇒쇓쇕쇖쇙쇚쇛쇜쇝쇞쇟쇡쇢쇣쇥쇦쇧쇩쇪쇫쇬쇭쇮쇯쇲쇴쇵쇶쇷쇸쇹쇺쇻쇾쇿숁숂숃숅숆숇숈숉숊숋숎숐숒숓숔숕숖숗숚숛숝숞숡숢숣�".split(""); +for(j = 0; j != D[153].length; ++j) if(D[153][j].charCodeAt(0) !== 0xFFFD) { e[D[153][j]] = 39168 + j; d[39168 + j] = D[153][j];} +D[154] = "�����������������������������������������������������������������숤숥숦숧숪숬숮숰숳숵숶숷숸숹숺숻숼숽숾숿쉀쉁쉂쉃쉄쉅������쉆쉇쉉쉊쉋쉌쉍쉎쉏쉒쉓쉕쉖쉗쉙쉚쉛쉜쉝쉞쉟쉡쉢쉣쉤쉦������쉧쉨쉩쉪쉫쉮쉯쉱쉲쉳쉵쉶쉷쉸쉹쉺쉻쉾슀슂슃슄슅슆슇슊슋슌슍슎슏슑슒슓슔슕슖슗슙슚슜슞슟슠슡슢슣슦슧슩슪슫슮슯슰슱슲슳슶슸슺슻슼슽슾슿싀싁싂싃싄싅싆싇싈싉싊싋싌싍싎싏싐싑싒싓싔싕싖싗싘싙싚싛싞싟싡싢싥싦싧싨싩싪싮싰싲싳싴싵싷싺싽싾싿쌁쌂쌃쌄쌅쌆쌇쌊쌋쌎쌏�".split(""); +for(j = 0; j != D[154].length; ++j) if(D[154][j].charCodeAt(0) !== 0xFFFD) { e[D[154][j]] = 39424 + j; d[39424 + j] = D[154][j];} +D[155] = "�����������������������������������������������������������������쌐쌑쌒쌖쌗쌙쌚쌛쌝쌞쌟쌠쌡쌢쌣쌦쌧쌪쌫쌬쌭쌮쌯쌰쌱쌲������쌳쌴쌵쌶쌷쌸쌹쌺쌻쌼쌽쌾쌿썀썁썂썃썄썆썇썈썉썊썋썌썍������썎썏썐썑썒썓썔썕썖썗썘썙썚썛썜썝썞썟썠썡썢썣썤썥썦썧썪썫썭썮썯썱썳썴썵썶썷썺썻썾썿쎀쎁쎂쎃쎅쎆쎇쎉쎊쎋쎍쎎쎏쎐쎑쎒쎓쎔쎕쎖쎗쎘쎙쎚쎛쎜쎝쎞쎟쎠쎡쎢쎣쎤쎥쎦쎧쎨쎩쎪쎫쎬쎭쎮쎯쎰쎱쎲쎳쎴쎵쎶쎷쎸쎹쎺쎻쎼쎽쎾쎿쏁쏂쏃쏄쏅쏆쏇쏈쏉쏊쏋쏌쏍쏎쏏쏐쏑쏒쏓쏔쏕쏖쏗쏚�".split(""); +for(j = 0; j != D[155].length; ++j) if(D[155][j].charCodeAt(0) !== 0xFFFD) { e[D[155][j]] = 39680 + j; d[39680 + j] = D[155][j];} +D[156] = "�����������������������������������������������������������������쏛쏝쏞쏡쏣쏤쏥쏦쏧쏪쏫쏬쏮쏯쏰쏱쏲쏳쏶쏷쏹쏺쏻쏼쏽쏾������쏿쐀쐁쐂쐃쐄쐅쐆쐇쐉쐊쐋쐌쐍쐎쐏쐑쐒쐓쐔쐕쐖쐗쐘쐙쐚������쐛쐜쐝쐞쐟쐠쐡쐢쐣쐥쐦쐧쐨쐩쐪쐫쐭쐮쐯쐱쐲쐳쐵쐶쐷쐸쐹쐺쐻쐾쐿쑀쑁쑂쑃쑄쑅쑆쑇쑉쑊쑋쑌쑍쑎쑏쑐쑑쑒쑓쑔쑕쑖쑗쑘쑙쑚쑛쑜쑝쑞쑟쑠쑡쑢쑣쑦쑧쑩쑪쑫쑭쑮쑯쑰쑱쑲쑳쑶쑷쑸쑺쑻쑼쑽쑾쑿쒁쒂쒃쒄쒅쒆쒇쒈쒉쒊쒋쒌쒍쒎쒏쒐쒑쒒쒓쒕쒖쒗쒘쒙쒚쒛쒝쒞쒟쒠쒡쒢쒣쒤쒥쒦쒧쒨쒩�".split(""); +for(j = 0; j != D[156].length; ++j) if(D[156][j].charCodeAt(0) !== 0xFFFD) { e[D[156][j]] = 39936 + j; d[39936 + j] = D[156][j];} +D[157] = "�����������������������������������������������������������������쒪쒫쒬쒭쒮쒯쒰쒱쒲쒳쒴쒵쒶쒷쒹쒺쒻쒽쒾쒿쓀쓁쓂쓃쓄쓅������쓆쓇쓈쓉쓊쓋쓌쓍쓎쓏쓐쓑쓒쓓쓔쓕쓖쓗쓘쓙쓚쓛쓜쓝쓞쓟������쓠쓡쓢쓣쓤쓥쓦쓧쓨쓪쓫쓬쓭쓮쓯쓲쓳쓵쓶쓷쓹쓻쓼쓽쓾씂씃씄씅씆씇씈씉씊씋씍씎씏씑씒씓씕씖씗씘씙씚씛씝씞씟씠씡씢씣씤씥씦씧씪씫씭씮씯씱씲씳씴씵씶씷씺씼씾씿앀앁앂앃앆앇앋앏앐앑앒앖앚앛앜앟앢앣앥앦앧앩앪앫앬앭앮앯앲앶앷앸앹앺앻앾앿얁얂얃얅얆얈얉얊얋얎얐얒얓얔�".split(""); +for(j = 0; j != D[157].length; ++j) if(D[157][j].charCodeAt(0) !== 0xFFFD) { e[D[157][j]] = 40192 + j; d[40192 + j] = D[157][j];} +D[158] = "�����������������������������������������������������������������얖얙얚얛얝얞얟얡얢얣얤얥얦얧얨얪얫얬얭얮얯얰얱얲얳얶������얷얺얿엀엁엂엃엋엍엏엒엓엕엖엗엙엚엛엜엝엞엟엢엤엦엧������엨엩엪엫엯엱엲엳엵엸엹엺엻옂옃옄옉옊옋옍옎옏옑옒옓옔옕옖옗옚옝옞옟옠옡옢옣옦옧옩옪옫옯옱옲옶옸옺옼옽옾옿왂왃왅왆왇왉왊왋왌왍왎왏왒왖왗왘왙왚왛왞왟왡왢왣왤왥왦왧왨왩왪왫왭왮왰왲왳왴왵왶왷왺왻왽왾왿욁욂욃욄욅욆욇욊욌욎욏욐욑욒욓욖욗욙욚욛욝욞욟욠욡욢욣욦�".split(""); +for(j = 0; j != D[158].length; ++j) if(D[158][j].charCodeAt(0) !== 0xFFFD) { e[D[158][j]] = 40448 + j; d[40448 + j] = D[158][j];} +D[159] = "�����������������������������������������������������������������욨욪욫욬욭욮욯욲욳욵욶욷욻욼욽욾욿웂웄웆웇웈웉웊웋웎������웏웑웒웓웕웖웗웘웙웚웛웞웟웢웣웤웥웦웧웪웫웭웮웯웱웲������웳웴웵웶웷웺웻웼웾웿윀윁윂윃윆윇윉윊윋윍윎윏윐윑윒윓윖윘윚윛윜윝윞윟윢윣윥윦윧윩윪윫윬윭윮윯윲윴윶윸윹윺윻윾윿읁읂읃읅읆읇읈읉읋읎읐읙읚읛읝읞읟읡읢읣읤읥읦읧읩읪읬읭읮읯읰읱읲읳읶읷읹읺읻읿잀잁잂잆잋잌잍잏잒잓잕잙잛잜잝잞잟잢잧잨잩잪잫잮잯잱잲잳잵잶잷�".split(""); +for(j = 0; j != D[159].length; ++j) if(D[159][j].charCodeAt(0) !== 0xFFFD) { e[D[159][j]] = 40704 + j; d[40704 + j] = D[159][j];} +D[160] = "�����������������������������������������������������������������잸잹잺잻잾쟂쟃쟄쟅쟆쟇쟊쟋쟍쟏쟑쟒쟓쟔쟕쟖쟗쟙쟚쟛쟜������쟞쟟쟠쟡쟢쟣쟥쟦쟧쟩쟪쟫쟭쟮쟯쟰쟱쟲쟳쟴쟵쟶쟷쟸쟹쟺������쟻쟼쟽쟾쟿젂젃젅젆젇젉젋젌젍젎젏젒젔젗젘젙젚젛젞젟젡젢젣젥젦젧젨젩젪젫젮젰젲젳젴젵젶젷젹젺젻젽젾젿졁졂졃졄졅졆졇졊졋졎졏졐졑졒졓졕졖졗졘졙졚졛졜졝졞졟졠졡졢졣졤졥졦졧졨졩졪졫졬졭졮졯졲졳졵졶졷졹졻졼졽졾졿좂좄좈좉좊좎좏좐좑좒좓좕좖좗좘좙좚좛좜좞좠좢좣좤�".split(""); +for(j = 0; j != D[160].length; ++j) if(D[160][j].charCodeAt(0) !== 0xFFFD) { e[D[160][j]] = 40960 + j; d[40960 + j] = D[160][j];} +D[161] = "�����������������������������������������������������������������좥좦좧좩좪좫좬좭좮좯좰좱좲좳좴좵좶좷좸좹좺좻좾좿죀죁������죂죃죅죆죇죉죊죋죍죎죏죐죑죒죓죖죘죚죛죜죝죞죟죢죣죥������죦죧죨죩죪죫죬죭죮죯죰죱죲죳죴죶죷죸죹죺죻죾죿줁줂줃줇줈줉줊줋줎　、。·‥…¨〃­―∥＼∼‘’“”〔〕〈〉《》「」『』【】±×÷≠≤≥∞∴°′″℃Å￠￡￥♂♀∠⊥⌒∂∇≡≒§※☆★○●◎◇◆□■△▲▽▼→←↑↓↔〓≪≫√∽∝∵∫∬∈∋⊆⊇⊂⊃∪∩∧∨￢�".split(""); +for(j = 0; j != D[161].length; ++j) if(D[161][j].charCodeAt(0) !== 0xFFFD) { e[D[161][j]] = 41216 + j; d[41216 + j] = D[161][j];} +D[162] = "�����������������������������������������������������������������줐줒줓줔줕줖줗줙줚줛줜줝줞줟줠줡줢줣줤줥줦줧줨줩줪줫������줭줮줯줰줱줲줳줵줶줷줸줹줺줻줼줽줾줿쥀쥁쥂쥃쥄쥅쥆쥇������쥈쥉쥊쥋쥌쥍쥎쥏쥒쥓쥕쥖쥗쥙쥚쥛쥜쥝쥞쥟쥢쥤쥥쥦쥧쥨쥩쥪쥫쥭쥮쥯⇒⇔∀∃´～ˇ˘˝˚˙¸˛¡¿ː∮∑∏¤℉‰◁◀▷▶♤♠♡♥♧♣⊙◈▣◐◑▒▤▥▨▧▦▩♨☏☎☜☞¶†‡↕↗↙↖↘♭♩♪♬㉿㈜№㏇™㏂㏘℡€®������������������������".split(""); +for(j = 0; j != D[162].length; ++j) if(D[162][j].charCodeAt(0) !== 0xFFFD) { e[D[162][j]] = 41472 + j; d[41472 + j] = D[162][j];} +D[163] = "�����������������������������������������������������������������쥱쥲쥳쥵쥶쥷쥸쥹쥺쥻쥽쥾쥿즀즁즂즃즄즅즆즇즊즋즍즎즏������즑즒즓즔즕즖즗즚즜즞즟즠즡즢즣즤즥즦즧즨즩즪즫즬즭즮������즯즰즱즲즳즴즵즶즷즸즹즺즻즼즽즾즿짂짃짅짆짉짋짌짍짎짏짒짔짗짘짛！＂＃＄％＆＇（）＊＋，－．／０１２３４５６７８９：；＜＝＞？＠ＡＢＣＤＥＦＧＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺ［￦］＾＿｀ａｂｃｄｅｆｇｈｉｊｋｌｍｎｏｐｑｒｓｔｕｖｗｘｙｚ｛｜｝￣�".split(""); +for(j = 0; j != D[163].length; ++j) if(D[163][j].charCodeAt(0) !== 0xFFFD) { e[D[163][j]] = 41728 + j; d[41728 + j] = D[163][j];} +D[164] = "�����������������������������������������������������������������짞짟짡짣짥짦짨짩짪짫짮짲짳짴짵짶짷짺짻짽짾짿쨁쨂쨃쨄������쨅쨆쨇쨊쨎쨏쨐쨑쨒쨓쨕쨖쨗쨙쨚쨛쨜쨝쨞쨟쨠쨡쨢쨣쨤쨥������쨦쨧쨨쨪쨫쨬쨭쨮쨯쨰쨱쨲쨳쨴쨵쨶쨷쨸쨹쨺쨻쨼쨽쨾쨿쩀쩁쩂쩃쩄쩅쩆ㄱㄲㄳㄴㄵㄶㄷㄸㄹㄺㄻㄼㄽㄾㄿㅀㅁㅂㅃㅄㅅㅆㅇㅈㅉㅊㅋㅌㅍㅎㅏㅐㅑㅒㅓㅔㅕㅖㅗㅘㅙㅚㅛㅜㅝㅞㅟㅠㅡㅢㅣㅤㅥㅦㅧㅨㅩㅪㅫㅬㅭㅮㅯㅰㅱㅲㅳㅴㅵㅶㅷㅸㅹㅺㅻㅼㅽㅾㅿㆀㆁㆂㆃㆄㆅㆆㆇㆈㆉㆊㆋㆌㆍㆎ�".split(""); +for(j = 0; j != D[164].length; ++j) if(D[164][j].charCodeAt(0) !== 0xFFFD) { e[D[164][j]] = 41984 + j; d[41984 + j] = D[164][j];} +D[165] = "�����������������������������������������������������������������쩇쩈쩉쩊쩋쩎쩏쩑쩒쩓쩕쩖쩗쩘쩙쩚쩛쩞쩢쩣쩤쩥쩦쩧쩩쩪������쩫쩬쩭쩮쩯쩰쩱쩲쩳쩴쩵쩶쩷쩸쩹쩺쩻쩼쩾쩿쪀쪁쪂쪃쪅쪆������쪇쪈쪉쪊쪋쪌쪍쪎쪏쪐쪑쪒쪓쪔쪕쪖쪗쪙쪚쪛쪜쪝쪞쪟쪠쪡쪢쪣쪤쪥쪦쪧ⅰⅱⅲⅳⅴⅵⅶⅷⅸⅹ�����ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩ�������ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩ��������αβγδεζηθικλμνξοπρστυφχψω�������".split(""); +for(j = 0; j != D[165].length; ++j) if(D[165][j].charCodeAt(0) !== 0xFFFD) { e[D[165][j]] = 42240 + j; d[42240 + j] = D[165][j];} +D[166] = "�����������������������������������������������������������������쪨쪩쪪쪫쪬쪭쪮쪯쪰쪱쪲쪳쪴쪵쪶쪷쪸쪹쪺쪻쪾쪿쫁쫂쫃쫅������쫆쫇쫈쫉쫊쫋쫎쫐쫒쫔쫕쫖쫗쫚쫛쫜쫝쫞쫟쫡쫢쫣쫤쫥쫦쫧������쫨쫩쫪쫫쫭쫮쫯쫰쫱쫲쫳쫵쫶쫷쫸쫹쫺쫻쫼쫽쫾쫿쬀쬁쬂쬃쬄쬅쬆쬇쬉쬊─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳┫┻╋┠┯┨┷┿┝┰┥┸╂┒┑┚┙┖┕┎┍┞┟┡┢┦┧┩┪┭┮┱┲┵┶┹┺┽┾╀╁╃╄╅╆╇╈╉╊���������������������������".split(""); +for(j = 0; j != D[166].length; ++j) if(D[166][j].charCodeAt(0) !== 0xFFFD) { e[D[166][j]] = 42496 + j; d[42496 + j] = D[166][j];} +D[167] = "�����������������������������������������������������������������쬋쬌쬍쬎쬏쬑쬒쬓쬕쬖쬗쬙쬚쬛쬜쬝쬞쬟쬢쬣쬤쬥쬦쬧쬨쬩������쬪쬫쬬쬭쬮쬯쬰쬱쬲쬳쬴쬵쬶쬷쬸쬹쬺쬻쬼쬽쬾쬿쭀쭂쭃쭄������쭅쭆쭇쭊쭋쭍쭎쭏쭑쭒쭓쭔쭕쭖쭗쭚쭛쭜쭞쭟쭠쭡쭢쭣쭥쭦쭧쭨쭩쭪쭫쭬㎕㎖㎗ℓ㎘㏄㎣㎤㎥㎦㎙㎚㎛㎜㎝㎞㎟㎠㎡㎢㏊㎍㎎㎏㏏㎈㎉㏈㎧㎨㎰㎱㎲㎳㎴㎵㎶㎷㎸㎹㎀㎁㎂㎃㎄㎺㎻㎼㎽㎾㎿㎐㎑㎒㎓㎔Ω㏀㏁㎊㎋㎌㏖㏅㎭㎮㎯㏛㎩㎪㎫㎬㏝㏐㏓㏃㏉㏜㏆����������������".split(""); +for(j = 0; j != D[167].length; ++j) if(D[167][j].charCodeAt(0) !== 0xFFFD) { e[D[167][j]] = 42752 + j; d[42752 + j] = D[167][j];} +D[168] = "�����������������������������������������������������������������쭭쭮쭯쭰쭱쭲쭳쭴쭵쭶쭷쭺쭻쭼쭽쭾쭿쮀쮁쮂쮃쮄쮅쮆쮇쮈������쮉쮊쮋쮌쮍쮎쮏쮐쮑쮒쮓쮔쮕쮖쮗쮘쮙쮚쮛쮝쮞쮟쮠쮡쮢쮣������쮤쮥쮦쮧쮨쮩쮪쮫쮬쮭쮮쮯쮰쮱쮲쮳쮴쮵쮶쮷쮹쮺쮻쮼쮽쮾쮿쯀쯁쯂쯃쯄ÆЪĦ�IJ�ĿŁØŒºÞŦŊ�㉠㉡㉢㉣㉤㉥㉦㉧㉨㉩㉪㉫㉬㉭㉮㉯㉰㉱㉲㉳㉴㉵㉶㉷㉸㉹㉺㉻ⓐⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜⓝⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ①②③④⑤⑥⑦⑧⑨⑩⑪⑫⑬⑭⑮½⅓⅔¼¾⅛⅜⅝⅞�".split(""); +for(j = 0; j != D[168].length; ++j) if(D[168][j].charCodeAt(0) !== 0xFFFD) { e[D[168][j]] = 43008 + j; d[43008 + j] = D[168][j];} +D[169] = "�����������������������������������������������������������������쯅쯆쯇쯈쯉쯊쯋쯌쯍쯎쯏쯐쯑쯒쯓쯕쯖쯗쯘쯙쯚쯛쯜쯝쯞쯟������쯠쯡쯢쯣쯥쯦쯨쯪쯫쯬쯭쯮쯯쯰쯱쯲쯳쯴쯵쯶쯷쯸쯹쯺쯻쯼������쯽쯾쯿찀찁찂찃찄찅찆찇찈찉찊찋찎찏찑찒찓찕찖찗찘찙찚찛찞찟찠찣찤æđðħıijĸŀłøœßþŧŋʼn㈀㈁㈂㈃㈄㈅㈆㈇㈈㈉㈊㈋㈌㈍㈎㈏㈐㈑㈒㈓㈔㈕㈖㈗㈘㈙㈚㈛⒜⒝⒞⒟⒠⒡⒢⒣⒤⒥⒦⒧⒨⒩⒪⒫⒬⒭⒮⒯⒰⒱⒲⒳⒴⒵⑴⑵⑶⑷⑸⑹⑺⑻⑼⑽⑾⑿⒀⒁⒂¹²³⁴ⁿ₁₂₃₄�".split(""); +for(j = 0; j != D[169].length; ++j) if(D[169][j].charCodeAt(0) !== 0xFFFD) { e[D[169][j]] = 43264 + j; d[43264 + j] = D[169][j];} +D[170] = "�����������������������������������������������������������������찥찦찪찫찭찯찱찲찳찴찵찶찷찺찿챀챁챂챃챆챇챉챊챋챍챎������챏챐챑챒챓챖챚챛챜챝챞챟챡챢챣챥챧챩챪챫챬챭챮챯챱챲������챳챴챶챷챸챹챺챻챼챽챾챿첀첁첂첃첄첅첆첇첈첉첊첋첌첍첎첏첐첑첒첓ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのはばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをん������������".split(""); +for(j = 0; j != D[170].length; ++j) if(D[170][j].charCodeAt(0) !== 0xFFFD) { e[D[170][j]] = 43520 + j; d[43520 + j] = D[170][j];} +D[171] = "�����������������������������������������������������������������첔첕첖첗첚첛첝첞첟첡첢첣첤첥첦첧첪첮첯첰첱첲첳첶첷첹������첺첻첽첾첿쳀쳁쳂쳃쳆쳈쳊쳋쳌쳍쳎쳏쳑쳒쳓쳕쳖쳗쳘쳙쳚������쳛쳜쳝쳞쳟쳠쳡쳢쳣쳥쳦쳧쳨쳩쳪쳫쳭쳮쳯쳱쳲쳳쳴쳵쳶쳷쳸쳹쳺쳻쳼쳽ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハバパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ���������".split(""); +for(j = 0; j != D[171].length; ++j) if(D[171][j].charCodeAt(0) !== 0xFFFD) { e[D[171][j]] = 43776 + j; d[43776 + j] = D[171][j];} +D[172] = "�����������������������������������������������������������������쳾쳿촀촂촃촄촅촆촇촊촋촍촎촏촑촒촓촔촕촖촗촚촜촞촟촠������촡촢촣촥촦촧촩촪촫촭촮촯촰촱촲촳촴촵촶촷촸촺촻촼촽촾������촿쵀쵁쵂쵃쵄쵅쵆쵇쵈쵉쵊쵋쵌쵍쵎쵏쵐쵑쵒쵓쵔쵕쵖쵗쵘쵙쵚쵛쵝쵞쵟АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ���������������абвгдеёжзийклмнопрстуфхцчшщъыьэюя��������������".split(""); +for(j = 0; j != D[172].length; ++j) if(D[172][j].charCodeAt(0) !== 0xFFFD) { e[D[172][j]] = 44032 + j; d[44032 + j] = D[172][j];} +D[173] = "�����������������������������������������������������������������쵡쵢쵣쵥쵦쵧쵨쵩쵪쵫쵮쵰쵲쵳쵴쵵쵶쵷쵹쵺쵻쵼쵽쵾쵿춀������춁춂춃춄춅춆춇춉춊춋춌춍춎춏춐춑춒춓춖춗춙춚춛춝춞춟������춠춡춢춣춦춨춪춫춬춭춮춯춱춲춳춴춵춶춷춸춹춺춻춼춽춾춿췀췁췂췃췅�����������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[173].length; ++j) if(D[173][j].charCodeAt(0) !== 0xFFFD) { e[D[173][j]] = 44288 + j; d[44288 + j] = D[173][j];} +D[174] = "�����������������������������������������������������������������췆췇췈췉췊췋췍췎췏췑췒췓췔췕췖췗췘췙췚췛췜췝췞췟췠췡������췢췣췤췥췦췧췩췪췫췭췮췯췱췲췳췴췵췶췷췺췼췾췿츀츁츂������츃츅츆츇츉츊츋츍츎츏츐츑츒츓츕츖츗츘츚츛츜츝츞츟츢츣츥츦츧츩츪츫�����������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[174].length; ++j) if(D[174][j].charCodeAt(0) !== 0xFFFD) { e[D[174][j]] = 44544 + j; d[44544 + j] = D[174][j];} +D[175] = "�����������������������������������������������������������������츬츭츮츯츲츴츶츷츸츹츺츻츼츽츾츿칀칁칂칃칄칅칆칇칈칉������칊칋칌칍칎칏칐칑칒칓칔칕칖칗칚칛칝칞칢칣칤칥칦칧칪칬������칮칯칰칱칲칳칶칷칹칺칻칽칾칿캀캁캂캃캆캈캊캋캌캍캎캏캒캓캕캖캗캙�����������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[175].length; ++j) if(D[175][j].charCodeAt(0) !== 0xFFFD) { e[D[175][j]] = 44800 + j; d[44800 + j] = D[175][j];} +D[176] = "�����������������������������������������������������������������캚캛캜캝캞캟캢캦캧캨캩캪캫캮캯캰캱캲캳캴캵캶캷캸캹캺������캻캼캽캾캿컀컂컃컄컅컆컇컈컉컊컋컌컍컎컏컐컑컒컓컔컕������컖컗컘컙컚컛컜컝컞컟컠컡컢컣컦컧컩컪컭컮컯컰컱컲컳컶컺컻컼컽컾컿가각간갇갈갉갊감갑값갓갔강갖갗같갚갛개객갠갤갬갭갯갰갱갸갹갼걀걋걍걔걘걜거걱건걷걸걺검겁것겄겅겆겉겊겋게겐겔겜겝겟겠겡겨격겪견겯결겸겹겻겼경곁계곈곌곕곗고곡곤곧골곪곬곯곰곱곳공곶과곽관괄괆�".split(""); +for(j = 0; j != D[176].length; ++j) if(D[176][j].charCodeAt(0) !== 0xFFFD) { e[D[176][j]] = 45056 + j; d[45056 + j] = D[176][j];} +D[177] = "�����������������������������������������������������������������켂켃켅켆켇켉켊켋켌켍켎켏켒켔켖켗켘켙켚켛켝켞켟켡켢켣������켥켦켧켨켩켪켫켮켲켳켴켵켶켷켹켺켻켼켽켾켿콀콁콂콃콄������콅콆콇콈콉콊콋콌콍콎콏콐콑콒콓콖콗콙콚콛콝콞콟콠콡콢콣콦콨콪콫콬괌괍괏광괘괜괠괩괬괭괴괵괸괼굄굅굇굉교굔굘굡굣구국군굳굴굵굶굻굼굽굿궁궂궈궉권궐궜궝궤궷귀귁귄귈귐귑귓규균귤그극근귿글긁금급긋긍긔기긱긴긷길긺김깁깃깅깆깊까깍깎깐깔깖깜깝깟깠깡깥깨깩깬깰깸�".split(""); +for(j = 0; j != D[177].length; ++j) if(D[177][j].charCodeAt(0) !== 0xFFFD) { e[D[177][j]] = 45312 + j; d[45312 + j] = D[177][j];} +D[178] = "�����������������������������������������������������������������콭콮콯콲콳콵콶콷콹콺콻콼콽콾콿쾁쾂쾃쾄쾆쾇쾈쾉쾊쾋쾍������쾎쾏쾐쾑쾒쾓쾔쾕쾖쾗쾘쾙쾚쾛쾜쾝쾞쾟쾠쾢쾣쾤쾥쾦쾧쾩������쾪쾫쾬쾭쾮쾯쾱쾲쾳쾴쾵쾶쾷쾸쾹쾺쾻쾼쾽쾾쾿쿀쿁쿂쿃쿅쿆쿇쿈쿉쿊쿋깹깻깼깽꺄꺅꺌꺼꺽꺾껀껄껌껍껏껐껑께껙껜껨껫껭껴껸껼꼇꼈꼍꼐꼬꼭꼰꼲꼴꼼꼽꼿꽁꽂꽃꽈꽉꽐꽜꽝꽤꽥꽹꾀꾄꾈꾐꾑꾕꾜꾸꾹꾼꿀꿇꿈꿉꿋꿍꿎꿔꿜꿨꿩꿰꿱꿴꿸뀀뀁뀄뀌뀐뀔뀜뀝뀨끄끅끈끊끌끎끓끔끕끗끙�".split(""); +for(j = 0; j != D[178].length; ++j) if(D[178][j].charCodeAt(0) !== 0xFFFD) { e[D[178][j]] = 45568 + j; d[45568 + j] = D[178][j];} +D[179] = "�����������������������������������������������������������������쿌쿍쿎쿏쿐쿑쿒쿓쿔쿕쿖쿗쿘쿙쿚쿛쿜쿝쿞쿟쿢쿣쿥쿦쿧쿩������쿪쿫쿬쿭쿮쿯쿲쿴쿶쿷쿸쿹쿺쿻쿽쿾쿿퀁퀂퀃퀅퀆퀇퀈퀉퀊������퀋퀌퀍퀎퀏퀐퀒퀓퀔퀕퀖퀗퀙퀚퀛퀜퀝퀞퀟퀠퀡퀢퀣퀤퀥퀦퀧퀨퀩퀪퀫퀬끝끼끽낀낄낌낍낏낑나낙낚난낟날낡낢남납낫났낭낮낯낱낳내낵낸낼냄냅냇냈냉냐냑냔냘냠냥너넉넋넌널넒넓넘넙넛넜넝넣네넥넨넬넴넵넷넸넹녀녁년녈념녑녔녕녘녜녠노녹논놀놂놈놉놋농높놓놔놘놜놨뇌뇐뇔뇜뇝�".split(""); +for(j = 0; j != D[179].length; ++j) if(D[179][j].charCodeAt(0) !== 0xFFFD) { e[D[179][j]] = 45824 + j; d[45824 + j] = D[179][j];} +D[180] = "�����������������������������������������������������������������퀮퀯퀰퀱퀲퀳퀶퀷퀹퀺퀻퀽퀾퀿큀큁큂큃큆큈큊큋큌큍큎큏������큑큒큓큕큖큗큙큚큛큜큝큞큟큡큢큣큤큥큦큧큨큩큪큫큮큯������큱큲큳큵큶큷큸큹큺큻큾큿킀킂킃킄킅킆킇킈킉킊킋킌킍킎킏킐킑킒킓킔뇟뇨뇩뇬뇰뇹뇻뇽누눅눈눋눌눔눕눗눙눠눴눼뉘뉜뉠뉨뉩뉴뉵뉼늄늅늉느늑는늘늙늚늠늡늣능늦늪늬늰늴니닉닌닐닒님닙닛닝닢다닥닦단닫달닭닮닯닳담답닷닸당닺닻닿대댁댄댈댐댑댓댔댕댜더덕덖던덛덜덞덟덤덥�".split(""); +for(j = 0; j != D[180].length; ++j) if(D[180][j].charCodeAt(0) !== 0xFFFD) { e[D[180][j]] = 46080 + j; d[46080 + j] = D[180][j];} +D[181] = "�����������������������������������������������������������������킕킖킗킘킙킚킛킜킝킞킟킠킡킢킣킦킧킩킪킫킭킮킯킰킱킲������킳킶킸킺킻킼킽킾킿탂탃탅탆탇탊탋탌탍탎탏탒탖탗탘탙탚������탛탞탟탡탢탣탥탦탧탨탩탪탫탮탲탳탴탵탶탷탹탺탻탼탽탾탿턀턁턂턃턄덧덩덫덮데덱덴델뎀뎁뎃뎄뎅뎌뎐뎔뎠뎡뎨뎬도독돈돋돌돎돐돔돕돗동돛돝돠돤돨돼됐되된될됨됩됫됴두둑둔둘둠둡둣둥둬뒀뒈뒝뒤뒨뒬뒵뒷뒹듀듄듈듐듕드득든듣들듦듬듭듯등듸디딕딘딛딜딤딥딧딨딩딪따딱딴딸�".split(""); +for(j = 0; j != D[181].length; ++j) if(D[181][j].charCodeAt(0) !== 0xFFFD) { e[D[181][j]] = 46336 + j; d[46336 + j] = D[181][j];} +D[182] = "�����������������������������������������������������������������턅턆턇턈턉턊턋턌턎턏턐턑턒턓턔턕턖턗턘턙턚턛턜턝턞턟������턠턡턢턣턤턥턦턧턨턩턪턫턬턭턮턯턲턳턵턶턷턹턻턼턽턾������턿텂텆텇텈텉텊텋텎텏텑텒텓텕텖텗텘텙텚텛텞텠텢텣텤텥텦텧텩텪텫텭땀땁땃땄땅땋때땍땐땔땜땝땟땠땡떠떡떤떨떪떫떰떱떳떴떵떻떼떽뗀뗄뗌뗍뗏뗐뗑뗘뗬또똑똔똘똥똬똴뙈뙤뙨뚜뚝뚠뚤뚫뚬뚱뛔뛰뛴뛸뜀뜁뜅뜨뜩뜬뜯뜰뜸뜹뜻띄띈띌띔띕띠띤띨띰띱띳띵라락란랄람랍랏랐랑랒랖랗�".split(""); +for(j = 0; j != D[182].length; ++j) if(D[182][j].charCodeAt(0) !== 0xFFFD) { e[D[182][j]] = 46592 + j; d[46592 + j] = D[182][j];} +D[183] = "�����������������������������������������������������������������텮텯텰텱텲텳텴텵텶텷텸텹텺텻텽텾텿톀톁톂톃톅톆톇톉톊������톋톌톍톎톏톐톑톒톓톔톕톖톗톘톙톚톛톜톝톞톟톢톣톥톦톧������톩톪톫톬톭톮톯톲톴톶톷톸톹톻톽톾톿퇁퇂퇃퇄퇅퇆퇇퇈퇉퇊퇋퇌퇍퇎퇏래랙랜랠램랩랫랬랭랴략랸럇량러럭런럴럼럽럿렀렁렇레렉렌렐렘렙렛렝려력련렬렴렵렷렸령례롄롑롓로록론롤롬롭롯롱롸롼뢍뢨뢰뢴뢸룀룁룃룅료룐룔룝룟룡루룩룬룰룸룹룻룽뤄뤘뤠뤼뤽륀륄륌륏륑류륙륜률륨륩�".split(""); +for(j = 0; j != D[183].length; ++j) if(D[183][j].charCodeAt(0) !== 0xFFFD) { e[D[183][j]] = 46848 + j; d[46848 + j] = D[183][j];} +D[184] = "�����������������������������������������������������������������퇐퇑퇒퇓퇔퇕퇖퇗퇙퇚퇛퇜퇝퇞퇟퇠퇡퇢퇣퇤퇥퇦퇧퇨퇩퇪������퇫퇬퇭퇮퇯퇰퇱퇲퇳퇵퇶퇷퇹퇺퇻퇼퇽퇾퇿툀툁툂툃툄툅툆������툈툊툋툌툍툎툏툑툒툓툔툕툖툗툘툙툚툛툜툝툞툟툠툡툢툣툤툥툦툧툨툩륫륭르륵른를름릅릇릉릊릍릎리릭린릴림립릿링마막만많맏말맑맒맘맙맛망맞맡맣매맥맨맬맴맵맷맸맹맺먀먁먈먕머먹먼멀멂멈멉멋멍멎멓메멕멘멜멤멥멧멨멩며멱면멸몃몄명몇몌모목몫몬몰몲몸몹못몽뫄뫈뫘뫙뫼�".split(""); +for(j = 0; j != D[184].length; ++j) if(D[184][j].charCodeAt(0) !== 0xFFFD) { e[D[184][j]] = 47104 + j; d[47104 + j] = D[184][j];} +D[185] = "�����������������������������������������������������������������툪툫툮툯툱툲툳툵툶툷툸툹툺툻툾퉀퉂퉃퉄퉅퉆퉇퉉퉊퉋퉌������퉍퉎퉏퉐퉑퉒퉓퉔퉕퉖퉗퉘퉙퉚퉛퉝퉞퉟퉠퉡퉢퉣퉥퉦퉧퉨������퉩퉪퉫퉬퉭퉮퉯퉰퉱퉲퉳퉴퉵퉶퉷퉸퉹퉺퉻퉼퉽퉾퉿튂튃튅튆튇튉튊튋튌묀묄묍묏묑묘묜묠묩묫무묵묶문묻물묽묾뭄뭅뭇뭉뭍뭏뭐뭔뭘뭡뭣뭬뮈뮌뮐뮤뮨뮬뮴뮷므믄믈믐믓미믹민믿밀밂밈밉밋밌밍및밑바박밖밗반받발밝밞밟밤밥밧방밭배백밴밸뱀뱁뱃뱄뱅뱉뱌뱍뱐뱝버벅번벋벌벎범법벗�".split(""); +for(j = 0; j != D[185].length; ++j) if(D[185][j].charCodeAt(0) !== 0xFFFD) { e[D[185][j]] = 47360 + j; d[47360 + j] = D[185][j];} +D[186] = "�����������������������������������������������������������������튍튎튏튒튓튔튖튗튘튙튚튛튝튞튟튡튢튣튥튦튧튨튩튪튫튭������튮튯튰튲튳튴튵튶튷튺튻튽튾틁틃틄틅틆틇틊틌틍틎틏틐틑������틒틓틕틖틗틙틚틛틝틞틟틠틡틢틣틦틧틨틩틪틫틬틭틮틯틲틳틵틶틷틹틺벙벚베벡벤벧벨벰벱벳벴벵벼벽변별볍볏볐병볕볘볜보복볶본볼봄봅봇봉봐봔봤봬뵀뵈뵉뵌뵐뵘뵙뵤뵨부북분붇불붉붊붐붑붓붕붙붚붜붤붰붸뷔뷕뷘뷜뷩뷰뷴뷸븀븃븅브븍븐블븜븝븟비빅빈빌빎빔빕빗빙빚빛빠빡빤�".split(""); +for(j = 0; j != D[186].length; ++j) if(D[186][j].charCodeAt(0) !== 0xFFFD) { e[D[186][j]] = 47616 + j; d[47616 + j] = D[186][j];} +D[187] = "�����������������������������������������������������������������틻틼틽틾틿팂팄팆팇팈팉팊팋팏팑팒팓팕팗팘팙팚팛팞팢팣������팤팦팧팪팫팭팮팯팱팲팳팴팵팶팷팺팾팿퍀퍁퍂퍃퍆퍇퍈퍉������퍊퍋퍌퍍퍎퍏퍐퍑퍒퍓퍔퍕퍖퍗퍘퍙퍚퍛퍜퍝퍞퍟퍠퍡퍢퍣퍤퍥퍦퍧퍨퍩빨빪빰빱빳빴빵빻빼빽뺀뺄뺌뺍뺏뺐뺑뺘뺙뺨뻐뻑뻔뻗뻘뻠뻣뻤뻥뻬뼁뼈뼉뼘뼙뼛뼜뼝뽀뽁뽄뽈뽐뽑뽕뾔뾰뿅뿌뿍뿐뿔뿜뿟뿡쀼쁑쁘쁜쁠쁨쁩삐삑삔삘삠삡삣삥사삭삯산삳살삵삶삼삽삿샀상샅새색샌샐샘샙샛샜생샤�".split(""); +for(j = 0; j != D[187].length; ++j) if(D[187][j].charCodeAt(0) !== 0xFFFD) { e[D[187][j]] = 47872 + j; d[47872 + j] = D[187][j];} +D[188] = "�����������������������������������������������������������������퍪퍫퍬퍭퍮퍯퍰퍱퍲퍳퍴퍵퍶퍷퍸퍹퍺퍻퍾퍿펁펂펃펅펆펇������펈펉펊펋펎펒펓펔펕펖펗펚펛펝펞펟펡펢펣펤펥펦펧펪펬펮������펯펰펱펲펳펵펶펷펹펺펻펽펾펿폀폁폂폃폆폇폊폋폌폍폎폏폑폒폓폔폕폖샥샨샬샴샵샷샹섀섄섈섐섕서석섞섟선섣설섦섧섬섭섯섰성섶세섹센셀셈셉셋셌셍셔셕션셜셤셥셧셨셩셰셴셸솅소속솎손솔솖솜솝솟송솥솨솩솬솰솽쇄쇈쇌쇔쇗쇘쇠쇤쇨쇰쇱쇳쇼쇽숀숄숌숍숏숑수숙순숟술숨숩숫숭�".split(""); +for(j = 0; j != D[188].length; ++j) if(D[188][j].charCodeAt(0) !== 0xFFFD) { e[D[188][j]] = 48128 + j; d[48128 + j] = D[188][j];} +D[189] = "�����������������������������������������������������������������폗폙폚폛폜폝폞폟폠폢폤폥폦폧폨폩폪폫폮폯폱폲폳폵폶폷������폸폹폺폻폾퐀퐂퐃퐄퐅퐆퐇퐉퐊퐋퐌퐍퐎퐏퐐퐑퐒퐓퐔퐕퐖������퐗퐘퐙퐚퐛퐜퐞퐟퐠퐡퐢퐣퐤퐥퐦퐧퐨퐩퐪퐫퐬퐭퐮퐯퐰퐱퐲퐳퐴퐵퐶퐷숯숱숲숴쉈쉐쉑쉔쉘쉠쉥쉬쉭쉰쉴쉼쉽쉿슁슈슉슐슘슛슝스슥슨슬슭슴습슷승시식신싣실싫심십싯싱싶싸싹싻싼쌀쌈쌉쌌쌍쌓쌔쌕쌘쌜쌤쌥쌨쌩썅써썩썬썰썲썸썹썼썽쎄쎈쎌쏀쏘쏙쏜쏟쏠쏢쏨쏩쏭쏴쏵쏸쐈쐐쐤쐬쐰�".split(""); +for(j = 0; j != D[189].length; ++j) if(D[189][j].charCodeAt(0) !== 0xFFFD) { e[D[189][j]] = 48384 + j; d[48384 + j] = D[189][j];} +D[190] = "�����������������������������������������������������������������퐸퐹퐺퐻퐼퐽퐾퐿푁푂푃푅푆푇푈푉푊푋푌푍푎푏푐푑푒푓������푔푕푖푗푘푙푚푛푝푞푟푡푢푣푥푦푧푨푩푪푫푬푮푰푱푲������푳푴푵푶푷푺푻푽푾풁풃풄풅풆풇풊풌풎풏풐풑풒풓풕풖풗풘풙풚풛풜풝쐴쐼쐽쑈쑤쑥쑨쑬쑴쑵쑹쒀쒔쒜쒸쒼쓩쓰쓱쓴쓸쓺쓿씀씁씌씐씔씜씨씩씬씰씸씹씻씽아악안앉않알앍앎앓암압앗았앙앝앞애액앤앨앰앱앳앴앵야약얀얄얇얌얍얏양얕얗얘얜얠얩어억언얹얻얼얽얾엄업없엇었엉엊엌엎�".split(""); +for(j = 0; j != D[190].length; ++j) if(D[190][j].charCodeAt(0) !== 0xFFFD) { e[D[190][j]] = 48640 + j; d[48640 + j] = D[190][j];} +D[191] = "�����������������������������������������������������������������풞풟풠풡풢풣풤풥풦풧풨풪풫풬풭풮풯풰풱풲풳풴풵풶풷풸������풹풺풻풼풽풾풿퓀퓁퓂퓃퓄퓅퓆퓇퓈퓉퓊퓋퓍퓎퓏퓑퓒퓓퓕������퓖퓗퓘퓙퓚퓛퓝퓞퓠퓡퓢퓣퓤퓥퓦퓧퓩퓪퓫퓭퓮퓯퓱퓲퓳퓴퓵퓶퓷퓹퓺퓼에엑엔엘엠엡엣엥여역엮연열엶엷염엽엾엿였영옅옆옇예옌옐옘옙옛옜오옥온올옭옮옰옳옴옵옷옹옻와왁완왈왐왑왓왔왕왜왝왠왬왯왱외왹왼욀욈욉욋욍요욕욘욜욤욥욧용우욱운울욹욺움웁웃웅워웍원월웜웝웠웡웨�".split(""); +for(j = 0; j != D[191].length; ++j) if(D[191][j].charCodeAt(0) !== 0xFFFD) { e[D[191][j]] = 48896 + j; d[48896 + j] = D[191][j];} +D[192] = "�����������������������������������������������������������������퓾퓿픀픁픂픃픅픆픇픉픊픋픍픎픏픐픑픒픓픖픘픙픚픛픜픝������픞픟픠픡픢픣픤픥픦픧픨픩픪픫픬픭픮픯픰픱픲픳픴픵픶픷������픸픹픺픻픾픿핁핂핃핅핆핇핈핉핊핋핎핐핒핓핔핕핖핗핚핛핝핞핟핡핢핣웩웬웰웸웹웽위윅윈윌윔윕윗윙유육윤율윰윱윳융윷으윽은을읊음읍읏응읒읓읔읕읖읗의읜읠읨읫이익인일읽읾잃임입잇있잉잊잎자작잔잖잗잘잚잠잡잣잤장잦재잭잰잴잼잽잿쟀쟁쟈쟉쟌쟎쟐쟘쟝쟤쟨쟬저적전절젊�".split(""); +for(j = 0; j != D[192].length; ++j) if(D[192][j].charCodeAt(0) !== 0xFFFD) { e[D[192][j]] = 49152 + j; d[49152 + j] = D[192][j];} +D[193] = "�����������������������������������������������������������������핤핦핧핪핬핮핯핰핱핲핳핶핷핹핺핻핽핾핿햀햁햂햃햆햊햋������햌햍햎햏햑햒햓햔햕햖햗햘햙햚햛햜햝햞햟햠햡햢햣햤햦햧������햨햩햪햫햬햭햮햯햰햱햲햳햴햵햶햷햸햹햺햻햼햽햾햿헀헁헂헃헄헅헆헇점접젓정젖제젝젠젤젬젭젯젱져젼졀졈졉졌졍졔조족존졸졺좀좁좃종좆좇좋좌좍좔좝좟좡좨좼좽죄죈죌죔죕죗죙죠죡죤죵주죽준줄줅줆줌줍줏중줘줬줴쥐쥑쥔쥘쥠쥡쥣쥬쥰쥴쥼즈즉즌즐즘즙즛증지직진짇질짊짐집짓�".split(""); +for(j = 0; j != D[193].length; ++j) if(D[193][j].charCodeAt(0) !== 0xFFFD) { e[D[193][j]] = 49408 + j; d[49408 + j] = D[193][j];} +D[194] = "�����������������������������������������������������������������헊헋헍헎헏헑헓헔헕헖헗헚헜헞헟헠헡헢헣헦헧헩헪헫헭헮������헯헰헱헲헳헶헸헺헻헼헽헾헿혂혃혅혆혇혉혊혋혌혍혎혏혒������혖혗혘혙혚혛혝혞혟혡혢혣혥혦혧혨혩혪혫혬혮혯혰혱혲혳혴혵혶혷혺혻징짖짙짚짜짝짠짢짤짧짬짭짯짰짱째짹짼쨀쨈쨉쨋쨌쨍쨔쨘쨩쩌쩍쩐쩔쩜쩝쩟쩠쩡쩨쩽쪄쪘쪼쪽쫀쫄쫌쫍쫏쫑쫓쫘쫙쫠쫬쫴쬈쬐쬔쬘쬠쬡쭁쭈쭉쭌쭐쭘쭙쭝쭤쭸쭹쮜쮸쯔쯤쯧쯩찌찍찐찔찜찝찡찢찧차착찬찮찰참찹찻�".split(""); +for(j = 0; j != D[194].length; ++j) if(D[194][j].charCodeAt(0) !== 0xFFFD) { e[D[194][j]] = 49664 + j; d[49664 + j] = D[194][j];} +D[195] = "�����������������������������������������������������������������혽혾혿홁홂홃홄홆홇홊홌홎홏홐홒홓홖홗홙홚홛홝홞홟홠홡������홢홣홤홥홦홨홪홫홬홭홮홯홲홳홵홶홷홸홹홺홻홼홽홾홿횀������횁횂횄횆횇횈횉횊횋횎횏횑횒횓횕횖횗횘횙횚횛횜횞횠횢횣횤횥횦횧횩횪찼창찾채책챈챌챔챕챗챘챙챠챤챦챨챰챵처척천철첨첩첫첬청체첵첸첼쳄쳅쳇쳉쳐쳔쳤쳬쳰촁초촉촌촐촘촙촛총촤촨촬촹최쵠쵤쵬쵭쵯쵱쵸춈추축춘출춤춥춧충춰췄췌췐취췬췰췸췹췻췽츄츈츌츔츙츠측츤츨츰츱츳층�".split(""); +for(j = 0; j != D[195].length; ++j) if(D[195][j].charCodeAt(0) !== 0xFFFD) { e[D[195][j]] = 49920 + j; d[49920 + j] = D[195][j];} +D[196] = "�����������������������������������������������������������������횫횭횮횯횱횲횳횴횵횶횷횸횺횼횽횾횿훀훁훂훃훆훇훉훊훋������훍훎훏훐훒훓훕훖훘훚훛훜훝훞훟훡훢훣훥훦훧훩훪훫훬훭������훮훯훱훲훳훴훶훷훸훹훺훻훾훿휁휂휃휅휆휇휈휉휊휋휌휍휎휏휐휒휓휔치칙친칟칠칡침칩칫칭카칵칸칼캄캅캇캉캐캑캔캘캠캡캣캤캥캬캭컁커컥컨컫컬컴컵컷컸컹케켁켄켈켐켑켓켕켜켠켤켬켭켯켰켱켸코콕콘콜콤콥콧콩콰콱콴콸쾀쾅쾌쾡쾨쾰쿄쿠쿡쿤쿨쿰쿱쿳쿵쿼퀀퀄퀑퀘퀭퀴퀵퀸퀼�".split(""); +for(j = 0; j != D[196].length; ++j) if(D[196][j].charCodeAt(0) !== 0xFFFD) { e[D[196][j]] = 50176 + j; d[50176 + j] = D[196][j];} +D[197] = "�����������������������������������������������������������������휕휖휗휚휛휝휞휟휡휢휣휤휥휦휧휪휬휮휯휰휱휲휳휶휷휹������휺휻휽휾휿흀흁흂흃흅흆흈흊흋흌흍흎흏흒흓흕흚흛흜흝흞������흟흢흤흦흧흨흪흫흭흮흯흱흲흳흵흶흷흸흹흺흻흾흿힀힂힃힄힅힆힇힊힋큄큅큇큉큐큔큘큠크큭큰클큼큽킁키킥킨킬킴킵킷킹타탁탄탈탉탐탑탓탔탕태택탠탤탬탭탯탰탱탸턍터턱턴털턺텀텁텃텄텅테텍텐텔템텝텟텡텨텬텼톄톈토톡톤톨톰톱톳통톺톼퇀퇘퇴퇸툇툉툐투툭툰툴툼툽툿퉁퉈퉜�".split(""); +for(j = 0; j != D[197].length; ++j) if(D[197][j].charCodeAt(0) !== 0xFFFD) { e[D[197][j]] = 50432 + j; d[50432 + j] = D[197][j];} +D[198] = "�����������������������������������������������������������������힍힎힏힑힒힓힔힕힖힗힚힜힞힟힠힡힢힣������������������������������������������������������������������������������퉤튀튁튄튈튐튑튕튜튠튤튬튱트특튼튿틀틂틈틉틋틔틘틜틤틥티틱틴틸팀팁팃팅파팍팎판팔팖팜팝팟팠팡팥패팩팬팰팸팹팻팼팽퍄퍅퍼퍽펀펄펌펍펏펐펑페펙펜펠펨펩펫펭펴편펼폄폅폈평폐폘폡폣포폭폰폴폼폽폿퐁�".split(""); +for(j = 0; j != D[198].length; ++j) if(D[198][j].charCodeAt(0) !== 0xFFFD) { e[D[198][j]] = 50688 + j; d[50688 + j] = D[198][j];} +D[199] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������퐈퐝푀푄표푠푤푭푯푸푹푼푿풀풂품풉풋풍풔풩퓌퓐퓔퓜퓟퓨퓬퓰퓸퓻퓽프픈플픔픕픗피픽핀필핌핍핏핑하학한할핥함합핫항해핵핸핼햄햅햇했행햐향허헉헌헐헒험헙헛헝헤헥헨헬헴헵헷헹혀혁현혈혐협혓혔형혜혠�".split(""); +for(j = 0; j != D[199].length; ++j) if(D[199][j].charCodeAt(0) !== 0xFFFD) { e[D[199][j]] = 50944 + j; d[50944 + j] = D[199][j];} +D[200] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������혤혭호혹혼홀홅홈홉홋홍홑화확환활홧황홰홱홴횃횅회획횐횔횝횟횡효횬횰횹횻후훅훈훌훑훔훗훙훠훤훨훰훵훼훽휀휄휑휘휙휜휠휨휩휫휭휴휵휸휼흄흇흉흐흑흔흖흗흘흙흠흡흣흥흩희흰흴흼흽힁히힉힌힐힘힙힛힝�".split(""); +for(j = 0; j != D[200].length; ++j) if(D[200][j].charCodeAt(0) !== 0xFFFD) { e[D[200][j]] = 51200 + j; d[51200 + j] = D[200][j];} +D[202] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������伽佳假價加可呵哥嘉嫁家暇架枷柯歌珂痂稼苛茄街袈訶賈跏軻迦駕刻却各恪慤殼珏脚覺角閣侃刊墾奸姦干幹懇揀杆柬桿澗癎看磵稈竿簡肝艮艱諫間乫喝曷渴碣竭葛褐蝎鞨勘坎堪嵌感憾戡敢柑橄減甘疳監瞰紺邯鑑鑒龕�".split(""); +for(j = 0; j != D[202].length; ++j) if(D[202][j].charCodeAt(0) !== 0xFFFD) { e[D[202][j]] = 51712 + j; d[51712 + j] = D[202][j];} +D[203] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������匣岬甲胛鉀閘剛堈姜岡崗康强彊慷江畺疆糠絳綱羌腔舡薑襁講鋼降鱇介价個凱塏愷愾慨改槪漑疥皆盖箇芥蓋豈鎧開喀客坑更粳羹醵倨去居巨拒据據擧渠炬祛距踞車遽鉅鋸乾件健巾建愆楗腱虔蹇鍵騫乞傑杰桀儉劍劒檢�".split(""); +for(j = 0; j != D[203].length; ++j) if(D[203][j].charCodeAt(0) !== 0xFFFD) { e[D[203][j]] = 51968 + j; d[51968 + j] = D[203][j];} +D[204] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������瞼鈐黔劫怯迲偈憩揭擊格檄激膈覡隔堅牽犬甄絹繭肩見譴遣鵑抉決潔結缺訣兼慊箝謙鉗鎌京俓倞傾儆勁勍卿坰境庚徑慶憬擎敬景暻更梗涇炅烱璟璥瓊痙硬磬竟競絅經耕耿脛莖警輕逕鏡頃頸驚鯨係啓堺契季屆悸戒桂械�".split(""); +for(j = 0; j != D[204].length; ++j) if(D[204][j].charCodeAt(0) !== 0xFFFD) { e[D[204][j]] = 52224 + j; d[52224 + j] = D[204][j];} +D[205] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������棨溪界癸磎稽系繫繼計誡谿階鷄古叩告呱固姑孤尻庫拷攷故敲暠枯槁沽痼皐睾稿羔考股膏苦苽菰藁蠱袴誥賈辜錮雇顧高鼓哭斛曲梏穀谷鵠困坤崑昆梱棍滾琨袞鯤汨滑骨供公共功孔工恐恭拱控攻珙空蚣貢鞏串寡戈果瓜�".split(""); +for(j = 0; j != D[205].length; ++j) if(D[205][j].charCodeAt(0) !== 0xFFFD) { e[D[205][j]] = 52480 + j; d[52480 + j] = D[205][j];} +D[206] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������科菓誇課跨過鍋顆廓槨藿郭串冠官寬慣棺款灌琯瓘管罐菅觀貫關館刮恝括适侊光匡壙廣曠洸炚狂珖筐胱鑛卦掛罫乖傀塊壞怪愧拐槐魁宏紘肱轟交僑咬喬嬌嶠巧攪敎校橋狡皎矯絞翹膠蕎蛟較轎郊餃驕鮫丘久九仇俱具勾�".split(""); +for(j = 0; j != D[206].length; ++j) if(D[206][j].charCodeAt(0) !== 0xFFFD) { e[D[206][j]] = 52736 + j; d[52736 + j] = D[206][j];} +D[207] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������區口句咎嘔坵垢寇嶇廐懼拘救枸柩構歐毆毬求溝灸狗玖球瞿矩究絿耉臼舅舊苟衢謳購軀逑邱鉤銶駒驅鳩鷗龜國局菊鞠鞫麴君窘群裙軍郡堀屈掘窟宮弓穹窮芎躬倦券勸卷圈拳捲權淃眷厥獗蕨蹶闕机櫃潰詭軌饋句晷歸貴�".split(""); +for(j = 0; j != D[207].length; ++j) if(D[207][j].charCodeAt(0) !== 0xFFFD) { e[D[207][j]] = 52992 + j; d[52992 + j] = D[207][j];} +D[208] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������鬼龜叫圭奎揆槻珪硅窺竅糾葵規赳逵閨勻均畇筠菌鈞龜橘克剋劇戟棘極隙僅劤勤懃斤根槿瑾筋芹菫覲謹近饉契今妗擒昑檎琴禁禽芩衾衿襟金錦伋及急扱汲級給亘兢矜肯企伎其冀嗜器圻基埼夔奇妓寄岐崎己幾忌技旗旣�".split(""); +for(j = 0; j != D[208].length; ++j) if(D[208][j].charCodeAt(0) !== 0xFFFD) { e[D[208][j]] = 53248 + j; d[53248 + j] = D[208][j];} +D[209] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������朞期杞棋棄機欺氣汽沂淇玘琦琪璂璣畸畿碁磯祁祇祈祺箕紀綺羈耆耭肌記譏豈起錡錤飢饑騎騏驥麒緊佶吉拮桔金喫儺喇奈娜懦懶拏拿癩羅蘿螺裸邏那樂洛烙珞落諾酪駱亂卵暖欄煖爛蘭難鸞捏捺南嵐枏楠湳濫男藍襤拉�".split(""); +for(j = 0; j != D[209].length; ++j) if(D[209][j].charCodeAt(0) !== 0xFFFD) { e[D[209][j]] = 53504 + j; d[53504 + j] = D[209][j];} +D[210] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������納臘蠟衲囊娘廊朗浪狼郎乃來內奈柰耐冷女年撚秊念恬拈捻寧寗努勞奴弩怒擄櫓爐瑙盧老蘆虜路露駑魯鷺碌祿綠菉錄鹿論壟弄濃籠聾膿農惱牢磊腦賂雷尿壘屢樓淚漏累縷陋嫩訥杻紐勒肋凜凌稜綾能菱陵尼泥匿溺多茶�".split(""); +for(j = 0; j != D[210].length; ++j) if(D[210][j].charCodeAt(0) !== 0xFFFD) { e[D[210][j]] = 53760 + j; d[53760 + j] = D[210][j];} +D[211] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������丹亶但單團壇彖斷旦檀段湍短端簞緞蛋袒鄲鍛撻澾獺疸達啖坍憺擔曇淡湛潭澹痰聃膽蕁覃談譚錟沓畓答踏遝唐堂塘幢戇撞棠當糖螳黨代垈坮大對岱帶待戴擡玳臺袋貸隊黛宅德悳倒刀到圖堵塗導屠島嶋度徒悼挑掉搗桃�".split(""); +for(j = 0; j != D[211].length; ++j) if(D[211][j].charCodeAt(0) !== 0xFFFD) { e[D[211][j]] = 54016 + j; d[54016 + j] = D[211][j];} +D[212] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������棹櫂淘渡滔濤燾盜睹禱稻萄覩賭跳蹈逃途道都鍍陶韜毒瀆牘犢獨督禿篤纛讀墩惇敦旽暾沌焞燉豚頓乭突仝冬凍動同憧東桐棟洞潼疼瞳童胴董銅兜斗杜枓痘竇荳讀豆逗頭屯臀芚遁遯鈍得嶝橙燈登等藤謄鄧騰喇懶拏癩羅�".split(""); +for(j = 0; j != D[212].length; ++j) if(D[212][j].charCodeAt(0) !== 0xFFFD) { e[D[212][j]] = 54272 + j; d[54272 + j] = D[212][j];} +D[213] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������蘿螺裸邏樂洛烙珞絡落諾酪駱丹亂卵欄欒瀾爛蘭鸞剌辣嵐擥攬欖濫籃纜藍襤覽拉臘蠟廊朗浪狼琅瑯螂郞來崍徠萊冷掠略亮倆兩凉梁樑粮粱糧良諒輛量侶儷勵呂廬慮戾旅櫚濾礪藜蠣閭驢驪麗黎力曆歷瀝礫轢靂憐戀攣漣�".split(""); +for(j = 0; j != D[213].length; ++j) if(D[213][j].charCodeAt(0) !== 0xFFFD) { e[D[213][j]] = 54528 + j; d[54528 + j] = D[213][j];} +D[214] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������煉璉練聯蓮輦連鍊冽列劣洌烈裂廉斂殮濂簾獵令伶囹寧岺嶺怜玲笭羚翎聆逞鈴零靈領齡例澧禮醴隷勞怒撈擄櫓潞瀘爐盧老蘆虜路輅露魯鷺鹵碌祿綠菉錄鹿麓論壟弄朧瀧瓏籠聾儡瀨牢磊賂賚賴雷了僚寮廖料燎療瞭聊蓼�".split(""); +for(j = 0; j != D[214].length; ++j) if(D[214][j].charCodeAt(0) !== 0xFFFD) { e[D[214][j]] = 54784 + j; d[54784 + j] = D[214][j];} +D[215] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������遼鬧龍壘婁屢樓淚漏瘻累縷蔞褸鏤陋劉旒柳榴流溜瀏琉瑠留瘤硫謬類六戮陸侖倫崙淪綸輪律慄栗率隆勒肋凜凌楞稜綾菱陵俚利厘吏唎履悧李梨浬犁狸理璃異痢籬罹羸莉裏裡里釐離鯉吝潾燐璘藺躪隣鱗麟林淋琳臨霖砬�".split(""); +for(j = 0; j != D[215].length; ++j) if(D[215][j].charCodeAt(0) !== 0xFFFD) { e[D[215][j]] = 55040 + j; d[55040 + j] = D[215][j];} +D[216] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������立笠粒摩瑪痲碼磨馬魔麻寞幕漠膜莫邈万卍娩巒彎慢挽晩曼滿漫灣瞞萬蔓蠻輓饅鰻唜抹末沫茉襪靺亡妄忘忙望網罔芒茫莽輞邙埋妹媒寐昧枚梅每煤罵買賣邁魅脈貊陌驀麥孟氓猛盲盟萌冪覓免冕勉棉沔眄眠綿緬面麵滅�".split(""); +for(j = 0; j != D[216].length; ++j) if(D[216][j].charCodeAt(0) !== 0xFFFD) { e[D[216][j]] = 55296 + j; d[55296 + j] = D[216][j];} +D[217] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������蔑冥名命明暝椧溟皿瞑茗蓂螟酩銘鳴袂侮冒募姆帽慕摸摹暮某模母毛牟牡瑁眸矛耗芼茅謀謨貌木沐牧目睦穆鶩歿沒夢朦蒙卯墓妙廟描昴杳渺猫竗苗錨務巫憮懋戊拇撫无楙武毋無珷畝繆舞茂蕪誣貿霧鵡墨默們刎吻問文�".split(""); +for(j = 0; j != D[217].length; ++j) if(D[217][j].charCodeAt(0) !== 0xFFFD) { e[D[217][j]] = 55552 + j; d[55552 + j] = D[217][j];} +D[218] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������汶紊紋聞蚊門雯勿沕物味媚尾嵋彌微未梶楣渼湄眉米美薇謎迷靡黴岷悶愍憫敏旻旼民泯玟珉緡閔密蜜謐剝博拍搏撲朴樸泊珀璞箔粕縛膊舶薄迫雹駁伴半反叛拌搬攀斑槃泮潘班畔瘢盤盼磐磻礬絆般蟠返頒飯勃拔撥渤潑�".split(""); +for(j = 0; j != D[218].length; ++j) if(D[218][j].charCodeAt(0) !== 0xFFFD) { e[D[218][j]] = 55808 + j; d[55808 + j] = D[218][j];} +D[219] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������發跋醱鉢髮魃倣傍坊妨尨幇彷房放方旁昉枋榜滂磅紡肪膀舫芳蒡蚌訪謗邦防龐倍俳北培徘拜排杯湃焙盃背胚裴裵褙賠輩配陪伯佰帛柏栢白百魄幡樊煩燔番磻繁蕃藩飜伐筏罰閥凡帆梵氾汎泛犯範范法琺僻劈壁擘檗璧癖�".split(""); +for(j = 0; j != D[219].length; ++j) if(D[219][j].charCodeAt(0) !== 0xFFFD) { e[D[219][j]] = 56064 + j; d[56064 + j] = D[219][j];} +D[220] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������碧蘗闢霹便卞弁變辨辯邊別瞥鱉鼈丙倂兵屛幷昞昺柄棅炳甁病秉竝輧餠騈保堡報寶普步洑湺潽珤甫菩補褓譜輔伏僕匐卜宓復服福腹茯蔔複覆輹輻馥鰒本乶俸奉封峯峰捧棒烽熢琫縫蓬蜂逢鋒鳳不付俯傅剖副否咐埠夫婦�".split(""); +for(j = 0; j != D[220].length; ++j) if(D[220][j].charCodeAt(0) !== 0xFFFD) { e[D[220][j]] = 56320 + j; d[56320 + j] = D[220][j];} +D[221] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������孚孵富府復扶敷斧浮溥父符簿缶腐腑膚艀芙莩訃負賦賻赴趺部釜阜附駙鳧北分吩噴墳奔奮忿憤扮昐汾焚盆粉糞紛芬賁雰不佛弗彿拂崩朋棚硼繃鵬丕備匕匪卑妃婢庇悲憊扉批斐枇榧比毖毗毘沸泌琵痺砒碑秕秘粃緋翡肥�".split(""); +for(j = 0; j != D[221].length; ++j) if(D[221][j].charCodeAt(0) !== 0xFFFD) { e[D[221][j]] = 56576 + j; d[56576 + j] = D[221][j];} +D[222] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������脾臂菲蜚裨誹譬費鄙非飛鼻嚬嬪彬斌檳殯浜濱瀕牝玭貧賓頻憑氷聘騁乍事些仕伺似使俟僿史司唆嗣四士奢娑寫寺射巳師徙思捨斜斯柶査梭死沙泗渣瀉獅砂社祀祠私篩紗絲肆舍莎蓑蛇裟詐詞謝賜赦辭邪飼駟麝削數朔索�".split(""); +for(j = 0; j != D[222].length; ++j) if(D[222][j].charCodeAt(0) !== 0xFFFD) { e[D[222][j]] = 56832 + j; d[56832 + j] = D[222][j];} +D[223] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������傘刪山散汕珊産疝算蒜酸霰乷撒殺煞薩三參杉森渗芟蔘衫揷澁鈒颯上傷像償商喪嘗孀尙峠常床庠廂想桑橡湘爽牀狀相祥箱翔裳觴詳象賞霜塞璽賽嗇塞穡索色牲生甥省笙墅壻嶼序庶徐恕抒捿敍暑曙書栖棲犀瑞筮絮緖署�".split(""); +for(j = 0; j != D[223].length; ++j) if(D[223][j].charCodeAt(0) !== 0xFFFD) { e[D[223][j]] = 57088 + j; d[57088 + j] = D[223][j];} +D[224] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������胥舒薯西誓逝鋤黍鼠夕奭席惜昔晳析汐淅潟石碩蓆釋錫仙僊先善嬋宣扇敾旋渲煽琁瑄璇璿癬禪線繕羨腺膳船蘚蟬詵跣選銑鐥饍鮮卨屑楔泄洩渫舌薛褻設說雪齧剡暹殲纖蟾贍閃陝攝涉燮葉城姓宬性惺成星晟猩珹盛省筬�".split(""); +for(j = 0; j != D[224].length; ++j) if(D[224][j].charCodeAt(0) !== 0xFFFD) { e[D[224][j]] = 57344 + j; d[57344 + j] = D[224][j];} +D[225] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������聖聲腥誠醒世勢歲洗稅笹細說貰召嘯塑宵小少巢所掃搔昭梳沼消溯瀟炤燒甦疏疎瘙笑篠簫素紹蔬蕭蘇訴逍遡邵銷韶騷俗屬束涑粟續謖贖速孫巽損蓀遜飡率宋悚松淞訟誦送頌刷殺灑碎鎖衰釗修受嗽囚垂壽嫂守岫峀帥愁�".split(""); +for(j = 0; j != D[225].length; ++j) if(D[225][j].charCodeAt(0) !== 0xFFFD) { e[D[225][j]] = 57600 + j; d[57600 + j] = D[225][j];} +D[226] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������戍手授搜收數樹殊水洙漱燧狩獸琇璲瘦睡秀穗竪粹綏綬繡羞脩茱蒐蓚藪袖誰讐輸遂邃酬銖銹隋隧隨雖需須首髓鬚叔塾夙孰宿淑潚熟琡璹肅菽巡徇循恂旬栒楯橓殉洵淳珣盾瞬筍純脣舜荀蓴蕣詢諄醇錞順馴戌術述鉥崇崧�".split(""); +for(j = 0; j != D[226].length; ++j) if(D[226][j].charCodeAt(0) !== 0xFFFD) { e[D[226][j]] = 57856 + j; d[57856 + j] = D[226][j];} +D[227] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������嵩瑟膝蝨濕拾習褶襲丞乘僧勝升承昇繩蠅陞侍匙嘶始媤尸屎屍市弑恃施是時枾柴猜矢示翅蒔蓍視試詩諡豕豺埴寔式息拭植殖湜熄篒蝕識軾食飾伸侁信呻娠宸愼新晨燼申神紳腎臣莘薪藎蜃訊身辛辰迅失室實悉審尋心沁�".split(""); +for(j = 0; j != D[227].length; ++j) if(D[227][j].charCodeAt(0) !== 0xFFFD) { e[D[227][j]] = 58112 + j; d[58112 + j] = D[227][j];} +D[228] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������沈深瀋甚芯諶什十拾雙氏亞俄兒啞娥峨我牙芽莪蛾衙訝阿雅餓鴉鵝堊岳嶽幄惡愕握樂渥鄂鍔顎鰐齷安岸按晏案眼雁鞍顔鮟斡謁軋閼唵岩巖庵暗癌菴闇壓押狎鴨仰央怏昻殃秧鴦厓哀埃崖愛曖涯碍艾隘靄厄扼掖液縊腋額�".split(""); +for(j = 0; j != D[228].length; ++j) if(D[228][j].charCodeAt(0) !== 0xFFFD) { e[D[228][j]] = 58368 + j; d[58368 + j] = D[228][j];} +D[229] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������櫻罌鶯鸚也倻冶夜惹揶椰爺耶若野弱掠略約若葯蒻藥躍亮佯兩凉壤孃恙揚攘敭暘梁楊樣洋瀁煬痒瘍禳穰糧羊良襄諒讓釀陽量養圄御於漁瘀禦語馭魚齬億憶抑檍臆偃堰彦焉言諺孼蘖俺儼嚴奄掩淹嶪業円予余勵呂女如廬�".split(""); +for(j = 0; j != D[229].length; ++j) if(D[229][j].charCodeAt(0) !== 0xFFFD) { e[D[229][j]] = 58624 + j; d[58624 + j] = D[229][j];} +D[230] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������旅歟汝濾璵礖礪與艅茹輿轝閭餘驪麗黎亦力域役易曆歷疫繹譯轢逆驛嚥堧姸娟宴年延憐戀捐挻撚椽沇沿涎涓淵演漣烟然煙煉燃燕璉硏硯秊筵緣練縯聯衍軟輦蓮連鉛鍊鳶列劣咽悅涅烈熱裂說閱厭廉念捻染殮炎焰琰艶苒�".split(""); +for(j = 0; j != D[230].length; ++j) if(D[230][j].charCodeAt(0) !== 0xFFFD) { e[D[230][j]] = 58880 + j; d[58880 + j] = D[230][j];} +D[231] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������簾閻髥鹽曄獵燁葉令囹塋寧嶺嶸影怜映暎楹榮永泳渶潁濚瀛瀯煐營獰玲瑛瑩瓔盈穎纓羚聆英詠迎鈴鍈零霙靈領乂倪例刈叡曳汭濊猊睿穢芮藝蘂禮裔詣譽豫醴銳隸霓預五伍俉傲午吾吳嗚塢墺奧娛寤悟惡懊敖旿晤梧汚澳�".split(""); +for(j = 0; j != D[231].length; ++j) if(D[231][j].charCodeAt(0) !== 0xFFFD) { e[D[231][j]] = 59136 + j; d[59136 + j] = D[231][j];} +D[232] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������烏熬獒筽蜈誤鰲鼇屋沃獄玉鈺溫瑥瘟穩縕蘊兀壅擁瓮甕癰翁邕雍饔渦瓦窩窪臥蛙蝸訛婉完宛梡椀浣玩琓琬碗緩翫脘腕莞豌阮頑曰往旺枉汪王倭娃歪矮外嵬巍猥畏了僚僥凹堯夭妖姚寥寮尿嶢拗搖撓擾料曜樂橈燎燿瑤療�".split(""); +for(j = 0; j != D[232].length; ++j) if(D[232][j].charCodeAt(0) !== 0xFFFD) { e[D[232][j]] = 59392 + j; d[59392 + j] = D[232][j];} +D[233] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������窈窯繇繞耀腰蓼蟯要謠遙遼邀饒慾欲浴縟褥辱俑傭冗勇埇墉容庸慂榕涌湧溶熔瑢用甬聳茸蓉踊鎔鏞龍于佑偶優又友右宇寓尤愚憂旴牛玗瑀盂祐禑禹紆羽芋藕虞迂遇郵釪隅雨雩勖彧旭昱栯煜稶郁頊云暈橒殞澐熉耘芸蕓�".split(""); +for(j = 0; j != D[233].length; ++j) if(D[233][j].charCodeAt(0) !== 0xFFFD) { e[D[233][j]] = 59648 + j; d[59648 + j] = D[233][j];} +D[234] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������運隕雲韻蔚鬱亐熊雄元原員圓園垣媛嫄寃怨愿援沅洹湲源爰猿瑗苑袁轅遠阮院願鴛月越鉞位偉僞危圍委威尉慰暐渭爲瑋緯胃萎葦蔿蝟衛褘謂違韋魏乳侑儒兪劉唯喩孺宥幼幽庾悠惟愈愉揄攸有杻柔柚柳楡楢油洧流游溜�".split(""); +for(j = 0; j != D[234].length; ++j) if(D[234][j].charCodeAt(0) !== 0xFFFD) { e[D[234][j]] = 59904 + j; d[59904 + j] = D[234][j];} +D[235] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������濡猶猷琉瑜由留癒硫紐維臾萸裕誘諛諭踰蹂遊逾遺酉釉鍮類六堉戮毓肉育陸倫允奫尹崙淪潤玧胤贇輪鈗閏律慄栗率聿戎瀜絨融隆垠恩慇殷誾銀隱乙吟淫蔭陰音飮揖泣邑凝應膺鷹依倚儀宜意懿擬椅毅疑矣義艤薏蟻衣誼�".split(""); +for(j = 0; j != D[235].length; ++j) if(D[235][j].charCodeAt(0) !== 0xFFFD) { e[D[235][j]] = 60160 + j; d[60160 + j] = D[235][j];} +D[236] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������議醫二以伊利吏夷姨履已弛彛怡易李梨泥爾珥理異痍痢移罹而耳肄苡荑裏裡貽貳邇里離飴餌匿溺瀷益翊翌翼謚人仁刃印吝咽因姻寅引忍湮燐璘絪茵藺蚓認隣靭靷鱗麟一佚佾壹日溢逸鎰馹任壬妊姙恁林淋稔臨荏賃入卄�".split(""); +for(j = 0; j != D[236].length; ++j) if(D[236][j].charCodeAt(0) !== 0xFFFD) { e[D[236][j]] = 60416 + j; d[60416 + j] = D[236][j];} +D[237] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������立笠粒仍剩孕芿仔刺咨姉姿子字孜恣慈滋炙煮玆瓷疵磁紫者自茨蔗藉諮資雌作勺嚼斫昨灼炸爵綽芍酌雀鵲孱棧殘潺盞岑暫潛箴簪蠶雜丈仗匠場墻壯奬將帳庄張掌暲杖樟檣欌漿牆狀獐璋章粧腸臟臧莊葬蔣薔藏裝贓醬長�".split(""); +for(j = 0; j != D[237].length; ++j) if(D[237][j].charCodeAt(0) !== 0xFFFD) { e[D[237][j]] = 60672 + j; d[60672 + j] = D[237][j];} +D[238] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������障再哉在宰才材栽梓渽滓災縡裁財載齋齎爭箏諍錚佇低儲咀姐底抵杵楮樗沮渚狙猪疽箸紵苧菹著藷詛貯躇這邸雎齟勣吊嫡寂摘敵滴狄炙的積笛籍績翟荻謫賊赤跡蹟迪迹適鏑佃佺傳全典前剪塡塼奠專展廛悛戰栓殿氈澱�".split(""); +for(j = 0; j != D[238].length; ++j) if(D[238][j].charCodeAt(0) !== 0xFFFD) { e[D[238][j]] = 60928 + j; d[60928 + j] = D[238][j];} +D[239] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������煎琠田甸畑癲筌箋箭篆纏詮輾轉鈿銓錢鐫電顚顫餞切截折浙癤竊節絶占岾店漸点粘霑鮎點接摺蝶丁井亭停偵呈姃定幀庭廷征情挺政整旌晶晸柾楨檉正汀淀淨渟湞瀞炡玎珽町睛碇禎程穽精綎艇訂諪貞鄭酊釘鉦鋌錠霆靖�".split(""); +for(j = 0; j != D[239].length; ++j) if(D[239][j].charCodeAt(0) !== 0xFFFD) { e[D[239][j]] = 61184 + j; d[61184 + j] = D[239][j];} +D[240] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������靜頂鼎制劑啼堤帝弟悌提梯濟祭第臍薺製諸蹄醍除際霽題齊俎兆凋助嘲弔彫措操早晁曺曹朝條棗槽漕潮照燥爪璪眺祖祚租稠窕粗糟組繰肇藻蚤詔調趙躁造遭釣阻雕鳥族簇足鏃存尊卒拙猝倧宗從悰慫棕淙琮種終綜縱腫�".split(""); +for(j = 0; j != D[240].length; ++j) if(D[240][j].charCodeAt(0) !== 0xFFFD) { e[D[240][j]] = 61440 + j; d[61440 + j] = D[240][j];} +D[241] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������踪踵鍾鐘佐坐左座挫罪主住侏做姝胄呪周嗾奏宙州廚晝朱柱株注洲湊澍炷珠疇籌紂紬綢舟蛛註誅走躊輳週酎酒鑄駐竹粥俊儁准埈寯峻晙樽浚準濬焌畯竣蠢逡遵雋駿茁中仲衆重卽櫛楫汁葺增憎曾拯烝甑症繒蒸證贈之只�".split(""); +for(j = 0; j != D[241].length; ++j) if(D[241][j].charCodeAt(0) !== 0xFFFD) { e[D[241][j]] = 61696 + j; d[61696 + j] = D[241][j];} +D[242] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������咫地址志持指摯支旨智枝枳止池沚漬知砥祉祗紙肢脂至芝芷蜘誌識贄趾遲直稙稷織職唇嗔塵振搢晉晋桭榛殄津溱珍瑨璡畛疹盡眞瞋秦縉縝臻蔯袗診賑軫辰進鎭陣陳震侄叱姪嫉帙桎瓆疾秩窒膣蛭質跌迭斟朕什執潗緝輯�".split(""); +for(j = 0; j != D[242].length; ++j) if(D[242][j].charCodeAt(0) !== 0xFFFD) { e[D[242][j]] = 61952 + j; d[61952 + j] = D[242][j];} +D[243] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������鏶集徵懲澄且侘借叉嗟嵯差次此磋箚茶蹉車遮捉搾着窄錯鑿齪撰澯燦璨瓚竄簒纂粲纘讚贊鑽餐饌刹察擦札紮僭參塹慘慙懺斬站讒讖倉倡創唱娼廠彰愴敞昌昶暢槍滄漲猖瘡窓脹艙菖蒼債埰寀寨彩採砦綵菜蔡采釵冊柵策�".split(""); +for(j = 0; j != D[243].length; ++j) if(D[243][j].charCodeAt(0) !== 0xFFFD) { e[D[243][j]] = 62208 + j; d[62208 + j] = D[243][j];} +D[244] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������責凄妻悽處倜刺剔尺慽戚拓擲斥滌瘠脊蹠陟隻仟千喘天川擅泉淺玔穿舛薦賤踐遷釧闡阡韆凸哲喆徹撤澈綴輟轍鐵僉尖沾添甛瞻簽籤詹諂堞妾帖捷牒疊睫諜貼輒廳晴淸聽菁請靑鯖切剃替涕滯締諦逮遞體初剿哨憔抄招梢�".split(""); +for(j = 0; j != D[244].length; ++j) if(D[244][j].charCodeAt(0) !== 0xFFFD) { e[D[244][j]] = 62464 + j; d[62464 + j] = D[244][j];} +D[245] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������椒楚樵炒焦硝礁礎秒稍肖艸苕草蕉貂超酢醋醮促囑燭矗蜀觸寸忖村邨叢塚寵悤憁摠總聰蔥銃撮催崔最墜抽推椎楸樞湫皺秋芻萩諏趨追鄒酋醜錐錘鎚雛騶鰍丑畜祝竺筑築縮蓄蹙蹴軸逐春椿瑃出朮黜充忠沖蟲衝衷悴膵萃�".split(""); +for(j = 0; j != D[245].length; ++j) if(D[245][j].charCodeAt(0) !== 0xFFFD) { e[D[245][j]] = 62720 + j; d[62720 + j] = D[245][j];} +D[246] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������贅取吹嘴娶就炊翠聚脆臭趣醉驟鷲側仄厠惻測層侈値嗤峙幟恥梔治淄熾痔痴癡稚穉緇緻置致蚩輜雉馳齒則勅飭親七柒漆侵寢枕沈浸琛砧針鍼蟄秤稱快他咤唾墮妥惰打拖朶楕舵陀馱駝倬卓啄坼度托拓擢晫柝濁濯琢琸託�".split(""); +for(j = 0; j != D[246].length; ++j) if(D[246][j].charCodeAt(0) !== 0xFFFD) { e[D[246][j]] = 62976 + j; d[62976 + j] = D[246][j];} +D[247] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������鐸呑嘆坦彈憚歎灘炭綻誕奪脫探眈耽貪塔搭榻宕帑湯糖蕩兌台太怠態殆汰泰笞胎苔跆邰颱宅擇澤撑攄兎吐土討慟桶洞痛筒統通堆槌腿褪退頹偸套妬投透鬪慝特闖坡婆巴把播擺杷波派爬琶破罷芭跛頗判坂板版瓣販辦鈑�".split(""); +for(j = 0; j != D[247].length; ++j) if(D[247][j].charCodeAt(0) !== 0xFFFD) { e[D[247][j]] = 63232 + j; d[63232 + j] = D[247][j];} +D[248] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������阪八叭捌佩唄悖敗沛浿牌狽稗覇貝彭澎烹膨愎便偏扁片篇編翩遍鞭騙貶坪平枰萍評吠嬖幣廢弊斃肺蔽閉陛佈包匍匏咆哺圃布怖抛抱捕暴泡浦疱砲胞脯苞葡蒲袍褒逋鋪飽鮑幅暴曝瀑爆輻俵剽彪慓杓標漂瓢票表豹飇飄驃�".split(""); +for(j = 0; j != D[248].length; ++j) if(D[248][j].charCodeAt(0) !== 0xFFFD) { e[D[248][j]] = 63488 + j; d[63488 + j] = D[248][j];} +D[249] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������品稟楓諷豊風馮彼披疲皮被避陂匹弼必泌珌畢疋筆苾馝乏逼下何厦夏廈昰河瑕荷蝦賀遐霞鰕壑學虐謔鶴寒恨悍旱汗漢澣瀚罕翰閑閒限韓割轄函含咸啣喊檻涵緘艦銜陷鹹合哈盒蛤閤闔陜亢伉姮嫦巷恒抗杭桁沆港缸肛航�".split(""); +for(j = 0; j != D[249].length; ++j) if(D[249][j].charCodeAt(0) !== 0xFFFD) { e[D[249][j]] = 63744 + j; d[63744 + j] = D[249][j];} +D[250] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������行降項亥偕咳垓奚孩害懈楷海瀣蟹解該諧邂駭骸劾核倖幸杏荇行享向嚮珦鄕響餉饗香噓墟虛許憲櫶獻軒歇險驗奕爀赫革俔峴弦懸晛泫炫玄玹現眩睍絃絢縣舷衒見賢鉉顯孑穴血頁嫌俠協夾峽挾浹狹脅脇莢鋏頰亨兄刑型�".split(""); +for(j = 0; j != D[250].length; ++j) if(D[250][j].charCodeAt(0) !== 0xFFFD) { e[D[250][j]] = 64000 + j; d[64000 + j] = D[250][j];} +D[251] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������形泂滎瀅灐炯熒珩瑩荊螢衡逈邢鎣馨兮彗惠慧暳蕙蹊醯鞋乎互呼壕壺好岵弧戶扈昊晧毫浩淏湖滸澔濠濩灝狐琥瑚瓠皓祜糊縞胡芦葫蒿虎號蝴護豪鎬頀顥惑或酷婚昏混渾琿魂忽惚笏哄弘汞泓洪烘紅虹訌鴻化和嬅樺火畵�".split(""); +for(j = 0; j != D[251].length; ++j) if(D[251][j].charCodeAt(0) !== 0xFFFD) { e[D[251][j]] = 64256 + j; d[64256 + j] = D[251][j];} +D[252] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������禍禾花華話譁貨靴廓擴攫確碻穫丸喚奐宦幻患換歡晥桓渙煥環紈還驩鰥活滑猾豁闊凰幌徨恍惶愰慌晃晄榥況湟滉潢煌璜皇篁簧荒蝗遑隍黃匯回廻徊恢悔懷晦會檜淮澮灰獪繪膾茴蛔誨賄劃獲宖橫鐄哮嚆孝效斅曉梟涍淆�".split(""); +for(j = 0; j != D[252].length; ++j) if(D[252][j].charCodeAt(0) !== 0xFFFD) { e[D[252][j]] = 64512 + j; d[64512 + j] = D[252][j];} +D[253] = "�����������������������������������������������������������������������������������������������������������������������������������������������������������������爻肴酵驍侯候厚后吼喉嗅帿後朽煦珝逅勛勳塤壎焄熏燻薰訓暈薨喧暄煊萱卉喙毁彙徽揮暉煇諱輝麾休携烋畦虧恤譎鷸兇凶匈洶胸黑昕欣炘痕吃屹紇訖欠欽歆吸恰洽翕興僖凞喜噫囍姬嬉希憙憘戱晞曦熙熹熺犧禧稀羲詰�".split(""); +for(j = 0; j != D[253].length; ++j) if(D[253][j].charCodeAt(0) !== 0xFFFD) { e[D[253][j]] = 64768 + j; d[64768 + j] = D[253][j];} +return {"enc": e, "dec": d }; })(); +cptable[950] = (function(){ var d = [], e = {}, D = [], j; +D[0] = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~��������������������������������������������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[0].length; ++j) if(D[0][j].charCodeAt(0) !== 0xFFFD) { e[D[0][j]] = 0 + j; d[0 + j] = D[0][j];} +D[161] = "����������������������������������������������������������������　，、。．‧；：？！︰…‥﹐﹑﹒·﹔﹕﹖﹗｜–︱—︳╴︴﹏（）︵︶｛｝︷︸〔〕︹︺【】︻︼《》︽︾〈〉︿﹀「」﹁﹂『』﹃﹄﹙﹚����������������������������������﹛﹜﹝﹞‘’“”〝〞‵′＃＆＊※§〃○●△▲◎☆★◇◆□■▽▼㊣℅¯￣＿ˍ﹉﹊﹍﹎﹋﹌﹟﹠﹡＋－×÷±√＜＞＝≦≧≠∞≒≡﹢﹣﹤﹥﹦～∩∪⊥∠∟⊿㏒㏑∫∮∵∴♀♂⊕⊙↑↓←→↖↗↙↘∥∣／�".split(""); +for(j = 0; j != D[161].length; ++j) if(D[161][j].charCodeAt(0) !== 0xFFFD) { e[D[161][j]] = 41216 + j; d[41216 + j] = D[161][j];} +D[162] = "����������������������������������������������������������������＼∕﹨＄￥〒￠￡％＠℃℉﹩﹪﹫㏕㎜㎝㎞㏎㎡㎎㎏㏄°兙兛兞兝兡兣嗧瓩糎▁▂▃▄▅▆▇█▏▎▍▌▋▊▉┼┴┬┤├▔─│▕┌┐└┘╭����������������������������������╮╰╯═╞╪╡◢◣◥◤╱╲╳０１２３４５６７８９ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩ〡〢〣〤〥〦〧〨〩十卄卅ＡＢＣＤＥＦＧＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺａｂｃｄｅｆｇｈｉｊｋｌｍｎｏｐｑｒｓｔｕｖ�".split(""); +for(j = 0; j != D[162].length; ++j) if(D[162][j].charCodeAt(0) !== 0xFFFD) { e[D[162][j]] = 41472 + j; d[41472 + j] = D[162][j];} +D[163] = "����������������������������������������������������������������ｗｘｙｚΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωㄅㄆㄇㄈㄉㄊㄋㄌㄍㄎㄏ����������������������������������ㄐㄑㄒㄓㄔㄕㄖㄗㄘㄙㄚㄛㄜㄝㄞㄟㄠㄡㄢㄣㄤㄥㄦㄧㄨㄩ˙ˉˊˇˋ���������������������������������€������������������������������".split(""); +for(j = 0; j != D[163].length; ++j) if(D[163][j].charCodeAt(0) !== 0xFFFD) { e[D[163][j]] = 41728 + j; d[41728 + j] = D[163][j];} +D[164] = "����������������������������������������������������������������一乙丁七乃九了二人儿入八几刀刁力匕十卜又三下丈上丫丸凡久么也乞于亡兀刃勺千叉口土士夕大女子孑孓寸小尢尸山川工己已巳巾干廾弋弓才����������������������������������丑丐不中丰丹之尹予云井互五亢仁什仃仆仇仍今介仄元允內六兮公冗凶分切刈勻勾勿化匹午升卅卞厄友及反壬天夫太夭孔少尤尺屯巴幻廿弔引心戈戶手扎支文斗斤方日曰月木欠止歹毋比毛氏水火爪父爻片牙牛犬王丙�".split(""); +for(j = 0; j != D[164].length; ++j) if(D[164][j].charCodeAt(0) !== 0xFFFD) { e[D[164][j]] = 41984 + j; d[41984 + j] = D[164][j];} +D[165] = "����������������������������������������������������������������世丕且丘主乍乏乎以付仔仕他仗代令仙仞充兄冉冊冬凹出凸刊加功包匆北匝仟半卉卡占卯卮去可古右召叮叩叨叼司叵叫另只史叱台句叭叻四囚外����������������������������������央失奴奶孕它尼巨巧左市布平幼弁弘弗必戊打扔扒扑斥旦朮本未末札正母民氐永汁汀氾犯玄玉瓜瓦甘生用甩田由甲申疋白皮皿目矛矢石示禾穴立丞丟乒乓乩亙交亦亥仿伉伙伊伕伍伐休伏仲件任仰仳份企伋光兇兆先全�".split(""); +for(j = 0; j != D[165].length; ++j) if(D[165][j].charCodeAt(0) !== 0xFFFD) { e[D[165][j]] = 42240 + j; d[42240 + j] = D[165][j];} +D[166] = "����������������������������������������������������������������共再冰列刑划刎刖劣匈匡匠印危吉吏同吊吐吁吋各向名合吃后吆吒因回囝圳地在圭圬圯圩夙多夷夸妄奸妃好她如妁字存宇守宅安寺尖屹州帆并年����������������������������������式弛忙忖戎戌戍成扣扛托收早旨旬旭曲曳有朽朴朱朵次此死氖汝汗汙江池汐汕污汛汍汎灰牟牝百竹米糸缶羊羽老考而耒耳聿肉肋肌臣自至臼舌舛舟艮色艾虫血行衣西阡串亨位住佇佗佞伴佛何估佐佑伽伺伸佃佔似但佣�".split(""); +for(j = 0; j != D[166].length; ++j) if(D[166][j].charCodeAt(0) !== 0xFFFD) { e[D[166][j]] = 42496 + j; d[42496 + j] = D[166][j];} +D[167] = "����������������������������������������������������������������作你伯低伶余佝佈佚兌克免兵冶冷別判利刪刨劫助努劬匣即卵吝吭吞吾否呎吧呆呃吳呈呂君吩告吹吻吸吮吵吶吠吼呀吱含吟听囪困囤囫坊坑址坍����������������������������������均坎圾坐坏圻壯夾妝妒妨妞妣妙妖妍妤妓妊妥孝孜孚孛完宋宏尬局屁尿尾岐岑岔岌巫希序庇床廷弄弟彤形彷役忘忌志忍忱快忸忪戒我抄抗抖技扶抉扭把扼找批扳抒扯折扮投抓抑抆改攻攸旱更束李杏材村杜杖杞杉杆杠�".split(""); +for(j = 0; j != D[167].length; ++j) if(D[167][j].charCodeAt(0) !== 0xFFFD) { e[D[167][j]] = 42752 + j; d[42752 + j] = D[167][j];} +D[168] = "����������������������������������������������������������������杓杗步每求汞沙沁沈沉沅沛汪決沐汰沌汨沖沒汽沃汲汾汴沆汶沍沔沘沂灶灼災灸牢牡牠狄狂玖甬甫男甸皂盯矣私秀禿究系罕肖肓肝肘肛肚育良芒����������������������������������芋芍見角言谷豆豕貝赤走足身車辛辰迂迆迅迄巡邑邢邪邦那酉釆里防阮阱阪阬並乖乳事些亞享京佯依侍佳使佬供例來侃佰併侈佩佻侖佾侏侑佺兔兒兕兩具其典冽函刻券刷刺到刮制剁劾劻卒協卓卑卦卷卸卹取叔受味呵�".split(""); +for(j = 0; j != D[168].length; ++j) if(D[168][j].charCodeAt(0) !== 0xFFFD) { e[D[168][j]] = 43008 + j; d[43008 + j] = D[168][j];} +D[169] = "����������������������������������������������������������������咖呸咕咀呻呷咄咒咆呼咐呱呶和咚呢周咋命咎固垃坷坪坩坡坦坤坼夜奉奇奈奄奔妾妻委妹妮姑姆姐姍始姓姊妯妳姒姅孟孤季宗定官宜宙宛尚屈居����������������������������������屆岷岡岸岩岫岱岳帘帚帖帕帛帑幸庚店府底庖延弦弧弩往征彿彼忝忠忽念忿怏怔怯怵怖怪怕怡性怩怫怛或戕房戾所承拉拌拄抿拂抹拒招披拓拔拋拈抨抽押拐拙拇拍抵拚抱拘拖拗拆抬拎放斧於旺昔易昌昆昂明昀昏昕昊�".split(""); +for(j = 0; j != D[169].length; ++j) if(D[169][j].charCodeAt(0) !== 0xFFFD) { e[D[169][j]] = 43264 + j; d[43264 + j] = D[169][j];} +D[170] = "����������������������������������������������������������������昇服朋杭枋枕東果杳杷枇枝林杯杰板枉松析杵枚枓杼杪杲欣武歧歿氓氛泣注泳沱泌泥河沽沾沼波沫法泓沸泄油況沮泗泅泱沿治泡泛泊沬泯泜泖泠����������������������������������炕炎炒炊炙爬爭爸版牧物狀狎狙狗狐玩玨玟玫玥甽疝疙疚的盂盲直知矽社祀祁秉秈空穹竺糾罔羌羋者肺肥肢肱股肫肩肴肪肯臥臾舍芳芝芙芭芽芟芹花芬芥芯芸芣芰芾芷虎虱初表軋迎返近邵邸邱邶采金長門阜陀阿阻附�".split(""); +for(j = 0; j != D[170].length; ++j) if(D[170][j].charCodeAt(0) !== 0xFFFD) { e[D[170][j]] = 43520 + j; d[43520 + j] = D[170][j];} +D[171] = "����������������������������������������������������������������陂隹雨青非亟亭亮信侵侯便俠俑俏保促侶俘俟俊俗侮俐俄係俚俎俞侷兗冒冑冠剎剃削前剌剋則勇勉勃勁匍南卻厚叛咬哀咨哎哉咸咦咳哇哂咽咪品����������������������������������哄哈咯咫咱咻咩咧咿囿垂型垠垣垢城垮垓奕契奏奎奐姜姘姿姣姨娃姥姪姚姦威姻孩宣宦室客宥封屎屏屍屋峙峒巷帝帥帟幽庠度建弈弭彥很待徊律徇後徉怒思怠急怎怨恍恰恨恢恆恃恬恫恪恤扁拜挖按拼拭持拮拽指拱拷�".split(""); +for(j = 0; j != D[171].length; ++j) if(D[171][j].charCodeAt(0) !== 0xFFFD) { e[D[171][j]] = 43776 + j; d[43776 + j] = D[171][j];} +D[172] = "����������������������������������������������������������������拯括拾拴挑挂政故斫施既春昭映昧是星昨昱昤曷柿染柱柔某柬架枯柵柩柯柄柑枴柚查枸柏柞柳枰柙柢柝柒歪殃殆段毒毗氟泉洋洲洪流津洌洱洞洗����������������������������������活洽派洶洛泵洹洧洸洩洮洵洎洫炫為炳炬炯炭炸炮炤爰牲牯牴狩狠狡玷珊玻玲珍珀玳甚甭畏界畎畋疫疤疥疢疣癸皆皇皈盈盆盃盅省盹相眉看盾盼眇矜砂研砌砍祆祉祈祇禹禺科秒秋穿突竿竽籽紂紅紀紉紇約紆缸美羿耄�".split(""); +for(j = 0; j != D[172].length; ++j) if(D[172][j].charCodeAt(0) !== 0xFFFD) { e[D[172][j]] = 44032 + j; d[44032 + j] = D[172][j];} +D[173] = "����������������������������������������������������������������耐耍耑耶胖胥胚胃胄背胡胛胎胞胤胝致舢苧范茅苣苛苦茄若茂茉苒苗英茁苜苔苑苞苓苟苯茆虐虹虻虺衍衫要觔計訂訃貞負赴赳趴軍軌述迦迢迪迥����������������������������������迭迫迤迨郊郎郁郃酋酊重閂限陋陌降面革韋韭音頁風飛食首香乘亳倌倍倣俯倦倥俸倩倖倆值借倚倒們俺倀倔倨俱倡個候倘俳修倭倪俾倫倉兼冤冥冢凍凌准凋剖剜剔剛剝匪卿原厝叟哨唐唁唷哼哥哲唆哺唔哩哭員唉哮哪�".split(""); +for(j = 0; j != D[173].length; ++j) if(D[173][j].charCodeAt(0) !== 0xFFFD) { e[D[173][j]] = 44288 + j; d[44288 + j] = D[173][j];} +D[174] = "����������������������������������������������������������������哦唧唇哽唏圃圄埂埔埋埃堉夏套奘奚娑娘娜娟娛娓姬娠娣娩娥娌娉孫屘宰害家宴宮宵容宸射屑展屐峭峽峻峪峨峰島崁峴差席師庫庭座弱徒徑徐恙����������������������������������恣恥恐恕恭恩息悄悟悚悍悔悌悅悖扇拳挈拿捎挾振捕捂捆捏捉挺捐挽挪挫挨捍捌效敉料旁旅時晉晏晃晒晌晅晁書朔朕朗校核案框桓根桂桔栩梳栗桌桑栽柴桐桀格桃株桅栓栘桁殊殉殷氣氧氨氦氤泰浪涕消涇浦浸海浙涓�".split(""); +for(j = 0; j != D[174].length; ++j) if(D[174][j].charCodeAt(0) !== 0xFFFD) { e[D[174][j]] = 44544 + j; d[44544 + j] = D[174][j];} +D[175] = "����������������������������������������������������������������浬涉浮浚浴浩涌涊浹涅浥涔烊烘烤烙烈烏爹特狼狹狽狸狷玆班琉珮珠珪珞畔畝畜畚留疾病症疲疳疽疼疹痂疸皋皰益盍盎眩真眠眨矩砰砧砸砝破砷����������������������������������砥砭砠砟砲祕祐祠祟祖神祝祗祚秤秣秧租秦秩秘窄窈站笆笑粉紡紗紋紊素索純紐紕級紜納紙紛缺罟羔翅翁耆耘耕耙耗耽耿胱脂胰脅胭胴脆胸胳脈能脊胼胯臭臬舀舐航舫舨般芻茫荒荔荊茸荐草茵茴荏茲茹茶茗荀茱茨荃�".split(""); +for(j = 0; j != D[175].length; ++j) if(D[175][j].charCodeAt(0) !== 0xFFFD) { e[D[175][j]] = 44800 + j; d[44800 + j] = D[175][j];} +D[176] = "����������������������������������������������������������������虔蚊蚪蚓蚤蚩蚌蚣蚜衰衷袁袂衽衹記訐討訌訕訊託訓訖訏訑豈豺豹財貢起躬軒軔軏辱送逆迷退迺迴逃追逅迸邕郡郝郢酒配酌釘針釗釜釙閃院陣陡����������������������������������陛陝除陘陞隻飢馬骨高鬥鬲鬼乾偺偽停假偃偌做偉健偶偎偕偵側偷偏倏偯偭兜冕凰剪副勒務勘動匐匏匙匿區匾參曼商啪啦啄啞啡啃啊唱啖問啕唯啤唸售啜唬啣唳啁啗圈國圉域堅堊堆埠埤基堂堵執培夠奢娶婁婉婦婪婀�".split(""); +for(j = 0; j != D[176].length; ++j) if(D[176][j].charCodeAt(0) !== 0xFFFD) { e[D[176][j]] = 45056 + j; d[45056 + j] = D[176][j];} +D[177] = "����������������������������������������������������������������娼婢婚婆婊孰寇寅寄寂宿密尉專將屠屜屝崇崆崎崛崖崢崑崩崔崙崤崧崗巢常帶帳帷康庸庶庵庾張強彗彬彩彫得徙從徘御徠徜恿患悉悠您惋悴惦悽����������������������������������情悻悵惜悼惘惕惆惟悸惚惇戚戛扈掠控捲掖探接捷捧掘措捱掩掉掃掛捫推掄授掙採掬排掏掀捻捩捨捺敝敖救教敗啟敏敘敕敔斜斛斬族旋旌旎晝晚晤晨晦晞曹勗望梁梯梢梓梵桿桶梱梧梗械梃棄梭梆梅梔條梨梟梡梂欲殺�".split(""); +for(j = 0; j != D[177].length; ++j) if(D[177][j].charCodeAt(0) !== 0xFFFD) { e[D[177][j]] = 45312 + j; d[45312 + j] = D[177][j];} +D[178] = "����������������������������������������������������������������毫毬氫涎涼淳淙液淡淌淤添淺清淇淋涯淑涮淞淹涸混淵淅淒渚涵淚淫淘淪深淮淨淆淄涪淬涿淦烹焉焊烽烯爽牽犁猜猛猖猓猙率琅琊球理現琍瓠瓶����������������������������������瓷甜產略畦畢異疏痔痕疵痊痍皎盔盒盛眷眾眼眶眸眺硫硃硎祥票祭移窒窕笠笨笛第符笙笞笮粒粗粕絆絃統紮紹紼絀細紳組累終紲紱缽羞羚翌翎習耜聊聆脯脖脣脫脩脰脤舂舵舷舶船莎莞莘荸莢莖莽莫莒莊莓莉莠荷荻荼�".split(""); +for(j = 0; j != D[178].length; ++j) if(D[178][j].charCodeAt(0) !== 0xFFFD) { e[D[178][j]] = 45568 + j; d[45568 + j] = D[178][j];} +D[179] = "����������������������������������������������������������������莆莧處彪蛇蛀蚶蛄蚵蛆蛋蚱蚯蛉術袞袈被袒袖袍袋覓規訪訝訣訥許設訟訛訢豉豚販責貫貨貪貧赧赦趾趺軛軟這逍通逗連速逝逐逕逞造透逢逖逛途����������������������������������部郭都酗野釵釦釣釧釭釩閉陪陵陳陸陰陴陶陷陬雀雪雩章竟頂頃魚鳥鹵鹿麥麻傢傍傅備傑傀傖傘傚最凱割剴創剩勞勝勛博厥啻喀喧啼喊喝喘喂喜喪喔喇喋喃喳單喟唾喲喚喻喬喱啾喉喫喙圍堯堪場堤堰報堡堝堠壹壺奠�".split(""); +for(j = 0; j != D[179].length; ++j) if(D[179][j].charCodeAt(0) !== 0xFFFD) { e[D[179][j]] = 45824 + j; d[45824 + j] = D[179][j];} +D[180] = "����������������������������������������������������������������婷媚婿媒媛媧孳孱寒富寓寐尊尋就嵌嵐崴嵇巽幅帽幀幃幾廊廁廂廄弼彭復循徨惑惡悲悶惠愜愣惺愕惰惻惴慨惱愎惶愉愀愒戟扉掣掌描揀揩揉揆揍����������������������������������插揣提握揖揭揮捶援揪換摒揚揹敞敦敢散斑斐斯普晰晴晶景暑智晾晷曾替期朝棺棕棠棘棗椅棟棵森棧棹棒棲棣棋棍植椒椎棉棚楮棻款欺欽殘殖殼毯氮氯氬港游湔渡渲湧湊渠渥渣減湛湘渤湖湮渭渦湯渴湍渺測湃渝渾滋�".split(""); +for(j = 0; j != D[180].length; ++j) if(D[180][j].charCodeAt(0) !== 0xFFFD) { e[D[180][j]] = 46080 + j; d[46080 + j] = D[180][j];} +D[181] = "����������������������������������������������������������������溉渙湎湣湄湲湩湟焙焚焦焰無然煮焜牌犄犀猶猥猴猩琺琪琳琢琥琵琶琴琯琛琦琨甥甦畫番痢痛痣痙痘痞痠登發皖皓皴盜睏短硝硬硯稍稈程稅稀窘����������������������������������窗窖童竣等策筆筐筒答筍筋筏筑粟粥絞結絨絕紫絮絲絡給絢絰絳善翔翕耋聒肅腕腔腋腑腎脹腆脾腌腓腴舒舜菩萃菸萍菠菅萋菁華菱菴著萊菰萌菌菽菲菊萸萎萄菜萇菔菟虛蛟蛙蛭蛔蛛蛤蛐蛞街裁裂袱覃視註詠評詞証詁�".split(""); +for(j = 0; j != D[181].length; ++j) if(D[181][j].charCodeAt(0) !== 0xFFFD) { e[D[181][j]] = 46336 + j; d[46336 + j] = D[181][j];} +D[182] = "����������������������������������������������������������������詔詛詐詆訴診訶詖象貂貯貼貳貽賁費賀貴買貶貿貸越超趁跎距跋跚跑跌跛跆軻軸軼辜逮逵週逸進逶鄂郵鄉郾酣酥量鈔鈕鈣鈉鈞鈍鈐鈇鈑閔閏開閑����������������������������������間閒閎隊階隋陽隅隆隍陲隄雁雅雄集雇雯雲韌項順須飧飪飯飩飲飭馮馭黃黍黑亂傭債傲傳僅傾催傷傻傯僇剿剷剽募勦勤勢勣匯嗟嗨嗓嗦嗎嗜嗇嗑嗣嗤嗯嗚嗡嗅嗆嗥嗉園圓塞塑塘塗塚塔填塌塭塊塢塒塋奧嫁嫉嫌媾媽媼�".split(""); +for(j = 0; j != D[182].length; ++j) if(D[182][j].charCodeAt(0) !== 0xFFFD) { e[D[182][j]] = 46592 + j; d[46592 + j] = D[182][j];} +D[183] = "����������������������������������������������������������������媳嫂媲嵩嵯幌幹廉廈弒彙徬微愚意慈感想愛惹愁愈慎慌慄慍愾愴愧愍愆愷戡戢搓搾搞搪搭搽搬搏搜搔損搶搖搗搆敬斟新暗暉暇暈暖暄暘暍會榔業����������������������������������楚楷楠楔極椰概楊楨楫楞楓楹榆楝楣楛歇歲毀殿毓毽溢溯滓溶滂源溝滇滅溥溘溼溺溫滑準溜滄滔溪溧溴煎煙煩煤煉照煜煬煦煌煥煞煆煨煖爺牒猷獅猿猾瑯瑚瑕瑟瑞瑁琿瑙瑛瑜當畸瘀痰瘁痲痱痺痿痴痳盞盟睛睫睦睞督�".split(""); +for(j = 0; j != D[183].length; ++j) if(D[183][j].charCodeAt(0) !== 0xFFFD) { e[D[183][j]] = 46848 + j; d[46848 + j] = D[183][j];} +D[184] = "����������������������������������������������������������������睹睪睬睜睥睨睢矮碎碰碗碘碌碉硼碑碓硿祺祿禁萬禽稜稚稠稔稟稞窟窠筷節筠筮筧粱粳粵經絹綑綁綏絛置罩罪署義羨群聖聘肆肄腱腰腸腥腮腳腫����������������������������������腹腺腦舅艇蒂葷落萱葵葦葫葉葬葛萼萵葡董葩葭葆虞虜號蛹蜓蜈蜇蜀蛾蛻蜂蜃蜆蜊衙裟裔裙補裘裝裡裊裕裒覜解詫該詳試詩詰誇詼詣誠話誅詭詢詮詬詹詻訾詨豢貊貉賊資賈賄貲賃賂賅跡跟跨路跳跺跪跤跦躲較載軾輊�".split(""); +for(j = 0; j != D[184].length; ++j) if(D[184][j].charCodeAt(0) !== 0xFFFD) { e[D[184][j]] = 47104 + j; d[47104 + j] = D[184][j];} +D[185] = "����������������������������������������������������������������辟農運遊道遂達逼違遐遇遏過遍遑逾遁鄒鄗酬酪酩釉鈷鉗鈸鈽鉀鈾鉛鉋鉤鉑鈴鉉鉍鉅鈹鈿鉚閘隘隔隕雍雋雉雊雷電雹零靖靴靶預頑頓頊頒頌飼飴����������������������������������飽飾馳馱馴髡鳩麂鼎鼓鼠僧僮僥僖僭僚僕像僑僱僎僩兢凳劃劂匱厭嗾嘀嘛嘗嗽嘔嘆嘉嘍嘎嗷嘖嘟嘈嘐嗶團圖塵塾境墓墊塹墅塽壽夥夢夤奪奩嫡嫦嫩嫗嫖嫘嫣孵寞寧寡寥實寨寢寤察對屢嶄嶇幛幣幕幗幔廓廖弊彆彰徹慇�".split(""); +for(j = 0; j != D[185].length; ++j) if(D[185][j].charCodeAt(0) !== 0xFFFD) { e[D[185][j]] = 47360 + j; d[47360 + j] = D[185][j];} +D[186] = "����������������������������������������������������������������愿態慷慢慣慟慚慘慵截撇摘摔撤摸摟摺摑摧搴摭摻敲斡旗旖暢暨暝榜榨榕槁榮槓構榛榷榻榫榴槐槍榭槌榦槃榣歉歌氳漳演滾漓滴漩漾漠漬漏漂漢����������������������������������滿滯漆漱漸漲漣漕漫漯澈漪滬漁滲滌滷熔熙煽熊熄熒爾犒犖獄獐瑤瑣瑪瑰瑭甄疑瘧瘍瘋瘉瘓盡監瞄睽睿睡磁碟碧碳碩碣禎福禍種稱窪窩竭端管箕箋筵算箝箔箏箸箇箄粹粽精綻綰綜綽綾綠緊綴網綱綺綢綿綵綸維緒緇綬�".split(""); +for(j = 0; j != D[186].length; ++j) if(D[186][j].charCodeAt(0) !== 0xFFFD) { e[D[186][j]] = 47616 + j; d[47616 + j] = D[186][j];} +D[187] = "����������������������������������������������������������������罰翠翡翟聞聚肇腐膀膏膈膊腿膂臧臺與舔舞艋蓉蒿蓆蓄蒙蒞蒲蒜蓋蒸蓀蓓蒐蒼蓑蓊蜿蜜蜻蜢蜥蜴蜘蝕蜷蜩裳褂裴裹裸製裨褚裯誦誌語誣認誡誓誤����������������������������������說誥誨誘誑誚誧豪貍貌賓賑賒赫趙趕跼輔輒輕輓辣遠遘遜遣遙遞遢遝遛鄙鄘鄞酵酸酷酴鉸銀銅銘銖鉻銓銜銨鉼銑閡閨閩閣閥閤隙障際雌雒需靼鞅韶頗領颯颱餃餅餌餉駁骯骰髦魁魂鳴鳶鳳麼鼻齊億儀僻僵價儂儈儉儅凜�".split(""); +for(j = 0; j != D[187].length; ++j) if(D[187][j].charCodeAt(0) !== 0xFFFD) { e[D[187][j]] = 47872 + j; d[47872 + j] = D[187][j];} +D[188] = "����������������������������������������������������������������劇劈劉劍劊勰厲嘮嘻嘹嘲嘿嘴嘩噓噎噗噴嘶嘯嘰墀墟增墳墜墮墩墦奭嬉嫻嬋嫵嬌嬈寮寬審寫層履嶝嶔幢幟幡廢廚廟廝廣廠彈影德徵慶慧慮慝慕憂����������������������������������慼慰慫慾憧憐憫憎憬憚憤憔憮戮摩摯摹撞撲撈撐撰撥撓撕撩撒撮播撫撚撬撙撢撳敵敷數暮暫暴暱樣樟槨樁樞標槽模樓樊槳樂樅槭樑歐歎殤毅毆漿潼澄潑潦潔澆潭潛潸潮澎潺潰潤澗潘滕潯潠潟熟熬熱熨牖犛獎獗瑩璋璃�".split(""); +for(j = 0; j != D[188].length; ++j) if(D[188][j].charCodeAt(0) !== 0xFFFD) { e[D[188][j]] = 48128 + j; d[48128 + j] = D[188][j];} +D[189] = "����������������������������������������������������������������瑾璀畿瘠瘩瘟瘤瘦瘡瘢皚皺盤瞎瞇瞌瞑瞋磋磅確磊碾磕碼磐稿稼穀稽稷稻窯窮箭箱範箴篆篇篁箠篌糊締練緯緻緘緬緝編緣線緞緩綞緙緲緹罵罷羯����������������������������������翩耦膛膜膝膠膚膘蔗蔽蔚蓮蔬蔭蔓蔑蔣蔡蔔蓬蔥蓿蔆螂蝴蝶蝠蝦蝸蝨蝙蝗蝌蝓衛衝褐複褒褓褕褊誼諒談諄誕請諸課諉諂調誰論諍誶誹諛豌豎豬賠賞賦賤賬賭賢賣賜質賡赭趟趣踫踐踝踢踏踩踟踡踞躺輝輛輟輩輦輪輜輞�".split(""); +for(j = 0; j != D[189].length; ++j) if(D[189][j].charCodeAt(0) !== 0xFFFD) { e[D[189][j]] = 48384 + j; d[48384 + j] = D[189][j];} +D[190] = "����������������������������������������������������������������輥適遮遨遭遷鄰鄭鄧鄱醇醉醋醃鋅銻銷鋪銬鋤鋁銳銼鋒鋇鋰銲閭閱霄霆震霉靠鞍鞋鞏頡頫頜颳養餓餒餘駝駐駟駛駑駕駒駙骷髮髯鬧魅魄魷魯鴆鴉����������������������������������鴃麩麾黎墨齒儒儘儔儐儕冀冪凝劑劓勳噙噫噹噩噤噸噪器噥噱噯噬噢噶壁墾壇壅奮嬝嬴學寰導彊憲憑憩憊懍憶憾懊懈戰擅擁擋撻撼據擄擇擂操撿擒擔撾整曆曉暹曄曇暸樽樸樺橙橫橘樹橄橢橡橋橇樵機橈歙歷氅濂澱澡�".split(""); +for(j = 0; j != D[190].length; ++j) if(D[190][j].charCodeAt(0) !== 0xFFFD) { e[D[190][j]] = 48640 + j; d[48640 + j] = D[190][j];} +D[191] = "����������������������������������������������������������������濃澤濁澧澳激澹澶澦澠澴熾燉燐燒燈燕熹燎燙燜燃燄獨璜璣璘璟璞瓢甌甍瘴瘸瘺盧盥瞠瞞瞟瞥磨磚磬磧禦積穎穆穌穋窺篙簑築篤篛篡篩篦糕糖縊����������������������������������縑縈縛縣縞縝縉縐罹羲翰翱翮耨膳膩膨臻興艘艙蕊蕙蕈蕨蕩蕃蕉蕭蕪蕞螃螟螞螢融衡褪褲褥褫褡親覦諦諺諫諱謀諜諧諮諾謁謂諷諭諳諶諼豫豭貓賴蹄踱踴蹂踹踵輻輯輸輳辨辦遵遴選遲遼遺鄴醒錠錶鋸錳錯錢鋼錫錄錚�".split(""); +for(j = 0; j != D[191].length; ++j) if(D[191][j].charCodeAt(0) !== 0xFFFD) { e[D[191][j]] = 48896 + j; d[48896 + j] = D[191][j];} +D[192] = "����������������������������������������������������������������錐錦錡錕錮錙閻隧隨險雕霎霑霖霍霓霏靛靜靦鞘頰頸頻頷頭頹頤餐館餞餛餡餚駭駢駱骸骼髻髭鬨鮑鴕鴣鴦鴨鴒鴛默黔龍龜優償儡儲勵嚎嚀嚐嚅嚇����������������������������������嚏壕壓壑壎嬰嬪嬤孺尷屨嶼嶺嶽嶸幫彌徽應懂懇懦懋戲戴擎擊擘擠擰擦擬擱擢擭斂斃曙曖檀檔檄檢檜櫛檣橾檗檐檠歜殮毚氈濘濱濟濠濛濤濫濯澀濬濡濩濕濮濰燧營燮燦燥燭燬燴燠爵牆獰獲璩環璦璨癆療癌盪瞳瞪瞰瞬�".split(""); +for(j = 0; j != D[192].length; ++j) if(D[192][j].charCodeAt(0) !== 0xFFFD) { e[D[192][j]] = 49152 + j; d[49152 + j] = D[192][j];} +D[193] = "����������������������������������������������������������������瞧瞭矯磷磺磴磯礁禧禪穗窿簇簍篾篷簌篠糠糜糞糢糟糙糝縮績繆縷縲繃縫總縱繅繁縴縹繈縵縿縯罄翳翼聱聲聰聯聳臆臃膺臂臀膿膽臉膾臨舉艱薪����������������������������������薄蕾薜薑薔薯薛薇薨薊虧蟀蟑螳蟒蟆螫螻螺蟈蟋褻褶襄褸褽覬謎謗謙講謊謠謝謄謐豁谿豳賺賽購賸賻趨蹉蹋蹈蹊轄輾轂轅輿避遽還邁邂邀鄹醣醞醜鍍鎂錨鍵鍊鍥鍋錘鍾鍬鍛鍰鍚鍔闊闋闌闈闆隱隸雖霜霞鞠韓顆颶餵騁�".split(""); +for(j = 0; j != D[193].length; ++j) if(D[193][j].charCodeAt(0) !== 0xFFFD) { e[D[193][j]] = 49408 + j; d[49408 + j] = D[193][j];} +D[194] = "����������������������������������������������������������������駿鮮鮫鮪鮭鴻鴿麋黏點黜黝黛鼾齋叢嚕嚮壙壘嬸彝懣戳擴擲擾攆擺擻擷斷曜朦檳檬櫃檻檸櫂檮檯歟歸殯瀉瀋濾瀆濺瀑瀏燻燼燾燸獷獵璧璿甕癖癘����������������������������������癒瞽瞿瞻瞼礎禮穡穢穠竄竅簫簧簪簞簣簡糧織繕繞繚繡繒繙罈翹翻職聶臍臏舊藏薩藍藐藉薰薺薹薦蟯蟬蟲蟠覆覲觴謨謹謬謫豐贅蹙蹣蹦蹤蹟蹕軀轉轍邇邃邈醫醬釐鎔鎊鎖鎢鎳鎮鎬鎰鎘鎚鎗闔闖闐闕離雜雙雛雞霤鞣鞦�".split(""); +for(j = 0; j != D[194].length; ++j) if(D[194][j].charCodeAt(0) !== 0xFFFD) { e[D[194][j]] = 49664 + j; d[49664 + j] = D[194][j];} +D[195] = "����������������������������������������������������������������鞭韹額顏題顎顓颺餾餿餽餮馥騎髁鬃鬆魏魎魍鯊鯉鯽鯈鯀鵑鵝鵠黠鼕鼬儳嚥壞壟壢寵龐廬懲懷懶懵攀攏曠曝櫥櫝櫚櫓瀛瀟瀨瀚瀝瀕瀘爆爍牘犢獸����������������������������������獺璽瓊瓣疇疆癟癡矇礙禱穫穩簾簿簸簽簷籀繫繭繹繩繪羅繳羶羹羸臘藩藝藪藕藤藥藷蟻蠅蠍蟹蟾襠襟襖襞譁譜識證譚譎譏譆譙贈贊蹼蹲躇蹶蹬蹺蹴轔轎辭邊邋醱醮鏡鏑鏟鏃鏈鏜鏝鏖鏢鏍鏘鏤鏗鏨關隴難霪霧靡韜韻類�".split(""); +for(j = 0; j != D[195].length; ++j) if(D[195][j].charCodeAt(0) !== 0xFFFD) { e[D[195][j]] = 49920 + j; d[49920 + j] = D[195][j];} +D[196] = "����������������������������������������������������������������願顛颼饅饉騖騙鬍鯨鯧鯖鯛鶉鵡鵲鵪鵬麒麗麓麴勸嚨嚷嚶嚴嚼壤孀孃孽寶巉懸懺攘攔攙曦朧櫬瀾瀰瀲爐獻瓏癢癥礦礪礬礫竇競籌籃籍糯糰辮繽繼����������������������������������纂罌耀臚艦藻藹蘑藺蘆蘋蘇蘊蠔蠕襤覺觸議譬警譯譟譫贏贍躉躁躅躂醴釋鐘鐃鏽闡霰飄饒饑馨騫騰騷騵鰓鰍鹹麵黨鼯齟齣齡儷儸囁囀囂夔屬巍懼懾攝攜斕曩櫻欄櫺殲灌爛犧瓖瓔癩矓籐纏續羼蘗蘭蘚蠣蠢蠡蠟襪襬覽譴�".split(""); +for(j = 0; j != D[196].length; ++j) if(D[196][j].charCodeAt(0) !== 0xFFFD) { e[D[196][j]] = 50176 + j; d[50176 + j] = D[196][j];} +D[197] = "����������������������������������������������������������������護譽贓躊躍躋轟辯醺鐮鐳鐵鐺鐸鐲鐫闢霸霹露響顧顥饗驅驃驀騾髏魔魑鰭鰥鶯鶴鷂鶸麝黯鼙齜齦齧儼儻囈囊囉孿巔巒彎懿攤權歡灑灘玀瓤疊癮癬����������������������������������禳籠籟聾聽臟襲襯觼讀贖贗躑躓轡酈鑄鑑鑒霽霾韃韁顫饕驕驍髒鬚鱉鰱鰾鰻鷓鷗鼴齬齪龔囌巖戀攣攫攪曬欐瓚竊籤籣籥纓纖纔臢蘸蘿蠱變邐邏鑣鑠鑤靨顯饜驚驛驗髓體髑鱔鱗鱖鷥麟黴囑壩攬灞癱癲矗罐羈蠶蠹衢讓讒�".split(""); +for(j = 0; j != D[197].length; ++j) if(D[197][j].charCodeAt(0) !== 0xFFFD) { e[D[197][j]] = 50432 + j; d[50432 + j] = D[197][j];} +D[198] = "����������������������������������������������������������������讖艷贛釀鑪靂靈靄韆顰驟鬢魘鱟鷹鷺鹼鹽鼇齷齲廳欖灣籬籮蠻觀躡釁鑲鑰顱饞髖鬣黌灤矚讚鑷韉驢驥纜讜躪釅鑽鑾鑼鱷鱸黷豔鑿鸚爨驪鬱鸛鸞籲���������������������������������������������������������������������������������������������������������������������������������".split(""); +for(j = 0; j != D[198].length; ++j) if(D[198][j].charCodeAt(0) !== 0xFFFD) { e[D[198][j]] = 50688 + j; d[50688 + j] = D[198][j];} +D[201] = "����������������������������������������������������������������乂乜凵匚厂万丌乇亍囗兀屮彳丏冇与丮亓仂仉仈冘勼卬厹圠夃夬尐巿旡殳毌气爿丱丼仨仜仩仡仝仚刌匜卌圢圣夗夯宁宄尒尻屴屳帄庀庂忉戉扐氕����������������������������������氶汃氿氻犮犰玊禸肊阞伎优伬仵伔仱伀价伈伝伂伅伢伓伄仴伒冱刓刉刐劦匢匟卍厊吇囡囟圮圪圴夼妀奼妅奻奾奷奿孖尕尥屼屺屻屾巟幵庄异弚彴忕忔忏扜扞扤扡扦扢扙扠扚扥旯旮朾朹朸朻机朿朼朳氘汆汒汜汏汊汔汋�".split(""); +for(j = 0; j != D[201].length; ++j) if(D[201][j].charCodeAt(0) !== 0xFFFD) { e[D[201][j]] = 51456 + j; d[51456 + j] = D[201][j];} +D[202] = "����������������������������������������������������������������汌灱牞犴犵玎甪癿穵网艸艼芀艽艿虍襾邙邗邘邛邔阢阤阠阣佖伻佢佉体佤伾佧佒佟佁佘伭伳伿佡冏冹刜刞刡劭劮匉卣卲厎厏吰吷吪呔呅吙吜吥吘����������������������������������吽呏呁吨吤呇囮囧囥坁坅坌坉坋坒夆奀妦妘妠妗妎妢妐妏妧妡宎宒尨尪岍岏岈岋岉岒岊岆岓岕巠帊帎庋庉庌庈庍弅弝彸彶忒忑忐忭忨忮忳忡忤忣忺忯忷忻怀忴戺抃抌抎抏抔抇扱扻扺扰抁抈扷扽扲扴攷旰旴旳旲旵杅杇�".split(""); +for(j = 0; j != D[202].length; ++j) if(D[202][j].charCodeAt(0) !== 0xFFFD) { e[D[202][j]] = 51712 + j; d[51712 + j] = D[202][j];} +D[203] = "����������������������������������������������������������������杙杕杌杈杝杍杚杋毐氙氚汸汧汫沄沋沏汱汯汩沚汭沇沕沜汦汳汥汻沎灴灺牣犿犽狃狆狁犺狅玕玗玓玔玒町甹疔疕皁礽耴肕肙肐肒肜芐芏芅芎芑芓����������������������������������芊芃芄豸迉辿邟邡邥邞邧邠阰阨阯阭丳侘佼侅佽侀侇佶佴侉侄佷佌侗佪侚佹侁佸侐侜侔侞侒侂侕佫佮冞冼冾刵刲刳剆刱劼匊匋匼厒厔咇呿咁咑咂咈呫呺呾呥呬呴呦咍呯呡呠咘呣呧呤囷囹坯坲坭坫坱坰坶垀坵坻坳坴坢�".split(""); +for(j = 0; j != D[203].length; ++j) if(D[203][j].charCodeAt(0) !== 0xFFFD) { e[D[203][j]] = 51968 + j; d[51968 + j] = D[203][j];} +D[204] = "����������������������������������������������������������������坨坽夌奅妵妺姏姎妲姌姁妶妼姃姖妱妽姀姈妴姇孢孥宓宕屄屇岮岤岠岵岯岨岬岟岣岭岢岪岧岝岥岶岰岦帗帔帙弨弢弣弤彔徂彾彽忞忥怭怦怙怲怋����������������������������������怴怊怗怳怚怞怬怢怍怐怮怓怑怌怉怜戔戽抭抴拑抾抪抶拊抮抳抯抻抩抰抸攽斨斻昉旼昄昒昈旻昃昋昍昅旽昑昐曶朊枅杬枎枒杶杻枘枆构杴枍枌杺枟枑枙枃杽极杸杹枔欥殀歾毞氝沓泬泫泮泙沶泔沭泧沷泐泂沺泃泆泭泲�".split(""); +for(j = 0; j != D[204].length; ++j) if(D[204][j].charCodeAt(0) !== 0xFFFD) { e[D[204][j]] = 52224 + j; d[52224 + j] = D[204][j];} +D[205] = "����������������������������������������������������������������泒泝沴沊沝沀泞泀洰泍泇沰泹泏泩泑炔炘炅炓炆炄炑炖炂炚炃牪狖狋狘狉狜狒狔狚狌狑玤玡玭玦玢玠玬玝瓝瓨甿畀甾疌疘皯盳盱盰盵矸矼矹矻矺����������������������������������矷祂礿秅穸穻竻籵糽耵肏肮肣肸肵肭舠芠苀芫芚芘芛芵芧芮芼芞芺芴芨芡芩苂芤苃芶芢虰虯虭虮豖迒迋迓迍迖迕迗邲邴邯邳邰阹阽阼阺陃俍俅俓侲俉俋俁俔俜俙侻侳俛俇俖侺俀侹俬剄剉勀勂匽卼厗厖厙厘咺咡咭咥哏�".split(""); +for(j = 0; j != D[205].length; ++j) if(D[205][j].charCodeAt(0) !== 0xFFFD) { e[D[205][j]] = 52480 + j; d[52480 + j] = D[205][j];} +D[206] = "����������������������������������������������������������������哃茍咷咮哖咶哅哆咠呰咼咢咾呲哞咰垵垞垟垤垌垗垝垛垔垘垏垙垥垚垕壴复奓姡姞姮娀姱姝姺姽姼姶姤姲姷姛姩姳姵姠姾姴姭宨屌峐峘峌峗峋峛����������������������������������峞峚峉峇峊峖峓峔峏峈峆峎峟峸巹帡帢帣帠帤庰庤庢庛庣庥弇弮彖徆怷怹恔恲恞恅恓恇恉恛恌恀恂恟怤恄恘恦恮扂扃拏挍挋拵挎挃拫拹挏挌拸拶挀挓挔拺挕拻拰敁敃斪斿昶昡昲昵昜昦昢昳昫昺昝昴昹昮朏朐柁柲柈枺�".split(""); +for(j = 0; j != D[206].length; ++j) if(D[206][j].charCodeAt(0) !== 0xFFFD) { e[D[206][j]] = 52736 + j; d[52736 + j] = D[206][j];} +D[207] = "����������������������������������������������������������������柜枻柸柘柀枷柅柫柤柟枵柍枳柷柶柮柣柂枹柎柧柰枲柼柆柭柌枮柦柛柺柉柊柃柪柋欨殂殄殶毖毘毠氠氡洨洴洭洟洼洿洒洊泚洳洄洙洺洚洑洀洝浂����������������������������������洁洘洷洃洏浀洇洠洬洈洢洉洐炷炟炾炱炰炡炴炵炩牁牉牊牬牰牳牮狊狤狨狫狟狪狦狣玅珌珂珈珅玹玶玵玴珫玿珇玾珃珆玸珋瓬瓮甮畇畈疧疪癹盄眈眃眄眅眊盷盻盺矧矨砆砑砒砅砐砏砎砉砃砓祊祌祋祅祄秕种秏秖秎窀�".split(""); +for(j = 0; j != D[207].length; ++j) if(D[207][j].charCodeAt(0) !== 0xFFFD) { e[D[207][j]] = 52992 + j; d[52992 + j] = D[207][j];} +D[208] = "����������������������������������������������������������������穾竑笀笁籺籸籹籿粀粁紃紈紁罘羑羍羾耇耎耏耔耷胘胇胠胑胈胂胐胅胣胙胜胊胕胉胏胗胦胍臿舡芔苙苾苹茇苨茀苕茺苫苖苴苬苡苲苵茌苻苶苰苪����������������������������������苤苠苺苳苭虷虴虼虳衁衎衧衪衩觓訄訇赲迣迡迮迠郱邽邿郕郅邾郇郋郈釔釓陔陏陑陓陊陎倞倅倇倓倢倰倛俵俴倳倷倬俶俷倗倜倠倧倵倯倱倎党冔冓凊凄凅凈凎剡剚剒剞剟剕剢勍匎厞唦哢唗唒哧哳哤唚哿唄唈哫唑唅哱�".split(""); +for(j = 0; j != D[208].length; ++j) if(D[208][j].charCodeAt(0) !== 0xFFFD) { e[D[208][j]] = 53248 + j; d[53248 + j] = D[208][j];} +D[209] = "����������������������������������������������������������������唊哻哷哸哠唎唃唋圁圂埌堲埕埒垺埆垽垼垸垶垿埇埐垹埁夎奊娙娖娭娮娕娏娗娊娞娳孬宧宭宬尃屖屔峬峿峮峱峷崀峹帩帨庨庮庪庬弳弰彧恝恚恧����������������������������������恁悢悈悀悒悁悝悃悕悛悗悇悜悎戙扆拲挐捖挬捄捅挶捃揤挹捋捊挼挩捁挴捘捔捙挭捇挳捚捑挸捗捀捈敊敆旆旃旄旂晊晟晇晑朒朓栟栚桉栲栳栻桋桏栖栱栜栵栫栭栯桎桄栴栝栒栔栦栨栮桍栺栥栠欬欯欭欱欴歭肂殈毦毤�".split(""); +for(j = 0; j != D[209].length; ++j) if(D[209][j].charCodeAt(0) !== 0xFFFD) { e[D[209][j]] = 53504 + j; d[53504 + j] = D[209][j];} +D[210] = "����������������������������������������������������������������毨毣毢毧氥浺浣浤浶洍浡涒浘浢浭浯涑涍淯浿涆浞浧浠涗浰浼浟涂涘洯浨涋浾涀涄洖涃浻浽浵涐烜烓烑烝烋缹烢烗烒烞烠烔烍烅烆烇烚烎烡牂牸����������������������������������牷牶猀狺狴狾狶狳狻猁珓珙珥珖玼珧珣珩珜珒珛珔珝珚珗珘珨瓞瓟瓴瓵甡畛畟疰痁疻痄痀疿疶疺皊盉眝眛眐眓眒眣眑眕眙眚眢眧砣砬砢砵砯砨砮砫砡砩砳砪砱祔祛祏祜祓祒祑秫秬秠秮秭秪秜秞秝窆窉窅窋窌窊窇竘笐�".split(""); +for(j = 0; j != D[210].length; ++j) if(D[210][j].charCodeAt(0) !== 0xFFFD) { e[D[210][j]] = 53760 + j; d[53760 + j] = D[210][j];} +D[211] = "����������������������������������������������������������������笄笓笅笏笈笊笎笉笒粄粑粊粌粈粍粅紞紝紑紎紘紖紓紟紒紏紌罜罡罞罠罝罛羖羒翃翂翀耖耾耹胺胲胹胵脁胻脀舁舯舥茳茭荄茙荑茥荖茿荁茦茜茢����������������������������������荂荎茛茪茈茼荍茖茤茠茷茯茩荇荅荌荓茞茬荋茧荈虓虒蚢蚨蚖蚍蚑蚞蚇蚗蚆蚋蚚蚅蚥蚙蚡蚧蚕蚘蚎蚝蚐蚔衃衄衭衵衶衲袀衱衿衯袃衾衴衼訒豇豗豻貤貣赶赸趵趷趶軑軓迾迵适迿迻逄迼迶郖郠郙郚郣郟郥郘郛郗郜郤酐�".split(""); +for(j = 0; j != D[211].length; ++j) if(D[211][j].charCodeAt(0) !== 0xFFFD) { e[D[211][j]] = 54016 + j; d[54016 + j] = D[211][j];} +D[212] = "����������������������������������������������������������������酎酏釕釢釚陜陟隼飣髟鬯乿偰偪偡偞偠偓偋偝偲偈偍偁偛偊偢倕偅偟偩偫偣偤偆偀偮偳偗偑凐剫剭剬剮勖勓匭厜啵啶唼啍啐唴唪啑啢唶唵唰啒啅����������������������������������唌唲啥啎唹啈唭唻啀啋圊圇埻堔埢埶埜埴堀埭埽堈埸堋埳埏堇埮埣埲埥埬埡堎埼堐埧堁堌埱埩埰堍堄奜婠婘婕婧婞娸娵婭婐婟婥婬婓婤婗婃婝婒婄婛婈媎娾婍娹婌婰婩婇婑婖婂婜孲孮寁寀屙崞崋崝崚崠崌崨崍崦崥崏�".split(""); +for(j = 0; j != D[212].length; ++j) if(D[212][j].charCodeAt(0) !== 0xFFFD) { e[D[212][j]] = 54272 + j; d[54272 + j] = D[212][j];} +D[213] = "����������������������������������������������������������������崰崒崣崟崮帾帴庱庴庹庲庳弶弸徛徖徟悊悐悆悾悰悺惓惔惏惤惙惝惈悱惛悷惊悿惃惍惀挲捥掊掂捽掽掞掭掝掗掫掎捯掇掐据掯捵掜捭掮捼掤挻掟����������������������������������捸掅掁掑掍捰敓旍晥晡晛晙晜晢朘桹梇梐梜桭桮梮梫楖桯梣梬梩桵桴梲梏桷梒桼桫桲梪梀桱桾梛梖梋梠梉梤桸桻梑梌梊桽欶欳欷欸殑殏殍殎殌氪淀涫涴涳湴涬淩淢涷淶淔渀淈淠淟淖涾淥淜淝淛淴淊涽淭淰涺淕淂淏淉�".split(""); +for(j = 0; j != D[213].length; ++j) if(D[213][j].charCodeAt(0) !== 0xFFFD) { e[D[213][j]] = 54528 + j; d[54528 + j] = D[213][j];} +D[214] = "����������������������������������������������������������������淐淲淓淽淗淍淣涻烺焍烷焗烴焌烰焄烳焐烼烿焆焓焀烸烶焋焂焎牾牻牼牿猝猗猇猑猘猊猈狿猏猞玈珶珸珵琄琁珽琇琀珺珼珿琌琋珴琈畤畣痎痒痏����������������������������������痋痌痑痐皏皉盓眹眯眭眱眲眴眳眽眥眻眵硈硒硉硍硊硌砦硅硐祤祧祩祪祣祫祡离秺秸秶秷窏窔窐笵筇笴笥笰笢笤笳笘笪笝笱笫笭笯笲笸笚笣粔粘粖粣紵紽紸紶紺絅紬紩絁絇紾紿絊紻紨罣羕羜羝羛翊翋翍翐翑翇翏翉耟�".split(""); +for(j = 0; j != D[214].length; ++j) if(D[214][j].charCodeAt(0) !== 0xFFFD) { e[D[214][j]] = 54784 + j; d[54784 + j] = D[214][j];} +D[215] = "����������������������������������������������������������������耞耛聇聃聈脘脥脙脛脭脟脬脞脡脕脧脝脢舑舸舳舺舴舲艴莐莣莨莍荺荳莤荴莏莁莕莙荵莔莩荽莃莌莝莛莪莋荾莥莯莈莗莰荿莦莇莮荶莚虙虖蚿蚷����������������������������������蛂蛁蛅蚺蚰蛈蚹蚳蚸蛌蚴蚻蚼蛃蚽蚾衒袉袕袨袢袪袚袑袡袟袘袧袙袛袗袤袬袌袓袎覂觖觙觕訰訧訬訞谹谻豜豝豽貥赽赻赹趼跂趹趿跁軘軞軝軜軗軠軡逤逋逑逜逌逡郯郪郰郴郲郳郔郫郬郩酖酘酚酓酕釬釴釱釳釸釤釹釪�".split(""); +for(j = 0; j != D[215].length; ++j) if(D[215][j].charCodeAt(0) !== 0xFFFD) { e[D[215][j]] = 55040 + j; d[55040 + j] = D[215][j];} +D[216] = "����������������������������������������������������������������釫釷釨釮镺閆閈陼陭陫陱陯隿靪頄飥馗傛傕傔傞傋傣傃傌傎傝偨傜傒傂傇兟凔匒匑厤厧喑喨喥喭啷噅喢喓喈喏喵喁喣喒喤啽喌喦啿喕喡喎圌堩堷����������������������������������堙堞堧堣堨埵塈堥堜堛堳堿堶堮堹堸堭堬堻奡媯媔媟婺媢媞婸媦婼媥媬媕媮娷媄媊媗媃媋媩婻婽媌媜媏媓媝寪寍寋寔寑寊寎尌尰崷嵃嵫嵁嵋崿崵嵑嵎嵕崳崺嵒崽崱嵙嵂崹嵉崸崼崲崶嵀嵅幄幁彘徦徥徫惉悹惌惢惎惄愔�".split(""); +for(j = 0; j != D[216].length; ++j) if(D[216][j].charCodeAt(0) !== 0xFFFD) { e[D[216][j]] = 55296 + j; d[55296 + j] = D[216][j];} +D[217] = "����������������������������������������������������������������惲愊愖愅惵愓惸惼惾惁愃愘愝愐惿愄愋扊掔掱掰揎揥揨揯揃撝揳揊揠揶揕揲揵摡揟掾揝揜揄揘揓揂揇揌揋揈揰揗揙攲敧敪敤敜敨敥斌斝斞斮旐旒����������������������������������晼晬晻暀晱晹晪晲朁椌棓椄棜椪棬棪棱椏棖棷棫棤棶椓椐棳棡椇棌椈楰梴椑棯棆椔棸棐棽棼棨椋椊椗棎棈棝棞棦棴棑椆棔棩椕椥棇欹欻欿欼殔殗殙殕殽毰毲毳氰淼湆湇渟湉溈渼渽湅湢渫渿湁湝湳渜渳湋湀湑渻渃渮湞�".split(""); +for(j = 0; j != D[217].length; ++j) if(D[217][j].charCodeAt(0) !== 0xFFFD) { e[D[217][j]] = 55552 + j; d[55552 + j] = D[217][j];} +D[218] = "����������������������������������������������������������������湨湜湡渱渨湠湱湫渹渢渰湓湥渧湸湤湷湕湹湒湦渵渶湚焠焞焯烻焮焱焣焥焢焲焟焨焺焛牋牚犈犉犆犅犋猒猋猰猢猱猳猧猲猭猦猣猵猌琮琬琰琫琖����������������������������������琚琡琭琱琤琣琝琩琠琲瓻甯畯畬痧痚痡痦痝痟痤痗皕皒盚睆睇睄睍睅睊睎睋睌矞矬硠硤硥硜硭硱硪确硰硩硨硞硢祴祳祲祰稂稊稃稌稄窙竦竤筊笻筄筈筌筎筀筘筅粢粞粨粡絘絯絣絓絖絧絪絏絭絜絫絒絔絩絑絟絎缾缿罥�".split(""); +for(j = 0; j != D[218].length; ++j) if(D[218][j].charCodeAt(0) !== 0xFFFD) { e[D[218][j]] = 55808 + j; d[55808 + j] = D[218][j];} +D[219] = "����������������������������������������������������������������罦羢羠羡翗聑聏聐胾胔腃腊腒腏腇脽腍脺臦臮臷臸臹舄舼舽舿艵茻菏菹萣菀菨萒菧菤菼菶萐菆菈菫菣莿萁菝菥菘菿菡菋菎菖菵菉萉萏菞萑萆菂菳����������������������������������菕菺菇菑菪萓菃菬菮菄菻菗菢萛菛菾蛘蛢蛦蛓蛣蛚蛪蛝蛫蛜蛬蛩蛗蛨蛑衈衖衕袺裗袹袸裀袾袶袼袷袽袲褁裉覕覘覗觝觚觛詎詍訹詙詀詗詘詄詅詒詈詑詊詌詏豟貁貀貺貾貰貹貵趄趀趉跘跓跍跇跖跜跏跕跙跈跗跅軯軷軺�".split(""); +for(j = 0; j != D[219].length; ++j) if(D[219][j].charCodeAt(0) !== 0xFFFD) { e[D[219][j]] = 56064 + j; d[56064 + j] = D[219][j];} +D[220] = "����������������������������������������������������������������軹軦軮軥軵軧軨軶軫軱軬軴軩逭逴逯鄆鄬鄄郿郼鄈郹郻鄁鄀鄇鄅鄃酡酤酟酢酠鈁鈊鈥鈃鈚鈦鈏鈌鈀鈒釿釽鈆鈄鈧鈂鈜鈤鈙鈗鈅鈖镻閍閌閐隇陾隈����������������������������������隉隃隀雂雈雃雱雰靬靰靮頇颩飫鳦黹亃亄亶傽傿僆傮僄僊傴僈僂傰僁傺傱僋僉傶傸凗剺剸剻剼嗃嗛嗌嗐嗋嗊嗝嗀嗔嗄嗩喿嗒喍嗏嗕嗢嗖嗈嗲嗍嗙嗂圔塓塨塤塏塍塉塯塕塎塝塙塥塛堽塣塱壼嫇嫄嫋媺媸媱媵媰媿嫈媻嫆�".split(""); +for(j = 0; j != D[220].length; ++j) if(D[220][j].charCodeAt(0) !== 0xFFFD) { e[D[220][j]] = 56320 + j; d[56320 + j] = D[220][j];} +D[221] = "����������������������������������������������������������������媷嫀嫊媴媶嫍媹媐寖寘寙尟尳嵱嵣嵊嵥嵲嵬嵞嵨嵧嵢巰幏幎幊幍幋廅廌廆廋廇彀徯徭惷慉慊愫慅愶愲愮慆愯慏愩慀戠酨戣戥戤揅揱揫搐搒搉搠搤����������������������������������搳摃搟搕搘搹搷搢搣搌搦搰搨摁搵搯搊搚摀搥搧搋揧搛搮搡搎敯斒旓暆暌暕暐暋暊暙暔晸朠楦楟椸楎楢楱椿楅楪椹楂楗楙楺楈楉椵楬椳椽楥棰楸椴楩楀楯楄楶楘楁楴楌椻楋椷楜楏楑椲楒椯楻椼歆歅歃歂歈歁殛嗀毻毼�".split(""); +for(j = 0; j != D[221].length; ++j) if(D[221][j].charCodeAt(0) !== 0xFFFD) { e[D[221][j]] = 56576 + j; d[56576 + j] = D[221][j];} +D[222] = "����������������������������������������������������������������毹毷毸溛滖滈溏滀溟溓溔溠溱溹滆滒溽滁溞滉溷溰滍溦滏溲溾滃滜滘溙溒溎溍溤溡溿溳滐滊溗溮溣煇煔煒煣煠煁煝煢煲煸煪煡煂煘煃煋煰煟煐煓����������������������������������煄煍煚牏犍犌犑犐犎猼獂猻猺獀獊獉瑄瑊瑋瑒瑑瑗瑀瑏瑐瑎瑂瑆瑍瑔瓡瓿瓾瓽甝畹畷榃痯瘏瘃痷痾痼痹痸瘐痻痶痭痵痽皙皵盝睕睟睠睒睖睚睩睧睔睙睭矠碇碚碔碏碄碕碅碆碡碃硹碙碀碖硻祼禂祽祹稑稘稙稒稗稕稢稓�".split(""); +for(j = 0; j != D[222].length; ++j) if(D[222][j].charCodeAt(0) !== 0xFFFD) { e[D[222][j]] = 56832 + j; d[56832 + j] = D[222][j];} +D[223] = "����������������������������������������������������������������稛稐窣窢窞竫筦筤筭筴筩筲筥筳筱筰筡筸筶筣粲粴粯綈綆綀綍絿綅絺綎絻綃絼綌綔綄絽綒罭罫罧罨罬羦羥羧翛翜耡腤腠腷腜腩腛腢腲朡腞腶腧腯����������������������������������腄腡舝艉艄艀艂艅蓱萿葖葶葹蒏蒍葥葑葀蒆葧萰葍葽葚葙葴葳葝蔇葞萷萺萴葺葃葸萲葅萩菙葋萯葂萭葟葰萹葎葌葒葯蓅蒎萻葇萶萳葨葾葄萫葠葔葮葐蜋蜄蛷蜌蛺蛖蛵蝍蛸蜎蜉蜁蛶蜍蜅裖裋裍裎裞裛裚裌裐覅覛觟觥觤�".split(""); +for(j = 0; j != D[223].length; ++j) if(D[223][j].charCodeAt(0) !== 0xFFFD) { e[D[223][j]] = 57088 + j; d[57088 + j] = D[223][j];} +D[224] = "����������������������������������������������������������������觡觠觢觜触詶誆詿詡訿詷誂誄詵誃誁詴詺谼豋豊豥豤豦貆貄貅賌赨赩趑趌趎趏趍趓趔趐趒跰跠跬跱跮跐跩跣跢跧跲跫跴輆軿輁輀輅輇輈輂輋遒逿����������������������������������遄遉逽鄐鄍鄏鄑鄖鄔鄋鄎酮酯鉈鉒鈰鈺鉦鈳鉥鉞銃鈮鉊鉆鉭鉬鉏鉠鉧鉯鈶鉡鉰鈱鉔鉣鉐鉲鉎鉓鉌鉖鈲閟閜閞閛隒隓隑隗雎雺雽雸雵靳靷靸靲頏頍頎颬飶飹馯馲馰馵骭骫魛鳪鳭鳧麀黽僦僔僗僨僳僛僪僝僤僓僬僰僯僣僠�".split(""); +for(j = 0; j != D[224].length; ++j) if(D[224][j].charCodeAt(0) !== 0xFFFD) { e[D[224][j]] = 57344 + j; d[57344 + j] = D[224][j];} +D[225] = "����������������������������������������������������������������凘劀劁勩勫匰厬嘧嘕嘌嘒嗼嘏嘜嘁嘓嘂嗺嘝嘄嗿嗹墉塼墐墘墆墁塿塴墋塺墇墑墎塶墂墈塻墔墏壾奫嫜嫮嫥嫕嫪嫚嫭嫫嫳嫢嫠嫛嫬嫞嫝嫙嫨嫟孷寠����������������������������������寣屣嶂嶀嵽嶆嵺嶁嵷嶊嶉嶈嵾嵼嶍嵹嵿幘幙幓廘廑廗廎廜廕廙廒廔彄彃彯徶愬愨慁慞慱慳慒慓慲慬憀慴慔慺慛慥愻慪慡慖戩戧戫搫摍摛摝摴摶摲摳摽摵摦撦摎撂摞摜摋摓摠摐摿搿摬摫摙摥摷敳斠暡暠暟朅朄朢榱榶槉�".split(""); +for(j = 0; j != D[225].length; ++j) if(D[225][j].charCodeAt(0) !== 0xFFFD) { e[D[225][j]] = 57600 + j; d[57600 + j] = D[225][j];} +D[226] = "����������������������������������������������������������������榠槎榖榰榬榼榑榙榎榧榍榩榾榯榿槄榽榤槔榹槊榚槏榳榓榪榡榞槙榗榐槂榵榥槆歊歍歋殞殟殠毃毄毾滎滵滱漃漥滸漷滻漮漉潎漙漚漧漘漻漒滭漊����������������������������������漶潳滹滮漭潀漰漼漵滫漇漎潃漅滽滶漹漜滼漺漟漍漞漈漡熇熐熉熀熅熂熏煻熆熁熗牄牓犗犕犓獃獍獑獌瑢瑳瑱瑵瑲瑧瑮甀甂甃畽疐瘖瘈瘌瘕瘑瘊瘔皸瞁睼瞅瞂睮瞀睯睾瞃碲碪碴碭碨硾碫碞碥碠碬碢碤禘禊禋禖禕禔禓�".split(""); +for(j = 0; j != D[226].length; ++j) if(D[226][j].charCodeAt(0) !== 0xFFFD) { e[D[226][j]] = 57856 + j; d[57856 + j] = D[226][j];} +D[227] = "����������������������������������������������������������������禗禈禒禐稫穊稰稯稨稦窨窫窬竮箈箜箊箑箐箖箍箌箛箎箅箘劄箙箤箂粻粿粼粺綧綷緂綣綪緁緀緅綝緎緄緆緋緌綯綹綖綼綟綦綮綩綡緉罳翢翣翥翞����������������������������������耤聝聜膉膆膃膇膍膌膋舕蒗蒤蒡蒟蒺蓎蓂蒬蒮蒫蒹蒴蓁蓍蒪蒚蒱蓐蒝蒧蒻蒢蒔蓇蓌蒛蒩蒯蒨蓖蒘蒶蓏蒠蓗蓔蓒蓛蒰蒑虡蜳蜣蜨蝫蝀蜮蜞蜡蜙蜛蝃蜬蝁蜾蝆蜠蜲蜪蜭蜼蜒蜺蜱蜵蝂蜦蜧蜸蜤蜚蜰蜑裷裧裱裲裺裾裮裼裶裻�".split(""); +for(j = 0; j != D[227].length; ++j) if(D[227][j].charCodeAt(0) !== 0xFFFD) { e[D[227][j]] = 58112 + j; d[58112 + j] = D[227][j];} +D[228] = "����������������������������������������������������������������裰裬裫覝覡覟覞觩觫觨誫誙誋誒誏誖谽豨豩賕賏賗趖踉踂跿踍跽踊踃踇踆踅跾踀踄輐輑輎輍鄣鄜鄠鄢鄟鄝鄚鄤鄡鄛酺酲酹酳銥銤鉶銛鉺銠銔銪銍����������������������������������銦銚銫鉹銗鉿銣鋮銎銂銕銢鉽銈銡銊銆銌銙銧鉾銇銩銝銋鈭隞隡雿靘靽靺靾鞃鞀鞂靻鞄鞁靿韎韍頖颭颮餂餀餇馝馜駃馹馻馺駂馽駇骱髣髧鬾鬿魠魡魟鳱鳲鳵麧僿儃儰僸儆儇僶僾儋儌僽儊劋劌勱勯噈噂噌嘵噁噊噉噆噘�".split(""); +for(j = 0; j != D[228].length; ++j) if(D[228][j].charCodeAt(0) !== 0xFFFD) { e[D[228][j]] = 58368 + j; d[58368 + j] = D[228][j];} +D[229] = "����������������������������������������������������������������噚噀嘳嘽嘬嘾嘸嘪嘺圚墫墝墱墠墣墯墬墥墡壿嫿嫴嫽嫷嫶嬃嫸嬂嫹嬁嬇嬅嬏屧嶙嶗嶟嶒嶢嶓嶕嶠嶜嶡嶚嶞幩幝幠幜緳廛廞廡彉徲憋憃慹憱憰憢憉����������������������������������憛憓憯憭憟憒憪憡憍慦憳戭摮摰撖撠撅撗撜撏撋撊撌撣撟摨撱撘敶敺敹敻斲斳暵暰暩暲暷暪暯樀樆樗槥槸樕槱槤樠槿槬槢樛樝槾樧槲槮樔槷槧橀樈槦槻樍槼槫樉樄樘樥樏槶樦樇槴樖歑殥殣殢殦氁氀毿氂潁漦潾澇濆澒�".split(""); +for(j = 0; j != D[229].length; ++j) if(D[229][j].charCodeAt(0) !== 0xFFFD) { e[D[229][j]] = 58624 + j; d[58624 + j] = D[229][j];} +D[230] = "����������������������������������������������������������������澍澉澌潢潏澅潚澖潶潬澂潕潲潒潐潗澔澓潝漀潡潫潽潧澐潓澋潩潿澕潣潷潪潻熲熯熛熰熠熚熩熵熝熥熞熤熡熪熜熧熳犘犚獘獒獞獟獠獝獛獡獚獙����������������������������������獢璇璉璊璆璁瑽璅璈瑼瑹甈甇畾瘥瘞瘙瘝瘜瘣瘚瘨瘛皜皝皞皛瞍瞏瞉瞈磍碻磏磌磑磎磔磈磃磄磉禚禡禠禜禢禛歶稹窲窴窳箷篋箾箬篎箯箹篊箵糅糈糌糋緷緛緪緧緗緡縃緺緦緶緱緰緮緟罶羬羰羭翭翫翪翬翦翨聤聧膣膟�".split(""); +for(j = 0; j != D[230].length; ++j) if(D[230][j].charCodeAt(0) !== 0xFFFD) { e[D[230][j]] = 58880 + j; d[58880 + j] = D[230][j];} +D[231] = "����������������������������������������������������������������膞膕膢膙膗舖艏艓艒艐艎艑蔤蔻蔏蔀蔩蔎蔉蔍蔟蔊蔧蔜蓻蔫蓺蔈蔌蓴蔪蓲蔕蓷蓫蓳蓼蔒蓪蓩蔖蓾蔨蔝蔮蔂蓽蔞蓶蔱蔦蓧蓨蓰蓯蓹蔘蔠蔰蔋蔙蔯虢����������������������������������蝖蝣蝤蝷蟡蝳蝘蝔蝛蝒蝡蝚蝑蝞蝭蝪蝐蝎蝟蝝蝯蝬蝺蝮蝜蝥蝏蝻蝵蝢蝧蝩衚褅褌褔褋褗褘褙褆褖褑褎褉覢覤覣觭觰觬諏諆誸諓諑諔諕誻諗誾諀諅諘諃誺誽諙谾豍貏賥賟賙賨賚賝賧趠趜趡趛踠踣踥踤踮踕踛踖踑踙踦踧�".split(""); +for(j = 0; j != D[231].length; ++j) if(D[231][j].charCodeAt(0) !== 0xFFFD) { e[D[231][j]] = 59136 + j; d[59136 + j] = D[231][j];} +D[232] = "����������������������������������������������������������������踔踒踘踓踜踗踚輬輤輘輚輠輣輖輗遳遰遯遧遫鄯鄫鄩鄪鄲鄦鄮醅醆醊醁醂醄醀鋐鋃鋄鋀鋙銶鋏鋱鋟鋘鋩鋗鋝鋌鋯鋂鋨鋊鋈鋎鋦鋍鋕鋉鋠鋞鋧鋑鋓����������������������������������銵鋡鋆銴镼閬閫閮閰隤隢雓霅霈霂靚鞊鞎鞈韐韏頞頝頦頩頨頠頛頧颲餈飺餑餔餖餗餕駜駍駏駓駔駎駉駖駘駋駗駌骳髬髫髳髲髱魆魃魧魴魱魦魶魵魰魨魤魬鳼鳺鳽鳿鳷鴇鴀鳹鳻鴈鴅鴄麃黓鼏鼐儜儓儗儚儑凞匴叡噰噠噮�".split(""); +for(j = 0; j != D[232].length; ++j) if(D[232][j].charCodeAt(0) !== 0xFFFD) { e[D[232][j]] = 59392 + j; d[59392 + j] = D[232][j];} +D[233] = "����������������������������������������������������������������噳噦噣噭噲噞噷圜圛壈墽壉墿墺壂墼壆嬗嬙嬛嬡嬔嬓嬐嬖嬨嬚嬠嬞寯嶬嶱嶩嶧嶵嶰嶮嶪嶨嶲嶭嶯嶴幧幨幦幯廩廧廦廨廥彋徼憝憨憖懅憴懆懁懌憺����������������������������������憿憸憌擗擖擐擏擉撽撉擃擛擳擙攳敿敼斢曈暾曀曊曋曏暽暻暺曌朣樴橦橉橧樲橨樾橝橭橶橛橑樨橚樻樿橁橪橤橐橏橔橯橩橠樼橞橖橕橍橎橆歕歔歖殧殪殫毈毇氄氃氆澭濋澣濇澼濎濈潞濄澽澞濊澨瀄澥澮澺澬澪濏澿澸�".split(""); +for(j = 0; j != D[233].length; ++j) if(D[233][j].charCodeAt(0) !== 0xFFFD) { e[D[233][j]] = 59648 + j; d[59648 + j] = D[233][j];} +D[234] = "����������������������������������������������������������������澢濉澫濍澯澲澰燅燂熿熸燖燀燁燋燔燊燇燏熽燘熼燆燚燛犝犞獩獦獧獬獥獫獪瑿璚璠璔璒璕璡甋疀瘯瘭瘱瘽瘳瘼瘵瘲瘰皻盦瞚瞝瞡瞜瞛瞢瞣瞕瞙����������������������������������瞗磝磩磥磪磞磣磛磡磢磭磟磠禤穄穈穇窶窸窵窱窷篞篣篧篝篕篥篚篨篹篔篪篢篜篫篘篟糒糔糗糐糑縒縡縗縌縟縠縓縎縜縕縚縢縋縏縖縍縔縥縤罃罻罼罺羱翯耪耩聬膱膦膮膹膵膫膰膬膴膲膷膧臲艕艖艗蕖蕅蕫蕍蕓蕡蕘�".split(""); +for(j = 0; j != D[234].length; ++j) if(D[234][j].charCodeAt(0) !== 0xFFFD) { e[D[234][j]] = 59904 + j; d[59904 + j] = D[234][j];} +D[235] = "����������������������������������������������������������������蕀蕆蕤蕁蕢蕄蕑蕇蕣蔾蕛蕱蕎蕮蕵蕕蕧蕠薌蕦蕝蕔蕥蕬虣虥虤螛螏螗螓螒螈螁螖螘蝹螇螣螅螐螑螝螄螔螜螚螉褞褦褰褭褮褧褱褢褩褣褯褬褟觱諠����������������������������������諢諲諴諵諝謔諤諟諰諈諞諡諨諿諯諻貑貒貐賵賮賱賰賳赬赮趥趧踳踾踸蹀蹅踶踼踽蹁踰踿躽輶輮輵輲輹輷輴遶遹遻邆郺鄳鄵鄶醓醐醑醍醏錧錞錈錟錆錏鍺錸錼錛錣錒錁鍆錭錎錍鋋錝鋺錥錓鋹鋷錴錂錤鋿錩錹錵錪錔錌�".split(""); +for(j = 0; j != D[235].length; ++j) if(D[235][j].charCodeAt(0) !== 0xFFFD) { e[D[235][j]] = 60160 + j; d[60160 + j] = D[235][j];} +D[236] = "����������������������������������������������������������������錋鋾錉錀鋻錖閼闍閾閹閺閶閿閵閽隩雔霋霒霐鞙鞗鞔韰韸頵頯頲餤餟餧餩馞駮駬駥駤駰駣駪駩駧骹骿骴骻髶髺髹髷鬳鮀鮅鮇魼魾魻鮂鮓鮒鮐魺鮕����������������������������������魽鮈鴥鴗鴠鴞鴔鴩鴝鴘鴢鴐鴙鴟麈麆麇麮麭黕黖黺鼒鼽儦儥儢儤儠儩勴嚓嚌嚍嚆嚄嚃噾嚂噿嚁壖壔壏壒嬭嬥嬲嬣嬬嬧嬦嬯嬮孻寱寲嶷幬幪徾徻懃憵憼懧懠懥懤懨懞擯擩擣擫擤擨斁斀斶旚曒檍檖檁檥檉檟檛檡檞檇檓檎�".split(""); +for(j = 0; j != D[236].length; ++j) if(D[236][j].charCodeAt(0) !== 0xFFFD) { e[D[236][j]] = 60416 + j; d[60416 + j] = D[236][j];} +D[237] = "����������������������������������������������������������������檕檃檨檤檑橿檦檚檅檌檒歛殭氉濌澩濴濔濣濜濭濧濦濞濲濝濢濨燡燱燨燲燤燰燢獳獮獯璗璲璫璐璪璭璱璥璯甐甑甒甏疄癃癈癉癇皤盩瞵瞫瞲瞷瞶����������������������������������瞴瞱瞨矰磳磽礂磻磼磲礅磹磾礄禫禨穜穛穖穘穔穚窾竀竁簅簏篲簀篿篻簎篴簋篳簂簉簃簁篸篽簆篰篱簐簊糨縭縼繂縳顈縸縪繉繀繇縩繌縰縻縶繄縺罅罿罾罽翴翲耬膻臄臌臊臅臇膼臩艛艚艜薃薀薏薧薕薠薋薣蕻薤薚薞�".split(""); +for(j = 0; j != D[237].length; ++j) if(D[237][j].charCodeAt(0) !== 0xFFFD) { e[D[237][j]] = 60672 + j; d[60672 + j] = D[237][j];} +D[238] = "����������������������������������������������������������������蕷蕼薉薡蕺蕸蕗薎薖薆薍薙薝薁薢薂薈薅蕹蕶薘薐薟虨螾螪螭蟅螰螬螹螵螼螮蟉蟃蟂蟌螷螯蟄蟊螴螶螿螸螽蟞螲褵褳褼褾襁襒褷襂覭覯覮觲觳謞����������������������������������謘謖謑謅謋謢謏謒謕謇謍謈謆謜謓謚豏豰豲豱豯貕貔賹赯蹎蹍蹓蹐蹌蹇轃轀邅遾鄸醚醢醛醙醟醡醝醠鎡鎃鎯鍤鍖鍇鍼鍘鍜鍶鍉鍐鍑鍠鍭鎏鍌鍪鍹鍗鍕鍒鍏鍱鍷鍻鍡鍞鍣鍧鎀鍎鍙闇闀闉闃闅閷隮隰隬霠霟霘霝霙鞚鞡鞜�".split(""); +for(j = 0; j != D[238].length; ++j) if(D[238][j].charCodeAt(0) !== 0xFFFD) { e[D[238][j]] = 60928 + j; d[60928 + j] = D[238][j];} +D[239] = "����������������������������������������������������������������鞞鞝韕韔韱顁顄顊顉顅顃餥餫餬餪餳餲餯餭餱餰馘馣馡騂駺駴駷駹駸駶駻駽駾駼騃骾髾髽鬁髼魈鮚鮨鮞鮛鮦鮡鮥鮤鮆鮢鮠鮯鴳鵁鵧鴶鴮鴯鴱鴸鴰����������������������������������鵅鵂鵃鴾鴷鵀鴽翵鴭麊麉麍麰黈黚黻黿鼤鼣鼢齔龠儱儭儮嚘嚜嚗嚚嚝嚙奰嬼屩屪巀幭幮懘懟懭懮懱懪懰懫懖懩擿攄擽擸攁攃擼斔旛曚曛曘櫅檹檽櫡櫆檺檶檷櫇檴檭歞毉氋瀇瀌瀍瀁瀅瀔瀎濿瀀濻瀦濼濷瀊爁燿燹爃燽獶�".split(""); +for(j = 0; j != D[239].length; ++j) if(D[239][j].charCodeAt(0) !== 0xFFFD) { e[D[239][j]] = 61184 + j; d[61184 + j] = D[239][j];} +D[240] = "����������������������������������������������������������������璸瓀璵瓁璾璶璻瓂甔甓癜癤癙癐癓癗癚皦皽盬矂瞺磿礌礓礔礉礐礒礑禭禬穟簜簩簙簠簟簭簝簦簨簢簥簰繜繐繖繣繘繢繟繑繠繗繓羵羳翷翸聵臑臒����������������������������������臐艟艞薴藆藀藃藂薳薵薽藇藄薿藋藎藈藅薱薶藒蘤薸薷薾虩蟧蟦蟢蟛蟫蟪蟥蟟蟳蟤蟔蟜蟓蟭蟘蟣螤蟗蟙蠁蟴蟨蟝襓襋襏襌襆襐襑襉謪謧謣謳謰謵譇謯謼謾謱謥謷謦謶謮謤謻謽謺豂豵貙貘貗賾贄贂贀蹜蹢蹠蹗蹖蹞蹥蹧�".split(""); +for(j = 0; j != D[240].length; ++j) if(D[240][j].charCodeAt(0) !== 0xFFFD) { e[D[240][j]] = 61440 + j; d[61440 + j] = D[240][j];} +D[241] = "����������������������������������������������������������������蹛蹚蹡蹝蹩蹔轆轇轈轋鄨鄺鄻鄾醨醥醧醯醪鎵鎌鎒鎷鎛鎝鎉鎧鎎鎪鎞鎦鎕鎈鎙鎟鎍鎱鎑鎲鎤鎨鎴鎣鎥闒闓闑隳雗雚巂雟雘雝霣霢霥鞬鞮鞨鞫鞤鞪����������������������������������鞢鞥韗韙韖韘韺顐顑顒颸饁餼餺騏騋騉騍騄騑騊騅騇騆髀髜鬈鬄鬅鬩鬵魊魌魋鯇鯆鯃鮿鯁鮵鮸鯓鮶鯄鮹鮽鵜鵓鵏鵊鵛鵋鵙鵖鵌鵗鵒鵔鵟鵘鵚麎麌黟鼁鼀鼖鼥鼫鼪鼩鼨齌齕儴儵劖勷厴嚫嚭嚦嚧嚪嚬壚壝壛夒嬽嬾嬿巃幰�".split(""); +for(j = 0; j != D[241].length; ++j) if(D[241][j].charCodeAt(0) !== 0xFFFD) { e[D[241][j]] = 61696 + j; d[61696 + j] = D[241][j];} +D[242] = "����������������������������������������������������������������徿懻攇攐攍攉攌攎斄旞旝曞櫧櫠櫌櫑櫙櫋櫟櫜櫐櫫櫏櫍櫞歠殰氌瀙瀧瀠瀖瀫瀡瀢瀣瀩瀗瀤瀜瀪爌爊爇爂爅犥犦犤犣犡瓋瓅璷瓃甖癠矉矊矄矱礝礛����������������������������������礡礜礗礞禰穧穨簳簼簹簬簻糬糪繶繵繸繰繷繯繺繲繴繨罋罊羃羆羷翽翾聸臗臕艤艡艣藫藱藭藙藡藨藚藗藬藲藸藘藟藣藜藑藰藦藯藞藢蠀蟺蠃蟶蟷蠉蠌蠋蠆蟼蠈蟿蠊蠂襢襚襛襗襡襜襘襝襙覈覷覶觶譐譈譊譀譓譖譔譋譕�".split(""); +for(j = 0; j != D[242].length; ++j) if(D[242][j].charCodeAt(0) !== 0xFFFD) { e[D[242][j]] = 61952 + j; d[61952 + j] = D[242][j];} +D[243] = "����������������������������������������������������������������譑譂譒譗豃豷豶貚贆贇贉趬趪趭趫蹭蹸蹳蹪蹯蹻軂轒轑轏轐轓辴酀鄿醰醭鏞鏇鏏鏂鏚鏐鏹鏬鏌鏙鎩鏦鏊鏔鏮鏣鏕鏄鏎鏀鏒鏧镽闚闛雡霩霫霬霨霦����������������������������������鞳鞷鞶韝韞韟顜顙顝顗颿颽颻颾饈饇饃馦馧騚騕騥騝騤騛騢騠騧騣騞騜騔髂鬋鬊鬎鬌鬷鯪鯫鯠鯞鯤鯦鯢鯰鯔鯗鯬鯜鯙鯥鯕鯡鯚鵷鶁鶊鶄鶈鵱鶀鵸鶆鶋鶌鵽鵫鵴鵵鵰鵩鶅鵳鵻鶂鵯鵹鵿鶇鵨麔麑黀黼鼭齀齁齍齖齗齘匷嚲�".split(""); +for(j = 0; j != D[243].length; ++j) if(D[243][j].charCodeAt(0) !== 0xFFFD) { e[D[243][j]] = 62208 + j; d[62208 + j] = D[243][j];} +D[244] = "����������������������������������������������������������������嚵嚳壣孅巆巇廮廯忀忁懹攗攖攕攓旟曨曣曤櫳櫰櫪櫨櫹櫱櫮櫯瀼瀵瀯瀷瀴瀱灂瀸瀿瀺瀹灀瀻瀳灁爓爔犨獽獼璺皫皪皾盭矌矎矏矍矲礥礣礧礨礤礩����������������������������������禲穮穬穭竷籉籈籊籇籅糮繻繾纁纀羺翿聹臛臙舋艨艩蘢藿蘁藾蘛蘀藶蘄蘉蘅蘌藽蠙蠐蠑蠗蠓蠖襣襦覹觷譠譪譝譨譣譥譧譭趮躆躈躄轙轖轗轕轘轚邍酃酁醷醵醲醳鐋鐓鏻鐠鐏鐔鏾鐕鐐鐨鐙鐍鏵鐀鏷鐇鐎鐖鐒鏺鐉鏸鐊鏿�".split(""); +for(j = 0; j != D[244].length; ++j) if(D[244][j].charCodeAt(0) !== 0xFFFD) { e[D[244][j]] = 62464 + j; d[62464 + j] = D[244][j];} +D[245] = "����������������������������������������������������������������鏼鐌鏶鐑鐆闞闠闟霮霯鞹鞻韽韾顠顢顣顟飁飂饐饎饙饌饋饓騲騴騱騬騪騶騩騮騸騭髇髊髆鬐鬒鬑鰋鰈鯷鰅鰒鯸鱀鰇鰎鰆鰗鰔鰉鶟鶙鶤鶝鶒鶘鶐鶛����������������������������������鶠鶔鶜鶪鶗鶡鶚鶢鶨鶞鶣鶿鶩鶖鶦鶧麙麛麚黥黤黧黦鼰鼮齛齠齞齝齙龑儺儹劘劗囃嚽嚾孈孇巋巏廱懽攛欂櫼欃櫸欀灃灄灊灈灉灅灆爝爚爙獾甗癪矐礭礱礯籔籓糲纊纇纈纋纆纍罍羻耰臝蘘蘪蘦蘟蘣蘜蘙蘧蘮蘡蘠蘩蘞蘥�".split(""); +for(j = 0; j != D[245].length; ++j) if(D[245][j].charCodeAt(0) !== 0xFFFD) { e[D[245][j]] = 62720 + j; d[62720 + j] = D[245][j];} +D[246] = "����������������������������������������������������������������蠩蠝蠛蠠蠤蠜蠫衊襭襩襮襫觺譹譸譅譺譻贐贔趯躎躌轞轛轝酆酄酅醹鐿鐻鐶鐩鐽鐼鐰鐹鐪鐷鐬鑀鐱闥闤闣霵霺鞿韡顤飉飆飀饘饖騹騽驆驄驂驁騺����������������������������������騿髍鬕鬗鬘鬖鬺魒鰫鰝鰜鰬鰣鰨鰩鰤鰡鶷鶶鶼鷁鷇鷊鷏鶾鷅鷃鶻鶵鷎鶹鶺鶬鷈鶱鶭鷌鶳鷍鶲鹺麜黫黮黭鼛鼘鼚鼱齎齥齤龒亹囆囅囋奱孋孌巕巑廲攡攠攦攢欋欈欉氍灕灖灗灒爞爟犩獿瓘瓕瓙瓗癭皭礵禴穰穱籗籜籙籛籚�".split(""); +for(j = 0; j != D[246].length; ++j) if(D[246][j].charCodeAt(0) !== 0xFFFD) { e[D[246][j]] = 62976 + j; d[62976 + j] = D[246][j];} +D[247] = "����������������������������������������������������������������糴糱纑罏羇臞艫蘴蘵蘳蘬蘲蘶蠬蠨蠦蠪蠥襱覿覾觻譾讄讂讆讅譿贕躕躔躚躒躐躖躗轠轢酇鑌鑐鑊鑋鑏鑇鑅鑈鑉鑆霿韣顪顩飋饔饛驎驓驔驌驏驈驊����������������������������������驉驒驐髐鬙鬫鬻魖魕鱆鱈鰿鱄鰹鰳鱁鰼鰷鰴鰲鰽鰶鷛鷒鷞鷚鷋鷐鷜鷑鷟鷩鷙鷘鷖鷵鷕鷝麶黰鼵鼳鼲齂齫龕龢儽劙壨壧奲孍巘蠯彏戁戃戄攩攥斖曫欑欒欏毊灛灚爢玂玁玃癰矔籧籦纕艬蘺虀蘹蘼蘱蘻蘾蠰蠲蠮蠳襶襴襳觾�".split(""); +for(j = 0; j != D[247].length; ++j) if(D[247][j].charCodeAt(0) !== 0xFFFD) { e[D[247][j]] = 63232 + j; d[63232 + j] = D[247][j];} +D[248] = "����������������������������������������������������������������讌讎讋讈豅贙躘轤轣醼鑢鑕鑝鑗鑞韄韅頀驖驙鬞鬟鬠鱒鱘鱐鱊鱍鱋鱕鱙鱌鱎鷻鷷鷯鷣鷫鷸鷤鷶鷡鷮鷦鷲鷰鷢鷬鷴鷳鷨鷭黂黐黲黳鼆鼜鼸鼷鼶齃齏����������������������������������齱齰齮齯囓囍孎屭攭曭曮欓灟灡灝灠爣瓛瓥矕礸禷禶籪纗羉艭虃蠸蠷蠵衋讔讕躞躟躠躝醾醽釂鑫鑨鑩雥靆靃靇韇韥驞髕魙鱣鱧鱦鱢鱞鱠鸂鷾鸇鸃鸆鸅鸀鸁鸉鷿鷽鸄麠鼞齆齴齵齶囔攮斸欘欙欗欚灢爦犪矘矙礹籩籫糶纚�".split(""); +for(j = 0; j != D[248].length; ++j) if(D[248][j].charCodeAt(0) !== 0xFFFD) { e[D[248][j]] = 63488 + j; d[63488 + j] = D[248][j];} +D[249] = "����������������������������������������������������������������纘纛纙臠臡虆虇虈襹襺襼襻觿讘讙躥躤躣鑮鑭鑯鑱鑳靉顲饟鱨鱮鱭鸋鸍鸐鸏鸒鸑麡黵鼉齇齸齻齺齹圞灦籯蠼趲躦釃鑴鑸鑶鑵驠鱴鱳鱱鱵鸔鸓黶鼊����������������������������������龤灨灥糷虪蠾蠽蠿讞貜躩軉靋顳顴飌饡馫驤驦驧鬤鸕鸗齈戇欞爧虌躨钂钀钁驩驨鬮鸙爩虋讟钃鱹麷癵驫鱺鸝灩灪麤齾齉龘碁銹裏墻恒粧嫺╔╦╗╠╬╣╚╩╝╒╤╕╞╪╡╘╧╛╓╥╖╟╫╢╙╨╜║═╭╮╰╯▓�".split(""); +for(j = 0; j != D[249].length; ++j) if(D[249][j].charCodeAt(0) !== 0xFFFD) { e[D[249][j]] = 63744 + j; d[63744 + j] = D[249][j];} +return {"enc": e, "dec": d }; })(); +cptable[1250] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚�„…†‡�‰Š‹ŚŤŽŹ�‘’“”•–—�™š›śťžź ˇ˘Ł¤Ą¦§¨©Ş«¬­®Ż°±˛ł´µ¶·¸ąş»Ľ˝ľżŔÁÂĂÄĹĆÇČÉĘËĚÍÎĎĐŃŇÓÔŐÖ×ŘŮÚŰÜÝŢßŕáâăäĺćçčéęëěíîďđńňóôőö÷řůúűüýţ˙", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +cptable[1251] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ЂЃ‚ѓ„…†‡€‰Љ‹ЊЌЋЏђ‘’“”•–—�™љ›њќћџ ЎўЈ¤Ґ¦§Ё©Є«¬­®Ї°±Ііґµ¶·ё№є»јЅѕїАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +cptable[1252] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚ƒ„…†‡ˆ‰Š‹Œ�Ž��‘’“”•–—˜™š›œ�žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +cptable[1253] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚ƒ„…†‡�‰�‹�����‘’“”•–—�™�›���� ΅Ά£¤¥¦§¨©�«¬­®―°±²³΄µ¶·ΈΉΊ»Ό½ΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡ�ΣΤΥΦΧΨΩΪΫάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώ�", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +cptable[1254] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚ƒ„…†‡ˆ‰Š‹Œ����‘’“”•–—˜™š›œ��Ÿ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏĞÑÒÓÔÕÖ×ØÙÚÛÜİŞßàáâãäåæçèéêëìíîïğñòóôõö÷øùúûüışÿ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +cptable[1255] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚ƒ„…†‡ˆ‰�‹�����‘’“”•–—˜™�›���� ¡¢£₪¥¦§¨©×«¬­®¯°±²³´µ¶·¸¹÷»¼½¾¿ְֱֲֳִֵֶַָֹ�ֻּֽ־ֿ׀ׁׂ׃װױײ׳״�������אבגדהוזחטיךכלםמןנסעףפץצקרשת��‎‏�", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +cptable[1256] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€پ‚ƒ„…†‡ˆ‰ٹ‹Œچژڈگ‘’“”•–—ک™ڑ›œ‌‍ں ،¢£¤¥¦§¨©ھ«¬­®¯°±²³´µ¶·¸¹؛»¼½¾؟ہءآأؤإئابةتثجحخدذرزسشصض×طظعغـفقكàلâمنهوçèéêëىيîïًٌٍَôُِ÷ّùْûü‎‏ے", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +cptable[1257] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚�„…†‡�‰�‹�¨ˇ¸�‘’“”•–—�™�›�¯˛� �¢£¤�¦§Ø©Ŗ«¬­®Æ°±²³´µ¶·ø¹ŗ»¼½¾æĄĮĀĆÄÅĘĒČÉŹĖĢĶĪĻŠŃŅÓŌÕÖ×ŲŁŚŪÜŻŽßąįāćäåęēčéźėģķīļšńņóōõö÷ųłśūüżž˙", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +cptable[1258] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€�‚ƒ„…†‡ˆ‰�‹Œ����‘’“”•–—˜™�›œ��Ÿ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂĂÄÅÆÇÈÉÊË̀ÍÎÏĐÑ̉ÓÔƠÖ×ØÙÚÛÜỮßàáâăäåæçèéêë́íîïđṇ̃óôơö÷øùúûüư₫ÿ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +cptable[10000] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄¤‹›fifl‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +cptable[10006] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~Ĺ²É³ÖÜ΅àâä΄¨çéèê룙î‰ôö¦­ùûü†ΓΔΘΛΞΠß®©ΣΪ§≠°·Α±≤≥¥ΒΕΖΗΙΚΜΦΫΨΩάΝ¬ΟΡ≈Τ«»… ΥΧΆΈœ–―“”‘’÷ΉΊΌΎέήίόΏύαβψδεφγηιξκλμνοπώρστθωςχυζϊϋΐΰ�", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +cptable[10007] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ†°¢£§•¶І®©™Ђђ≠Ѓѓ∞±≤≥іµ∂ЈЄєЇїЉљЊњјЅ¬√ƒ≈∆«»… ЋћЌќѕ–—“”‘’÷„ЎўЏџ№Ёёяабвгдежзийклмнопрстуфхцчшщъыьэю¤", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +cptable[10029] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ÄĀāÉĄÖÜáąČäčĆć鏟ĎíďĒēĖóėôöõúĚěü†°Ę£§•¶ß®©™ę¨≠ģĮįĪ≤≥īĶ∂∑łĻļĽľĹĺŅņѬ√ńŇ∆«»… ňŐÕőŌ–—“”‘’÷◊ōŔŕŘ‹›řŖŗŠ‚„šŚśÁŤťÍŽžŪÓÔūŮÚůŰűŲųÝýķŻŁżĢˇ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +cptable[10079] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûüÝ°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄¤ÐðÞþý·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +cptable[10081] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸĞğİıŞş‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙ�ˆ˜¯˘˙˚¸˝˛ˇ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); +if (typeof module !== 'undefined' && module.exports) module.exports = cptable; +/* cputils.js (C) 2013-2014 SheetJS -- http://sheetjs.com */ +/*jshint newcap: false */ +(function(root, factory){ + "use strict"; + if(typeof cptable === "undefined") { + if(typeof require !== "undefined"){ + var cpt = require('./cpt' + 'able'); + if (typeof module !== 'undefined' && module.exports) module.exports = factory(cpt); + else root.cptable = factory(cpt); + } else throw new Error("cptable not found"); + } else cptable = factory(cptable); +}(this, function(cpt){ + "use strict"; + var magic = { + "1200":"utf16le", + "1201":"utf16be", + "12000":"utf32le", + "12001":"utf32be", + "16969":"utf64le", + "20127":"ascii", + "65000":"utf7", + "65001":"utf8" + }; + + var sbcs_cache = [874,1250,1251,1252,1253,1254,1255,1256,10000]; + var dbcs_cache = [932,936,949,950]; + var magic_cache = [65001]; + var magic_decode = {}; + var magic_encode = {}; + var cpecache = {}; + var cpdcache = {}; + + var sfcc = function sfcc(x) { return String.fromCharCode(x); }; + var cca = function cca(x){ return x.charCodeAt(0); }; + + var has_buf = (typeof Buffer !== 'undefined'); + if(has_buf) { + var mdl = 1024, mdb = new Buffer(mdl); + var make_EE = function make_EE(E){ + var EE = new Buffer(65536); + for(var i = 0; i < 65536;++i) EE[i] = 0; + var keys = Object.keys(E), len = keys.length; + for(var ee = 0, e = keys[ee]; ee < len; ++ee) { + if(!(e = keys[ee])) continue; + EE[e.charCodeAt(0)] = E[e]; + } + return EE; + }; + var sbcs_encode = function make_sbcs_encode(cp) { + var EE = make_EE(cpt[cp].enc); + return function sbcs_e(data, ofmt) { + var len = data.length; + var out, i, j, D, w; + if(typeof data === 'string') { + out = Buffer(len); + for(i = 0; i < len; ++i) out[i] = EE[data.charCodeAt(i)]; + } else if(Buffer.isBuffer(data)) { + out = Buffer(2*len); + j = 0; + for(i = 0; i < len; ++i) { + D = data[i]; + if(D < 128) out[j++] = EE[D]; + else if(D < 224) { out[j++] = EE[((D&31)<<6)+(data[i+1]&63)]; ++i; } + else if(D < 240) { out[j++] = EE[((D&15)<<12)+((data[i+1]&63)<<6)+(data[i+2]&63)]; i+=2; } + else { + w = ((D&7)<<18)+((data[i+1]&63)<<12)+((data[i+2]&63)<<6)+(data[i+3]&63); i+=3; + if(w < 65536) out[j++] = EE[w]; + else { w -= 65536; out[j++] = EE[0xD800 + ((w>>10)&1023)]; out[j++] = EE[0xDC00 + (w&1023)]; } + } + } + out.length = j; + out = out.slice(0,j); + } else { + out = Buffer(len); + for(i = 0; i < len; ++i) out[i] = EE[data[i].charCodeAt(0)]; + } + if(ofmt === undefined || ofmt === 'buf') return out; + if(ofmt !== 'arr') return out.toString('binary'); + return [].slice.call(out); + }; + }; + var sbcs_decode = function make_sbcs_decode(cp) { + var D = cpt[cp].dec; + var DD = new Buffer(131072), d=0, c; + for(d=0;d>8; + } + return function sbcs_d(data) { + var len = data.length, i=0, j; + if(2 * len > mdl) { mdl = 2 * len; mdb = new Buffer(mdl); } + if(Buffer.isBuffer(data)) { + for(i = 0; i < len; i++) { + j = 2*data[i]; + mdb[2*i] = DD[j]; mdb[2*i+1] = DD[j+1]; + } + } else if(typeof data === "string") { + for(i = 0; i < len; i++) { + j = 2*data.charCodeAt(i); + mdb[2*i] = DD[j]; mdb[2*i+1] = DD[j+1]; + } + } else { + for(i = 0; i < len; i++) { + j = 2*data[i]; + mdb[2*i] = DD[j]; mdb[2*i+1] = DD[j+1]; + } + } + mdb.length = 2 * len; + return mdb.toString('ucs2'); + }; + }; + var dbcs_encode = function make_dbcs_encode(cp) { + var E = cpt[cp].enc; + var EE = new Buffer(131072); + for(var i = 0; i < 131072; ++i) EE[i] = 0; + var keys = Object.keys(E); + for(var ee = 0, e = keys[ee]; ee < keys.length; ++ee) { + if(!(e = keys[ee])) continue; + var f = e.charCodeAt(0); + EE[2*f] = E[e] & 255; EE[2*f+1] = E[e]>>8; + } + return function dbcs_e(data, ofmt) { + var len = data.length, out = new Buffer(2*len), i, j, jj, k, D; + if(typeof data === 'string') { + for(i = k = 0; i < len; ++i) { + j = data.charCodeAt(i)*2; + out[k++] = EE[j+1] || EE[j]; if(EE[j+1] > 0) out[k++] = EE[j]; + } + out.length = k; + out = out.slice(0,k); + } else if(Buffer.isBuffer(data)) { + for(i = k = 0; i < len; ++i) { + D = data[i]; + if(D < 128) j = D; + else if(D < 224) { j = ((D&31)<<6)+(data[i+1]&63); ++i; } + else if(D < 240) { j = ((D&15)<<12)+((data[i+1]&63)<<6)+(data[i+2]&63); i+=2; } + else { j = ((D&7)<<18)+((data[i+1]&63)<<12)+((data[i+2]&63)<<6)+(data[i+3]&63); i+=3; } + if(j<65536) { j*=2; out[k++] = EE[j+1] || EE[j]; if(EE[j+1] > 0) out[k++] = EE[j]; } + else { jj = j-65536; + j=2*(0xD800 + ((jj>>10)&1023)); out[k++] = EE[j+1] || EE[j]; if(EE[j+1] > 0) out[k++] = EE[j]; + j=2*(0xDC00 + (jj&1023)); out[k++] = EE[j+1] || EE[j]; if(EE[j+1] > 0) out[k++] = EE[j]; + } + } + out.length = k; + out = out.slice(0,k); + } else { + for(i = k = 0; i < len; i++) { + j = data[i].charCodeAt(0)*2; + out[k++] = EE[j+1] || EE[j]; if(EE[j+1] > 0) out[k++] = EE[j]; + } + } + if(ofmt === undefined || ofmt === 'buf') return out; + if(ofmt !== 'arr') return out.toString('binary'); + return [].slice.call(out); + }; + }; + var dbcs_decode = function make_dbcs_decode(cp) { + var D = cpt[cp].dec; + var DD = new Buffer(131072), d=0, c, w=0, j=0, i=0; + for(i = 0; i < 65536; ++i) { DD[2*i] = 0xFF; DD[2*i+1] = 0xFD;} + for(d = 0; d < D.length; ++d) { + if(!(c=D[d])) continue; + w = c.charCodeAt(0); + j = 2*d; + DD[j] = w&255; DD[j+1] = w>>8; + } + return function dbcs_d(data) { + var len = data.length, out = new Buffer(2*len), i, j, k=0; + if(Buffer.isBuffer(data)) { + for(i = 0; i < len; i++) { + j = 2*data[i]; + if(DD[j]===0xFF && DD[j+1]===0xFD) { j=2*((data[i]<<8)+data[i+1]); ++i; } + out[k++] = DD[j]; out[k++] = DD[j+1]; + } + } else if(typeof data === "string") { + for(i = 0; i < len; i++) { + j = 2*data.charCodeAt(i); + if(DD[j]===0xFF && DD[j+1]===0xFD) { j=2*((data.charCodeAt(i)<<8)+data.charCodeAt(i+1)); ++i; } + out[k++] = DD[j]; out[k++] = DD[j+1]; + } + } else { + for(i = 0; i < len; i++) { + j = 2*data[i]; + if(DD[j]===0xFF && DD[j+1]===0xFD) { j=2*((data[i]<<8)+data[i+1]); ++i; } + out[k++] = DD[j]; out[k++] = DD[j+1]; + } + } + out.length = k; + return out.toString('ucs2'); + }; + }; + magic_decode[65001] = function utf8_d(data) { + var len = data.length, w = 0, ww = 0; + if(4 * len > mdl) { mdl = 4 * len; mdb = new Buffer(mdl); } + mdb.length = 0; + var i = 0; + if(len >= 3 && data[0] == 0xEF) if(data[1] == 0xBB && data[2] == 0xBF) i = 3; + for(var j = 1, k = 0, D = 0; i < len; i+=j) { + j = 1; D = data[i]; + if(D < 128) w = D; + else if(D < 224) { w=(D&31)*64+(data[i+1]&63); j=2; } + else if(D < 240) { w=((D&15)<<12)+(data[i+1]&63)*64+(data[i+2]&63); j=3; } + else { w=(D&7)*262144+((data[i+1]&63)<<12)+(data[i+2]&63)*64+(data[i+3]&63); j=4; } + if(w < 65536) { mdb[k++] = w&255; mdb[k++] = w>>8; } + else { + w -= 65536; ww = 0xD800 + ((w>>10)&1023); w = 0xDC00 + (w&1023); + mdb[k++] = ww&255; mdb[k++] = ww>>>8; mdb[k++] = w&255; mdb[k++] = (w>>>8)&255; + } + } + mdb.length = k; + return mdb.toString('ucs2'); + }; + magic_encode[65001] = function utf8_e(data, ofmt) { + var len = data.length, w = 0, ww = 0, j = 0; + var direct = typeof data === "string"; + if(4 * len > mdl) { mdl = 4 * len; mdb = new Buffer(mdl); } + for(var i = 0; i < len; ++i) { + w = direct ? data.charCodeAt(i) : data[i].charCodeAt(0); + if(w <= 0x007F) mdb[j++] = w; + else if(w <= 0x07FF) { + mdb[j++] = 192 + (w >> 6); + mdb[j++] = 128 + (w&63); + } else if(w >= 0xD800 && w <= 0xDFFF) { + w -= 0xD800; ++i; + ww = (direct ? data.charCodeAt(i) : data[i].charCodeAt(0)) - 0xDC00 + (w << 10); + mdb[j++] = 240 + ((ww>>>18) & 0x07); + mdb[j++] = 144 + ((ww>>>12) & 0x3F); + mdb[j++] = 128 + ((ww>>>6) & 0x3F); + mdb[j++] = 128 + (ww & 0x3F); + } else { + mdb[j++] = 224 + (w >> 12); + mdb[j++] = 128 + ((w >> 6)&63); + mdb[j++] = 128 + (w&63); + } + } + mdb.length = j; + if(ofmt === undefined || ofmt === 'buf') return mdb; + if(ofmt !== 'arr') return mdb.toString('binary'); + return [].slice.call(mdb); + }; + } + + var encache = function encache() { + if(has_buf) { + if(cpdcache[sbcs_cache[0]]) return; + var i, s; + for(i = 0; i < sbcs_cache.length; ++i) { + s = sbcs_cache[i]; + if(cpt[s]) { + cpdcache[s] = sbcs_decode(s); + cpecache[s] = sbcs_encode(s); + } + } + for(i = 0; i < dbcs_cache.length; ++i) { + s = dbcs_cache[i]; + if(cpt[s]) { + cpdcache[s] = dbcs_decode(s); + cpecache[s] = dbcs_encode(s); + } + } + for(i = 0; i < magic_cache.length; ++i) { + s = magic_cache[i]; + if(magic_decode[s]) cpdcache[s] = magic_decode[s]; + if(magic_encode[s]) cpecache[s] = magic_encode[s]; + } + } + }; + var cp_decache = function cp_decache(cp) { cpdcache[cp] = cpecache[cp] = undefined; }; + var decache = function decache() { + if(has_buf) { + if(!cpdcache[sbcs_cache[0]]) return; + sbcs_cache.forEach(cp_decache); + dbcs_cache.forEach(cp_decache); + magic_cache.forEach(cp_decache); + } + last_enc = last_cp = undefined; + }; + var cache = { + encache: encache, + decache: decache, + sbcs: sbcs_cache, + dbcs: dbcs_cache + }; + + encache(); + + var BM = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + var SetD = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'(),-./:?"; + var last_enc, last_cp; + var encode = function encode(cp, data, ofmt) { + if(cp === last_cp) { return last_enc(data, ofmt); } + if(cpecache[cp] !== undefined) { last_enc = cpecache[last_cp=cp]; return last_enc(data, ofmt); } + if(has_buf && Buffer.isBuffer(data)) data = data.toString('utf8'); + var len = data.length; + var out = has_buf ? new Buffer(4*len) : [], w, i, j = 0, c, tt, ww; + var C = cpt[cp], E, M; + if(C && (E=C.enc)) for(i = 0; i < len; ++i, ++j) { + w = E[data[i]]; + out[j] = w&255; + if(w > 255) { + out[j] = w>>8; + out[++j] = w&255; + } + } + else if((M=magic[cp])) switch(M) { + case "utf8": + if(has_buf && typeof data === "string") { out = new Buffer(data, M); j = out.length; break; } + for(i = 0; i < len; ++i, ++j) { + w = data[i].charCodeAt(0); + if(w <= 0x007F) out[j] = w; + else if(w <= 0x07FF) { + out[j] = 192 + (w >> 6); + out[++j] = 128 + (w&63); + } else if(w >= 0xD800 && w <= 0xDFFF) { + w -= 0xD800; + ww = data[++i].charCodeAt(0) - 0xDC00 + (w << 10); + out[j] = 240 + ((ww>>>18) & 0x07); + out[++j] = 144 + ((ww>>>12) & 0x3F); + out[++j] = 128 + ((ww>>>6) & 0x3F); + out[++j] = 128 + (ww & 0x3F); + } else { + out[j] = 224 + (w >> 12); + out[++j] = 128 + ((w >> 6)&63); + out[++j] = 128 + (w&63); + } + } + break; + case "ascii": + if(has_buf && typeof data === "string") { out = new Buffer(data, M); j = out.length; break; } + for(i = 0; i < len; ++i, ++j) { + w = data[i].charCodeAt(0); + if(w <= 0x007F) out[j] = w; + else throw new Error("bad ascii " + w); + } + break; + case "utf16le": + if(has_buf && typeof data === "string") { out = new Buffer(data, M); j = out.length; break; } + for(i = 0; i < len; ++i) { + w = data[i].charCodeAt(0); + out[j++] = w&255; + out[j++] = w>>8; + } + break; + case "utf16be": + for(i = 0; i < len; ++i) { + w = data[i].charCodeAt(0); + out[j++] = w>>8; + out[j++] = w&255; + } + break; + case "utf32le": + for(i = 0; i < len; ++i) { + w = data[i].charCodeAt(0); + if(w >= 0xD800 && w <= 0xDFFF) w = 0x10000 + ((w - 0xD800) << 10) + (data[++i].charCodeAt(0) - 0xDC00); + out[j++] = w&255; w >>= 8; + out[j++] = w&255; w >>= 8; + out[j++] = w&255; w >>= 8; + out[j++] = w&255; + } + break; + case "utf32be": + for(i = 0; i < len; ++i) { + w = data[i].charCodeAt(0); + if(w >= 0xD800 && w <= 0xDFFF) w = 0x10000 + ((w - 0xD800) << 10) + (data[++i].charCodeAt(0) - 0xDC00); + out[j+3] = w&255; w >>= 8; + out[j+2] = w&255; w >>= 8; + out[j+1] = w&255; w >>= 8; + out[j] = w&255; w >>= 8; + j+=4; + } + break; + case "utf7": + for(i = 0; i < len; i++) { + c = data[i]; + if(c === "+") { out[j++] = 0x2b; out[j++] = 0x2d; continue; } + if(SetD.indexOf(c) > -1) { out[j++] = c.charCodeAt(0); continue; } + tt = encode(1201, c); + out[j++] = 0x2b; + out[j++] = BM.charCodeAt(tt[0]>>2); + out[j++] = BM.charCodeAt(((tt[0]&0x03)<<4) + ((tt[1]||0)>>4)); + out[j++] = BM.charCodeAt(((tt[1]&0x0F)<<2) + ((tt[2]||0)>>6)); + out[j++] = 0x2d; + } + break; + default: throw new Error("Unsupported magic: " + cp + " " + magic[cp]); + } + else throw new Error("Unrecognized CP: " + cp); + out.length = j; + out = out.slice(0,j); + if(typeof Buffer === 'undefined') return (ofmt == 'str') ? out.map(sfcc).join("") : out; + if(ofmt === undefined || ofmt === 'buf') return out; + if(ofmt !== 'arr') return out.toString('binary'); + return [].slice.call(out); + }; + var decode = function decode(cp, data) { + var F; if((F=cpdcache[cp])) return F(data); + var len = data.length, out = new Array(len), w, i, j = 1, k = 0, ww; + var C = cpt[cp], D, M; + if(C && (D=C.dec)) { + if(typeof data === "string") data = data.split("").map(cca); + for(i = 0; i < len; i+=j) { + j = 2; + w = D[(data[i]<<8)+ data[i+1]]; + if(!w) { + j = 1; + w = D[data[i]]; + } + if(!w) throw new Error('Unrecognized code: ' + data[i] + ' ' + data[i+j-1] + ' ' + i + ' ' + j + ' ' + D[data[i]]); + out[k++] = w; + } + } + else if((M=magic[cp])) switch(M) { + case "utf8": + i = 0; + if(len >= 3 && data[0] == 0xEF) if(data[1] == 0xBB && data[2] == 0xBF) i = 3; + for(; i < len; i+=j) { + j = 1; + if(data[i] < 128) w = data[i]; + else if(data[i] < 224) { w=(data[i]&31)*64+(data[i+1]&63); j=2; } + else if(data[i] < 240) { w=((data[i]&15)<<12)+(data[i+1]&63)*64+(data[i+2]&63); j=3; } + else { w=(data[i]&7)*262144+((data[i+1]&63)<<12)+(data[i+2]&63)*64+(data[i+3]&63); j=4; } + if(w < 65536) { out[k++] = String.fromCharCode(w); } + else { + w -= 65536; ww = 0xD800 + ((w>>10)&1023); w = 0xDC00 + (w&1023); + out[k++] = String.fromCharCode(ww); out[k++] = String.fromCharCode(w); + } + } + break; + case "ascii": + if(has_buf && Buffer.isBuffer(data)) return data.toString(M); + for(i = 0; i < len; i++) out[i] = String.fromCharCode(data[i]); + k = len; break; + case "utf16le": + i = 0; + if(len >= 2 && data[0] == 0xFF) if(data[1] == 0xFE) i = 2; + if(has_buf && Buffer.isBuffer(data)) return data.toString(M); + j = 2; + for(; i < len; i+=j) { + out[k++] = String.fromCharCode((data[i+1]<<8) + data[i]); + } + break; + case "utf16be": + i = 0; + if(len >= 2 && data[0] == 0xFE) if(data[1] == 0xFF) i = 2; + j = 2; + for(; i < len; i+=j) { + out[k++] = String.fromCharCode((data[i]<<8) + data[i+1]); + } + break; + case "utf32le": + i = 0; + if(len >= 4 && data[0] == 0xFF) if(data[1] == 0xFE && data[2] == 0 && data[3] == 0) i = 4; + j = 4; + for(; i < len; i+=j) { + w = (data[i+3]<<24) + (data[i+2]<<16) + (data[i+1]<<8) + (data[i]); + if(w > 0xFFFF) { + w -= 0x10000; + out[k++] = String.fromCharCode(0xD800 + ((w >> 10) & 0x3FF)); + out[k++] = String.fromCharCode(0xDC00 + (w & 0x3FF)); + } + else out[k++] = String.fromCharCode(w); + } + break; + case "utf32be": + i = 0; + if(len >= 4 && data[3] == 0xFF) if(data[2] == 0xFE && data[1] == 0 && data[0] == 0) i = 4; + j = 4; + for(; i < len; i+=j) { + w = (data[i]<<24) + (data[i+1]<<16) + (data[i+2]<<8) + (data[i+3]); + if(w > 0xFFFF) { + w -= 0x10000; + out[k++] = String.fromCharCode(0xD800 + ((w >> 10) & 0x3FF)); + out[k++] = String.fromCharCode(0xDC00 + (w & 0x3FF)); + } + else out[k++] = String.fromCharCode(w); + } + break; + case "utf7": + i = 0; + if(len >= 4 && data[0] == 0x2B && data[1] == 0x2F && data[2] == 0x76) { + if(len >= 5 && data[3] == 0x38 && data[4] == 0x2D) i = 5; + else if(data[3] == 0x38 || data[3] == 0x39 || data[3] == 0x2B || data[3] == 0x2F) i = 4; + } + for(; i < len; i+=j) { + if(data[i] !== 0x2b) { j=1; out[k++] = String.fromCharCode(data[i]); continue; } + j=1; + if(data[i+1] === 0x2d) { j = 2; out[k++] = "+"; continue; } + while(String.fromCharCode(data[i+j]).match(/[A-Za-z0-9+\/]/)) j++; + var dash = 0; + if(data[i+j] === 0x2d) { ++j; dash=1; } + var tt = []; + var o64; + var c1, c2, c3; + var e1, e2, e3, e4; + for(var l = 1; l < j - dash;) { + e1 = BM.indexOf(String.fromCharCode(data[i+l++])); + e2 = BM.indexOf(String.fromCharCode(data[i+l++])); + c1 = e1 << 2 | e2 >> 4; + tt.push(c1); + e3 = BM.indexOf(String.fromCharCode(data[i+l++])); + if(e3 === -1) break; + c2 = (e2 & 15) << 4 | e3 >> 2; + tt.push(c2); + e4 = BM.indexOf(String.fromCharCode(data[i+l++])); + if(e4 === -1) break; + c3 = (e3 & 3) << 6 | e4; + if(e4 < 64) tt.push(c3); + } + if((tt.length & 1) === 1) tt.length--; + o64 = decode(1201, tt); + for(l = 0; l < o64.length; ++l) out[k++] = o64[l]; + } + break; + default: throw new Error("Unsupported magic: " + cp + " " + magic[cp]); + } + else throw new Error("Unrecognized CP: " + cp); + out.length = k; + return out.join(""); + }; + var hascp = function hascp(cp) { return cpt[cp] || magic[cp]; }; + cpt.utils = { decode: decode, encode: encode, hascp: hascp, magic: magic, cache:cache }; + return cpt; +})); diff --git a/plugins/tiddlywiki/xlsx-utils/files/tiddlywiki.files b/plugins/tiddlywiki/xlsx-utils/files/tiddlywiki.files new file mode 100644 index 000000000..4654fac8a --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/files/tiddlywiki.files @@ -0,0 +1,29 @@ +{ + "tiddlers": [ + { + "file": "xlsx.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/xlsx-utils/xlsx.js", + "module-type": "library" + }, + "prefix": "var old_exports = exports,JSZip = require(\"$:/plugins/tiddlywiki/jszip/jszip.js\");exports = {};if($tw.browser){module.exports=undefined;};", + "suffix": "$tw.utils.extend(old_exports,exports);exports = old_exports;module.exports=exports;" + },{ + "file": "cpexcel.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/xlsx-utils/dist/cpexcel.js", + "module-type": "library" + }, + "prefix": "if($tw.browser){Buffer = undefined;};", + "suffix": "" + },{ + "file": "LICENSE", + "fields": { + "type": "text/plain", + "title": "$:/plugins/tiddlywiki/xlsx-utils/license" + } + } + ] +} diff --git a/plugins/tiddlywiki/xlsx-utils/files/xlsx.js b/plugins/tiddlywiki/xlsx-utils/files/xlsx.js new file mode 100755 index 000000000..c29f5ceae --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/files/xlsx.js @@ -0,0 +1,11654 @@ +/* xlsx.js (C) 2013-2015 SheetJS -- http://sheetjs.com */ +/* vim: set ts=2: */ +/*jshint -W041 */ +/*jshint funcscope:true, eqnull:true */ +var XLSX = {}; +(function make_xlsx(XLSX){ +XLSX.version = '0.8.0'; +var current_codepage = 1200, current_cptable; +if(typeof module !== "undefined" && typeof require !== 'undefined') { + if(typeof cptable === 'undefined') cptable = require('./dist/cpexcel'); + current_cptable = cptable[current_codepage]; +} +function reset_cp() { set_cp(1200); } +var set_cp = function(cp) { current_codepage = cp; }; + +function char_codes(data) { var o = []; for(var i = 0, len = data.length; i < len; ++i) o[i] = data.charCodeAt(i); return o; } +var debom_xml = function(data) { return data; }; + +var _getchar = function _gc1(x) { return String.fromCharCode(x); }; +if(typeof cptable !== 'undefined') { + set_cp = function(cp) { current_codepage = cp; current_cptable = cptable[cp]; }; + debom_xml = function(data) { + if(data.charCodeAt(0) === 0xFF && data.charCodeAt(1) === 0xFE) { return cptable.utils.decode(1200, char_codes(data.substr(2))); } + return data; + }; + _getchar = function _gc2(x) { + if(current_codepage === 1200) return String.fromCharCode(x); + return cptable.utils.decode(current_codepage, [x&255,x>>8])[0]; + }; +} +var Base64 = (function make_b64(){ + var map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; + return { + encode: function(input, utf8) { + var o = ""; + var c1, c2, c3, e1, e2, e3, e4; + for(var i = 0; i < input.length; ) { + c1 = input.charCodeAt(i++); + c2 = input.charCodeAt(i++); + c3 = input.charCodeAt(i++); + e1 = c1 >> 2; + e2 = (c1 & 3) << 4 | c2 >> 4; + e3 = (c2 & 15) << 2 | c3 >> 6; + e4 = c3 & 63; + if (isNaN(c2)) { e3 = e4 = 64; } + else if (isNaN(c3)) { e4 = 64; } + o += map.charAt(e1) + map.charAt(e2) + map.charAt(e3) + map.charAt(e4); + } + return o; + }, + decode: function b64_decode(input, utf8) { + var o = ""; + var c1, c2, c3; + var e1, e2, e3, e4; + input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); + for(var i = 0; i < input.length;) { + e1 = map.indexOf(input.charAt(i++)); + e2 = map.indexOf(input.charAt(i++)); + e3 = map.indexOf(input.charAt(i++)); + e4 = map.indexOf(input.charAt(i++)); + c1 = e1 << 2 | e2 >> 4; + c2 = (e2 & 15) << 4 | e3 >> 2; + c3 = (e3 & 3) << 6 | e4; + o += String.fromCharCode(c1); + if (e3 != 64) { o += String.fromCharCode(c2); } + if (e4 != 64) { o += String.fromCharCode(c3); } + } + return o; + } + }; +})(); +var has_buf = (typeof Buffer !== 'undefined'); + +function new_raw_buf(len) { + /* jshint -W056 */ + return new (has_buf ? Buffer : Array)(len); + /* jshint +W056 */ +} + +function s2a(s) { + if(has_buf) return new Buffer(s, "binary"); + return s.split("").map(function(x){ return x.charCodeAt(0) & 0xff; }); +} + +var bconcat = function(bufs) { return [].concat.apply([], bufs); }; + +var chr0 = /\u0000/g, chr1 = /[\u0001-\u0006]/; +/* ssf.js (C) 2013-2014 SheetJS -- http://sheetjs.com */ +/*jshint -W041 */ +var SSF = {}; +var make_ssf = function make_ssf(SSF){ +SSF.version = '0.8.1'; +function _strrev(x) { var o = "", i = x.length-1; while(i>=0) o += x.charAt(i--); return o; } +function fill(c,l) { var o = ""; while(o.length < l) o+=c; return o; } +function pad0(v,d){var t=""+v; return t.length>=d?t:fill('0',d-t.length)+t;} +function pad_(v,d){var t=""+v;return t.length>=d?t:fill(' ',d-t.length)+t;} +function rpad_(v,d){var t=""+v; return t.length>=d?t:t+fill(' ',d-t.length);} +function pad0r1(v,d){var t=""+Math.round(v); return t.length>=d?t:fill('0',d-t.length)+t;} +function pad0r2(v,d){var t=""+v; return t.length>=d?t:fill('0',d-t.length)+t;} +var p2_32 = Math.pow(2,32); +function pad0r(v,d){if(v>p2_32||v<-p2_32) return pad0r1(v,d); var i = Math.round(v); return pad0r2(i,d); } +function isgeneral(s, i) { return s.length >= 7 + i && (s.charCodeAt(i)|32) === 103 && (s.charCodeAt(i+1)|32) === 101 && (s.charCodeAt(i+2)|32) === 110 && (s.charCodeAt(i+3)|32) === 101 && (s.charCodeAt(i+4)|32) === 114 && (s.charCodeAt(i+5)|32) === 97 && (s.charCodeAt(i+6)|32) === 108; } +/* Options */ +var opts_fmt = [ + ["date1904", 0], + ["output", ""], + ["WTF", false] +]; +function fixopts(o){ + for(var y = 0; y != opts_fmt.length; ++y) if(o[opts_fmt[y][0]]===undefined) o[opts_fmt[y][0]]=opts_fmt[y][1]; +} +SSF.opts = opts_fmt; +var table_fmt = { + 0: 'General', + 1: '0', + 2: '0.00', + 3: '#,##0', + 4: '#,##0.00', + 9: '0%', + 10: '0.00%', + 11: '0.00E+00', + 12: '# ?/?', + 13: '# ??/??', + 14: 'm/d/yy', + 15: 'd-mmm-yy', + 16: 'd-mmm', + 17: 'mmm-yy', + 18: 'h:mm AM/PM', + 19: 'h:mm:ss AM/PM', + 20: 'h:mm', + 21: 'h:mm:ss', + 22: 'm/d/yy h:mm', + 37: '#,##0 ;(#,##0)', + 38: '#,##0 ;[Red](#,##0)', + 39: '#,##0.00;(#,##0.00)', + 40: '#,##0.00;[Red](#,##0.00)', + 45: 'mm:ss', + 46: '[h]:mm:ss', + 47: 'mmss.0', + 48: '##0.0E+0', + 49: '@', + 56: '"上午/下午 "hh"時"mm"分"ss"秒 "', + 65535: 'General' +}; +var days = [ + ['Sun', 'Sunday'], + ['Mon', 'Monday'], + ['Tue', 'Tuesday'], + ['Wed', 'Wednesday'], + ['Thu', 'Thursday'], + ['Fri', 'Friday'], + ['Sat', 'Saturday'] +]; +var months = [ + ['J', 'Jan', 'January'], + ['F', 'Feb', 'February'], + ['M', 'Mar', 'March'], + ['A', 'Apr', 'April'], + ['M', 'May', 'May'], + ['J', 'Jun', 'June'], + ['J', 'Jul', 'July'], + ['A', 'Aug', 'August'], + ['S', 'Sep', 'September'], + ['O', 'Oct', 'October'], + ['N', 'Nov', 'November'], + ['D', 'Dec', 'December'] +]; +function frac(x, D, mixed) { + var sgn = x < 0 ? -1 : 1; + var B = x * sgn; + var P_2 = 0, P_1 = 1, P = 0; + var Q_2 = 1, Q_1 = 0, Q = 0; + var A = Math.floor(B); + while(Q_1 < D) { + A = Math.floor(B); + P = A * P_1 + P_2; + Q = A * Q_1 + Q_2; + if((B - A) < 0.0000000005) break; + B = 1 / (B - A); + P_2 = P_1; P_1 = P; + Q_2 = Q_1; Q_1 = Q; + } + if(Q > D) { Q = Q_1; P = P_1; } + if(Q > D) { Q = Q_2; P = P_2; } + if(!mixed) return [0, sgn * P, Q]; + if(Q===0) throw "Unexpected state: "+P+" "+P_1+" "+P_2+" "+Q+" "+Q_1+" "+Q_2; + var q = Math.floor(sgn * P/Q); + return [q, sgn*P - q*Q, Q]; +} +function general_fmt_int(v, opts) { return ""+v; } +SSF._general_int = general_fmt_int; +var general_fmt_num = (function make_general_fmt_num() { +var gnr1 = /\.(\d*[1-9])0+$/, gnr2 = /\.0*$/, gnr4 = /\.(\d*[1-9])0+/, gnr5 = /\.0*[Ee]/, gnr6 = /(E[+-])(\d)$/; +function gfn2(v) { + var w = (v<0?12:11); + var o = gfn5(v.toFixed(12)); if(o.length <= w) return o; + o = v.toPrecision(10); if(o.length <= w) return o; + return v.toExponential(5); +} +function gfn3(v) { + var o = v.toFixed(11).replace(gnr1,".$1"); + if(o.length > (v<0?12:11)) o = v.toPrecision(6); + return o; +} +function gfn4(o) { + for(var i = 0; i != o.length; ++i) if((o.charCodeAt(i) | 0x20) === 101) return o.replace(gnr4,".$1").replace(gnr5,"E").replace("e","E").replace(gnr6,"$10$2"); + return o; +} +function gfn5(o) { + //for(var i = 0; i != o.length; ++i) if(o.charCodeAt(i) === 46) return o.replace(gnr2,"").replace(gnr1,".$1"); + //return o; + return o.indexOf(".") > -1 ? o.replace(gnr2,"").replace(gnr1,".$1") : o; +} +return function general_fmt_num(v, opts) { + var V = Math.floor(Math.log(Math.abs(v))*Math.LOG10E), o; + if(V >= -4 && V <= -1) o = v.toPrecision(10+V); + else if(Math.abs(V) <= 9) o = gfn2(v); + else if(V === 10) o = v.toFixed(10).substr(0,12); + else o = gfn3(v); + return gfn5(gfn4(o)); +};})(); +SSF._general_num = general_fmt_num; +function general_fmt(v, opts) { + switch(typeof v) { + case 'string': return v; + case 'boolean': return v ? "TRUE" : "FALSE"; + case 'number': return (v|0) === v ? general_fmt_int(v, opts) : general_fmt_num(v, opts); + } + throw new Error("unsupported value in General format: " + v); +} +SSF._general = general_fmt; +function fix_hijri(date, o) { return 0; } +function parse_date_code(v,opts,b2) { + if(v > 2958465 || v < 0) return null; + var date = (v|0), time = Math.floor(86400 * (v - date)), dow=0; + var dout=[]; + var out={D:date, T:time, u:86400*(v-date)-time,y:0,m:0,d:0,H:0,M:0,S:0,q:0}; + if(Math.abs(out.u) < 1e-6) out.u = 0; + fixopts(opts != null ? opts : (opts=[])); + if(opts.date1904) date += 1462; + if(out.u > 0.999) { + out.u = 0; + if(++time == 86400) { time = 0; ++date; } + } + if(date === 60) {dout = b2 ? [1317,10,29] : [1900,2,29]; dow=3;} + else if(date === 0) {dout = b2 ? [1317,8,29] : [1900,1,0]; dow=6;} + else { + if(date > 60) --date; + /* 1 = Jan 1 1900 */ + var d = new Date(1900,0,1); + d.setDate(d.getDate() + date - 1); + dout = [d.getFullYear(), d.getMonth()+1,d.getDate()]; + dow = d.getDay(); + if(date < 60) dow = (dow + 6) % 7; + if(b2) dow = fix_hijri(d, dout); + } + out.y = dout[0]; out.m = dout[1]; out.d = dout[2]; + out.S = time % 60; time = Math.floor(time / 60); + out.M = time % 60; time = Math.floor(time / 60); + out.H = time; + out.q = dow; + return out; +} +SSF.parse_date_code = parse_date_code; +/*jshint -W086 */ +function write_date(type, fmt, val, ss0) { + var o="", ss=0, tt=0, y = val.y, out, outl = 0; + switch(type) { + case 98: /* 'b' buddhist year */ + y = val.y + 543; + /* falls through */ + case 121: /* 'y' year */ + switch(fmt.length) { + case 1: case 2: out = y % 100; outl = 2; break; + default: out = y % 10000; outl = 4; break; + } break; + case 109: /* 'm' month */ + switch(fmt.length) { + case 1: case 2: out = val.m; outl = fmt.length; break; + case 3: return months[val.m-1][1]; + case 5: return months[val.m-1][0]; + default: return months[val.m-1][2]; + } break; + case 100: /* 'd' day */ + switch(fmt.length) { + case 1: case 2: out = val.d; outl = fmt.length; break; + case 3: return days[val.q][0]; + default: return days[val.q][1]; + } break; + case 104: /* 'h' 12-hour */ + switch(fmt.length) { + case 1: case 2: out = 1+(val.H+11)%12; outl = fmt.length; break; + default: throw 'bad hour format: ' + fmt; + } break; + case 72: /* 'H' 24-hour */ + switch(fmt.length) { + case 1: case 2: out = val.H; outl = fmt.length; break; + default: throw 'bad hour format: ' + fmt; + } break; + case 77: /* 'M' minutes */ + switch(fmt.length) { + case 1: case 2: out = val.M; outl = fmt.length; break; + default: throw 'bad minute format: ' + fmt; + } break; + case 115: /* 's' seconds */ + if(val.u === 0) switch(fmt) { + case 's': case 'ss': return pad0(val.S, fmt.length); + case '.0': case '.00': case '.000': + } + switch(fmt) { + case 's': case 'ss': case '.0': case '.00': case '.000': + if(ss0 >= 2) tt = ss0 === 3 ? 1000 : 100; + else tt = ss0 === 1 ? 10 : 1; + ss = Math.round((tt)*(val.S + val.u)); + if(ss >= 60*tt) ss = 0; + if(fmt === 's') return ss === 0 ? "0" : ""+ss/tt; + o = pad0(ss,2 + ss0); + if(fmt === 'ss') return o.substr(0,2); + return "." + o.substr(2,fmt.length-1); + default: throw 'bad second format: ' + fmt; + } + case 90: /* 'Z' absolute time */ + switch(fmt) { + case '[h]': case '[hh]': out = val.D*24+val.H; break; + case '[m]': case '[mm]': out = (val.D*24+val.H)*60+val.M; break; + case '[s]': case '[ss]': out = ((val.D*24+val.H)*60+val.M)*60+Math.round(val.S+val.u); break; + default: throw 'bad abstime format: ' + fmt; + } outl = fmt.length === 3 ? 1 : 2; break; + case 101: /* 'e' era */ + out = y; outl = 1; + } + if(outl > 0) return pad0(out, outl); else return ""; +} +/*jshint +W086 */ +function commaify(s) { + if(s.length <= 3) return s; + var j = (s.length % 3), o = s.substr(0,j); + for(; j!=s.length; j+=3) o+=(o.length > 0 ? "," : "") + s.substr(j,3); + return o; +} +var write_num = (function make_write_num(){ +var pct1 = /%/g; +function write_num_pct(type, fmt, val){ + var sfmt = fmt.replace(pct1,""), mul = fmt.length - sfmt.length; + return write_num(type, sfmt, val * Math.pow(10,2*mul)) + fill("%",mul); +} +function write_num_cm(type, fmt, val){ + var idx = fmt.length - 1; + while(fmt.charCodeAt(idx-1) === 44) --idx; + return write_num(type, fmt.substr(0,idx), val / Math.pow(10,3*(fmt.length-idx))); +} +function write_num_exp(fmt, val){ + var o; + var idx = fmt.indexOf("E") - fmt.indexOf(".") - 1; + if(fmt.match(/^#+0.0E\+0$/)) { + var period = fmt.indexOf("."); if(period === -1) period=fmt.indexOf('E'); + var ee = Math.floor(Math.log(Math.abs(val))*Math.LOG10E)%period; + if(ee < 0) ee += period; + o = (val/Math.pow(10,ee)).toPrecision(idx+1+(period+ee)%period); + if(o.indexOf("e") === -1) { + var fakee = Math.floor(Math.log(Math.abs(val))*Math.LOG10E); + if(o.indexOf(".") === -1) o = o[0] + "." + o.substr(1) + "E+" + (fakee - o.length+ee); + else o += "E+" + (fakee - ee); + while(o.substr(0,2) === "0.") { + o = o[0] + o.substr(2,period) + "." + o.substr(2+period); + o = o.replace(/^0+([1-9])/,"$1").replace(/^0+\./,"0."); + } + o = o.replace(/\+-/,"-"); + } + o = o.replace(/^([+-]?)(\d*)\.(\d*)[Ee]/,function($$,$1,$2,$3) { return $1 + $2 + $3.substr(0,(period+ee)%period) + "." + $3.substr(ee) + "E"; }); + } else o = val.toExponential(idx); + if(fmt.match(/E\+00$/) && o.match(/e[+-]\d$/)) o = o.substr(0,o.length-1) + "0" + o[o.length-1]; + if(fmt.match(/E\-/) && o.match(/e\+/)) o = o.replace(/e\+/,"e"); + return o.replace("e","E"); +} +var frac1 = /# (\?+)( ?)\/( ?)(\d+)/; +function write_num_f1(r, aval, sign) { + var den = parseInt(r[4]), rr = Math.round(aval * den), base = Math.floor(rr/den); + var myn = (rr - base*den), myd = den; + return sign + (base === 0 ? "" : ""+base) + " " + (myn === 0 ? fill(" ", r[1].length + 1 + r[4].length) : pad_(myn,r[1].length) + r[2] + "/" + r[3] + pad0(myd,r[4].length)); +} +function write_num_f2(r, aval, sign) { + return sign + (aval === 0 ? "" : ""+aval) + fill(" ", r[1].length + 2 + r[4].length); +} +var dec1 = /^#*0*\.(0+)/; +var closeparen = /\).*[0#]/; +var phone = /\(###\) ###\\?-####/; +function hashq(str) { + var o = "", cc; + for(var i = 0; i != str.length; ++i) switch((cc=str.charCodeAt(i))) { + case 35: break; + case 63: o+= " "; break; + case 48: o+= "0"; break; + default: o+= String.fromCharCode(cc); + } + return o; +} +function rnd(val, d) { var dd = Math.pow(10,d); return ""+(Math.round(val * dd)/dd); } +function dec(val, d) { return Math.round((val-Math.floor(val))*Math.pow(10,d)); } +function flr(val) { if(val < 2147483647 && val > -2147483648) return ""+(val >= 0 ? (val|0) : (val-1|0)); return ""+Math.floor(val); } +function write_num_flt(type, fmt, val) { + if(type.charCodeAt(0) === 40 && !fmt.match(closeparen)) { + var ffmt = fmt.replace(/\( */,"").replace(/ \)/,"").replace(/\)/,""); + if(val >= 0) return write_num_flt('n', ffmt, val); + return '(' + write_num_flt('n', ffmt, -val) + ')'; + } + if(fmt.charCodeAt(fmt.length - 1) === 44) return write_num_cm(type, fmt, val); + if(fmt.indexOf('%') !== -1) return write_num_pct(type, fmt, val); + if(fmt.indexOf('E') !== -1) return write_num_exp(fmt, val); + if(fmt.charCodeAt(0) === 36) return "$"+write_num_flt(type,fmt.substr(fmt[1]==' '?2:1),val); + var o, oo; + var r, ri, ff, aval = Math.abs(val), sign = val < 0 ? "-" : ""; + if(fmt.match(/^00+$/)) return sign + pad0r(aval,fmt.length); + if(fmt.match(/^[#?]+$/)) { + o = pad0r(val,0); if(o === "0") o = ""; + return o.length > fmt.length ? o : hashq(fmt.substr(0,fmt.length-o.length)) + o; + } + if((r = fmt.match(frac1)) !== null) return write_num_f1(r, aval, sign); + if(fmt.match(/^#+0+$/) !== null) return sign + pad0r(aval,fmt.length - fmt.indexOf("0")); + if((r = fmt.match(dec1)) !== null) { + o = rnd(val, r[1].length).replace(/^([^\.]+)$/,"$1."+r[1]).replace(/\.$/,"."+r[1]).replace(/\.(\d*)$/,function($$, $1) { return "." + $1 + fill("0", r[1].length-$1.length); }); + return fmt.indexOf("0.") !== -1 ? o : o.replace(/^0\./,"."); + } + fmt = fmt.replace(/^#+([0.])/, "$1"); + if((r = fmt.match(/^(0*)\.(#*)$/)) !== null) { + return sign + rnd(aval, r[2].length).replace(/\.(\d*[1-9])0*$/,".$1").replace(/^(-?\d*)$/,"$1.").replace(/^0\./,r[1].length?"0.":"."); + } + if((r = fmt.match(/^#,##0(\.?)$/)) !== null) return sign + commaify(pad0r(aval,0)); + if((r = fmt.match(/^#,##0\.([#0]*0)$/)) !== null) { + return val < 0 ? "-" + write_num_flt(type, fmt, -val) : commaify(""+(Math.floor(val))) + "." + pad0(dec(val, r[1].length),r[1].length); + } + if((r = fmt.match(/^#,#*,#0/)) !== null) return write_num_flt(type,fmt.replace(/^#,#*,/,""),val); + if((r = fmt.match(/^([0#]+)(\\?-([0#]+))+$/)) !== null) { + o = _strrev(write_num_flt(type, fmt.replace(/[\\-]/g,""), val)); + ri = 0; + return _strrev(_strrev(fmt.replace(/\\/g,"")).replace(/[0#]/g,function(x){return ri= 0) return write_num_int('n', ffmt, val); + return '(' + write_num_int('n', ffmt, -val) + ')'; + } + if(fmt.charCodeAt(fmt.length - 1) === 44) return write_num_cm2(type, fmt, val); + if(fmt.indexOf('%') !== -1) return write_num_pct2(type, fmt, val); + if(fmt.indexOf('E') !== -1) return write_num_exp2(fmt, val); + if(fmt.charCodeAt(0) === 36) return "$"+write_num_int(type,fmt.substr(fmt[1]==' '?2:1),val); + var o; + var r, ri, ff, aval = Math.abs(val), sign = val < 0 ? "-" : ""; + if(fmt.match(/^00+$/)) return sign + pad0(aval,fmt.length); + if(fmt.match(/^[#?]+$/)) { + o = (""+val); if(val === 0) o = ""; + return o.length > fmt.length ? o : hashq(fmt.substr(0,fmt.length-o.length)) + o; + } + if((r = fmt.match(frac1)) !== null) return write_num_f2(r, aval, sign); + if(fmt.match(/^#+0+$/) !== null) return sign + pad0(aval,fmt.length - fmt.indexOf("0")); + if((r = fmt.match(dec1)) !== null) { + o = (""+val).replace(/^([^\.]+)$/,"$1."+r[1]).replace(/\.$/,"."+r[1]).replace(/\.(\d*)$/,function($$, $1) { return "." + $1 + fill("0", r[1].length-$1.length); }); + return fmt.indexOf("0.") !== -1 ? o : o.replace(/^0\./,"."); + } + fmt = fmt.replace(/^#+([0.])/, "$1"); + if((r = fmt.match(/^(0*)\.(#*)$/)) !== null) { + return sign + (""+aval).replace(/\.(\d*[1-9])0*$/,".$1").replace(/^(-?\d*)$/,"$1.").replace(/^0\./,r[1].length?"0.":"."); + } + if((r = fmt.match(/^#,##0(\.?)$/)) !== null) return sign + commaify((""+aval)); + if((r = fmt.match(/^#,##0\.([#0]*0)$/)) !== null) { + return val < 0 ? "-" + write_num_int(type, fmt, -val) : commaify((""+val)) + "." + fill('0',r[1].length); + } + if((r = fmt.match(/^#,#*,#0/)) !== null) return write_num_int(type,fmt.replace(/^#,#*,/,""),val); + if((r = fmt.match(/^([0#]+)(\\?-([0#]+))+$/)) !== null) { + o = _strrev(write_num_int(type, fmt.replace(/[\\-]/g,""), val)); + ri = 0; + return _strrev(_strrev(fmt.replace(/\\/g,"")).replace(/[0#]/g,function(x){return ri= 12 ? "P" : "A"; q.t = 'T'; hr='h';i+=3;} + else if(fmt.substr(i,5) === "AM/PM") { if(dt!=null) q.v = dt.H >= 12 ? "PM" : "AM"; q.t = 'T'; i+=5; hr='h'; } + else { q.t = "t"; ++i; } + if(dt==null && q.t === 'T') return ""; + out[out.length] = q; lst = c; break; + case '[': + o = c; + while(fmt[i++] !== ']' && i < fmt.length) o += fmt[i]; + if(o.substr(-1) !== ']') throw 'unterminated "[" block: |' + o + '|'; + if(o.match(abstime)) { + if(dt==null) { dt=parse_date_code(v, opts); if(dt==null) return ""; } + out[out.length] = {t:'Z', v:o.toLowerCase()}; + } else { o=""; } + break; + /* Numbers */ + case '.': + if(dt != null) { + o = c; while((c=fmt[++i]) === "0") o += c; + out[out.length] = {t:'s', v:o}; break; + } + /* falls through */ + case '0': case '#': + o = c; while("0#?.,E+-%".indexOf(c=fmt[++i]) > -1 || c=='\\' && fmt[i+1] == "-" && "0#".indexOf(fmt[i+2])>-1) o += c; + out[out.length] = {t:'n', v:o}; break; + case '?': + o = c; while(fmt[++i] === c) o+=c; + q={t:c, v:o}; out[out.length] = q; lst = c; break; + case '*': ++i; if(fmt[i] == ' ' || fmt[i] == '*') ++i; break; // ** + case '(': case ')': out[out.length] = {t:(flen===1?'t':c), v:c}; ++i; break; + case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': + o = c; while("0123456789".indexOf(fmt[++i]) > -1) o+=fmt[i]; + out[out.length] = {t:'D', v:o}; break; + case ' ': out[out.length] = {t:c, v:c}; ++i; break; + default: + if(",$-+/():!^&'~{}<>=€acfijklopqrtuvwxz".indexOf(c) === -1) throw new Error('unrecognized character ' + c + ' in ' + fmt); + out[out.length] = {t:'t', v:c}; ++i; break; + } + } + var bt = 0, ss0 = 0, ssm; + for(i=out.length-1, lst='t'; i >= 0; --i) { + switch(out[i].t) { + case 'h': case 'H': out[i].t = hr; lst='h'; if(bt < 1) bt = 1; break; + case 's': + if((ssm=out[i].v.match(/\.0+$/))) ss0=Math.max(ss0,ssm[0].length-1); + if(bt < 3) bt = 3; + /* falls through */ + case 'd': case 'y': case 'M': case 'e': lst=out[i].t; break; + case 'm': if(lst === 's') { out[i].t = 'M'; if(bt < 2) bt = 2; } break; + case 'X': if(out[i].v === "B2"); + break; + case 'Z': + if(bt < 1 && out[i].v.match(/[Hh]/)) bt = 1; + if(bt < 2 && out[i].v.match(/[Mm]/)) bt = 2; + if(bt < 3 && out[i].v.match(/[Ss]/)) bt = 3; + } + } + switch(bt) { + case 0: break; + case 1: + if(dt.u >= 0.5) { dt.u = 0; ++dt.S; } + if(dt.S >= 60) { dt.S = 0; ++dt.M; } + if(dt.M >= 60) { dt.M = 0; ++dt.H; } + break; + case 2: + if(dt.u >= 0.5) { dt.u = 0; ++dt.S; } + if(dt.S >= 60) { dt.S = 0; ++dt.M; } + break; + } + /* replace fields */ + var nstr = "", jj; + for(i=0; i < out.length; ++i) { + switch(out[i].t) { + case 't': case 'T': case ' ': case 'D': break; + case 'X': out[i] = undefined; break; + case 'd': case 'm': case 'y': case 'h': case 'H': case 'M': case 's': case 'e': case 'b': case 'Z': + out[i].v = write_date(out[i].t.charCodeAt(0), out[i].v, dt, ss0); + out[i].t = 't'; break; + case 'n': case '(': case '?': + jj = i+1; + while(out[jj] != null && ( + (c=out[jj].t) === "?" || c === "D" || + (c === " " || c === "t") && out[jj+1] != null && (out[jj+1].t === '?' || out[jj+1].t === "t" && out[jj+1].v === '/') || + out[i].t === '(' && (c === ' ' || c === 'n' || c === ')') || + c === 't' && (out[jj].v === '/' || '$€'.indexOf(out[jj].v) > -1 || out[jj].v === ' ' && out[jj+1] != null && out[jj+1].t == '?') + )) { + out[i].v += out[jj].v; + out[jj] = undefined; ++jj; + } + nstr += out[i].v; + i = jj-1; break; + case 'G': out[i].t = 't'; out[i].v = general_fmt(v,opts); break; + } + } + var vv = "", myv, ostr; + if(nstr.length > 0) { + myv = (v<0&&nstr.charCodeAt(0) === 45 ? -v : v); /* '-' */ + ostr = write_num(nstr.charCodeAt(0) === 40 ? '(' : 'n', nstr, myv); /* '(' */ + jj=ostr.length-1; + var decpt = out.length; + for(i=0; i < out.length; ++i) if(out[i] != null && out[i].v.indexOf(".") > -1) { decpt = i; break; } + var lasti=out.length; + if(decpt === out.length && ostr.indexOf("E") === -1) { + for(i=out.length-1; i>= 0;--i) { + if(out[i] == null || 'n?('.indexOf(out[i].t) === -1) continue; + if(jj>=out[i].v.length-1) { jj -= out[i].v.length; out[i].v = ostr.substr(jj+1, out[i].v.length); } + else if(jj < 0) out[i].v = ""; + else { out[i].v = ostr.substr(0, jj+1); jj = -1; } + out[i].t = 't'; + lasti = i; + } + if(jj>=0 && lasti= 0; --i) { + if(out[i] == null || 'n?('.indexOf(out[i].t) === -1) continue; + j=out[i].v.indexOf(".")>-1&&i===decpt?out[i].v.indexOf(".")-1:out[i].v.length-1; + vv = out[i].v.substr(j+1); + for(; j>=0; --j) { + if(jj>=0 && (out[i].v[j] === "0" || out[i].v[j] === "#")) vv = ostr[jj--] + vv; + } + out[i].v = vv; + out[i].t = 't'; + lasti = i; + } + if(jj>=0 && lasti-1&&i===decpt?out[i].v.indexOf(".")+1:0; + vv = out[i].v.substr(0,j); + for(; j-1) { + myv = (flen >1 && v < 0 && i>0 && out[i-1].v === "-" ? -v:v); + out[i].v = write_num(out[i].t, out[i].v, myv); + out[i].t = 't'; + } + var retval = ""; + for(i=0; i !== out.length; ++i) if(out[i] != null) retval += out[i].v; + return retval; +} +SSF._eval = eval_fmt; +var cfregex = /\[[=<>]/; +var cfregex2 = /\[([=<>]*)(-?\d+\.?\d*)\]/; +function chkcond(v, rr) { + if(rr == null) return false; + var thresh = parseFloat(rr[2]); + switch(rr[1]) { + case "=": if(v == thresh) return true; break; + case ">": if(v > thresh) return true; break; + case "<": if(v < thresh) return true; break; + case "<>": if(v != thresh) return true; break; + case ">=": if(v >= thresh) return true; break; + case "<=": if(v <= thresh) return true; break; + } + return false; +} +function choose_fmt(f, v) { + var fmt = split_fmt(f); + var l = fmt.length, lat = fmt[l-1].indexOf("@"); + if(l<4 && lat>-1) --l; + if(fmt.length > 4) throw "cannot find right format for |" + fmt + "|"; + if(typeof v !== "number") return [4, fmt.length === 4 || lat>-1?fmt[fmt.length-1]:"@"]; + switch(fmt.length) { + case 1: fmt = lat>-1 ? ["General", "General", "General", fmt[0]] : [fmt[0], fmt[0], fmt[0], "@"]; break; + case 2: fmt = lat>-1 ? [fmt[0], fmt[0], fmt[0], fmt[1]] : [fmt[0], fmt[1], fmt[0], "@"]; break; + case 3: fmt = lat>-1 ? [fmt[0], fmt[1], fmt[0], fmt[2]] : [fmt[0], fmt[1], fmt[2], "@"]; break; + case 4: break; + } + var ff = v > 0 ? fmt[0] : v < 0 ? fmt[1] : fmt[2]; + if(fmt[0].indexOf("[") === -1 && fmt[1].indexOf("[") === -1) return [l, ff]; + if(fmt[0].match(cfregex) != null || fmt[1].match(cfregex) != null) { + var m1 = fmt[0].match(cfregex2); + var m2 = fmt[1].match(cfregex2); + return chkcond(v, m1) ? [l, fmt[0]] : chkcond(v, m2) ? [l, fmt[1]] : [l, fmt[m1 != null && m2 != null ? 2 : 1]]; + } + return [l, ff]; +} +function format(fmt,v,o) { + fixopts(o != null ? o : (o=[])); + var sfmt = ""; + switch(typeof fmt) { + case "string": sfmt = fmt; break; + case "number": sfmt = (o.table != null ? o.table : table_fmt)[fmt]; break; + } + if(isgeneral(sfmt,0)) return general_fmt(v, o); + var f = choose_fmt(sfmt, v); + if(isgeneral(f[1])) return general_fmt(v, o); + if(v === true) v = "TRUE"; else if(v === false) v = "FALSE"; + else if(v === "" || v == null) return ""; + return eval_fmt(f[1], v, o, f[0]); +} +SSF._table = table_fmt; +SSF.load = function load_entry(fmt, idx) { table_fmt[idx] = fmt; }; +SSF.format = format; +SSF.get_table = function get_table() { return table_fmt; }; +SSF.load_table = function load_table(tbl) { for(var i=0; i!=0x0188; ++i) if(tbl[i] !== undefined) SSF.load(tbl[i], i); }; +}; +make_ssf(SSF); +/* map from xlml named formats to SSF TODO: localize */ +var XLMLFormatMap = { + "General Number": "General", + "General Date": SSF._table[22], + "Long Date": "dddd, mmmm dd, yyyy", + "Medium Date": SSF._table[15], + "Short Date": SSF._table[14], + "Long Time": SSF._table[19], + "Medium Time": SSF._table[18], + "Short Time": SSF._table[20], + "Currency": '"$"#,##0.00_);[Red]\\("$"#,##0.00\\)', + "Fixed": SSF._table[2], + "Standard": SSF._table[4], + "Percent": SSF._table[10], + "Scientific": SSF._table[11], + "Yes/No": '"Yes";"Yes";"No";@', + "True/False": '"True";"True";"False";@', + "On/Off": '"Yes";"Yes";"No";@' +}; + +var DO_NOT_EXPORT_CFB = true; +/* cfb.js (C) 2013-2014 SheetJS -- http://sheetjs.com */ +/* vim: set ts=2: */ +/*jshint eqnull:true */ + +/* [MS-CFB] v20130118 */ +var CFB = (function _CFB(){ +var exports = {}; +exports.version = '0.10.2'; +function parse(file) { +var mver = 3; // major version +var ssz = 512; // sector size +var nmfs = 0; // number of mini FAT sectors +var ndfs = 0; // number of DIFAT sectors +var dir_start = 0; // first directory sector location +var minifat_start = 0; // first mini FAT sector location +var difat_start = 0; // first mini FAT sector location + +var fat_addrs = []; // locations of FAT sectors + +/* [MS-CFB] 2.2 Compound File Header */ +var blob = file.slice(0,512); +prep_blob(blob, 0); + +/* major version */ +var mv = check_get_mver(blob); +mver = mv[0]; +switch(mver) { + case 3: ssz = 512; break; case 4: ssz = 4096; break; + default: throw "Major Version: Expected 3 or 4 saw " + mver; +} + +/* reprocess header */ +if(ssz !== 512) { blob = file.slice(0,ssz); prep_blob(blob, 28 /* blob.l */); } +/* Save header for final object */ +var header = file.slice(0,ssz); + +check_shifts(blob, mver); + +// Number of Directory Sectors +var nds = blob.read_shift(4, 'i'); +if(mver === 3 && nds !== 0) throw '# Directory Sectors: Expected 0 saw ' + nds; + +// Number of FAT Sectors +//var nfs = blob.read_shift(4, 'i'); +blob.l += 4; + +// First Directory Sector Location +dir_start = blob.read_shift(4, 'i'); + +// Transaction Signature +blob.l += 4; + +// Mini Stream Cutoff Size +blob.chk('00100000', 'Mini Stream Cutoff Size: '); + +// First Mini FAT Sector Location +minifat_start = blob.read_shift(4, 'i'); + +// Number of Mini FAT Sectors +nmfs = blob.read_shift(4, 'i'); + +// First DIFAT sector location +difat_start = blob.read_shift(4, 'i'); + +// Number of DIFAT Sectors +ndfs = blob.read_shift(4, 'i'); + +// Grab FAT Sector Locations +for(var q, j = 0; j < 109; ++j) { /* 109 = (512 - blob.l)>>>2; */ + q = blob.read_shift(4, 'i'); + if(q<0) break; + fat_addrs[j] = q; +} + +/** Break the file up into sectors */ +var sectors = sectorify(file, ssz); + +sleuth_fat(difat_start, ndfs, sectors, ssz, fat_addrs); + +/** Chains */ +var sector_list = make_sector_list(sectors, dir_start, fat_addrs, ssz); + +sector_list[dir_start].name = "!Directory"; +if(nmfs > 0 && minifat_start !== ENDOFCHAIN) sector_list[minifat_start].name = "!MiniFAT"; +sector_list[fat_addrs[0]].name = "!FAT"; +sector_list.fat_addrs = fat_addrs; +sector_list.ssz = ssz; + +/* [MS-CFB] 2.6.1 Compound File Directory Entry */ +var files = {}, Paths = [], FileIndex = [], FullPaths = [], FullPathDir = {}; +read_directory(dir_start, sector_list, sectors, Paths, nmfs, files, FileIndex); + +build_full_paths(FileIndex, FullPathDir, FullPaths, Paths); + +var root_name = Paths.shift(); +Paths.root = root_name; + +/* [MS-CFB] 2.6.4 (Unicode 3.0.1 case conversion) */ +var find_path = make_find_path(FullPaths, Paths, FileIndex, files, root_name); + +return { + raw: {header: header, sectors: sectors}, + FileIndex: FileIndex, + FullPaths: FullPaths, + FullPathDir: FullPathDir, + find: find_path +}; +} // parse + +/* [MS-CFB] 2.2 Compound File Header -- read up to major version */ +function check_get_mver(blob) { + // header signature 8 + blob.chk(HEADER_SIGNATURE, 'Header Signature: '); + + // clsid 16 + blob.chk(HEADER_CLSID, 'CLSID: '); + + // minor version 2 + var mver = blob.read_shift(2, 'u'); + + return [blob.read_shift(2,'u'), mver]; +} +function check_shifts(blob, mver) { + var shift = 0x09; + + // Byte Order + blob.chk('feff', 'Byte Order: '); + + // Sector Shift + switch((shift = blob.read_shift(2))) { + case 0x09: if(mver !== 3) throw 'MajorVersion/SectorShift Mismatch'; break; + case 0x0c: if(mver !== 4) throw 'MajorVersion/SectorShift Mismatch'; break; + default: throw 'Sector Shift: Expected 9 or 12 saw ' + shift; + } + + // Mini Sector Shift + blob.chk('0600', 'Mini Sector Shift: '); + + // Reserved + blob.chk('000000000000', 'Reserved: '); +} + +/** Break the file up into sectors */ +function sectorify(file, ssz) { + var nsectors = Math.ceil(file.length/ssz)-1; + var sectors = new Array(nsectors); + for(var i=1; i < nsectors; ++i) sectors[i-1] = file.slice(i*ssz,(i+1)*ssz); + sectors[nsectors-1] = file.slice(nsectors*ssz); + return sectors; +} + +/* [MS-CFB] 2.6.4 Red-Black Tree */ +function build_full_paths(FI, FPD, FP, Paths) { + var i = 0, L = 0, R = 0, C = 0, j = 0, pl = Paths.length; + var dad = new Array(pl), q = new Array(pl); + + for(; i < pl; ++i) { dad[i]=q[i]=i; FP[i]=Paths[i]; } + + for(; j < q.length; ++j) { + i = q[j]; + L = FI[i].L; R = FI[i].R; C = FI[i].C; + if(dad[i] === i) { + if(L !== -1 /*NOSTREAM*/ && dad[L] !== L) dad[i] = dad[L]; + if(R !== -1 && dad[R] !== R) dad[i] = dad[R]; + } + if(C !== -1 /*NOSTREAM*/) dad[C] = i; + if(L !== -1) { dad[L] = dad[i]; q.push(L); } + if(R !== -1) { dad[R] = dad[i]; q.push(R); } + } + for(i=1; i !== pl; ++i) if(dad[i] === i) { + if(R !== -1 /*NOSTREAM*/ && dad[R] !== R) dad[i] = dad[R]; + else if(L !== -1 && dad[L] !== L) dad[i] = dad[L]; + } + + for(i=1; i < pl; ++i) { + if(FI[i].type === 0 /* unknown */) continue; + j = dad[i]; + if(j === 0) FP[i] = FP[0] + "/" + FP[i]; + else while(j !== 0) { + FP[i] = FP[j] + "/" + FP[i]; + j = dad[j]; + } + dad[i] = 0; + } + + FP[0] += "/"; + for(i=1; i < pl; ++i) { + if(FI[i].type !== 2 /* stream */) FP[i] += "/"; + FPD[FP[i]] = FI[i]; + } +} + +/* [MS-CFB] 2.6.4 */ +function make_find_path(FullPaths, Paths, FileIndex, files, root_name) { + var UCFullPaths = new Array(FullPaths.length); + var UCPaths = new Array(Paths.length), i; + for(i = 0; i < FullPaths.length; ++i) UCFullPaths[i] = FullPaths[i].toUpperCase().replace(chr0,'').replace(chr1,'!'); + for(i = 0; i < Paths.length; ++i) UCPaths[i] = Paths[i].toUpperCase().replace(chr0,'').replace(chr1,'!'); + return function find_path(path) { + var k; + if(path.charCodeAt(0) === 47 /* "/" */) { k=true; path = root_name + path; } + else k = path.indexOf("/") !== -1; + var UCPath = path.toUpperCase().replace(chr0,'').replace(chr1,'!'); + var w = k === true ? UCFullPaths.indexOf(UCPath) : UCPaths.indexOf(UCPath); + if(w === -1) return null; + return k === true ? FileIndex[w] : files[Paths[w]]; + }; +} + +/** Chase down the rest of the DIFAT chain to build a comprehensive list + DIFAT chains by storing the next sector number as the last 32 bytes */ +function sleuth_fat(idx, cnt, sectors, ssz, fat_addrs) { + var q; + if(idx === ENDOFCHAIN) { + if(cnt !== 0) throw "DIFAT chain shorter than expected"; + } else if(idx !== -1 /*FREESECT*/) { + var sector = sectors[idx], m = (ssz>>>2)-1; + for(var i = 0; i < m; ++i) { + if((q = __readInt32LE(sector,i*4)) === ENDOFCHAIN) break; + fat_addrs.push(q); + } + sleuth_fat(__readInt32LE(sector,ssz-4),cnt - 1, sectors, ssz, fat_addrs); + } +} + +/** Follow the linked list of sectors for a given starting point */ +function get_sector_list(sectors, start, fat_addrs, ssz, chkd) { + var sl = sectors.length; + var buf, buf_chain; + if(!chkd) chkd = new Array(sl); + var modulus = ssz - 1, j, jj; + buf = []; + buf_chain = []; + for(j=start; j>=0;) { + chkd[j] = true; + buf[buf.length] = j; + buf_chain.push(sectors[j]); + var addr = fat_addrs[Math.floor(j*4/ssz)]; + jj = ((j*4) & modulus); + if(ssz < 4 + jj) throw "FAT boundary crossed: " + j + " 4 "+ssz; + j = __readInt32LE(sectors[addr], jj); + } + return {nodes: buf, data:__toBuffer([buf_chain])}; +} + +/** Chase down the sector linked lists */ +function make_sector_list(sectors, dir_start, fat_addrs, ssz) { + var sl = sectors.length, sector_list = new Array(sl); + var chkd = new Array(sl), buf, buf_chain; + var modulus = ssz - 1, i, j, k, jj; + for(i=0; i < sl; ++i) { + buf = []; + k = (i + dir_start); if(k >= sl) k-=sl; + if(chkd[k] === true) continue; + buf_chain = []; + for(j=k; j>=0;) { + chkd[j] = true; + buf[buf.length] = j; + buf_chain.push(sectors[j]); + var addr = fat_addrs[Math.floor(j*4/ssz)]; + jj = ((j*4) & modulus); + if(ssz < 4 + jj) throw "FAT boundary crossed: " + j + " 4 "+ssz; + j = __readInt32LE(sectors[addr], jj); + } + sector_list[k] = {nodes: buf, data:__toBuffer([buf_chain])}; + } + return sector_list; +} + +/* [MS-CFB] 2.6.1 Compound File Directory Entry */ +function read_directory(dir_start, sector_list, sectors, Paths, nmfs, files, FileIndex) { + var blob; + var minifat_store = 0, pl = (Paths.length?2:0); + var sector = sector_list[dir_start].data; + var i = 0, namelen = 0, name, o, ctime, mtime; + for(; i < sector.length; i+= 128) { + blob = sector.slice(i, i+128); + prep_blob(blob, 64); + namelen = blob.read_shift(2); + if(namelen === 0) continue; + name = __utf16le(blob,0,namelen-pl); + Paths.push(name); + o = { + name: name, + type: blob.read_shift(1), + color: blob.read_shift(1), + L: blob.read_shift(4, 'i'), + R: blob.read_shift(4, 'i'), + C: blob.read_shift(4, 'i'), + clsid: blob.read_shift(16), + state: blob.read_shift(4, 'i') + }; + ctime = blob.read_shift(2) + blob.read_shift(2) + blob.read_shift(2) + blob.read_shift(2); + if(ctime !== 0) { + o.ctime = ctime; o.ct = read_date(blob, blob.l-8); + } + mtime = blob.read_shift(2) + blob.read_shift(2) + blob.read_shift(2) + blob.read_shift(2); + if(mtime !== 0) { + o.mtime = mtime; o.mt = read_date(blob, blob.l-8); + } + o.start = blob.read_shift(4, 'i'); + o.size = blob.read_shift(4, 'i'); + if(o.type === 5) { /* root */ + minifat_store = o.start; + if(nmfs > 0 && minifat_store !== ENDOFCHAIN) sector_list[minifat_store].name = "!StreamData"; + /*minifat_size = o.size;*/ + } else if(o.size >= 4096 /* MSCSZ */) { + o.storage = 'fat'; + if(sector_list[o.start] === undefined) sector_list[o.start] = get_sector_list(sectors, o.start, sector_list.fat_addrs, sector_list.ssz); + sector_list[o.start].name = o.name; + o.content = sector_list[o.start].data.slice(0,o.size); + prep_blob(o.content, 0); + } else { + o.storage = 'minifat'; + if(minifat_store !== ENDOFCHAIN && o.start !== ENDOFCHAIN) { + o.content = sector_list[minifat_store].data.slice(o.start*MSSZ,o.start*MSSZ+o.size); + prep_blob(o.content, 0); + } + } + files[name] = o; + FileIndex.push(o); + } +} + +function read_date(blob, offset) { + return new Date(( ( (__readUInt32LE(blob,offset+4)/1e7)*Math.pow(2,32)+__readUInt32LE(blob,offset)/1e7 ) - 11644473600)*1000); +} + +var fs; +function readFileSync(filename, options) { + if(fs === undefined) fs = require('fs'); + return parse(fs.readFileSync(filename), options); +} + +function readSync(blob, options) { + switch(options !== undefined && options.type !== undefined ? options.type : "base64") { + case "file": return readFileSync(blob, options); + case "base64": return parse(s2a(Base64.decode(blob)), options); + case "binary": return parse(s2a(blob), options); + } + return parse(blob); +} + +/** CFB Constants */ +var MSSZ = 64; /* Mini Sector Size = 1<<6 */ +//var MSCSZ = 4096; /* Mini Stream Cutoff Size */ +/* 2.1 Compound File Sector Numbers and Types */ +var ENDOFCHAIN = -2; +/* 2.2 Compound File Header */ +var HEADER_SIGNATURE = 'd0cf11e0a1b11ae1'; +var HEADER_CLSID = '00000000000000000000000000000000'; +var consts = { + /* 2.1 Compund File Sector Numbers and Types */ + MAXREGSECT: -6, + DIFSECT: -4, + FATSECT: -3, + ENDOFCHAIN: ENDOFCHAIN, + FREESECT: -1, + /* 2.2 Compound File Header */ + HEADER_SIGNATURE: HEADER_SIGNATURE, + HEADER_MINOR_VERSION: '3e00', + MAXREGSID: -6, + NOSTREAM: -1, + HEADER_CLSID: HEADER_CLSID, + /* 2.6.1 Compound File Directory Entry */ + EntryTypes: ['unknown','storage','stream','lockbytes','property','root'] +}; + +exports.read = readSync; +exports.parse = parse; +exports.utils = { + ReadShift: ReadShift, + CheckField: CheckField, + prep_blob: prep_blob, + bconcat: bconcat, + consts: consts +}; + +return exports; +})(); + +if(typeof require !== 'undefined' && typeof module !== 'undefined' && typeof DO_NOT_EXPORT_CFB === 'undefined') { module.exports = CFB; } +function isval(x) { return x !== undefined && x !== null; } + +function keys(o) { return Object.keys(o); } + +function evert_key(obj, key) { + var o = [], K = keys(obj); + for(var i = 0; i !== K.length; ++i) o[obj[K[i]][key]] = K[i]; + return o; +} + +function evert(obj) { + var o = [], K = keys(obj); + for(var i = 0; i !== K.length; ++i) o[obj[K[i]]] = K[i]; + return o; +} + +function evert_num(obj) { + var o = [], K = keys(obj); + for(var i = 0; i !== K.length; ++i) o[obj[K[i]]] = parseInt(K[i],10); + return o; +} + +function evert_arr(obj) { + var o = [], K = keys(obj); + for(var i = 0; i !== K.length; ++i) { + if(o[obj[K[i]]] == null) o[obj[K[i]]] = []; + o[obj[K[i]]].push(K[i]); + } + return o; +} + +/* TODO: date1904 logic */ +function datenum(v, date1904) { + if(date1904) v+=1462; + var epoch = Date.parse(v); + return (epoch + 2209161600000) / (24 * 60 * 60 * 1000); +} + +function cc2str(arr) { + var o = ""; + for(var i = 0; i != arr.length; ++i) o += String.fromCharCode(arr[i]); + return o; +} + +function getdata(data) { + if(!data) return null; + if(data.name.substr(-4) === ".bin") { + if(data.data) return char_codes(data.data); + if(data.asNodeBuffer && has_buf) return data.asNodeBuffer(); + if(data._data && data._data.getContent) return Array.prototype.slice.call(data._data.getContent()); + } else { + if(data.data) return data.name.substr(-4) !== ".bin" ? debom_xml(data.data) : char_codes(data.data); + if(data.asNodeBuffer && has_buf) return debom_xml(data.asNodeBuffer().toString('binary')); + if(data.asBinary) return debom_xml(data.asBinary()); + if(data._data && data._data.getContent) return debom_xml(cc2str(Array.prototype.slice.call(data._data.getContent(),0))); + } + return null; +} + +function safegetzipfile(zip, file) { + var f = file; if(zip.files[f]) return zip.files[f]; + f = file.toLowerCase(); if(zip.files[f]) return zip.files[f]; + f = f.replace(/\//g,'\\'); if(zip.files[f]) return zip.files[f]; + return null; +} + +function getzipfile(zip, file) { + var o = safegetzipfile(zip, file); + if(o == null) throw new Error("Cannot find file " + file + " in zip"); + return o; +} + +function getzipdata(zip, file, safe) { + if(!safe) return getdata(getzipfile(zip, file)); + if(!file) return null; + try { return getzipdata(zip, file); } catch(e) { return null; } +} + +var _fs, jszip; +if(typeof JSZip !== 'undefined') jszip = JSZip; +if (typeof exports !== 'undefined') { + if (typeof module !== 'undefined' && module.exports) { + if(has_buf && typeof jszip === 'undefined') jszip = require('js'+'zip'); + if(typeof jszip === 'undefined') jszip = require('./js'+'zip').JSZip; + _fs = require('f'+'s'); + } +} +var attregexg=/([\w:]+)=((?:")([^"]*)(?:")|(?:')([^']*)(?:'))/g; +var tagregex=/<[^>]*>/g; +var nsregex=/<\w*:/, nsregex2 = /<(\/?)\w+:/; +function parsexmltag(tag, skip_root) { + var z = []; + var eq = 0, c = 0; + for(; eq !== tag.length; ++eq) if((c = tag.charCodeAt(eq)) === 32 || c === 10 || c === 13) break; + if(!skip_root) z[0] = tag.substr(0, eq); + if(eq === tag.length) return z; + var m = tag.match(attregexg), j=0, w="", v="", i=0, q="", cc=""; + if(m) for(i = 0; i != m.length; ++i) { + cc = m[i]; + for(c=0; c != cc.length; ++c) if(cc.charCodeAt(c) === 61) break; + q = cc.substr(0,c); v = cc.substring(c+2, cc.length-1); + for(j=0;j!=q.length;++j) if(q.charCodeAt(j) === 58) break; + if(j===q.length) z[q] = v; + else z[(j===5 && q.substr(0,5)==="xmlns"?"xmlns":"")+q.substr(j+1)] = v; + } + return z; +} +function strip_ns(x) { return x.replace(nsregex2, "<$1"); } + +var encodings = { + '"': '"', + ''': "'", + '>': '>', + '<': '<', + '&': '&' +}; +var rencoding = evert(encodings); +var rencstr = "&<>'\"".split(""); + +// TODO: CP remap (need to read file version to determine OS) +var unescapexml = (function() { + var encregex = /&[a-z]*;/g, coderegex = /_x([\da-fA-F]+)_/g; + return function unescapexml(text){ + var s = text + ''; + return s.replace(encregex, function($$) { return encodings[$$]; }).replace(coderegex,function(m,c) {return String.fromCharCode(parseInt(c,16));}); + }; +})(); + +var decregex=/[&<>'"]/g, charegex = /[\u0000-\u0008\u000b-\u001f]/g; +function escapexml(text){ + var s = text + ''; + return s.replace(decregex, function(y) { return rencoding[y]; }).replace(charegex,function(s) { return "_x" + ("000"+s.charCodeAt(0).toString(16)).substr(-4) + "_";}); +} + +/* TODO: handle codepages */ +var xlml_fixstr = (function() { + var entregex = /&#(\d+);/g; + function entrepl($$,$1) { return String.fromCharCode(parseInt($1,10)); } + return function xlml_fixstr(str) { return str.replace(entregex,entrepl); }; +})(); + +function parsexmlbool(value, tag) { + switch(value) { + case '1': case 'true': case 'TRUE': return true; + /* case '0': case 'false': case 'FALSE':*/ + default: return false; + } +} + +var utf8read = function utf8reada(orig) { + var out = "", i = 0, c = 0, d = 0, e = 0, f = 0, w = 0; + while (i < orig.length) { + c = orig.charCodeAt(i++); + if (c < 128) { out += String.fromCharCode(c); continue; } + d = orig.charCodeAt(i++); + if (c>191 && c<224) { out += String.fromCharCode(((c & 31) << 6) | (d & 63)); continue; } + e = orig.charCodeAt(i++); + if (c < 240) { out += String.fromCharCode(((c & 15) << 12) | ((d & 63) << 6) | (e & 63)); continue; } + f = orig.charCodeAt(i++); + w = (((c & 7) << 18) | ((d & 63) << 12) | ((e & 63) << 6) | (f & 63))-65536; + out += String.fromCharCode(0xD800 + ((w>>>10)&1023)); + out += String.fromCharCode(0xDC00 + (w&1023)); + } + return out; +}; + + +if(has_buf) { + var utf8readb = function utf8readb(data) { + var out = new Buffer(2*data.length), w, i, j = 1, k = 0, ww=0, c; + for(i = 0; i < data.length; i+=j) { + j = 1; + if((c=data.charCodeAt(i)) < 128) w = c; + else if(c < 224) { w = (c&31)*64+(data.charCodeAt(i+1)&63); j=2; } + else if(c < 240) { w=(c&15)*4096+(data.charCodeAt(i+1)&63)*64+(data.charCodeAt(i+2)&63); j=3; } + else { j = 4; + w = (c & 7)*262144+(data.charCodeAt(i+1)&63)*4096+(data.charCodeAt(i+2)&63)*64+(data.charCodeAt(i+3)&63); + w -= 65536; ww = 0xD800 + ((w>>>10)&1023); w = 0xDC00 + (w&1023); + } + if(ww !== 0) { out[k++] = ww&255; out[k++] = ww>>>8; ww = 0; } + out[k++] = w%256; out[k++] = w>>>8; + } + out.length = k; + return out.toString('ucs2'); + }; + var corpus = "foo bar baz\u00e2\u0098\u0083\u00f0\u009f\u008d\u00a3"; + if(utf8read(corpus) == utf8readb(corpus)) utf8read = utf8readb; + var utf8readc = function utf8readc(data) { return Buffer(data, 'binary').toString('utf8'); }; + if(utf8read(corpus) == utf8readc(corpus)) utf8read = utf8readc; +} + +// matches ... extracts content +var matchtag = (function() { + var mtcache = {}; + return function matchtag(f,g) { + var t = f+"|"+g; + if(mtcache[t] !== undefined) return mtcache[t]; + return (mtcache[t] = new RegExp('<(?:\\w+:)?'+f+'(?: xml:space="preserve")?(?:[^>]*)>([^\u2603]*)',(g||""))); + }; +})(); + +var vtregex = (function(){ var vt_cache = {}; + return function vt_regex(bt) { + if(vt_cache[bt] !== undefined) return vt_cache[bt]; + return (vt_cache[bt] = new RegExp("(.*?)", 'g') ); +};})(); +var vtvregex = /<\/?vt:variant>/g, vtmregex = /]*)>(.*)' + g + '';} + +function wxt_helper(h) { return keys(h).map(function(k) { return " " + k + '="' + h[k] + '"';}).join(""); } +function writextag(f,g,h) { return '<' + f + (isval(h) ? wxt_helper(h) : "") + (isval(g) ? (g.match(wtregex)?' xml:space="preserve"' : "") + '>' + g + '';} + +function write_w3cdtf(d, t) { try { return d.toISOString().replace(/\.\d*/,""); } catch(e) { if(t) throw e; } } + +function write_vt(s) { + switch(typeof s) { + case 'string': return writextag('vt:lpwstr', s); + case 'number': return writextag((s|0)==s?'vt:i4':'vt:r8', String(s)); + case 'boolean': return writextag('vt:bool',s?'true':'false'); + } + if(s instanceof Date) return writextag('vt:filetime', write_w3cdtf(s)); + throw new Error("Unable to serialize " + s); +} + +var XML_HEADER = '\r\n'; +var XMLNS = { + 'dc': 'http://purl.org/dc/elements/1.1/', + 'dcterms': 'http://purl.org/dc/terms/', + 'dcmitype': 'http://purl.org/dc/dcmitype/', + 'mx': 'http://schemas.microsoft.com/office/mac/excel/2008/main', + 'r': 'http://schemas.openxmlformats.org/officeDocument/2006/relationships', + 'sjs': 'http://schemas.openxmlformats.org/package/2006/sheetjs/core-properties', + 'vt': 'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes', + 'xsi': 'http://www.w3.org/2001/XMLSchema-instance', + 'xsd': 'http://www.w3.org/2001/XMLSchema' +}; + +XMLNS.main = [ + 'http://schemas.openxmlformats.org/spreadsheetml/2006/main', + 'http://purl.oclc.org/ooxml/spreadsheetml/main', + 'http://schemas.microsoft.com/office/excel/2006/main', + 'http://schemas.microsoft.com/office/excel/2006/2' +]; + +function readIEEE754(buf, idx, isLE, nl, ml) { + if(isLE === undefined) isLE = true; + if(!nl) nl = 8; + if(!ml && nl === 8) ml = 52; + var e, m, el = nl * 8 - ml - 1, eMax = (1 << el) - 1, eBias = eMax >> 1; + var bits = -7, d = isLE ? -1 : 1, i = isLE ? (nl - 1) : 0, s = buf[idx + i]; + + i += d; + e = s & ((1 << (-bits)) - 1); s >>>= (-bits); bits += el; + for (; bits > 0; e = e * 256 + buf[idx + i], i += d, bits -= 8); + m = e & ((1 << (-bits)) - 1); e >>>= (-bits); bits += ml; + for (; bits > 0; m = m * 256 + buf[idx + i], i += d, bits -= 8); + if (e === eMax) return m ? NaN : ((s ? -1 : 1) * Infinity); + else if (e === 0) e = 1 - eBias; + else { m = m + Math.pow(2, ml); e = e - eBias; } + return (s ? -1 : 1) * m * Math.pow(2, e - ml); +} + +var __toBuffer, ___toBuffer; +__toBuffer = ___toBuffer = function toBuffer_(bufs) { var x = []; for(var i = 0; i < bufs[0].length; ++i) { x.push.apply(x, bufs[0][i]); } return x; }; +var __utf16le, ___utf16le; +__utf16le = ___utf16le = function utf16le_(b,s,e) { var ss=[]; for(var i=s; i 0 ? __utf8(b, i+4,i+4+len-1) : "";}; +var __lpwstr, ___lpwstr; +__lpwstr = ___lpwstr = function lpwstr_(b,i) { var len = 2*__readUInt32LE(b,i); return len > 0 ? __utf8(b, i+4,i+4+len-1) : "";}; +var __double, ___double; +__double = ___double = function(b, idx) { return readIEEE754(b, idx);}; + +var is_buf = function is_buf_a(a) { return Array.isArray(a); }; +if(has_buf) { + __utf16le = function utf16le_b(b,s,e) { if(!Buffer.isBuffer(b)) return ___utf16le(b,s,e); return b.toString('utf16le',s,e); }; + __hexlify = function(b,s,l) { return Buffer.isBuffer(b) ? b.toString('hex',s,s+l) : ___hexlify(b,s,l); }; + __lpstr = function lpstr_b(b,i) { if(!Buffer.isBuffer(b)) return ___lpstr(b, i); var len = b.readUInt32LE(i); return len > 0 ? b.toString('utf8',i+4,i+4+len-1) : "";}; + __lpwstr = function lpwstr_b(b,i) { if(!Buffer.isBuffer(b)) return ___lpwstr(b, i); var len = 2*b.readUInt32LE(i); return b.toString('utf16le',i+4,i+4+len-1);}; + __utf8 = function utf8_b(s,e) { return this.toString('utf8',s,e); }; + __toBuffer = function(bufs) { return (bufs[0].length > 0 && Buffer.isBuffer(bufs[0][0])) ? Buffer.concat(bufs[0]) : ___toBuffer(bufs);}; + bconcat = function(bufs) { return Buffer.isBuffer(bufs[0]) ? Buffer.concat(bufs) : [].concat.apply([], bufs); }; + __double = function double_(b,i) { if(Buffer.isBuffer(b)) return b.readDoubleLE(i); return ___double(b,i); }; + is_buf = function is_buf_b(a) { return Buffer.isBuffer(a) || Array.isArray(a); }; +} + +/* from js-xls */ +if(typeof cptable !== 'undefined') { + __utf16le = function(b,s,e) { return cptable.utils.decode(1200, b.slice(s,e)); }; + __utf8 = function(b,s,e) { return cptable.utils.decode(65001, b.slice(s,e)); }; + __lpstr = function(b,i) { var len = __readUInt32LE(b,i); return len > 0 ? cptable.utils.decode(current_codepage, b.slice(i+4, i+4+len-1)) : "";}; + __lpwstr = function(b,i) { var len = 2*__readUInt32LE(b,i); return len > 0 ? cptable.utils.decode(1200, b.slice(i+4,i+4+len-1)) : "";}; +} + +var __readUInt8 = function(b, idx) { return b[idx]; }; +var __readUInt16LE = function(b, idx) { return b[idx+1]*(1<<8)+b[idx]; }; +var __readInt16LE = function(b, idx) { var u = b[idx+1]*(1<<8)+b[idx]; return (u < 0x8000) ? u : (0xffff - u + 1) * -1; }; +var __readUInt32LE = function(b, idx) { return b[idx+3]*(1<<24)+(b[idx+2]<<16)+(b[idx+1]<<8)+b[idx]; }; +var __readInt32LE = function(b, idx) { return (b[idx+3]<<24)|(b[idx+2]<<16)|(b[idx+1]<<8)|b[idx]; }; + +var ___unhexlify = function(s) { return s.match(/../g).map(function(x) { return parseInt(x,16);}); }; +var __unhexlify = typeof Buffer !== "undefined" ? function(s) { return Buffer.isBuffer(s) ? new Buffer(s, 'hex') : ___unhexlify(s); } : ___unhexlify; + +function ReadShift(size, t) { + var o="", oI, oR, oo=[], w, vv, i, loc; + switch(t) { + case 'dbcs': + loc = this.l; + if(has_buf && Buffer.isBuffer(this)) o = this.slice(this.l, this.l+2*size).toString("utf16le"); + else for(i = 0; i != size; ++i) { o+=String.fromCharCode(__readUInt16LE(this, loc)); loc+=2; } + size *= 2; + break; + + case 'utf8': o = __utf8(this, this.l, this.l + size); break; + case 'utf16le': size *= 2; o = __utf16le(this, this.l, this.l + size); break; + + /* [MS-OLEDS] 2.1.4 LengthPrefixedAnsiString */ + case 'lpstr': o = __lpstr(this, this.l); size = 5 + o.length; break; + /* [MS-OLEDS] 2.1.5 LengthPrefixedUnicodeString */ + case 'lpwstr': o = __lpwstr(this, this.l); size = 5 + o.length; if(o[o.length-1] == '\u0000') size += 2; break; + + case 'cstr': size = 0; o = ""; + while((w=__readUInt8(this, this.l + size++))!==0) oo.push(_getchar(w)); + o = oo.join(""); break; + case 'wstr': size = 0; o = ""; + while((w=__readUInt16LE(this,this.l +size))!==0){oo.push(_getchar(w));size+=2;} + size+=2; o = oo.join(""); break; + + /* sbcs and dbcs support continue records in the SST way TODO codepages */ + case 'dbcs-cont': o = ""; loc = this.l; + for(i = 0; i != size; ++i) { + if(this.lens && this.lens.indexOf(loc) !== -1) { + w = __readUInt8(this, loc); + this.l = loc + 1; + vv = ReadShift.call(this, size-i, w ? 'dbcs-cont' : 'sbcs-cont'); + return oo.join("") + vv; + } + oo.push(_getchar(__readUInt16LE(this, loc))); + loc+=2; + } o = oo.join(""); size *= 2; break; + + case 'sbcs-cont': o = ""; loc = this.l; + for(i = 0; i != size; ++i) { + if(this.lens && this.lens.indexOf(loc) !== -1) { + w = __readUInt8(this, loc); + this.l = loc + 1; + vv = ReadShift.call(this, size-i, w ? 'dbcs-cont' : 'sbcs-cont'); + return oo.join("") + vv; + } + oo.push(_getchar(__readUInt8(this, loc))); + loc+=1; + } o = oo.join(""); break; + + default: + switch(size) { + case 1: oI = __readUInt8(this, this.l); this.l++; return oI; + case 2: oI = (t === 'i' ? __readInt16LE : __readUInt16LE)(this, this.l); this.l += 2; return oI; + case 4: + if(t === 'i' || (this[this.l+3] & 0x80)===0) { oI = __readInt32LE(this, this.l); this.l += 4; return oI; } + else { oR = __readUInt32LE(this, this.l); this.l += 4; return oR; } break; + case 8: if(t === 'f') { oR = __double(this, this.l); this.l += 8; return oR; } + /* falls through */ + case 16: o = __hexlify(this, this.l, size); break; + }} + this.l+=size; return o; +} + +function WriteShift(t, val, f) { + var size, i; + if(f === 'dbcs') { + for(i = 0; i != val.length; ++i) this.writeUInt16LE(val.charCodeAt(i), this.l + 2 * i); + size = 2 * val.length; + } else switch(t) { + case 1: size = 1; this[this.l] = val&255; break; + case 3: size = 3; this[this.l+2] = val & 255; val >>>= 8; this[this.l+1] = val&255; val >>>= 8; this[this.l] = val&255; break; + case 4: size = 4; this.writeUInt32LE(val, this.l); break; + case 8: size = 8; if(f === 'f') { this.writeDoubleLE(val, this.l); break; } + /* falls through */ + case 16: break; + case -4: size = 4; this.writeInt32LE(val, this.l); break; + } + this.l += size; return this; +} + +function CheckField(hexstr, fld) { + var m = __hexlify(this,this.l,hexstr.length>>1); + if(m !== hexstr) throw fld + 'Expected ' + hexstr + ' saw ' + m; + this.l += hexstr.length>>1; +} + +function prep_blob(blob, pos) { + blob.l = pos; + blob.read_shift = ReadShift; + blob.chk = CheckField; + blob.write_shift = WriteShift; +} + +function parsenoop(blob, length) { blob.l += length; } + +function writenoop(blob, length) { blob.l += length; } + +function new_buf(sz) { + var o = new_raw_buf(sz); + prep_blob(o, 0); + return o; +} + +/* [MS-XLSB] 2.1.4 Record */ +function recordhopper(data, cb, opts) { + var tmpbyte, cntbyte, length; + prep_blob(data, data.l || 0); + while(data.l < data.length) { + var RT = data.read_shift(1); + if(RT & 0x80) RT = (RT & 0x7F) + ((data.read_shift(1) & 0x7F)<<7); + var R = XLSBRecordEnum[RT] || XLSBRecordEnum[0xFFFF]; + tmpbyte = data.read_shift(1); + length = tmpbyte & 0x7F; + for(cntbyte = 1; cntbyte <4 && (tmpbyte & 0x80); ++cntbyte) length += ((tmpbyte = data.read_shift(1)) & 0x7F)<<(7*cntbyte); + var d = R.f(data, length, opts); + if(cb(d, R, RT)) return; + } +} + +/* control buffer usage for fixed-length buffers */ +function buf_array() { + var bufs = [], blksz = 2048; + var newblk = function ba_newblk(sz) { + var o = new_buf(sz); + prep_blob(o, 0); + return o; + }; + + var curbuf = newblk(blksz); + + var endbuf = function ba_endbuf() { + curbuf.length = curbuf.l; + if(curbuf.length > 0) bufs.push(curbuf); + curbuf = null; + }; + + var next = function ba_next(sz) { + if(sz < curbuf.length - curbuf.l) return curbuf; + endbuf(); + return (curbuf = newblk(Math.max(sz+1, blksz))); + }; + + var end = function ba_end() { + endbuf(); + return __toBuffer([bufs]); + }; + + var push = function ba_push(buf) { endbuf(); curbuf = buf; next(blksz); }; + + return { next:next, push:push, end:end, _bufs:bufs }; +} + +function write_record(ba, type, payload, length) { + var t = evert_RE[type], l; + if(!length) length = XLSBRecordEnum[t].p || (payload||[]).length || 0; + l = 1 + (t >= 0x80 ? 1 : 0) + 1 + length; + if(length >= 0x80) ++l; if(length >= 0x4000) ++l; if(length >= 0x200000) ++l; + var o = ba.next(l); + if(t <= 0x7F) o.write_shift(1, t); + else { + o.write_shift(1, (t & 0x7F) + 0x80); + o.write_shift(1, (t >> 7)); + } + for(var i = 0; i != 4; ++i) { + if(length >= 0x80) { o.write_shift(1, (length & 0x7F)+0x80); length >>= 7; } + else { o.write_shift(1, length); break; } + } + if(length > 0 && is_buf(payload)) ba.push(payload); +} +/* XLS ranges enforced */ +function shift_cell_xls(cell, tgt) { + if(tgt.s) { + if(cell.cRel) cell.c += tgt.s.c; + if(cell.rRel) cell.r += tgt.s.r; + } else { + cell.c += tgt.c; + cell.r += tgt.r; + } + cell.cRel = cell.rRel = 0; + while(cell.c >= 0x100) cell.c -= 0x100; + while(cell.r >= 0x10000) cell.r -= 0x10000; + return cell; +} + +function shift_range_xls(cell, range) { + cell.s = shift_cell_xls(cell.s, range.s); + cell.e = shift_cell_xls(cell.e, range.s); + return cell; +} + +var OFFCRYPTO = {}; +var make_offcrypto = function(O, _crypto) { + var crypto; + if(typeof _crypto !== 'undefined') crypto = _crypto; + else if(typeof require !== 'undefined') { + try { crypto = require('cry'+'pto'); } + catch(e) { crypto = null; } + } + + O.rc4 = function(key, data) { + var S = new Array(256); + var c = 0, i = 0, j = 0, t = 0; + for(i = 0; i != 256; ++i) S[i] = i; + for(i = 0; i != 256; ++i) { + j = (j + S[i] + (key[i%key.length]).charCodeAt(0))&255; + t = S[i]; S[i] = S[j]; S[j] = t; + } + i = j = 0; out = Buffer(data.length); + for(c = 0; c != data.length; ++c) { + i = (i + 1)&255; + j = (j + S[i])%256; + t = S[i]; S[i] = S[j]; S[j] = t; + out[c] = (data[c] ^ S[(S[i]+S[j])&255]); + } + return out; + }; + + if(crypto) { + O.md5 = function(hex) { return crypto.createHash('md5').update(hex).digest('hex'); }; + } else { + O.md5 = function(hex) { throw "unimplemented"; }; + } +}; +make_offcrypto(OFFCRYPTO, typeof crypto !== "undefined" ? crypto : undefined); + + +/* [MS-XLSB] 2.5.143 */ +function parse_StrRun(data, length) { + return { ich: data.read_shift(2), ifnt: data.read_shift(2) }; +} + +/* [MS-XLSB] 2.1.7.121 */ +function parse_RichStr(data, length) { + var start = data.l; + var flags = data.read_shift(1); + var str = parse_XLWideString(data); + var rgsStrRun = []; + var z = { t: str, h: str }; + if((flags & 1) !== 0) { /* fRichStr */ + /* TODO: formatted string */ + var dwSizeStrRun = data.read_shift(4); + for(var i = 0; i != dwSizeStrRun; ++i) rgsStrRun.push(parse_StrRun(data)); + z.r = rgsStrRun; + } + else z.r = "" + escapexml(str) + ""; + if((flags & 2) !== 0) { /* fExtStr */ + /* TODO: phonetic string */ + } + data.l = start + length; + return z; +} +function write_RichStr(str, o) { + /* TODO: formatted string */ + if(o == null) o = new_buf(5+2*str.t.length); + o.write_shift(1,0); + write_XLWideString(str.t, o); + return o; +} + +/* [MS-XLSB] 2.5.9 */ +function parse_XLSBCell(data) { + var col = data.read_shift(4); + var iStyleRef = data.read_shift(2); + iStyleRef += data.read_shift(1) <<16; + var fPhShow = data.read_shift(1); + return { c:col, iStyleRef: iStyleRef }; +} +function write_XLSBCell(cell, o) { + if(o == null) o = new_buf(8); + o.write_shift(-4, cell.c); + o.write_shift(3, cell.iStyleRef === undefined ? cell.iStyleRef : cell.s); + o.write_shift(1, 0); /* fPhShow */ + return o; +} + + +/* [MS-XLSB] 2.5.21 */ +function parse_XLSBCodeName (data, length) { return parse_XLWideString(data, length); } + +/* [MS-XLSB] 2.5.166 */ +function parse_XLNullableWideString(data) { + var cchCharacters = data.read_shift(4); + return cchCharacters === 0 || cchCharacters === 0xFFFFFFFF ? "" : data.read_shift(cchCharacters, 'dbcs'); +} +function write_XLNullableWideString(data, o) { + if(!o) o = new_buf(127); + o.write_shift(4, data.length > 0 ? data.length : 0xFFFFFFFF); + if(data.length > 0) o.write_shift(0, data, 'dbcs'); + return o; +} + +/* [MS-XLSB] 2.5.168 */ +function parse_XLWideString(data) { + var cchCharacters = data.read_shift(4); + return cchCharacters === 0 ? "" : data.read_shift(cchCharacters, 'dbcs'); +} +function write_XLWideString(data, o) { + if(o == null) o = new_buf(4+2*data.length); + o.write_shift(4, data.length); + if(data.length > 0) o.write_shift(0, data, 'dbcs'); + return o; +} + +/* [MS-XLSB] 2.5.114 */ +var parse_RelID = parse_XLNullableWideString; +var write_RelID = write_XLNullableWideString; + + +/* [MS-XLSB] 2.5.122 */ +/* [MS-XLS] 2.5.217 */ +function parse_RkNumber(data) { + var b = data.slice(data.l, data.l+4); + var fX100 = b[0] & 1, fInt = b[0] & 2; + data.l+=4; + b[0] &= 0xFC; // b[0] &= ~3; + var RK = fInt === 0 ? __double([0,0,0,0,b[0],b[1],b[2],b[3]],0) : __readInt32LE(b,0)>>2; + return fX100 ? RK/100 : RK; +} + +/* [MS-XLSB] 2.5.153 */ +function parse_UncheckedRfX(data) { + var cell = {s: {}, e: {}}; + cell.s.r = data.read_shift(4); + cell.e.r = data.read_shift(4); + cell.s.c = data.read_shift(4); + cell.e.c = data.read_shift(4); + return cell; +} + +function write_UncheckedRfX(r, o) { + if(!o) o = new_buf(16); + o.write_shift(4, r.s.r); + o.write_shift(4, r.e.r); + o.write_shift(4, r.s.c); + o.write_shift(4, r.e.c); + return o; +} + +/* [MS-XLSB] 2.5.171 */ +/* [MS-XLS] 2.5.342 */ +function parse_Xnum(data, length) { return data.read_shift(8, 'f'); } +function write_Xnum(data, o) { return (o || new_buf(8)).write_shift(8, 'f', data); } + +/* [MS-XLSB] 2.5.198.2 */ +var BErr = { + 0x00: "#NULL!", + 0x07: "#DIV/0!", + 0x0F: "#VALUE!", + 0x17: "#REF!", + 0x1D: "#NAME?", + 0x24: "#NUM!", + 0x2A: "#N/A", + 0x2B: "#GETTING_DATA", + 0xFF: "#WTF?" +}; +var RBErr = evert_num(BErr); + +/* [MS-XLSB] 2.4.321 BrtColor */ +function parse_BrtColor(data, length) { + var out = {}; + var d = data.read_shift(1); + out.fValidRGB = d & 1; + out.xColorType = d >>> 1; + out.index = data.read_shift(1); + out.nTintAndShade = data.read_shift(2, 'i'); + out.bRed = data.read_shift(1); + out.bGreen = data.read_shift(1); + out.bBlue = data.read_shift(1); + out.bAlpha = data.read_shift(1); +} + +/* [MS-XLSB] 2.5.52 */ +function parse_FontFlags(data, length) { + var d = data.read_shift(1); + data.l++; + var out = { + fItalic: d & 0x2, + fStrikeout: d & 0x8, + fOutline: d & 0x10, + fShadow: d & 0x20, + fCondense: d & 0x40, + fExtend: d & 0x80 + }; + return out; +} +/* [MS-OLEPS] 2.2 PropertyType */ +{ + var VT_EMPTY = 0x0000; + var VT_NULL = 0x0001; + var VT_I2 = 0x0002; + var VT_I4 = 0x0003; + var VT_R4 = 0x0004; + var VT_R8 = 0x0005; + var VT_CY = 0x0006; + var VT_DATE = 0x0007; + var VT_BSTR = 0x0008; + var VT_ERROR = 0x000A; + var VT_BOOL = 0x000B; + var VT_VARIANT = 0x000C; + var VT_DECIMAL = 0x000E; + var VT_I1 = 0x0010; + var VT_UI1 = 0x0011; + var VT_UI2 = 0x0012; + var VT_UI4 = 0x0013; + var VT_I8 = 0x0014; + var VT_UI8 = 0x0015; + var VT_INT = 0x0016; + var VT_UINT = 0x0017; + var VT_LPSTR = 0x001E; + var VT_LPWSTR = 0x001F; + var VT_FILETIME = 0x0040; + var VT_BLOB = 0x0041; + var VT_STREAM = 0x0042; + var VT_STORAGE = 0x0043; + var VT_STREAMED_Object = 0x0044; + var VT_STORED_Object = 0x0045; + var VT_BLOB_Object = 0x0046; + var VT_CF = 0x0047; + var VT_CLSID = 0x0048; + var VT_VERSIONED_STREAM = 0x0049; + var VT_VECTOR = 0x1000; + var VT_ARRAY = 0x2000; + + var VT_STRING = 0x0050; // 2.3.3.1.11 VtString + var VT_USTR = 0x0051; // 2.3.3.1.12 VtUnalignedString + var VT_CUSTOM = [VT_STRING, VT_USTR]; +} + +/* [MS-OSHARED] 2.3.3.2.2.1 Document Summary Information PIDDSI */ +var DocSummaryPIDDSI = { + 0x01: { n: 'CodePage', t: VT_I2 }, + 0x02: { n: 'Category', t: VT_STRING }, + 0x03: { n: 'PresentationFormat', t: VT_STRING }, + 0x04: { n: 'ByteCount', t: VT_I4 }, + 0x05: { n: 'LineCount', t: VT_I4 }, + 0x06: { n: 'ParagraphCount', t: VT_I4 }, + 0x07: { n: 'SlideCount', t: VT_I4 }, + 0x08: { n: 'NoteCount', t: VT_I4 }, + 0x09: { n: 'HiddenCount', t: VT_I4 }, + 0x0a: { n: 'MultimediaClipCount', t: VT_I4 }, + 0x0b: { n: 'Scale', t: VT_BOOL }, + 0x0c: { n: 'HeadingPair', t: VT_VECTOR | VT_VARIANT }, + 0x0d: { n: 'DocParts', t: VT_VECTOR | VT_LPSTR }, + 0x0e: { n: 'Manager', t: VT_STRING }, + 0x0f: { n: 'Company', t: VT_STRING }, + 0x10: { n: 'LinksDirty', t: VT_BOOL }, + 0x11: { n: 'CharacterCount', t: VT_I4 }, + 0x13: { n: 'SharedDoc', t: VT_BOOL }, + 0x16: { n: 'HLinksChanged', t: VT_BOOL }, + 0x17: { n: 'AppVersion', t: VT_I4, p: 'version' }, + 0x1A: { n: 'ContentType', t: VT_STRING }, + 0x1B: { n: 'ContentStatus', t: VT_STRING }, + 0x1C: { n: 'Language', t: VT_STRING }, + 0x1D: { n: 'Version', t: VT_STRING }, + 0xFF: {} +}; + +/* [MS-OSHARED] 2.3.3.2.1.1 Summary Information Property Set PIDSI */ +var SummaryPIDSI = { + 0x01: { n: 'CodePage', t: VT_I2 }, + 0x02: { n: 'Title', t: VT_STRING }, + 0x03: { n: 'Subject', t: VT_STRING }, + 0x04: { n: 'Author', t: VT_STRING }, + 0x05: { n: 'Keywords', t: VT_STRING }, + 0x06: { n: 'Comments', t: VT_STRING }, + 0x07: { n: 'Template', t: VT_STRING }, + 0x08: { n: 'LastAuthor', t: VT_STRING }, + 0x09: { n: 'RevNumber', t: VT_STRING }, + 0x0A: { n: 'EditTime', t: VT_FILETIME }, + 0x0B: { n: 'LastPrinted', t: VT_FILETIME }, + 0x0C: { n: 'CreatedDate', t: VT_FILETIME }, + 0x0D: { n: 'ModifiedDate', t: VT_FILETIME }, + 0x0E: { n: 'PageCount', t: VT_I4 }, + 0x0F: { n: 'WordCount', t: VT_I4 }, + 0x10: { n: 'CharCount', t: VT_I4 }, + 0x11: { n: 'Thumbnail', t: VT_CF }, + 0x12: { n: 'ApplicationName', t: VT_LPSTR }, + 0x13: { n: 'DocumentSecurity', t: VT_I4 }, + 0xFF: {} +}; + +/* [MS-OLEPS] 2.18 */ +var SpecialProperties = { + 0x80000000: { n: 'Locale', t: VT_UI4 }, + 0x80000003: { n: 'Behavior', t: VT_UI4 }, + 0x72627262: {} +}; + +(function() { + for(var y in SpecialProperties) if(SpecialProperties.hasOwnProperty(y)) + DocSummaryPIDDSI[y] = SummaryPIDSI[y] = SpecialProperties[y]; +})(); + +/* [MS-XLS] 2.4.63 Country/Region codes */ +var CountryEnum = { + 0x0001: "US", // United States + 0x0002: "CA", // Canada + 0x0003: "", // Latin America (except Brazil) + 0x0007: "RU", // Russia + 0x0014: "EG", // Egypt + 0x001E: "GR", // Greece + 0x001F: "NL", // Netherlands + 0x0020: "BE", // Belgium + 0x0021: "FR", // France + 0x0022: "ES", // Spain + 0x0024: "HU", // Hungary + 0x0027: "IT", // Italy + 0x0029: "CH", // Switzerland + 0x002B: "AT", // Austria + 0x002C: "GB", // United Kingdom + 0x002D: "DK", // Denmark + 0x002E: "SE", // Sweden + 0x002F: "NO", // Norway + 0x0030: "PL", // Poland + 0x0031: "DE", // Germany + 0x0034: "MX", // Mexico + 0x0037: "BR", // Brazil + 0x003d: "AU", // Australia + 0x0040: "NZ", // New Zealand + 0x0042: "TH", // Thailand + 0x0051: "JP", // Japan + 0x0052: "KR", // Korea + 0x0054: "VN", // Viet Nam + 0x0056: "CN", // China + 0x005A: "TR", // Turkey + 0x0069: "JS", // Ramastan + 0x00D5: "DZ", // Algeria + 0x00D8: "MA", // Morocco + 0x00DA: "LY", // Libya + 0x015F: "PT", // Portugal + 0x0162: "IS", // Iceland + 0x0166: "FI", // Finland + 0x01A4: "CZ", // Czech Republic + 0x0376: "TW", // Taiwan + 0x03C1: "LB", // Lebanon + 0x03C2: "JO", // Jordan + 0x03C3: "SY", // Syria + 0x03C4: "IQ", // Iraq + 0x03C5: "KW", // Kuwait + 0x03C6: "SA", // Saudi Arabia + 0x03CB: "AE", // United Arab Emirates + 0x03CC: "IL", // Israel + 0x03CE: "QA", // Qatar + 0x03D5: "IR", // Iran + 0xFFFF: "US" // United States +}; + +/* [MS-XLS] 2.5.127 */ +var XLSFillPattern = [ + null, + 'solid', + 'mediumGray', + 'darkGray', + 'lightGray', + 'darkHorizontal', + 'darkVertical', + 'darkDown', + 'darkUp', + 'darkGrid', + 'darkTrellis', + 'lightHorizontal', + 'lightVertical', + 'lightDown', + 'lightUp', + 'lightGrid', + 'lightTrellis', + 'gray125', + 'gray0625' +]; + +function rgbify(arr) { return arr.map(function(x) { return [(x>>16)&255,(x>>8)&255,x&255]; }); } + +/* [MS-XLS] 2.5.161 */ +var XLSIcv = rgbify([ + /* Color Constants */ + 0x000000, + 0xFFFFFF, + 0xFF0000, + 0x00FF00, + 0x0000FF, + 0xFFFF00, + 0xFF00FF, + 0x00FFFF, + + /* Defaults */ + 0x000000, + 0xFFFFFF, + 0xFF0000, + 0x00FF00, + 0x0000FF, + 0xFFFF00, + 0xFF00FF, + 0x00FFFF, + + 0x800000, + 0x008000, + 0x000080, + 0x808000, + 0x800080, + 0x008080, + 0xC0C0C0, + 0x808080, + 0x9999FF, + 0x993366, + 0xFFFFCC, + 0xCCFFFF, + 0x660066, + 0xFF8080, + 0x0066CC, + 0xCCCCFF, + + 0x000080, + 0xFF00FF, + 0xFFFF00, + 0x00FFFF, + 0x800080, + 0x800000, + 0x008080, + 0x0000FF, + 0x00CCFF, + 0xCCFFFF, + 0xCCFFCC, + 0xFFFF99, + 0x99CCFF, + 0xFF99CC, + 0xCC99FF, + 0xFFCC99, + + 0x3366FF, + 0x33CCCC, + 0x99CC00, + 0xFFCC00, + 0xFF9900, + 0xFF6600, + 0x666699, + 0x969696, + 0x003366, + 0x339966, + 0x003300, + 0x333300, + 0x993300, + 0x993366, + 0x333399, + 0x333333, + + /* Sheet */ + 0xFFFFFF, + 0x000000 +]); + +/* Parts enumerated in OPC spec, MS-XLSB and MS-XLSX */ +/* 12.3 Part Summary */ +/* 14.2 Part Summary */ +/* [MS-XLSX] 2.1 Part Enumerations */ +/* [MS-XLSB] 2.1.7 Part Enumeration */ +var ct2type = { + /* Workbook */ + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml": "workbooks", + + /* Worksheet */ + "application/vnd.ms-excel.binIndexWs": "TODO", /* Binary Index */ + + /* Chartsheet */ + "application/vnd.ms-excel.chartsheet": "TODO", + "application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml": "TODO", + + /* Dialogsheet */ + "application/vnd.ms-excel.dialogsheet": "TODO", + "application/vnd.openxmlformats-officedocument.spreadsheetml.dialogsheet+xml": "TODO", + + /* Macrosheet */ + "application/vnd.ms-excel.macrosheet": "TODO", + "application/vnd.ms-excel.macrosheet+xml": "TODO", + "application/vnd.ms-excel.intlmacrosheet": "TODO", + "application/vnd.ms-excel.binIndexMs": "TODO", /* Binary Index */ + + /* File Properties */ + "application/vnd.openxmlformats-package.core-properties+xml": "coreprops", + "application/vnd.openxmlformats-officedocument.custom-properties+xml": "custprops", + "application/vnd.openxmlformats-officedocument.extended-properties+xml": "extprops", + + /* Custom Data Properties */ + "application/vnd.openxmlformats-officedocument.customXmlProperties+xml": "TODO", + + /* Comments */ + "application/vnd.ms-excel.comments": "comments", + "application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml": "comments", + + /* PivotTable */ + "application/vnd.ms-excel.pivotTable": "TODO", + "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml": "TODO", + + /* Calculation Chain */ + "application/vnd.ms-excel.calcChain": "calcchains", + "application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml": "calcchains", + + /* Printer Settings */ + "application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings": "TODO", + + /* ActiveX */ + "application/vnd.ms-office.activeX": "TODO", + "application/vnd.ms-office.activeX+xml": "TODO", + + /* Custom Toolbars */ + "application/vnd.ms-excel.attachedToolbars": "TODO", + + /* External Data Connections */ + "application/vnd.ms-excel.connections": "TODO", + "application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml": "TODO", + + /* External Links */ + "application/vnd.ms-excel.externalLink": "TODO", + "application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml": "TODO", + + /* Metadata */ + "application/vnd.ms-excel.sheetMetadata": "TODO", + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMetadata+xml": "TODO", + + /* PivotCache */ + "application/vnd.ms-excel.pivotCacheDefinition": "TODO", + "application/vnd.ms-excel.pivotCacheRecords": "TODO", + "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml": "TODO", + "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml": "TODO", + + /* Query Table */ + "application/vnd.ms-excel.queryTable": "TODO", + "application/vnd.openxmlformats-officedocument.spreadsheetml.queryTable+xml": "TODO", + + /* Shared Workbook */ + "application/vnd.ms-excel.userNames": "TODO", + "application/vnd.ms-excel.revisionHeaders": "TODO", + "application/vnd.ms-excel.revisionLog": "TODO", + "application/vnd.openxmlformats-officedocument.spreadsheetml.revisionHeaders+xml": "TODO", + "application/vnd.openxmlformats-officedocument.spreadsheetml.revisionLog+xml": "TODO", + "application/vnd.openxmlformats-officedocument.spreadsheetml.userNames+xml": "TODO", + + /* Single Cell Table */ + "application/vnd.ms-excel.tableSingleCells": "TODO", + "application/vnd.openxmlformats-officedocument.spreadsheetml.tableSingleCells+xml": "TODO", + + /* Slicer */ + "application/vnd.ms-excel.slicer": "TODO", + "application/vnd.ms-excel.slicerCache": "TODO", + "application/vnd.ms-excel.slicer+xml": "TODO", + "application/vnd.ms-excel.slicerCache+xml": "TODO", + + /* Sort Map */ + "application/vnd.ms-excel.wsSortMap": "TODO", + + /* Table */ + "application/vnd.ms-excel.table": "TODO", + "application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml": "TODO", + + /* Themes */ + "application/vnd.openxmlformats-officedocument.theme+xml": "themes", + + /* Timeline */ + "application/vnd.ms-excel.Timeline+xml": "TODO", /* verify */ + "application/vnd.ms-excel.TimelineCache+xml": "TODO", /* verify */ + + /* VBA */ + "application/vnd.ms-office.vbaProject": "vba", + "application/vnd.ms-office.vbaProjectSignature": "vba", + + /* Volatile Dependencies */ + "application/vnd.ms-office.volatileDependencies": "TODO", + "application/vnd.openxmlformats-officedocument.spreadsheetml.volatileDependencies+xml": "TODO", + + /* Control Properties */ + "application/vnd.ms-excel.controlproperties+xml": "TODO", + + /* Data Model */ + "application/vnd.openxmlformats-officedocument.model+data": "TODO", + + /* Survey */ + "application/vnd.ms-excel.Survey+xml": "TODO", + + /* Drawing */ + "application/vnd.openxmlformats-officedocument.drawing+xml": "TODO", + "application/vnd.openxmlformats-officedocument.drawingml.chart+xml": "TODO", + "application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml": "TODO", + "application/vnd.openxmlformats-officedocument.drawingml.diagramColors+xml": "TODO", + "application/vnd.openxmlformats-officedocument.drawingml.diagramData+xml": "TODO", + "application/vnd.openxmlformats-officedocument.drawingml.diagramLayout+xml": "TODO", + "application/vnd.openxmlformats-officedocument.drawingml.diagramStyle+xml": "TODO", + + /* VML */ + "application/vnd.openxmlformats-officedocument.vmlDrawing": "TODO", + + "application/vnd.openxmlformats-package.relationships+xml": "rels", + "application/vnd.openxmlformats-officedocument.oleObject": "TODO", + + "sheet": "js" +}; + +var CT_LIST = (function(){ + var o = { + workbooks: { + xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml", + xlsm: "application/vnd.ms-excel.sheet.macroEnabled.main+xml", + xlsb: "application/vnd.ms-excel.sheet.binary.macroEnabled.main", + xltx: "application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml" + }, + strs: { /* Shared Strings */ + xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml", + xlsb: "application/vnd.ms-excel.sharedStrings" + }, + sheets: { + xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml", + xlsb: "application/vnd.ms-excel.worksheet" + }, + styles: {/* Styles */ + xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml", + xlsb: "application/vnd.ms-excel.styles" + } + }; + keys(o).forEach(function(k) { if(!o[k].xlsm) o[k].xlsm = o[k].xlsx; }); + keys(o).forEach(function(k){ keys(o[k]).forEach(function(v) { ct2type[o[k][v]] = k; }); }); + return o; +})(); + +var type2ct = evert_arr(ct2type); + +XMLNS.CT = 'http://schemas.openxmlformats.org/package/2006/content-types'; + +function parse_ct(data, opts) { + var ctext = {}; + if(!data || !data.match) return data; + var ct = { workbooks: [], sheets: [], calcchains: [], themes: [], styles: [], + coreprops: [], extprops: [], custprops: [], strs:[], comments: [], vba: [], + TODO:[], rels:[], xmlns: "" }; + (data.match(tagregex)||[]).forEach(function(x) { + var y = parsexmltag(x); + switch(y[0].replace(nsregex,"<")) { + case ' 0 ? ct.calcchains[0] : ""; + ct.sst = ct.strs.length > 0 ? ct.strs[0] : ""; + ct.style = ct.styles.length > 0 ? ct.styles[0] : ""; + ct.defaults = ctext; + delete ct.calcchains; + return ct; +} + +var CTYPE_XML_ROOT = writextag('Types', null, { + 'xmlns': XMLNS.CT, + 'xmlns:xsd': XMLNS.xsd, + 'xmlns:xsi': XMLNS.xsi +}); + +var CTYPE_DEFAULTS = [ + ['xml', 'application/xml'], + ['bin', 'application/vnd.ms-excel.sheet.binary.macroEnabled.main'], + ['rels', type2ct.rels[0]] +].map(function(x) { + return writextag('Default', null, {'Extension':x[0], 'ContentType': x[1]}); +}); + +function write_ct(ct, opts) { + var o = [], v; + o[o.length] = (XML_HEADER); + o[o.length] = (CTYPE_XML_ROOT); + o = o.concat(CTYPE_DEFAULTS); + var f1 = function(w) { + if(ct[w] && ct[w].length > 0) { + v = ct[w][0]; + o[o.length] = (writextag('Override', null, { + 'PartName': (v[0] == '/' ? "":"/") + v, + 'ContentType': CT_LIST[w][opts.bookType || 'xlsx'] + })); + } + }; + var f2 = function(w) { + ct[w].forEach(function(v) { + o[o.length] = (writextag('Override', null, { + 'PartName': (v[0] == '/' ? "":"/") + v, + 'ContentType': CT_LIST[w][opts.bookType || 'xlsx'] + })); + }); + }; + var f3 = function(t) { + (ct[t]||[]).forEach(function(v) { + o[o.length] = (writextag('Override', null, { + 'PartName': (v[0] == '/' ? "":"/") + v, + 'ContentType': type2ct[t][0] + })); + }); + }; + f1('workbooks'); + f2('sheets'); + f3('themes'); + ['strs', 'styles'].forEach(f1); + ['coreprops', 'extprops', 'custprops'].forEach(f3); + if(o.length>2){ o[o.length] = (''); o[1]=o[1].replace("/>",">"); } + return o.join(""); +} +/* 9.3.2 OPC Relationships Markup */ +var RELS = { + WB: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument", + SHEET: "http://sheetjs.openxmlformats.org/officeDocument/2006/relationships/officeDocument" +}; + +function parse_rels(data, currentFilePath) { + if (!data) return data; + if (currentFilePath.charAt(0) !== '/') { + currentFilePath = '/'+currentFilePath; + } + var rels = {}; + var hash = {}; + var resolveRelativePathIntoAbsolute = function (to) { + var toksFrom = currentFilePath.split('/'); + toksFrom.pop(); // folder path + var toksTo = to.split('/'); + var reversed = []; + while (toksTo.length !== 0) { + var tokTo = toksTo.shift(); + if (tokTo === '..') { + toksFrom.pop(); + } else if (tokTo !== '.') { + toksFrom.push(tokTo); + } + } + return toksFrom.join('/'); + }; + + data.match(tagregex).forEach(function(x) { + var y = parsexmltag(x); + /* 9.3.2.2 OPC_Relationships */ + if (y[0] === '2){ o[o.length] = (''); o[1]=o[1].replace("/>",">"); } + return o.join(""); +} +/* ECMA-376 Part II 11.1 Core Properties Part */ +/* [MS-OSHARED] 2.3.3.2.[1-2].1 (PIDSI/PIDDSI) */ +var CORE_PROPS = [ + ["cp:category", "Category"], + ["cp:contentStatus", "ContentStatus"], + ["cp:keywords", "Keywords"], + ["cp:lastModifiedBy", "LastAuthor"], + ["cp:lastPrinted", "LastPrinted"], + ["cp:revision", "RevNumber"], + ["cp:version", "Version"], + ["dc:creator", "Author"], + ["dc:description", "Comments"], + ["dc:identifier", "Identifier"], + ["dc:language", "Language"], + ["dc:subject", "Subject"], + ["dc:title", "Title"], + ["dcterms:created", "CreatedDate", 'date'], + ["dcterms:modified", "ModifiedDate", 'date'] +]; + +XMLNS.CORE_PROPS = "http://schemas.openxmlformats.org/package/2006/metadata/core-properties"; +RELS.CORE_PROPS = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties'; + +var CORE_PROPS_REGEX = (function() { + var r = new Array(CORE_PROPS.length); + for(var i = 0; i < CORE_PROPS.length; ++i) { + var f = CORE_PROPS[i]; + var g = "(?:"+ f[0].substr(0,f[0].indexOf(":")) +":)"+ f[0].substr(f[0].indexOf(":")+1); + r[i] = new RegExp("<" + g + "[^>]*>(.*)<\/" + g + ">"); + } + return r; +})(); + +function parse_core_props(data) { + var p = {}; + + for(var i = 0; i < CORE_PROPS.length; ++i) { + var f = CORE_PROPS[i], cur = data.match(CORE_PROPS_REGEX[i]); + if(cur != null && cur.length > 0) p[f[1]] = cur[1]; + if(f[2] === 'date' && p[f[1]]) p[f[1]] = new Date(p[f[1]]); + } + + return p; +} + +var CORE_PROPS_XML_ROOT = writextag('cp:coreProperties', null, { + //'xmlns': XMLNS.CORE_PROPS, + 'xmlns:cp': XMLNS.CORE_PROPS, + 'xmlns:dc': XMLNS.dc, + 'xmlns:dcterms': XMLNS.dcterms, + 'xmlns:dcmitype': XMLNS.dcmitype, + 'xmlns:xsi': XMLNS.xsi +}); + +function cp_doit(f, g, h, o, p) { + if(p[f] != null || g == null || g === "") return; + p[f] = g; + o[o.length] = (h ? writextag(f,g,h) : writetag(f,g)); +} + +function write_core_props(cp, opts) { + var o = [XML_HEADER, CORE_PROPS_XML_ROOT], p = {}; + if(!cp) return o.join(""); + + + if(cp.CreatedDate != null) cp_doit("dcterms:created", typeof cp.CreatedDate === "string" ? cp.CreatedDate : write_w3cdtf(cp.CreatedDate, opts.WTF), {"xsi:type":"dcterms:W3CDTF"}, o, p); + if(cp.ModifiedDate != null) cp_doit("dcterms:modified", typeof cp.ModifiedDate === "string" ? cp.ModifiedDate : write_w3cdtf(cp.ModifiedDate, opts.WTF), {"xsi:type":"dcterms:W3CDTF"}, o, p); + + for(var i = 0; i != CORE_PROPS.length; ++i) { var f = CORE_PROPS[i]; cp_doit(f[0], cp[f[1]], null, o, p); } + if(o.length>2){ o[o.length] = (''); o[1]=o[1].replace("/>",">"); } + return o.join(""); +} +/* 15.2.12.3 Extended File Properties Part */ +/* [MS-OSHARED] 2.3.3.2.[1-2].1 (PIDSI/PIDDSI) */ +var EXT_PROPS = [ + ["Application", "Application", "string"], + ["AppVersion", "AppVersion", "string"], + ["Company", "Company", "string"], + ["DocSecurity", "DocSecurity", "string"], + ["Manager", "Manager", "string"], + ["HyperlinksChanged", "HyperlinksChanged", "bool"], + ["SharedDoc", "SharedDoc", "bool"], + ["LinksUpToDate", "LinksUpToDate", "bool"], + ["ScaleCrop", "ScaleCrop", "bool"], + ["HeadingPairs", "HeadingPairs", "raw"], + ["TitlesOfParts", "TitlesOfParts", "raw"] +]; + +XMLNS.EXT_PROPS = "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"; +RELS.EXT_PROPS = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties'; + +function parse_ext_props(data, p) { + var q = {}; if(!p) p = {}; + + EXT_PROPS.forEach(function(f) { + switch(f[2]) { + case "string": p[f[1]] = (data.match(matchtag(f[0]))||[])[1]; break; + case "bool": p[f[1]] = (data.match(matchtag(f[0]))||[])[1] === "true"; break; + case "raw": + var cur = data.match(new RegExp("<" + f[0] + "[^>]*>(.*)<\/" + f[0] + ">")); + if(cur && cur.length > 0) q[f[1]] = cur[1]; + break; + } + }); + + if(q.HeadingPairs && q.TitlesOfParts) { + var v = parseVector(q.HeadingPairs); + var j = 0, widx = 0; + for(var i = 0; i !== v.length; ++i) { + switch(v[i].v) { + case "Worksheets": widx = j; p.Worksheets = +(v[++i].v); break; + case "Named Ranges": ++i; break; // TODO: Handle Named Ranges + } + } + var parts = parseVector(q.TitlesOfParts).map(function(x) { return utf8read(x.v); }); + p.SheetNames = parts.slice(widx, widx + p.Worksheets); + } + return p; +} + +var EXT_PROPS_XML_ROOT = writextag('Properties', null, { + 'xmlns': XMLNS.EXT_PROPS, + 'xmlns:vt': XMLNS.vt +}); + +function write_ext_props(cp, opts) { + var o = [], p = {}, W = writextag; + if(!cp) cp = {}; + cp.Application = "SheetJS"; + o[o.length] = (XML_HEADER); + o[o.length] = (EXT_PROPS_XML_ROOT); + + EXT_PROPS.forEach(function(f) { + if(cp[f[1]] === undefined) return; + var v; + switch(f[2]) { + case 'string': v = cp[f[1]]; break; + case 'bool': v = cp[f[1]] ? 'true' : 'false'; break; + } + if(v !== undefined) o[o.length] = (W(f[0], v)); + }); + + /* TODO: HeadingPairs, TitlesOfParts */ + o[o.length] = (W('HeadingPairs', W('vt:vector', W('vt:variant', 'Worksheets')+W('vt:variant', W('vt:i4', String(cp.Worksheets))), {size:2, baseType:"variant"}))); + o[o.length] = (W('TitlesOfParts', W('vt:vector', cp.SheetNames.map(function(s) { return "" + s + ""; }).join(""), {size: cp.Worksheets, baseType:"lpstr"}))); + if(o.length>2){ o[o.length] = (''); o[1]=o[1].replace("/>",">"); } + return o.join(""); +} +/* 15.2.12.2 Custom File Properties Part */ +XMLNS.CUST_PROPS = "http://schemas.openxmlformats.org/officeDocument/2006/custom-properties"; +RELS.CUST_PROPS = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties'; + +var custregex = /<[^>]+>[^<]*/g; +function parse_cust_props(data, opts) { + var p = {}, name; + var m = data.match(custregex); + if(m) for(var i = 0; i != m.length; ++i) { + var x = m[i], y = parsexmltag(x); + switch(y[0]) { + case '': name = null; break; + default: if (x.indexOf(''); + var type = toks[0].substring(4), text = toks[1]; + /* 22.4.2.32 (CT_Variant). Omit the binary types from 22.4 (Variant Types) */ + switch(type) { + case 'lpstr': case 'lpwstr': case 'bstr': case 'lpwstr': + p[name] = unescapexml(text); + break; + case 'bool': + p[name] = parsexmlbool(text, ''); + break; + case 'i1': case 'i2': case 'i4': case 'i8': case 'int': case 'uint': + p[name] = parseInt(text, 10); + break; + case 'r4': case 'r8': case 'decimal': + p[name] = parseFloat(text); + break; + case 'filetime': case 'date': + p[name] = new Date(text); + break; + case 'cy': case 'error': + p[name] = unescapexml(text); + break; + default: + if(typeof console !== 'undefined') console.warn('Unexpected', x, type, toks); + } + } else if(x.substr(0,2) === "2){ o[o.length] = ''; o[1]=o[1].replace("/>",">"); } + return o.join(""); +} +function xlml_set_prop(Props, tag, val) { + /* TODO: Normalize the properties */ + switch(tag) { + case 'Description': tag = 'Comments'; break; + } + Props[tag] = val; +} + +/* [MS-DTYP] 2.3.3 FILETIME */ +/* [MS-OLEDS] 2.1.3 FILETIME (Packet Version) */ +/* [MS-OLEPS] 2.8 FILETIME (Packet Version) */ +function parse_FILETIME(blob) { + var dwLowDateTime = blob.read_shift(4), dwHighDateTime = blob.read_shift(4); + return new Date(((dwHighDateTime/1e7*Math.pow(2,32) + dwLowDateTime/1e7) - 11644473600)*1000).toISOString().replace(/\.000/,""); +} + +/* [MS-OSHARED] 2.3.3.1.4 Lpstr */ +function parse_lpstr(blob, type, pad) { + var str = blob.read_shift(0, 'lpstr'); + if(pad) blob.l += (4 - ((str.length+1) & 3)) & 3; + return str; +} + +/* [MS-OSHARED] 2.3.3.1.6 Lpwstr */ +function parse_lpwstr(blob, type, pad) { + var str = blob.read_shift(0, 'lpwstr'); + if(pad) blob.l += (4 - ((str.length+1) & 3)) & 3; + return str; +} + + +/* [MS-OSHARED] 2.3.3.1.11 VtString */ +/* [MS-OSHARED] 2.3.3.1.12 VtUnalignedString */ +function parse_VtStringBase(blob, stringType, pad) { + if(stringType === 0x1F /*VT_LPWSTR*/) return parse_lpwstr(blob); + return parse_lpstr(blob, stringType, pad); +} + +function parse_VtString(blob, t, pad) { return parse_VtStringBase(blob, t, pad === false ? 0: 4); } +function parse_VtUnalignedString(blob, t) { if(!t) throw new Error("dafuq?"); return parse_VtStringBase(blob, t, 0); } + +/* [MS-OSHARED] 2.3.3.1.9 VtVecUnalignedLpstrValue */ +function parse_VtVecUnalignedLpstrValue(blob) { + var length = blob.read_shift(4); + var ret = []; + for(var i = 0; i != length; ++i) ret[i] = blob.read_shift(0, 'lpstr'); + return ret; +} + +/* [MS-OSHARED] 2.3.3.1.10 VtVecUnalignedLpstr */ +function parse_VtVecUnalignedLpstr(blob) { + return parse_VtVecUnalignedLpstrValue(blob); +} + +/* [MS-OSHARED] 2.3.3.1.13 VtHeadingPair */ +function parse_VtHeadingPair(blob) { + var headingString = parse_TypedPropertyValue(blob, VT_USTR); + var headerParts = parse_TypedPropertyValue(blob, VT_I4); + return [headingString, headerParts]; +} + +/* [MS-OSHARED] 2.3.3.1.14 VtVecHeadingPairValue */ +function parse_VtVecHeadingPairValue(blob) { + var cElements = blob.read_shift(4); + var out = []; + for(var i = 0; i != cElements / 2; ++i) out.push(parse_VtHeadingPair(blob)); + return out; +} + +/* [MS-OSHARED] 2.3.3.1.15 VtVecHeadingPair */ +function parse_VtVecHeadingPair(blob) { + // NOTE: When invoked, wType & padding were already consumed + return parse_VtVecHeadingPairValue(blob); +} + +/* [MS-OLEPS] 2.18.1 Dictionary (uses 2.17, 2.16) */ +function parse_dictionary(blob,CodePage) { + var cnt = blob.read_shift(4); + var dict = {}; + for(var j = 0; j != cnt; ++j) { + var pid = blob.read_shift(4); + var len = blob.read_shift(4); + dict[pid] = blob.read_shift(len, (CodePage === 0x4B0 ?'utf16le':'utf8')).replace(chr0,'').replace(chr1,'!'); + } + if(blob.l & 3) blob.l = (blob.l>>2+1)<<2; + return dict; +} + +/* [MS-OLEPS] 2.9 BLOB */ +function parse_BLOB(blob) { + var size = blob.read_shift(4); + var bytes = blob.slice(blob.l,blob.l+size); + if(size & 3 > 0) blob.l += (4 - (size & 3)) & 3; + return bytes; +} + +/* [MS-OLEPS] 2.11 ClipboardData */ +function parse_ClipboardData(blob) { + // TODO + var o = {}; + o.Size = blob.read_shift(4); + //o.Format = blob.read_shift(4); + blob.l += o.Size; + return o; +} + +/* [MS-OLEPS] 2.14 Vector and Array Property Types */ +function parse_VtVector(blob, cb) { + /* [MS-OLEPS] 2.14.2 VectorHeader */ +/* var Length = blob.read_shift(4); + var o = []; + for(var i = 0; i != Length; ++i) { + o.push(cb(blob)); + } + return o;*/ +} + +/* [MS-OLEPS] 2.15 TypedPropertyValue */ +function parse_TypedPropertyValue(blob, type, _opts) { + var t = blob.read_shift(2), ret, opts = _opts||{}; + blob.l += 2; + if(type !== VT_VARIANT) + if(t !== type && VT_CUSTOM.indexOf(type)===-1) throw new Error('Expected type ' + type + ' saw ' + t); + switch(type === VT_VARIANT ? t : type) { + case 0x02 /*VT_I2*/: ret = blob.read_shift(2, 'i'); if(!opts.raw) blob.l += 2; return ret; + case 0x03 /*VT_I4*/: ret = blob.read_shift(4, 'i'); return ret; + case 0x0B /*VT_BOOL*/: return blob.read_shift(4) !== 0x0; + case 0x13 /*VT_UI4*/: ret = blob.read_shift(4); return ret; + case 0x1E /*VT_LPSTR*/: return parse_lpstr(blob, t, 4).replace(chr0,''); + case 0x1F /*VT_LPWSTR*/: return parse_lpwstr(blob); + case 0x40 /*VT_FILETIME*/: return parse_FILETIME(blob); + case 0x41 /*VT_BLOB*/: return parse_BLOB(blob); + case 0x47 /*VT_CF*/: return parse_ClipboardData(blob); + case 0x50 /*VT_STRING*/: return parse_VtString(blob, t, !opts.raw && 4).replace(chr0,''); + case 0x51 /*VT_USTR*/: return parse_VtUnalignedString(blob, t, 4).replace(chr0,''); + case 0x100C /*VT_VECTOR|VT_VARIANT*/: return parse_VtVecHeadingPair(blob); + case 0x101E /*VT_LPSTR*/: return parse_VtVecUnalignedLpstr(blob); + default: throw new Error("TypedPropertyValue unrecognized type " + type + " " + t); + } +} +/* [MS-OLEPS] 2.14.2 VectorHeader */ +/*function parse_VTVectorVariant(blob) { + var Length = blob.read_shift(4); + + if(Length & 1 !== 0) throw new Error("VectorHeader Length=" + Length + " must be even"); + var o = []; + for(var i = 0; i != Length; ++i) { + o.push(parse_TypedPropertyValue(blob, VT_VARIANT)); + } + return o; +}*/ + +/* [MS-OLEPS] 2.20 PropertySet */ +function parse_PropertySet(blob, PIDSI) { + var start_addr = blob.l; + var size = blob.read_shift(4); + var NumProps = blob.read_shift(4); + var Props = [], i = 0; + var CodePage = 0; + var Dictionary = -1, DictObj; + for(i = 0; i != NumProps; ++i) { + var PropID = blob.read_shift(4); + var Offset = blob.read_shift(4); + Props[i] = [PropID, Offset + start_addr]; + } + var PropH = {}; + for(i = 0; i != NumProps; ++i) { + if(blob.l !== Props[i][1]) { + var fail = true; + if(i>0 && PIDSI) switch(PIDSI[Props[i-1][0]].t) { + case 0x02 /*VT_I2*/: if(blob.l +2 === Props[i][1]) { blob.l+=2; fail = false; } break; + case 0x50 /*VT_STRING*/: if(blob.l <= Props[i][1]) { blob.l=Props[i][1]; fail = false; } break; + case 0x100C /*VT_VECTOR|VT_VARIANT*/: if(blob.l <= Props[i][1]) { blob.l=Props[i][1]; fail = false; } break; + } + if(!PIDSI && blob.l <= Props[i][1]) { fail=false; blob.l = Props[i][1]; } + if(fail) throw new Error("Read Error: Expected address " + Props[i][1] + ' at ' + blob.l + ' :' + i); + } + if(PIDSI) { + var piddsi = PIDSI[Props[i][0]]; + PropH[piddsi.n] = parse_TypedPropertyValue(blob, piddsi.t, {raw:true}); + if(piddsi.p === 'version') PropH[piddsi.n] = String(PropH[piddsi.n] >> 16) + "." + String(PropH[piddsi.n] & 0xFFFF); + if(piddsi.n == "CodePage") switch(PropH[piddsi.n]) { + case 0: PropH[piddsi.n] = 1252; + /* falls through */ + case 10000: // OSX Roman + case 1252: // Windows Latin + + case 874: // SB Windows Thai + case 1250: // SB Windows Central Europe + case 1251: // SB Windows Cyrillic + case 1253: // SB Windows Greek + case 1254: // SB Windows Turkish + case 1255: // SB Windows Hebrew + case 1256: // SB Windows Arabic + case 1257: // SB Windows Baltic + case 1258: // SB Windows Vietnam + + case 932: // DB Windows Japanese Shift-JIS + case 936: // DB Windows Simplified Chinese GBK + case 949: // DB Windows Korean + case 950: // DB Windows Traditional Chinese Big5 + + case 1200: // UTF16LE + case 1201: // UTF16BE + case 65000: case -536: // UTF-7 + case 65001: case -535: // UTF-8 + set_cp(CodePage = PropH[piddsi.n]); break; + default: throw new Error("Unsupported CodePage: " + PropH[piddsi.n]); + } + } else { + if(Props[i][0] === 0x1) { + CodePage = PropH.CodePage = parse_TypedPropertyValue(blob, VT_I2); + set_cp(CodePage); + if(Dictionary !== -1) { + var oldpos = blob.l; + blob.l = Props[Dictionary][1]; + DictObj = parse_dictionary(blob,CodePage); + blob.l = oldpos; + } + } else if(Props[i][0] === 0) { + if(CodePage === 0) { Dictionary = i; blob.l = Props[i+1][1]; continue; } + DictObj = parse_dictionary(blob,CodePage); + } else { + var name = DictObj[Props[i][0]]; + var val; + /* [MS-OSHARED] 2.3.3.2.3.1.2 + PROPVARIANT */ + switch(blob[blob.l]) { + case 0x41 /*VT_BLOB*/: blob.l += 4; val = parse_BLOB(blob); break; + case 0x1E /*VT_LPSTR*/: blob.l += 4; val = parse_VtString(blob, blob[blob.l-4]); break; + case 0x1F /*VT_LPWSTR*/: blob.l += 4; val = parse_VtString(blob, blob[blob.l-4]); break; + case 0x03 /*VT_I4*/: blob.l += 4; val = blob.read_shift(4, 'i'); break; + case 0x13 /*VT_UI4*/: blob.l += 4; val = blob.read_shift(4); break; + case 0x05 /*VT_R8*/: blob.l += 4; val = blob.read_shift(8, 'f'); break; + case 0x0B /*VT_BOOL*/: blob.l += 4; val = parsebool(blob, 4); break; + case 0x40 /*VT_FILETIME*/: blob.l += 4; val = new Date(parse_FILETIME(blob)); break; + default: throw new Error("unparsed value: " + blob[blob.l]); + } + PropH[name] = val; + } + } + } + blob.l = start_addr + size; /* step ahead to skip padding */ + return PropH; +} + +/* [MS-OLEPS] 2.21 PropertySetStream */ +function parse_PropertySetStream(file, PIDSI) { + var blob = file.content; + prep_blob(blob, 0); + + var NumSets, FMTID0, FMTID1, Offset0, Offset1; + blob.chk('feff', 'Byte Order: '); + + var vers = blob.read_shift(2); // TODO: check version + var SystemIdentifier = blob.read_shift(4); + blob.chk(CFB.utils.consts.HEADER_CLSID, 'CLSID: '); + NumSets = blob.read_shift(4); + if(NumSets !== 1 && NumSets !== 2) throw "Unrecognized #Sets: " + NumSets; + FMTID0 = blob.read_shift(16); Offset0 = blob.read_shift(4); + + if(NumSets === 1 && Offset0 !== blob.l) throw "Length mismatch"; + else if(NumSets === 2) { FMTID1 = blob.read_shift(16); Offset1 = blob.read_shift(4); } + var PSet0 = parse_PropertySet(blob, PIDSI); + + var rval = { SystemIdentifier: SystemIdentifier }; + for(var y in PSet0) rval[y] = PSet0[y]; + //rval.blob = blob; + rval.FMTID = FMTID0; + //rval.PSet0 = PSet0; + if(NumSets === 1) return rval; + if(blob.l !== Offset1) throw "Length mismatch 2: " + blob.l + " !== " + Offset1; + var PSet1; + try { PSet1 = parse_PropertySet(blob, null); } catch(e) { } + for(y in PSet1) rval[y] = PSet1[y]; + rval.FMTID = [FMTID0, FMTID1]; // TODO: verify FMTID0/1 + return rval; +} + + +function parsenoop2(blob, length) { blob.read_shift(length); return null; } + +function parslurp(blob, length, cb) { + var arr = [], target = blob.l + length; + while(blob.l < target) arr.push(cb(blob, target - blob.l)); + if(target !== blob.l) throw new Error("Slurp error"); + return arr; +} + +function parslurp2(blob, length, cb) { + var arr = [], target = blob.l + length, len = blob.read_shift(2); + while(len-- !== 0) arr.push(cb(blob, target - blob.l)); + if(target !== blob.l) throw new Error("Slurp error"); + return arr; +} + +function parsebool(blob, length) { return blob.read_shift(length) === 0x1; } + +function parseuint16(blob) { return blob.read_shift(2, 'u'); } +function parseuint16a(blob, length) { return parslurp(blob,length,parseuint16);} + +/* --- 2.5 Structures --- */ + +/* [MS-XLS] 2.5.14 Boolean */ +var parse_Boolean = parsebool; + +/* [MS-XLS] 2.5.10 Bes (boolean or error) */ +function parse_Bes(blob) { + var v = blob.read_shift(1), t = blob.read_shift(1); + return t === 0x01 ? v : v === 0x01; +} + +/* [MS-XLS] 2.5.240 ShortXLUnicodeString */ +function parse_ShortXLUnicodeString(blob, length, opts) { + var cch = blob.read_shift(1); + var width = 1, encoding = 'sbcs-cont'; + var cp = current_codepage; + if(opts && opts.biff >= 8) current_codepage = 1200; + if(opts === undefined || opts.biff !== 5) { + var fHighByte = blob.read_shift(1); + if(fHighByte) { width = 2; encoding = 'dbcs-cont'; } + } + var o = cch ? blob.read_shift(cch, encoding) : ""; + current_codepage = cp; + return o; +} + +/* 2.5.293 XLUnicodeRichExtendedString */ +function parse_XLUnicodeRichExtendedString(blob) { + var cp = current_codepage; + current_codepage = 1200; + var cch = blob.read_shift(2), flags = blob.read_shift(1); + var fHighByte = flags & 0x1, fExtSt = flags & 0x4, fRichSt = flags & 0x8; + var width = 1 + (flags & 0x1); // 0x0 -> utf8, 0x1 -> dbcs + var cRun, cbExtRst; + var z = {}; + if(fRichSt) cRun = blob.read_shift(2); + if(fExtSt) cbExtRst = blob.read_shift(4); + var encoding = (flags & 0x1) ? 'dbcs-cont' : 'sbcs-cont'; + var msg = cch === 0 ? "" : blob.read_shift(cch, encoding); + if(fRichSt) blob.l += 4 * cRun; //TODO: parse this + if(fExtSt) blob.l += cbExtRst; //TODO: parse this + z.t = msg; + if(!fRichSt) { z.raw = "" + z.t + ""; z.r = z.t; } + current_codepage = cp; + return z; +} + +/* 2.5.296 XLUnicodeStringNoCch */ +function parse_XLUnicodeStringNoCch(blob, cch, opts) { + var retval; + var fHighByte = blob.read_shift(1); + if(fHighByte===0) { retval = blob.read_shift(cch, 'sbcs-cont'); } + else { retval = blob.read_shift(cch, 'dbcs-cont'); } + return retval; +} + +/* 2.5.294 XLUnicodeString */ +function parse_XLUnicodeString(blob, length, opts) { + var cch = blob.read_shift(opts !== undefined && opts.biff > 0 && opts.biff < 8 ? 1 : 2); + if(cch === 0) { blob.l++; return ""; } + return parse_XLUnicodeStringNoCch(blob, cch, opts); +} +/* BIFF5 override */ +function parse_XLUnicodeString2(blob, length, opts) { + if(opts.biff !== 5 && opts.biff !== 2) return parse_XLUnicodeString(blob, length, opts); + var cch = blob.read_shift(1); + if(cch === 0) { blob.l++; return ""; } + return blob.read_shift(cch, 'sbcs-cont'); +} + +/* [MS-XLS] 2.5.61 ControlInfo */ +var parse_ControlInfo = parsenoop; + +/* [MS-OSHARED] 2.3.7.6 URLMoniker TODO: flags */ +var parse_URLMoniker = function(blob, length) { + var len = blob.read_shift(4), start = blob.l; + var extra = false; + if(len > 24) { + /* look ahead */ + blob.l += len - 24; + if(blob.read_shift(16) === "795881f43b1d7f48af2c825dc4852763") extra = true; + blob.l = start; + } + var url = blob.read_shift((extra?len-24:len)>>1, 'utf16le').replace(chr0,""); + if(extra) blob.l += 24; + return url; +}; + +/* [MS-OSHARED] 2.3.7.8 FileMoniker TODO: all fields */ +var parse_FileMoniker = function(blob, length) { + var cAnti = blob.read_shift(2); + var ansiLength = blob.read_shift(4); + var ansiPath = blob.read_shift(ansiLength, 'cstr'); + var endServer = blob.read_shift(2); + var versionNumber = blob.read_shift(2); + var cbUnicodePathSize = blob.read_shift(4); + if(cbUnicodePathSize === 0) return ansiPath.replace(/\\/g,"/"); + var cbUnicodePathBytes = blob.read_shift(4); + var usKeyValue = blob.read_shift(2); + var unicodePath = blob.read_shift(cbUnicodePathBytes>>1, 'utf16le').replace(chr0,""); + return unicodePath; +}; + +/* [MS-OSHARED] 2.3.7.2 HyperlinkMoniker TODO: all the monikers */ +var parse_HyperlinkMoniker = function(blob, length) { + var clsid = blob.read_shift(16); length -= 16; + switch(clsid) { + case "e0c9ea79f9bace118c8200aa004ba90b": return parse_URLMoniker(blob, length); + case "0303000000000000c000000000000046": return parse_FileMoniker(blob, length); + default: throw "unsupported moniker " + clsid; + } +}; + +/* [MS-OSHARED] 2.3.7.9 HyperlinkString */ +var parse_HyperlinkString = function(blob, length) { + var len = blob.read_shift(4); + var o = blob.read_shift(len, 'utf16le').replace(chr0, ""); + return o; +}; + +/* [MS-OSHARED] 2.3.7.1 Hyperlink Object TODO: unify params with XLSX */ +var parse_Hyperlink = function(blob, length) { + var end = blob.l + length; + var sVer = blob.read_shift(4); + if(sVer !== 2) throw new Error("Unrecognized streamVersion: " + sVer); + var flags = blob.read_shift(2); + blob.l += 2; + var displayName, targetFrameName, moniker, oleMoniker, location, guid, fileTime; + if(flags & 0x0010) displayName = parse_HyperlinkString(blob, end - blob.l); + if(flags & 0x0080) targetFrameName = parse_HyperlinkString(blob, end - blob.l); + if((flags & 0x0101) === 0x0101) moniker = parse_HyperlinkString(blob, end - blob.l); + if((flags & 0x0101) === 0x0001) oleMoniker = parse_HyperlinkMoniker(blob, end - blob.l); + if(flags & 0x0008) location = parse_HyperlinkString(blob, end - blob.l); + if(flags & 0x0020) guid = blob.read_shift(16); + if(flags & 0x0040) fileTime = parse_FILETIME(blob, 8); + blob.l = end; + var target = (targetFrameName||moniker||oleMoniker); + if(location) target+="#"+location; + return {Target: target}; +}; + +/* 2.5.178 LongRGBA */ +function parse_LongRGBA(blob, length) { var r = blob.read_shift(1), g = blob.read_shift(1), b = blob.read_shift(1), a = blob.read_shift(1); return [r,g,b,a]; } + +/* 2.5.177 LongRGB */ +function parse_LongRGB(blob, length) { var x = parse_LongRGBA(blob, length); x[3] = 0; return x; } + + +/* --- MS-XLS --- */ + +/* 2.5.19 */ +function parse_XLSCell(blob, length) { + var rw = blob.read_shift(2); // 0-indexed + var col = blob.read_shift(2); + var ixfe = blob.read_shift(2); + return {r:rw, c:col, ixfe:ixfe}; +} + +/* 2.5.134 */ +function parse_frtHeader(blob) { + var rt = blob.read_shift(2); + var flags = blob.read_shift(2); // TODO: parse these flags + blob.l += 8; + return {type: rt, flags: flags}; +} + + + +function parse_OptXLUnicodeString(blob, length, opts) { return length === 0 ? "" : parse_XLUnicodeString2(blob, length, opts); } + +/* 2.5.158 */ +var HIDEOBJENUM = ['SHOWALL', 'SHOWPLACEHOLDER', 'HIDEALL']; +var parse_HideObjEnum = parseuint16; + +/* 2.5.344 */ +function parse_XTI(blob, length) { + var iSupBook = blob.read_shift(2), itabFirst = blob.read_shift(2,'i'), itabLast = blob.read_shift(2,'i'); + return [iSupBook, itabFirst, itabLast]; +} + +/* 2.5.218 */ +function parse_RkRec(blob, length) { + var ixfe = blob.read_shift(2); + var RK = parse_RkNumber(blob); + //console.log("::", ixfe, RK,";;"); + return [ixfe, RK]; +} + +/* 2.5.1 */ +function parse_AddinUdf(blob, length) { + blob.l += 4; length -= 4; + var l = blob.l + length; + var udfName = parse_ShortXLUnicodeString(blob, length); + var cb = blob.read_shift(2); + l -= blob.l; + if(cb !== l) throw "Malformed AddinUdf: padding = " + l + " != " + cb; + blob.l += cb; + return udfName; +} + +/* 2.5.209 TODO: Check sizes */ +function parse_Ref8U(blob, length) { + var rwFirst = blob.read_shift(2); + var rwLast = blob.read_shift(2); + var colFirst = blob.read_shift(2); + var colLast = blob.read_shift(2); + return {s:{c:colFirst, r:rwFirst}, e:{c:colLast,r:rwLast}}; +} + +/* 2.5.211 */ +function parse_RefU(blob, length) { + var rwFirst = blob.read_shift(2); + var rwLast = blob.read_shift(2); + var colFirst = blob.read_shift(1); + var colLast = blob.read_shift(1); + return {s:{c:colFirst, r:rwFirst}, e:{c:colLast,r:rwLast}}; +} + +/* 2.5.207 */ +var parse_Ref = parse_RefU; + +/* 2.5.143 */ +function parse_FtCmo(blob, length) { + blob.l += 4; + var ot = blob.read_shift(2); + var id = blob.read_shift(2); + var flags = blob.read_shift(2); + blob.l+=12; + return [id, ot, flags]; +} + +/* 2.5.149 */ +function parse_FtNts(blob, length) { + var out = {}; + blob.l += 4; + blob.l += 16; // GUID TODO + out.fSharedNote = blob.read_shift(2); + blob.l += 4; + return out; +} + +/* 2.5.142 */ +function parse_FtCf(blob, length) { + var out = {}; + blob.l += 4; + blob.cf = blob.read_shift(2); + return out; +} + +/* 2.5.140 - 2.5.154 and friends */ +var FtTab = { + 0x15: parse_FtCmo, + 0x13: parsenoop, /* FtLbsData */ + 0x12: function(blob, length) { blob.l += 12; }, /* FtCblsData */ + 0x11: function(blob, length) { blob.l += 8; }, /* FtRboData */ + 0x10: parsenoop, /* FtEdoData */ + 0x0F: parsenoop, /* FtGboData */ + 0x0D: parse_FtNts, /* FtNts */ + 0x0C: function(blob, length) { blob.l += 24; }, /* FtSbs */ + 0x0B: function(blob, length) { blob.l += 10; }, /* FtRbo */ + 0x0A: function(blob, length) { blob.l += 16; }, /* FtCbls */ + 0x09: parsenoop, /* FtPictFmla */ + 0x08: function(blob, length) { blob.l += 6; }, /* FtPioGrbit */ + 0x07: parse_FtCf, /* FtCf */ + 0x06: function(blob, length) { blob.l += 6; }, /* FtGmo */ + 0x04: parsenoop, /* FtMacro */ + 0x00: function(blob, length) { blob.l += 4; } /* FtEnding */ +}; +function parse_FtArray(blob, length, ot) { + var s = blob.l; + var fts = []; + while(blob.l < s + length) { + var ft = blob.read_shift(2); + blob.l-=2; + try { + fts.push(FtTab[ft](blob, s + length - blob.l)); + } catch(e) { blob.l = s + length; return fts; } + } + if(blob.l != s + length) blob.l = s + length; //throw "bad Object Ft-sequence"; + return fts; +} + +/* 2.5.129 */ +var parse_FontIndex = parseuint16; + +/* --- 2.4 Records --- */ + +/* 2.4.21 */ +function parse_BOF(blob, length) { + var o = {}; + o.BIFFVer = blob.read_shift(2); length -= 2; + switch(o.BIFFVer) { + case 0x0600: /* BIFF8 */ + case 0x0500: /* BIFF5 */ + case 0x0002: case 0x0007: /* BIFF2 */ + break; + default: throw "Unexpected BIFF Ver " + o.BIFFVer; + } + blob.read_shift(length); + return o; +} + + +/* 2.4.146 */ +function parse_InterfaceHdr(blob, length) { + if(length === 0) return 0x04b0; + var q; + if((q=blob.read_shift(2))!==0x04b0) throw 'InterfaceHdr codePage ' + q; + return 0x04b0; +} + + +/* 2.4.349 */ +function parse_WriteAccess(blob, length, opts) { + if(opts.enc) { blob.l += length; return ""; } + var l = blob.l; + // TODO: make sure XLUnicodeString doesnt overrun + var UserName = parse_XLUnicodeString(blob, 0, opts); + blob.read_shift(length + l - blob.l); + return UserName; +} + +/* 2.4.28 */ +function parse_BoundSheet8(blob, length, opts) { + var pos = blob.read_shift(4); + var hidden = blob.read_shift(1) >> 6; + var dt = blob.read_shift(1); + switch(dt) { + case 0: dt = 'Worksheet'; break; + case 1: dt = 'Macrosheet'; break; + case 2: dt = 'Chartsheet'; break; + case 6: dt = 'VBAModule'; break; + } + var name = parse_ShortXLUnicodeString(blob, 0, opts); + if(name.length === 0) name = "Sheet1"; + return { pos:pos, hs:hidden, dt:dt, name:name }; +} + +/* 2.4.265 TODO */ +function parse_SST(blob, length) { + var cnt = blob.read_shift(4); + var ucnt = blob.read_shift(4); + var strs = []; + for(var i = 0; i != ucnt; ++i) { + strs.push(parse_XLUnicodeRichExtendedString(blob)); + } + strs.Count = cnt; strs.Unique = ucnt; + return strs; +} + +/* 2.4.107 */ +function parse_ExtSST(blob, length) { + var extsst = {}; + extsst.dsst = blob.read_shift(2); + blob.l += length-2; + return extsst; +} + + +/* 2.4.221 TODO*/ +function parse_Row(blob, length) { + var rw = blob.read_shift(2), col = blob.read_shift(2), Col = blob.read_shift(2), rht = blob.read_shift(2); + blob.read_shift(4); // reserved(2), unused(2) + var flags = blob.read_shift(1); // various flags + blob.read_shift(1); // reserved + blob.read_shift(2); //ixfe, other flags + return {r:rw, c:col, cnt:Col-col}; +} + + +/* 2.4.125 */ +function parse_ForceFullCalculation(blob, length) { + var header = parse_frtHeader(blob); + if(header.type != 0x08A3) throw "Invalid Future Record " + header.type; + var fullcalc = blob.read_shift(4); + return fullcalc !== 0x0; +} + + +var parse_CompressPictures = parsenoop2; /* 2.4.55 Not interesting */ + + + +/* 2.4.215 rt */ +function parse_RecalcId(blob, length) { + blob.read_shift(2); + return blob.read_shift(4); +} + +/* 2.4.87 */ +function parse_DefaultRowHeight (blob, length) { + var f = blob.read_shift(2), miyRw; + miyRw = blob.read_shift(2); // flags & 0x02 -> hidden, else empty + var fl = {Unsynced:f&1,DyZero:(f&2)>>1,ExAsc:(f&4)>>2,ExDsc:(f&8)>>3}; + return [fl, miyRw]; +} + +/* 2.4.345 TODO */ +function parse_Window1(blob, length) { + var xWn = blob.read_shift(2), yWn = blob.read_shift(2), dxWn = blob.read_shift(2), dyWn = blob.read_shift(2); + var flags = blob.read_shift(2), iTabCur = blob.read_shift(2), iTabFirst = blob.read_shift(2); + var ctabSel = blob.read_shift(2), wTabRatio = blob.read_shift(2); + return { Pos: [xWn, yWn], Dim: [dxWn, dyWn], Flags: flags, CurTab: iTabCur, + FirstTab: iTabFirst, Selected: ctabSel, TabRatio: wTabRatio }; +} + +/* 2.4.122 TODO */ +function parse_Font(blob, length, opts) { + blob.l += 14; + var name = parse_ShortXLUnicodeString(blob, 0, opts); + return name; +} + +/* 2.4.149 */ +function parse_LabelSst(blob, length) { + var cell = parse_XLSCell(blob); + cell.isst = blob.read_shift(4); + return cell; +} + +/* 2.4.148 */ +function parse_Label(blob, length, opts) { + var cell = parse_XLSCell(blob, 6); + var str = parse_XLUnicodeString(blob, length-6, opts); + cell.val = str; + return cell; +} + +/* 2.4.126 Number Formats */ +function parse_Format(blob, length, opts) { + var ifmt = blob.read_shift(2); + var fmtstr = parse_XLUnicodeString2(blob, 0, opts); + return [ifmt, fmtstr]; +} + +/* 2.4.90 */ +function parse_Dimensions(blob, length) { + var w = length === 10 ? 2 : 4; + var r = blob.read_shift(w), R = blob.read_shift(w), + c = blob.read_shift(2), C = blob.read_shift(2); + blob.l += 2; + return {s: {r:r, c:c}, e: {r:R, c:C}}; +} + +/* 2.4.220 */ +function parse_RK(blob, length) { + var rw = blob.read_shift(2), col = blob.read_shift(2); + var rkrec = parse_RkRec(blob); + return {r:rw, c:col, ixfe:rkrec[0], rknum:rkrec[1]}; +} + +/* 2.4.175 */ +function parse_MulRk(blob, length) { + var target = blob.l + length - 2; + var rw = blob.read_shift(2), col = blob.read_shift(2); + var rkrecs = []; + while(blob.l < target) rkrecs.push(parse_RkRec(blob)); + if(blob.l !== target) throw "MulRK read error"; + var lastcol = blob.read_shift(2); + if(rkrecs.length != lastcol - col + 1) throw "MulRK length mismatch"; + return {r:rw, c:col, C:lastcol, rkrec:rkrecs}; +} + +/* 2.5.20 2.5.249 TODO */ +function parse_CellStyleXF(blob, length, style) { + var o = {}; + var a = blob.read_shift(4), b = blob.read_shift(4); + var c = blob.read_shift(4), d = blob.read_shift(2); + o.patternType = XLSFillPattern[c >> 26]; + o.icvFore = d & 0x7F; + o.icvBack = (d >> 7) & 0x7F; + return o; +} +function parse_CellXF(blob, length) {return parse_CellStyleXF(blob,length,0);} +function parse_StyleXF(blob, length) {return parse_CellStyleXF(blob,length,1);} + +/* 2.4.353 TODO: actually do this right */ +function parse_XF(blob, length) { + var o = {}; + o.ifnt = blob.read_shift(2); o.ifmt = blob.read_shift(2); o.flags = blob.read_shift(2); + o.fStyle = (o.flags >> 2) & 0x01; + length -= 6; + o.data = parse_CellStyleXF(blob, length, o.fStyle); + return o; +} + +/* 2.4.134 */ +function parse_Guts(blob, length) { + blob.l += 4; + var out = [blob.read_shift(2), blob.read_shift(2)]; + if(out[0] !== 0) out[0]--; + if(out[1] !== 0) out[1]--; + if(out[0] > 7 || out[1] > 7) throw "Bad Gutters: " + out; + return out; +} + +/* 2.4.24 */ +function parse_BoolErr(blob, length) { + var cell = parse_XLSCell(blob, 6); + var val = parse_Bes(blob, 2); + cell.val = val; + cell.t = (val === true || val === false) ? 'b' : 'e'; + return cell; +} + +/* 2.4.180 Number */ +function parse_Number(blob, length) { + var cell = parse_XLSCell(blob, 6); + var xnum = parse_Xnum(blob, 8); + cell.val = xnum; + return cell; +} + +var parse_XLHeaderFooter = parse_OptXLUnicodeString; // TODO: parse 2.4.136 + +/* 2.4.271 */ +function parse_SupBook(blob, length, opts) { + var end = blob.l + length; + var ctab = blob.read_shift(2); + var cch = blob.read_shift(2); + var virtPath; + if(cch >=0x01 && cch <=0xff) virtPath = parse_XLUnicodeStringNoCch(blob, cch); + var rgst = blob.read_shift(end - blob.l); + opts.sbcch = cch; + return [cch, ctab, virtPath, rgst]; +} + +/* 2.4.105 TODO */ +function parse_ExternName(blob, length, opts) { + var flags = blob.read_shift(2); + var body; + var o = { + fBuiltIn: flags & 0x01, + fWantAdvise: (flags >>> 1) & 0x01, + fWantPict: (flags >>> 2) & 0x01, + fOle: (flags >>> 3) & 0x01, + fOleLink: (flags >>> 4) & 0x01, + cf: (flags >>> 5) & 0x3FF, + fIcon: flags >>> 15 & 0x01 + }; + if(opts.sbcch === 0x3A01) body = parse_AddinUdf(blob, length-2); + //else throw new Error("unsupported SupBook cch: " + opts.sbcch); + o.body = body || blob.read_shift(length-2); + return o; +} + +/* 2.4.150 TODO */ +function parse_Lbl(blob, length, opts) { + if(opts.biff < 8) return parse_Label(blob, length, opts); + var target = blob.l + length; + var flags = blob.read_shift(2); + var chKey = blob.read_shift(1); + var cch = blob.read_shift(1); + var cce = blob.read_shift(2); + blob.l += 2; + var itab = blob.read_shift(2); + blob.l += 4; + var name = parse_XLUnicodeStringNoCch(blob, cch, opts); + var rgce = parse_NameParsedFormula(blob, target - blob.l, opts, cce); + return { + chKey: chKey, + Name: name, + rgce: rgce + }; +} + +/* 2.4.106 TODO: verify supbook manipulation */ +function parse_ExternSheet(blob, length, opts) { + if(opts.biff < 8) return parse_ShortXLUnicodeString(blob, length, opts); + var o = parslurp2(blob,length,parse_XTI); + var oo = []; + if(opts.sbcch === 0x0401) { + for(var i = 0; i != o.length; ++i) oo.push(opts.snames[o[i][1]]); + return oo; + } + else return o; +} + +/* 2.4.260 */ +function parse_ShrFmla(blob, length, opts) { + var ref = parse_RefU(blob, 6); + blob.l++; + var cUse = blob.read_shift(1); + length -= 8; + return [parse_SharedParsedFormula(blob, length, opts), cUse]; +} + +/* 2.4.4 TODO */ +function parse_Array(blob, length, opts) { + var ref = parse_Ref(blob, 6); + blob.l += 6; length -= 12; /* TODO: fAlwaysCalc */ + return [ref, parse_ArrayParsedFormula(blob, length, opts, ref)]; +} + +/* 2.4.173 */ +function parse_MTRSettings(blob, length) { + var fMTREnabled = blob.read_shift(4) !== 0x00; + var fUserSetThreadCount = blob.read_shift(4) !== 0x00; + var cUserThreadCount = blob.read_shift(4); + return [fMTREnabled, fUserSetThreadCount, cUserThreadCount]; +} + +/* 2.5.186 TODO: BIFF5 */ +function parse_NoteSh(blob, length, opts) { + if(opts.biff < 8) return; + var row = blob.read_shift(2), col = blob.read_shift(2); + var flags = blob.read_shift(2), idObj = blob.read_shift(2); + var stAuthor = parse_XLUnicodeString2(blob, 0, opts); + if(opts.biff < 8) blob.read_shift(1); + return [{r:row,c:col}, stAuthor, idObj, flags]; +} + +/* 2.4.179 */ +function parse_Note(blob, length, opts) { + /* TODO: Support revisions */ + return parse_NoteSh(blob, length, opts); +} + +/* 2.4.168 */ +function parse_MergeCells(blob, length) { + var merges = []; + var cmcs = blob.read_shift(2); + while (cmcs--) merges.push(parse_Ref8U(blob,length)); + return merges; +} + +/* 2.4.181 TODO: parse all the things! */ +function parse_Obj(blob, length) { + var cmo = parse_FtCmo(blob, 22); // id, ot, flags + var fts = parse_FtArray(blob, length-22, cmo[1]); + return { cmo: cmo, ft:fts }; +} + +/* 2.4.329 TODO: parse properly */ +function parse_TxO(blob, length, opts) { + var s = blob.l; +try { + blob.l += 4; + var ot = (opts.lastobj||{cmo:[0,0]}).cmo[1]; + var controlInfo; + if([0,5,7,11,12,14].indexOf(ot) == -1) blob.l += 6; + else controlInfo = parse_ControlInfo(blob, 6, opts); + var cchText = blob.read_shift(2); + var cbRuns = blob.read_shift(2); + var ifntEmpty = parse_FontIndex(blob, 2); + var len = blob.read_shift(2); + blob.l += len; + //var fmla = parse_ObjFmla(blob, s + length - blob.l); + + var texts = ""; + for(var i = 1; i < blob.lens.length-1; ++i) { + if(blob.l-s != blob.lens[i]) throw "TxO: bad continue record"; + var hdr = blob[blob.l]; + var t = parse_XLUnicodeStringNoCch(blob, blob.lens[i+1]-blob.lens[i]-1); + texts += t; + if(texts.length >= (hdr ? cchText : 2*cchText)) break; + } + if(texts.length !== cchText && texts.length !== cchText*2) { + throw "cchText: " + cchText + " != " + texts.length; + } + + blob.l = s + length; + /* 2.5.272 TxORuns */ +// var rgTxoRuns = []; +// for(var j = 0; j != cbRuns/8-1; ++j) blob.l += 8; +// var cchText2 = blob.read_shift(2); +// if(cchText2 !== cchText) throw "TxOLastRun mismatch: " + cchText2 + " " + cchText; +// blob.l += 6; +// if(s + length != blob.l) throw "TxO " + (s + length) + ", at " + blob.l; + return { t: texts }; +} catch(e) { blob.l = s + length; return { t: texts||"" }; } +} + +/* 2.4.140 */ +var parse_HLink = function(blob, length) { + var ref = parse_Ref8U(blob, 8); + blob.l += 16; /* CLSID */ + var hlink = parse_Hyperlink(blob, length-24); + return [ref, hlink]; +}; + +/* 2.4.141 */ +var parse_HLinkTooltip = function(blob, length) { + var end = blob.l + length; + blob.read_shift(2); + var ref = parse_Ref8U(blob, 8); + var wzTooltip = blob.read_shift((length-10)/2, 'dbcs-cont'); + wzTooltip = wzTooltip.replace(chr0,""); + return [ref, wzTooltip]; +}; + +/* 2.4.63 */ +function parse_Country(blob, length) { + var o = [], d; + d = blob.read_shift(2); o[0] = CountryEnum[d] || d; + d = blob.read_shift(2); o[1] = CountryEnum[d] || d; + return o; +} + +/* 2.4.50 ClrtClient */ +function parse_ClrtClient(blob, length) { + var ccv = blob.read_shift(2); + var o = []; + while(ccv-->0) o.push(parse_LongRGB(blob, 8)); + return o; +} + +/* 2.4.188 */ +function parse_Palette(blob, length) { + var ccv = blob.read_shift(2); + var o = []; + while(ccv-->0) o.push(parse_LongRGB(blob, 8)); + return o; +} + +/* 2.4.354 */ +function parse_XFCRC(blob, length) { + blob.l += 2; + var o = {cxfs:0, crc:0}; + o.cxfs = blob.read_shift(2); + o.crc = blob.read_shift(4); + return o; +} + + +var parse_Style = parsenoop; +var parse_StyleExt = parsenoop; + +var parse_ColInfo = parsenoop; + +var parse_Window2 = parsenoop; + + +var parse_Backup = parsebool; /* 2.4.14 */ +var parse_Blank = parse_XLSCell; /* 2.4.20 Just the cell */ +var parse_BottomMargin = parse_Xnum; /* 2.4.27 */ +var parse_BuiltInFnGroupCount = parseuint16; /* 2.4.30 0x0E or 0x10 but excel 2011 generates 0x11? */ +var parse_CalcCount = parseuint16; /* 2.4.31 #Iterations */ +var parse_CalcDelta = parse_Xnum; /* 2.4.32 */ +var parse_CalcIter = parsebool; /* 2.4.33 1=iterative calc */ +var parse_CalcMode = parseuint16; /* 2.4.34 0=manual, 1=auto (def), 2=table */ +var parse_CalcPrecision = parsebool; /* 2.4.35 */ +var parse_CalcRefMode = parsenoop2; /* 2.4.36 */ +var parse_CalcSaveRecalc = parsebool; /* 2.4.37 */ +var parse_CodePage = parseuint16; /* 2.4.52 */ +var parse_Compat12 = parsebool; /* 2.4.54 true = no compatibility check */ +var parse_Date1904 = parsebool; /* 2.4.77 - 1=1904,0=1900 */ +var parse_DefColWidth = parseuint16; /* 2.4.89 */ +var parse_DSF = parsenoop2; /* 2.4.94 -- MUST be ignored */ +var parse_EntExU2 = parsenoop2; /* 2.4.102 -- Explicitly says to ignore */ +var parse_EOF = parsenoop2; /* 2.4.103 */ +var parse_Excel9File = parsenoop2; /* 2.4.104 -- Optional and unused */ +var parse_FeatHdr = parsenoop2; /* 2.4.112 */ +var parse_FontX = parseuint16; /* 2.4.123 */ +var parse_Footer = parse_XLHeaderFooter; /* 2.4.124 */ +var parse_GridSet = parseuint16; /* 2.4.132, =1 */ +var parse_HCenter = parsebool; /* 2.4.135 sheet centered horizontal on print */ +var parse_Header = parse_XLHeaderFooter; /* 2.4.136 */ +var parse_HideObj = parse_HideObjEnum; /* 2.4.139 */ +var parse_InterfaceEnd = parsenoop2; /* 2.4.145 -- noop */ +var parse_LeftMargin = parse_Xnum; /* 2.4.151 */ +var parse_Mms = parsenoop2; /* 2.4.169 -- Explicitly says to ignore */ +var parse_ObjProtect = parsebool; /* 2.4.183 -- must be 1 if present */ +var parse_Password = parseuint16; /* 2.4.191 */ +var parse_PrintGrid = parsebool; /* 2.4.202 */ +var parse_PrintRowCol = parsebool; /* 2.4.203 */ +var parse_PrintSize = parseuint16; /* 2.4.204 0:3 */ +var parse_Prot4Rev = parsebool; /* 2.4.205 */ +var parse_Prot4RevPass = parseuint16; /* 2.4.206 */ +var parse_Protect = parsebool; /* 2.4.207 */ +var parse_RefreshAll = parsebool; /* 2.4.217 -- must be 0 if not template */ +var parse_RightMargin = parse_Xnum; /* 2.4.219 */ +var parse_RRTabId = parseuint16a; /* 2.4.241 */ +var parse_ScenarioProtect = parsebool; /* 2.4.245 */ +var parse_Scl = parseuint16a; /* 2.4.247 num, den */ +var parse_String = parse_XLUnicodeString; /* 2.4.268 */ +var parse_SxBool = parsebool; /* 2.4.274 */ +var parse_TopMargin = parse_Xnum; /* 2.4.328 */ +var parse_UsesELFs = parsebool; /* 2.4.337 -- should be 0 */ +var parse_VCenter = parsebool; /* 2.4.342 */ +var parse_WinProtect = parsebool; /* 2.4.347 */ +var parse_WriteProtect = parsenoop; /* 2.4.350 empty record */ + + +/* ---- */ +var parse_VerticalPageBreaks = parsenoop; +var parse_HorizontalPageBreaks = parsenoop; +var parse_Selection = parsenoop; +var parse_Continue = parsenoop; +var parse_Pane = parsenoop; +var parse_Pls = parsenoop; +var parse_DCon = parsenoop; +var parse_DConRef = parsenoop; +var parse_DConName = parsenoop; +var parse_XCT = parsenoop; +var parse_CRN = parsenoop; +var parse_FileSharing = parsenoop; +var parse_Uncalced = parsenoop; +var parse_Template = parsenoop; +var parse_Intl = parsenoop; +var parse_WsBool = parsenoop; +var parse_Sort = parsenoop; +var parse_Sync = parsenoop; +var parse_LPr = parsenoop; +var parse_DxGCol = parsenoop; +var parse_FnGroupName = parsenoop; +var parse_FilterMode = parsenoop; +var parse_AutoFilterInfo = parsenoop; +var parse_AutoFilter = parsenoop; +var parse_Setup = parsenoop; +var parse_ScenMan = parsenoop; +var parse_SCENARIO = parsenoop; +var parse_SxView = parsenoop; +var parse_Sxvd = parsenoop; +var parse_SXVI = parsenoop; +var parse_SxIvd = parsenoop; +var parse_SXLI = parsenoop; +var parse_SXPI = parsenoop; +var parse_DocRoute = parsenoop; +var parse_RecipName = parsenoop; +var parse_MulBlank = parsenoop; +var parse_SXDI = parsenoop; +var parse_SXDB = parsenoop; +var parse_SXFDB = parsenoop; +var parse_SXDBB = parsenoop; +var parse_SXNum = parsenoop; +var parse_SxErr = parsenoop; +var parse_SXInt = parsenoop; +var parse_SXString = parsenoop; +var parse_SXDtr = parsenoop; +var parse_SxNil = parsenoop; +var parse_SXTbl = parsenoop; +var parse_SXTBRGIITM = parsenoop; +var parse_SxTbpg = parsenoop; +var parse_ObProj = parsenoop; +var parse_SXStreamID = parsenoop; +var parse_DBCell = parsenoop; +var parse_SXRng = parsenoop; +var parse_SxIsxoper = parsenoop; +var parse_BookBool = parsenoop; +var parse_DbOrParamQry = parsenoop; +var parse_OleObjectSize = parsenoop; +var parse_SXVS = parsenoop; +var parse_BkHim = parsenoop; +var parse_MsoDrawingGroup = parsenoop; +var parse_MsoDrawing = parsenoop; +var parse_MsoDrawingSelection = parsenoop; +var parse_PhoneticInfo = parsenoop; +var parse_SxRule = parsenoop; +var parse_SXEx = parsenoop; +var parse_SxFilt = parsenoop; +var parse_SxDXF = parsenoop; +var parse_SxItm = parsenoop; +var parse_SxName = parsenoop; +var parse_SxSelect = parsenoop; +var parse_SXPair = parsenoop; +var parse_SxFmla = parsenoop; +var parse_SxFormat = parsenoop; +var parse_SXVDEx = parsenoop; +var parse_SXFormula = parsenoop; +var parse_SXDBEx = parsenoop; +var parse_RRDInsDel = parsenoop; +var parse_RRDHead = parsenoop; +var parse_RRDChgCell = parsenoop; +var parse_RRDRenSheet = parsenoop; +var parse_RRSort = parsenoop; +var parse_RRDMove = parsenoop; +var parse_RRFormat = parsenoop; +var parse_RRAutoFmt = parsenoop; +var parse_RRInsertSh = parsenoop; +var parse_RRDMoveBegin = parsenoop; +var parse_RRDMoveEnd = parsenoop; +var parse_RRDInsDelBegin = parsenoop; +var parse_RRDInsDelEnd = parsenoop; +var parse_RRDConflict = parsenoop; +var parse_RRDDefName = parsenoop; +var parse_RRDRstEtxp = parsenoop; +var parse_LRng = parsenoop; +var parse_CUsr = parsenoop; +var parse_CbUsr = parsenoop; +var parse_UsrInfo = parsenoop; +var parse_UsrExcl = parsenoop; +var parse_FileLock = parsenoop; +var parse_RRDInfo = parsenoop; +var parse_BCUsrs = parsenoop; +var parse_UsrChk = parsenoop; +var parse_UserBView = parsenoop; +var parse_UserSViewBegin = parsenoop; // overloaded +var parse_UserSViewEnd = parsenoop; +var parse_RRDUserView = parsenoop; +var parse_Qsi = parsenoop; +var parse_CondFmt = parsenoop; +var parse_CF = parsenoop; +var parse_DVal = parsenoop; +var parse_DConBin = parsenoop; +var parse_Lel = parsenoop; +var parse_XLSCodeName = parse_XLUnicodeString; +var parse_SXFDBType = parsenoop; +var parse_ObNoMacros = parsenoop; +var parse_Dv = parsenoop; +var parse_Index = parsenoop; +var parse_Table = parsenoop; +var parse_BigName = parsenoop; +var parse_ContinueBigName = parsenoop; +var parse_WebPub = parsenoop; +var parse_QsiSXTag = parsenoop; +var parse_DBQueryExt = parsenoop; +var parse_ExtString = parsenoop; +var parse_TxtQry = parsenoop; +var parse_Qsir = parsenoop; +var parse_Qsif = parsenoop; +var parse_RRDTQSIF = parsenoop; +var parse_OleDbConn = parsenoop; +var parse_WOpt = parsenoop; +var parse_SXViewEx = parsenoop; +var parse_SXTH = parsenoop; +var parse_SXPIEx = parsenoop; +var parse_SXVDTEx = parsenoop; +var parse_SXViewEx9 = parsenoop; +var parse_ContinueFrt = parsenoop; +var parse_RealTimeData = parsenoop; +var parse_ChartFrtInfo = parsenoop; +var parse_FrtWrapper = parsenoop; +var parse_StartBlock = parsenoop; +var parse_EndBlock = parsenoop; +var parse_StartObject = parsenoop; +var parse_EndObject = parsenoop; +var parse_CatLab = parsenoop; +var parse_YMult = parsenoop; +var parse_SXViewLink = parsenoop; +var parse_PivotChartBits = parsenoop; +var parse_FrtFontList = parsenoop; +var parse_SheetExt = parsenoop; +var parse_BookExt = parsenoop; +var parse_SXAddl = parsenoop; +var parse_CrErr = parsenoop; +var parse_HFPicture = parsenoop; +var parse_Feat = parsenoop; +var parse_DataLabExt = parsenoop; +var parse_DataLabExtContents = parsenoop; +var parse_CellWatch = parsenoop; +var parse_FeatHdr11 = parsenoop; +var parse_Feature11 = parsenoop; +var parse_DropDownObjIds = parsenoop; +var parse_ContinueFrt11 = parsenoop; +var parse_DConn = parsenoop; +var parse_List12 = parsenoop; +var parse_Feature12 = parsenoop; +var parse_CondFmt12 = parsenoop; +var parse_CF12 = parsenoop; +var parse_CFEx = parsenoop; +var parse_AutoFilter12 = parsenoop; +var parse_ContinueFrt12 = parsenoop; +var parse_MDTInfo = parsenoop; +var parse_MDXStr = parsenoop; +var parse_MDXTuple = parsenoop; +var parse_MDXSet = parsenoop; +var parse_MDXProp = parsenoop; +var parse_MDXKPI = parsenoop; +var parse_MDB = parsenoop; +var parse_PLV = parsenoop; +var parse_DXF = parsenoop; +var parse_TableStyles = parsenoop; +var parse_TableStyle = parsenoop; +var parse_TableStyleElement = parsenoop; +var parse_NamePublish = parsenoop; +var parse_NameCmt = parsenoop; +var parse_SortData = parsenoop; +var parse_GUIDTypeLib = parsenoop; +var parse_FnGrp12 = parsenoop; +var parse_NameFnGrp12 = parsenoop; +var parse_HeaderFooter = parsenoop; +var parse_CrtLayout12 = parsenoop; +var parse_CrtMlFrt = parsenoop; +var parse_CrtMlFrtContinue = parsenoop; +var parse_ShapePropsStream = parsenoop; +var parse_TextPropsStream = parsenoop; +var parse_RichTextStream = parsenoop; +var parse_CrtLayout12A = parsenoop; +var parse_Units = parsenoop; +var parse_Chart = parsenoop; +var parse_Series = parsenoop; +var parse_DataFormat = parsenoop; +var parse_LineFormat = parsenoop; +var parse_MarkerFormat = parsenoop; +var parse_AreaFormat = parsenoop; +var parse_PieFormat = parsenoop; +var parse_AttachedLabel = parsenoop; +var parse_SeriesText = parsenoop; +var parse_ChartFormat = parsenoop; +var parse_Legend = parsenoop; +var parse_SeriesList = parsenoop; +var parse_Bar = parsenoop; +var parse_Line = parsenoop; +var parse_Pie = parsenoop; +var parse_Area = parsenoop; +var parse_Scatter = parsenoop; +var parse_CrtLine = parsenoop; +var parse_Axis = parsenoop; +var parse_Tick = parsenoop; +var parse_ValueRange = parsenoop; +var parse_CatSerRange = parsenoop; +var parse_AxisLine = parsenoop; +var parse_CrtLink = parsenoop; +var parse_DefaultText = parsenoop; +var parse_Text = parsenoop; +var parse_ObjectLink = parsenoop; +var parse_Frame = parsenoop; +var parse_Begin = parsenoop; +var parse_End = parsenoop; +var parse_PlotArea = parsenoop; +var parse_Chart3d = parsenoop; +var parse_PicF = parsenoop; +var parse_DropBar = parsenoop; +var parse_Radar = parsenoop; +var parse_Surf = parsenoop; +var parse_RadarArea = parsenoop; +var parse_AxisParent = parsenoop; +var parse_LegendException = parsenoop; +var parse_ShtProps = parsenoop; +var parse_SerToCrt = parsenoop; +var parse_AxesUsed = parsenoop; +var parse_SBaseRef = parsenoop; +var parse_SerParent = parsenoop; +var parse_SerAuxTrend = parsenoop; +var parse_IFmtRecord = parsenoop; +var parse_Pos = parsenoop; +var parse_AlRuns = parsenoop; +var parse_BRAI = parsenoop; +var parse_SerAuxErrBar = parsenoop; +var parse_SerFmt = parsenoop; +var parse_Chart3DBarShape = parsenoop; +var parse_Fbi = parsenoop; +var parse_BopPop = parsenoop; +var parse_AxcExt = parsenoop; +var parse_Dat = parsenoop; +var parse_PlotGrowth = parsenoop; +var parse_SIIndex = parsenoop; +var parse_GelFrame = parsenoop; +var parse_BopPopCustom = parsenoop; +var parse_Fbi2 = parsenoop; + +/* --- Specific to versions before BIFF8 --- */ +function parse_BIFF5String(blob) { + var len = blob.read_shift(1); + return blob.read_shift(len, 'sbcs-cont'); +} + +/* BIFF2_??? where ??? is the name from [XLS] */ +function parse_BIFF2STR(blob, length, opts) { + var cell = parse_XLSCell(blob, 6); + ++blob.l; + var str = parse_XLUnicodeString2(blob, length-7, opts); + cell.val = str; + return cell; +} + +function parse_BIFF2NUM(blob, length, opts) { + var cell = parse_XLSCell(blob, 6); + ++blob.l; + var num = parse_Xnum(blob, 8); + cell.val = num; + return cell; +} + +/* 18.4.1 charset to codepage mapping */ +var CS2CP = { + 0: 1252, /* ANSI */ + 1: 65001, /* DEFAULT */ + 2: 65001, /* SYMBOL */ + 77: 10000, /* MAC */ + 128: 932, /* SHIFTJIS */ + 129: 949, /* HANGUL */ + 130: 1361, /* JOHAB */ + 134: 936, /* GB2312 */ + 136: 950, /* CHINESEBIG5 */ + 161: 1253, /* GREEK */ + 162: 1254, /* TURKISH */ + 163: 1258, /* VIETNAMESE */ + 177: 1255, /* HEBREW */ + 178: 1256, /* ARABIC */ + 186: 1257, /* BALTIC */ + 204: 1251, /* RUSSIAN */ + 222: 874, /* THAI */ + 238: 1250, /* EASTEUROPE */ + 255: 1252, /* OEM */ + 69: 6969 /* MISC */ +}; + +/* Parse a list of tags */ +var parse_rs = (function parse_rs_factory() { + var tregex = matchtag("t"), rpregex = matchtag("rPr"), rregex = //g, rend = /<\/r>/, nlregex = /\r\n/g; + /* 18.4.7 rPr CT_RPrElt */ + var parse_rpr = function parse_rpr(rpr, intro, outro) { + var font = {}, cp = 65001; + var m = rpr.match(tagregex), i = 0; + if(m) for(;i!=m.length; ++i) { + var y = parsexmltag(m[i]); + switch(y[0]) { + /* 18.8.12 condense CT_BooleanProperty */ + /* ** not required . */ + case '': break; + + /* 18.4.1 charset CT_IntProperty TODO */ + case '': break; + + /* 18.4.5 rFont CT_FontName */ + case '': font.strike = 1; break; + case '': break; + + /* 18.4.13 u CT_UnderlineProperty */ + case '': font.u = 1; break; + case '': break; + + /* 18.8.2 b */ + case '': font.b = 1; break; + case '': break; + + /* 18.8.26 i */ + case '': font.i = 1; break; + case '': break; + + /* 18.3.1.15 color CT_Color TODO: tint, theme, auto, indexed */ + case ''); + outro.push(""); + return cp; + }; + + /* 18.4.4 r CT_RElt */ + function parse_r(r) { + var terms = [[],"",[]]; + /* 18.4.12 t ST_Xstring */ + var t = r.match(tregex), cp = 65001; + if(!isval(t)) return ""; + terms[1] = t[1]; + + var rpr = r.match(rpregex); + if(isval(rpr)) cp = parse_rpr(rpr[1], terms[0], terms[2]); + + return terms[0].join("") + terms[1].replace(nlregex,'
    ') + terms[2].join(""); + } + return function parse_rs(rs) { + return rs.replace(rregex,"").split(rend).map(parse_r).join(""); + }; +})(); + +/* 18.4.8 si CT_Rst */ +var sitregex = /]*>([^<]*)<\/t>/g, sirregex = //; +function parse_si(x, opts) { + var html = opts ? opts.cellHTML : true; + var z = {}; + if(!x) return null; + var y; + /* 18.4.12 t ST_Xstring (Plaintext String) */ + if(x.charCodeAt(1) === 116) { + z.t = utf8read(unescapexml(x.substr(x.indexOf(">")+1).split(/<\/t>/)[0])); + z.r = x; + if(html) z.h = z.t; + } + /* 18.4.4 r CT_RElt (Rich Text Run) */ + else if((y = x.match(sirregex))) { + z.r = x; + z.t = utf8read(unescapexml(x.match(sitregex).join("").replace(tagregex,""))); + if(html) z.h = parse_rs(x); + } + /* 18.4.3 phoneticPr CT_PhoneticPr (TODO: needed for Asian support) */ + /* 18.4.6 rPh CT_PhoneticRun (TODO: needed for Asian support) */ + return z; +} + +/* 18.4 Shared String Table */ +var sstr0 = /]*)>([\s\S]*)<\/sst>/; +var sstr1 = /<(?:si|sstItem)>/g; +var sstr2 = /<\/(?:si|sstItem)>/; +function parse_sst_xml(data, opts) { + var s = [], ss; + /* 18.4.9 sst CT_Sst */ + var sst = data.match(sstr0); + if(isval(sst)) { + ss = sst[2].replace(sstr1,"").split(sstr2); + for(var i = 0; i != ss.length; ++i) { + var o = parse_si(ss[i], opts); + if(o != null) s[s.length] = o; + } + sst = parsexmltag(sst[1]); s.Count = sst.count; s.Unique = sst.uniqueCount; + } + return s; +} + +RELS.SST = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings"; +var straywsregex = /^\s|\s$|[\t\n\r]/; +function write_sst_xml(sst, opts) { + if(!opts.bookSST) return ""; + var o = [XML_HEADER]; + o[o.length] = (writextag('sst', null, { + xmlns: XMLNS.main[0], + count: sst.Count, + uniqueCount: sst.Unique + })); + for(var i = 0; i != sst.length; ++i) { if(sst[i] == null) continue; + var s = sst[i]; + var sitag = ""; + if(s.r) sitag += s.r; + else { + sitag += ""; + } + sitag += ""; + o[o.length] = (sitag); + } + if(o.length>2){ o[o.length] = (''); o[1]=o[1].replace("/>",">"); } + return o.join(""); +} +/* [MS-XLSB] 2.4.219 BrtBeginSst */ +function parse_BrtBeginSst(data, length) { + return [data.read_shift(4), data.read_shift(4)]; +} + +/* [MS-XLSB] 2.1.7.45 Shared Strings */ +function parse_sst_bin(data, opts) { + var s = []; + var pass = false; + recordhopper(data, function hopper_sst(val, R, RT) { + switch(R.n) { + case 'BrtBeginSst': s.Count = val[0]; s.Unique = val[1]; break; + case 'BrtSSTItem': s.push(val); break; + case 'BrtEndSst': return true; + /* TODO: produce a test case with a future record */ + case 'BrtFRTBegin': pass = true; break; + case 'BrtFRTEnd': pass = false; break; + default: if(!pass || opts.WTF) throw new Error("Unexpected record " + RT + " " + R.n); + } + }); + return s; +} + +function write_BrtBeginSst(sst, o) { + if(!o) o = new_buf(8); + o.write_shift(4, sst.Count); + o.write_shift(4, sst.Unique); + return o; +} + +var write_BrtSSTItem = write_RichStr; + +function write_sst_bin(sst, opts) { + var ba = buf_array(); + write_record(ba, "BrtBeginSst", write_BrtBeginSst(sst)); + for(var i = 0; i < sst.length; ++i) write_record(ba, "BrtSSTItem", write_BrtSSTItem(sst[i])); + write_record(ba, "BrtEndSst"); + return ba.end(); +} +function _JS2ANSI(str) { if(typeof cptable !== 'undefined') return cptable.utils.encode(1252, str); return str.split("").map(function(x) { return x.charCodeAt(0); }); } + +/* [MS-OFFCRYPTO] 2.1.4 Version */ +function parse_Version(blob, length) { + var o = {}; + o.Major = blob.read_shift(2); + o.Minor = blob.read_shift(2); + return o; +} +/* [MS-OFFCRYPTO] 2.3.2 Encryption Header */ +function parse_EncryptionHeader(blob, length) { + var o = {}; + o.Flags = blob.read_shift(4); + + // Check if SizeExtra is 0x00000000 + var tmp = blob.read_shift(4); + if(tmp !== 0) throw 'Unrecognized SizeExtra: ' + tmp; + + o.AlgID = blob.read_shift(4); + switch(o.AlgID) { + case 0: case 0x6801: case 0x660E: case 0x660F: case 0x6610: break; + default: throw 'Unrecognized encryption algorithm: ' + o.AlgID; + } + parsenoop(blob, length-12); + return o; +} + +/* [MS-OFFCRYPTO] 2.3.3 Encryption Verifier */ +function parse_EncryptionVerifier(blob, length) { + return parsenoop(blob, length); +} +/* [MS-OFFCRYPTO] 2.3.5.1 RC4 CryptoAPI Encryption Header */ +function parse_RC4CryptoHeader(blob, length) { + var o = {}; + var vers = o.EncryptionVersionInfo = parse_Version(blob, 4); length -= 4; + if(vers.Minor != 2) throw 'unrecognized minor version code: ' + vers.Minor; + if(vers.Major > 4 || vers.Major < 2) throw 'unrecognized major version code: ' + vers.Major; + o.Flags = blob.read_shift(4); length -= 4; + var sz = blob.read_shift(4); length -= 4; + o.EncryptionHeader = parse_EncryptionHeader(blob, sz); length -= sz; + o.EncryptionVerifier = parse_EncryptionVerifier(blob, length); + return o; +} +/* [MS-OFFCRYPTO] 2.3.6.1 RC4 Encryption Header */ +function parse_RC4Header(blob, length) { + var o = {}; + var vers = o.EncryptionVersionInfo = parse_Version(blob, 4); length -= 4; + if(vers.Major != 1 || vers.Minor != 1) throw 'unrecognized version code ' + vers.Major + ' : ' + vers.Minor; + o.Salt = blob.read_shift(16); + o.EncryptedVerifier = blob.read_shift(16); + o.EncryptedVerifierHash = blob.read_shift(16); + return o; +} + +/* [MS-OFFCRYPTO] 2.3.7.1 Binary Document Password Verifier Derivation */ +function crypto_CreatePasswordVerifier_Method1(Password) { + var Verifier = 0x0000, PasswordArray; + var PasswordDecoded = _JS2ANSI(Password); + var len = PasswordDecoded.length + 1, i, PasswordByte; + var Intermediate1, Intermediate2, Intermediate3; + PasswordArray = new_raw_buf(len); + PasswordArray[0] = PasswordDecoded.length; + for(i = 1; i != len; ++i) PasswordArray[i] = PasswordDecoded[i-1]; + for(i = len-1; i >= 0; --i) { + PasswordByte = PasswordArray[i]; + Intermediate1 = ((Verifier & 0x4000) === 0x0000) ? 0 : 1; + Intermediate2 = (Verifier << 1) & 0x7FFF; + Intermediate3 = Intermediate1 | Intermediate2; + Verifier = Intermediate3 ^ PasswordByte; + } + return Verifier ^ 0xCE4B; +} + +/* [MS-OFFCRYPTO] 2.3.7.2 Binary Document XOR Array Initialization */ +var crypto_CreateXorArray_Method1 = (function() { + var PadArray = [0xBB, 0xFF, 0xFF, 0xBA, 0xFF, 0xFF, 0xB9, 0x80, 0x00, 0xBE, 0x0F, 0x00, 0xBF, 0x0F, 0x00]; + var InitialCode = [0xE1F0, 0x1D0F, 0xCC9C, 0x84C0, 0x110C, 0x0E10, 0xF1CE, 0x313E, 0x1872, 0xE139, 0xD40F, 0x84F9, 0x280C, 0xA96A, 0x4EC3]; + var XorMatrix = [0xAEFC, 0x4DD9, 0x9BB2, 0x2745, 0x4E8A, 0x9D14, 0x2A09, 0x7B61, 0xF6C2, 0xFDA5, 0xEB6B, 0xC6F7, 0x9DCF, 0x2BBF, 0x4563, 0x8AC6, 0x05AD, 0x0B5A, 0x16B4, 0x2D68, 0x5AD0, 0x0375, 0x06EA, 0x0DD4, 0x1BA8, 0x3750, 0x6EA0, 0xDD40, 0xD849, 0xA0B3, 0x5147, 0xA28E, 0x553D, 0xAA7A, 0x44D5, 0x6F45, 0xDE8A, 0xAD35, 0x4A4B, 0x9496, 0x390D, 0x721A, 0xEB23, 0xC667, 0x9CEF, 0x29FF, 0x53FE, 0xA7FC, 0x5FD9, 0x47D3, 0x8FA6, 0x0F6D, 0x1EDA, 0x3DB4, 0x7B68, 0xF6D0, 0xB861, 0x60E3, 0xC1C6, 0x93AD, 0x377B, 0x6EF6, 0xDDEC, 0x45A0, 0x8B40, 0x06A1, 0x0D42, 0x1A84, 0x3508, 0x6A10, 0xAA51, 0x4483, 0x8906, 0x022D, 0x045A, 0x08B4, 0x1168, 0x76B4, 0xED68, 0xCAF1, 0x85C3, 0x1BA7, 0x374E, 0x6E9C, 0x3730, 0x6E60, 0xDCC0, 0xA9A1, 0x4363, 0x86C6, 0x1DAD, 0x3331, 0x6662, 0xCCC4, 0x89A9, 0x0373, 0x06E6, 0x0DCC, 0x1021, 0x2042, 0x4084, 0x8108, 0x1231, 0x2462, 0x48C4]; + var Ror = function(Byte) { return ((Byte/2) | (Byte*128)) & 0xFF; }; + var XorRor = function(byte1, byte2) { return Ror(byte1 ^ byte2); }; + var CreateXorKey_Method1 = function(Password) { + var XorKey = InitialCode[Password.length - 1]; + var CurrentElement = 0x68; + for(var i = Password.length-1; i >= 0; --i) { + var Char = Password[i]; + for(var j = 0; j != 7; ++j) { + if(Char & 0x40) XorKey ^= XorMatrix[CurrentElement]; + Char *= 2; --CurrentElement; + } + } + return XorKey; + }; + return function(password) { + var Password = _JS2ANSI(password); + var XorKey = CreateXorKey_Method1(Password); + var Index = Password.length; + var ObfuscationArray = new_raw_buf(16); + for(var i = 0; i != 16; ++i) ObfuscationArray[i] = 0x00; + var Temp, PasswordLastChar, PadIndex; + if((Index & 1) === 1) { + Temp = XorKey >> 8; + ObfuscationArray[Index] = XorRor(PadArray[0], Temp); + --Index; + Temp = XorKey & 0xFF; + PasswordLastChar = Password[Password.length - 1]; + ObfuscationArray[Index] = XorRor(PasswordLastChar, Temp); + } + while(Index > 0) { + --Index; + Temp = XorKey >> 8; + ObfuscationArray[Index] = XorRor(Password[Index], Temp); + --Index; + Temp = XorKey & 0xFF; + ObfuscationArray[Index] = XorRor(Password[Index], Temp); + } + Index = 15; + PadIndex = 15 - Password.length; + while(PadIndex > 0) { + Temp = XorKey >> 8; + ObfuscationArray[Index] = XorRor(PadArray[PadIndex], Temp); + --Index; + --PadIndex; + Temp = XorKey & 0xFF; + ObfuscationArray[Index] = XorRor(Password[Index], Temp); + --Index; + --PadIndex; + } + return ObfuscationArray; + }; +})(); + +/* [MS-OFFCRYPTO] 2.3.7.3 Binary Document XOR Data Transformation Method 1 */ +var crypto_DecryptData_Method1 = function(password, Data, XorArrayIndex, XorArray, O) { + /* If XorArray is set, use it; if O is not set, make changes in-place */ + if(!O) O = Data; + if(!XorArray) XorArray = crypto_CreateXorArray_Method1(password); + var Index, Value; + for(Index = 0; Index != Data.length; ++Index) { + Value = Data[Index]; + Value ^= XorArray[XorArrayIndex]; + Value = ((Value>>5) | (Value<<3)) & 0xFF; + O[Index] = Value; + ++XorArrayIndex; + } + return [O, XorArrayIndex, XorArray]; +}; + +var crypto_MakeXorDecryptor = function(password) { + var XorArrayIndex = 0, XorArray = crypto_CreateXorArray_Method1(password); + return function(Data) { + var O = crypto_DecryptData_Method1(null, Data, XorArrayIndex, XorArray); + XorArrayIndex = O[1]; + return O[0]; + }; +}; + +/* 2.5.343 */ +function parse_XORObfuscation(blob, length, opts, out) { + var o = { key: parseuint16(blob), verificationBytes: parseuint16(blob) }; + if(opts.password) o.verifier = crypto_CreatePasswordVerifier_Method1(opts.password); + out.valid = o.verificationBytes === o.verifier; + if(out.valid) out.insitu_decrypt = crypto_MakeXorDecryptor(opts.password); + return o; +} + +/* 2.4.117 */ +function parse_FilePassHeader(blob, length, oo) { + var o = oo || {}; o.Info = blob.read_shift(2); blob.l -= 2; + if(o.Info === 1) o.Data = parse_RC4Header(blob, length); + else o.Data = parse_RC4CryptoHeader(blob, length); + return o; +} +function parse_FilePass(blob, length, opts) { + var o = { Type: blob.read_shift(2) }; /* wEncryptionType */ + if(o.Type) parse_FilePassHeader(blob, length-2, o); + else parse_XORObfuscation(blob, length-2, opts, o); + return o; +} + + +function hex2RGB(h) { + var o = h.substr(h[0]==="#"?1:0,6); + return [parseInt(o.substr(0,2),16),parseInt(o.substr(0,2),16),parseInt(o.substr(0,2),16)]; +} +function rgb2Hex(rgb) { + for(var i=0,o=1; i!=3; ++i) o = o*256 + (rgb[i]>255?255:rgb[i]<0?0:rgb[i]); + return o.toString(16).toUpperCase().substr(1); +} + +function rgb2HSL(rgb) { + var R = rgb[0]/255, G = rgb[1]/255, B=rgb[2]/255; + var M = Math.max(R, G, B), m = Math.min(R, G, B), C = M - m; + if(C === 0) return [0, 0, R]; + + var H6 = 0, S = 0, L2 = (M + m); + S = C / (L2 > 1 ? 2 - L2 : L2); + switch(M){ + case R: H6 = ((G - B) / C + 6)%6; break; + case G: H6 = ((B - R) / C + 2); break; + case B: H6 = ((R - G) / C + 4); break; + } + return [H6 / 6, S, L2 / 2]; +} + +function hsl2RGB(hsl){ + var H = hsl[0], S = hsl[1], L = hsl[2]; + var C = S * 2 * (L < 0.5 ? L : 1 - L), m = L - C/2; + var rgb = [m,m,m], h6 = 6*H; + + var X; + if(S !== 0) switch(h6|0) { + case 0: case 6: X = C * h6; rgb[0] += C; rgb[1] += X; break; + case 1: X = C * (2 - h6); rgb[0] += X; rgb[1] += C; break; + case 2: X = C * (h6 - 2); rgb[1] += C; rgb[2] += X; break; + case 3: X = C * (4 - h6); rgb[1] += X; rgb[2] += C; break; + case 4: X = C * (h6 - 4); rgb[2] += C; rgb[0] += X; break; + case 5: X = C * (6 - h6); rgb[2] += X; rgb[0] += C; break; + } + for(var i = 0; i != 3; ++i) rgb[i] = Math.round(rgb[i]*255); + return rgb; +} + +/* 18.8.3 bgColor tint algorithm */ +function rgb_tint(hex, tint) { + if(tint === 0) return hex; + var hsl = rgb2HSL(hex2RGB(hex)); + if (tint < 0) hsl[2] = hsl[2] * (1 + tint); + else hsl[2] = 1 - (1 - hsl[2]) * (1 - tint); + return rgb2Hex(hsl2RGB(hsl)); +} + +/* 18.3.1.13 width calculations */ +var DEF_MDW = 7, MAX_MDW = 15, MIN_MDW = 1, MDW = DEF_MDW; +function width2px(width) { return (( width + ((128/MDW)|0)/256 )* MDW )|0; } +function px2char(px) { return (((px - 5)/MDW * 100 + 0.5)|0)/100; } +function char2width(chr) { return (((chr * MDW + 5)/MDW*256)|0)/256; } +function cycle_width(collw) { return char2width(px2char(width2px(collw))); } +function find_mdw(collw, coll) { + if(cycle_width(collw) != collw) { + for(MDW=DEF_MDW; MDW>MIN_MDW; --MDW) if(cycle_width(collw) === collw) break; + if(MDW === MIN_MDW) for(MDW=DEF_MDW+1; MDW': case '': break; + + /* 18.8.20 fill CT_Fill */ + case '': break; + case '': styles.Fills.push(fill); fill = {}; break; + + /* 18.8.32 patternFill CT_PatternFill */ + case '': case '': break; + + /* 18.8.3 bgColor CT_Color */ + case '': case '': break; + + /* 18.8.19 fgColor CT_Color */ + case '': case '': break; + + default: if(opts.WTF) throw 'unrecognized ' + y[0] + ' in fills'; + } + }); +} + +/* 18.8.31 numFmts CT_NumFmts */ +function parse_numFmts(t, opts) { + styles.NumberFmt = []; + var k = keys(SSF._table); + for(var i=0; i < k.length; ++i) styles.NumberFmt[k[i]] = SSF._table[k[i]]; + var m = t[0].match(tagregex); + for(i=0; i < m.length; ++i) { + var y = parsexmltag(m[i]); + switch(y[0]) { + case '': case '': case '': break; + case '0) SSF.load(f,j); + } break; + default: if(opts.WTF) throw 'unrecognized ' + y[0] + ' in numFmts'; + } + } +} + +function write_numFmts(NF, opts) { + var o = [""]; + [[5,8],[23,26],[41,44],[63,66],[164,392]].forEach(function(r) { + for(var i = r[0]; i <= r[1]; ++i) if(NF[i] !== undefined) o[o.length] = (writextag('numFmt',null,{numFmtId:i,formatCode:escapexml(NF[i])})); + }); + if(o.length === 1) return ""; + o[o.length] = (""); + o[0] = writextag('numFmts', null, { count:o.length-2 }).replace("/>", ">"); + return o.join(""); +} + +/* 18.8.10 cellXfs CT_CellXfs */ +function parse_cellXfs(t, opts) { + styles.CellXf = []; + t[0].match(tagregex).forEach(function(x) { + var y = parsexmltag(x); + switch(y[0]) { + case '': case '': case '': break; + + /* 18.8.45 xf CT_Xf */ + case '': break; + + /* 18.8.1 alignment CT_CellAlignment */ + case '': break; + + /* 18.8.33 protection CT_CellProtection */ + case '': case '': break; + + case '': break; + case '"); + if(o.length === 2) return ""; + o[0] = writextag('cellXfs',null, {count:o.length-2}).replace("/>",">"); + return o.join(""); +} + +/* 18.8 Styles CT_Stylesheet*/ +var parse_sty_xml= (function make_pstyx() { +var numFmtRegex = /]*)>.*<\/numFmts>/; +var cellXfRegex = /]*)>.*<\/cellXfs>/; +var fillsRegex = /]*)>.*<\/fills>/; + +return function parse_sty_xml(data, opts) { + /* 18.8.39 styleSheet CT_Stylesheet */ + var t; + + /* numFmts CT_NumFmts ? */ + if((t=data.match(numFmtRegex))) parse_numFmts(t, opts); + + /* fonts CT_Fonts ? */ + /*if((t=data.match(/]*)>.*<\/fonts>/))) parse_fonts(t, opts);*/ + + /* fills CT_Fills */ + if((t=data.match(fillsRegex))) parse_fills(t, opts); + + /* borders CT_Borders ? */ + /* cellStyleXfs CT_CellStyleXfs ? */ + + /* cellXfs CT_CellXfs ? */ + if((t=data.match(cellXfRegex))) parse_cellXfs(t, opts); + + /* dxfs CT_Dxfs ? */ + /* tableStyles CT_TableStyles ? */ + /* colors CT_Colors ? */ + /* extLst CT_ExtensionList ? */ + + return styles; +}; +})(); + +var STYLES_XML_ROOT = writextag('styleSheet', null, { + 'xmlns': XMLNS.main[0], + 'xmlns:vt': XMLNS.vt +}); + +RELS.STY = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"; + +function write_sty_xml(wb, opts) { + var o = [XML_HEADER, STYLES_XML_ROOT], w; + if((w = write_numFmts(wb.SSF)) != null) o[o.length] = w; + o[o.length] = (''); + o[o.length] = (''); + o[o.length] = (''); + o[o.length] = (''); + if((w = write_cellXfs(opts.cellXfs))) o[o.length] = (w); + o[o.length] = (''); + o[o.length] = (''); + o[o.length] = (''); + + if(o.length>2){ o[o.length] = (''); o[1]=o[1].replace("/>",">"); } + return o.join(""); +} +/* [MS-XLSB] 2.4.651 BrtFmt */ +function parse_BrtFmt(data, length) { + var ifmt = data.read_shift(2); + var stFmtCode = parse_XLWideString(data,length-2); + return [ifmt, stFmtCode]; +} + +/* [MS-XLSB] 2.4.653 BrtFont TODO */ +function parse_BrtFont(data, length) { + var out = {flags:{}}; + out.dyHeight = data.read_shift(2); + out.grbit = parse_FontFlags(data, 2); + out.bls = data.read_shift(2); + out.sss = data.read_shift(2); + out.uls = data.read_shift(1); + out.bFamily = data.read_shift(1); + out.bCharSet = data.read_shift(1); + data.l++; + out.brtColor = parse_BrtColor(data, 8); + out.bFontScheme = data.read_shift(1); + out.name = parse_XLWideString(data, length - 21); + + out.flags.Bold = out.bls === 0x02BC; + out.flags.Italic = out.grbit.fItalic; + out.flags.Strikeout = out.grbit.fStrikeout; + out.flags.Outline = out.grbit.fOutline; + out.flags.Shadow = out.grbit.fShadow; + out.flags.Condense = out.grbit.fCondense; + out.flags.Extend = out.grbit.fExtend; + out.flags.Sub = out.sss & 0x2; + out.flags.Sup = out.sss & 0x1; + return out; +} + +/* [MS-XLSB] 2.4.816 BrtXF */ +function parse_BrtXF(data, length) { + var ixfeParent = data.read_shift(2); + var ifmt = data.read_shift(2); + parsenoop(data, length-4); + return {ixfe:ixfeParent, ifmt:ifmt }; +} + +/* [MS-XLSB] 2.1.7.50 Styles */ +function parse_sty_bin(data, opts) { + styles.NumberFmt = []; + for(var y in SSF._table) styles.NumberFmt[y] = SSF._table[y]; + + styles.CellXf = []; + var state = ""; /* TODO: this should be a stack */ + var pass = false; + recordhopper(data, function hopper_sty(val, R, RT) { + switch(R.n) { + case 'BrtFmt': + styles.NumberFmt[val[0]] = val[1]; SSF.load(val[1], val[0]); + break; + case 'BrtFont': break; /* TODO */ + case 'BrtKnownFonts': break; /* TODO */ + case 'BrtFill': break; /* TODO */ + case 'BrtBorder': break; /* TODO */ + case 'BrtXF': + if(state === "CELLXFS") { + styles.CellXf.push(val); + } + break; /* TODO */ + case 'BrtStyle': break; /* TODO */ + case 'BrtDXF': break; /* TODO */ + case 'BrtMRUColor': break; /* TODO */ + case 'BrtIndexedColor': break; /* TODO */ + case 'BrtBeginStyleSheet': break; + case 'BrtEndStyleSheet': break; + case 'BrtBeginTableStyle': break; + case 'BrtTableStyleElement': break; + case 'BrtEndTableStyle': break; + case 'BrtBeginFmts': state = "FMTS"; break; + case 'BrtEndFmts': state = ""; break; + case 'BrtBeginFonts': state = "FONTS"; break; + case 'BrtEndFonts': state = ""; break; + case 'BrtACBegin': state = "ACFONTS"; break; + case 'BrtACEnd': state = ""; break; + case 'BrtBeginFills': state = "FILLS"; break; + case 'BrtEndFills': state = ""; break; + case 'BrtBeginBorders': state = "BORDERS"; break; + case 'BrtEndBorders': state = ""; break; + case 'BrtBeginCellStyleXFs': state = "CELLSTYLEXFS"; break; + case 'BrtEndCellStyleXFs': state = ""; break; + case 'BrtBeginCellXFs': state = "CELLXFS"; break; + case 'BrtEndCellXFs': state = ""; break; + case 'BrtBeginStyles': state = "STYLES"; break; + case 'BrtEndStyles': state = ""; break; + case 'BrtBeginDXFs': state = "DXFS"; break; + case 'BrtEndDXFs': state = ""; break; + case 'BrtBeginTableStyles': state = "TABLESTYLES"; break; + case 'BrtEndTableStyles': state = ""; break; + case 'BrtBeginColorPalette': state = "COLORPALETTE"; break; + case 'BrtEndColorPalette': state = ""; break; + case 'BrtBeginIndexedColors': state = "INDEXEDCOLORS"; break; + case 'BrtEndIndexedColors': state = ""; break; + case 'BrtBeginMRUColors': state = "MRUCOLORS"; break; + case 'BrtEndMRUColors': state = ""; break; + case 'BrtFRTBegin': pass = true; break; + case 'BrtFRTEnd': pass = false; break; + case 'BrtBeginStyleSheetExt14': break; + case 'BrtBeginSlicerStyles': break; + case 'BrtEndSlicerStyles': break; + case 'BrtBeginTimelineStylesheetExt15': break; + case 'BrtEndTimelineStylesheetExt15': break; + case 'BrtBeginTimelineStyles': break; + case 'BrtEndTimelineStyles': break; + case 'BrtEndStyleSheetExt14': break; + default: if(!pass || opts.WTF) throw new Error("Unexpected record " + RT + " " + R.n); + } + }); + return styles; +} + +/* [MS-XLSB] 2.1.7.50 Styles */ +function write_sty_bin(data, opts) { + var ba = buf_array(); + write_record(ba, "BrtBeginStyleSheet"); + /* [FMTS] */ + /* [FONTS] */ + /* [FILLS] */ + /* [BORDERS] */ + /* CELLSTYLEXFS */ + /* CELLXFS*/ + /* STYLES */ + /* DXFS */ + /* TABLESTYLES */ + /* [COLORPALETTE] */ + /* FRTSTYLESHEET*/ + write_record(ba, "BrtEndStyleSheet"); + return ba.end(); +} +RELS.THEME = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"; + +/* 20.1.6.2 clrScheme CT_ColorScheme */ +function parse_clrScheme(t, opts) { + themes.themeElements.clrScheme = []; + var color = {}; + t[0].match(tagregex).forEach(function(x) { + var y = parsexmltag(x); + switch(y[0]) { + case '': break; + + /* 20.1.2.3.32 srgbClr CT_SRgbColor */ + case '': + case '': + /* 20.1.4.1.10 dk2 (Dark 2) */ + case '': + case '': + /* 20.1.4.1.22 lt1 (Light 1) */ + case '': + case '': + /* 20.1.4.1.23 lt2 (Light 2) */ + case '': + case '': + /* 20.1.4.1.1 accent1 (Accent 1) */ + case '': + case '': + /* 20.1.4.1.2 accent2 (Accent 2) */ + case '': + case '': + /* 20.1.4.1.3 accent3 (Accent 3) */ + case '': + case '': + /* 20.1.4.1.4 accent4 (Accent 4) */ + case '': + case '': + /* 20.1.4.1.5 accent5 (Accent 5) */ + case '': + case '': + /* 20.1.4.1.6 accent6 (Accent 6) */ + case '': + case '': + /* 20.1.4.1.19 hlink (Hyperlink) */ + case '': + case '': + /* 20.1.4.1.15 folHlink (Followed Hyperlink) */ + case '': + case '': + if (y[0][1] === '/') { + themes.themeElements.clrScheme.push(color); + color = {}; + } else { + color.name = y[0].substring(3, y[0].length - 1); + } + break; + + default: if(opts.WTF) throw 'unrecognized ' + y[0] + ' in clrScheme'; + } + }); +} + +/* 20.1.4.1.18 fontScheme CT_FontScheme */ +function parse_fontScheme(t, opts) { } + +/* 20.1.4.1.15 fmtScheme CT_StyleMatrix */ +function parse_fmtScheme(t, opts) { } + +var clrsregex = /]*)>[^\u2603]*<\/a:clrScheme>/; +var fntsregex = /]*)>[^\u2603]*<\/a:fontScheme>/; +var fmtsregex = /]*)>[^\u2603]*<\/a:fmtScheme>/; + +/* 20.1.6.10 themeElements CT_BaseStyles */ +function parse_themeElements(data, opts) { + themes.themeElements = {}; + + var t; + + [ + /* clrScheme CT_ColorScheme */ + ['clrScheme', clrsregex, parse_clrScheme], + /* fontScheme CT_FontScheme */ + ['fontScheme', fntsregex, parse_fontScheme], + /* fmtScheme CT_StyleMatrix */ + ['fmtScheme', fmtsregex, parse_fmtScheme] + ].forEach(function(m) { + if(!(t=data.match(m[1]))) throw m[0] + ' not found in themeElements'; + m[2](t, opts); + }); +} + +var themeltregex = /]*)>[^\u2603]*<\/a:themeElements>/; + +/* 14.2.7 Theme Part */ +function parse_theme_xml(data, opts) { + /* 20.1.6.9 theme CT_OfficeStyleSheet */ + if(!data || data.length === 0) return themes; + + var t; + + /* themeElements CT_BaseStyles */ + if(!(t=data.match(themeltregex))) throw 'themeElements not found in theme'; + parse_themeElements(t[0], opts); + + return themes; +} + +function write_theme() { return '\n'; } +/* [MS-XLS] 2.4.326 TODO: payload is a zip file */ +function parse_Theme(blob, length) { + var dwThemeVersion = blob.read_shift(4); + if(dwThemeVersion === 124226) return; + blob.l += length-4; +} + +/* 2.5.49 */ +function parse_ColorTheme(blob, length) { return blob.read_shift(4); } + +/* 2.5.155 */ +function parse_FullColorExt(blob, length) { + var o = {}; + o.xclrType = blob.read_shift(2); + o.nTintShade = blob.read_shift(2); + switch(o.xclrType) { + case 0: blob.l += 4; break; + case 1: o.xclrValue = parse_IcvXF(blob, 4); break; + case 2: o.xclrValue = parse_LongRGBA(blob, 4); break; + case 3: o.xclrValue = parse_ColorTheme(blob, 4); break; + case 4: blob.l += 4; break; + } + blob.l += 8; + return o; +} + +/* 2.5.164 TODO: read 7 bits*/ +function parse_IcvXF(blob, length) { + return parsenoop(blob, length); +} + +/* 2.5.280 */ +function parse_XFExtGradient(blob, length) { + return parsenoop(blob, length); +} + +/* 2.5.108 */ +function parse_ExtProp(blob, length) { + var extType = blob.read_shift(2); + var cb = blob.read_shift(2); + var o = [extType]; + switch(extType) { + case 0x04: case 0x05: case 0x07: case 0x08: + case 0x09: case 0x0A: case 0x0B: case 0x0D: + o[1] = parse_FullColorExt(blob, cb); break; + case 0x06: o[1] = parse_XFExtGradient(blob, cb); break; + case 0x0E: case 0x0F: o[1] = blob.read_shift(cb === 5 ? 1 : 2); break; + default: throw new Error("Unrecognized ExtProp type: " + extType + " " + cb); + } + return o; +} + +/* 2.4.355 */ +function parse_XFExt(blob, length) { + var end = blob.l + length; + blob.l += 2; + var ixfe = blob.read_shift(2); + blob.l += 2; + var cexts = blob.read_shift(2); + var ext = []; + while(cexts-- > 0) ext.push(parse_ExtProp(blob, end-blob.l)); + return {ixfe:ixfe, ext:ext}; +} + +/* xf is an XF, see parse_XFExt for xfext */ +function update_xfext(xf, xfext) { + xfext.forEach(function(xfe) { + switch(xfe[0]) { /* 2.5.108 extPropData */ + case 0x04: break; /* foreground color */ + case 0x05: break; /* background color */ + case 0x07: case 0x08: case 0x09: case 0x0a: break; + case 0x0d: break; /* text color */ + case 0x0e: break; /* font scheme */ + default: throw "bafuq" + xfe[0].toString(16); + } + }); +} + +/* 18.6 Calculation Chain */ +function parse_cc_xml(data, opts) { + var d = []; + var l = 0, i = 1; + (data.match(tagregex)||[]).forEach(function(x) { + var y = parsexmltag(x); + switch(y[0]) { + case '': case '': break; + /* 18.6.1 c CT_CalcCell 1 */ + case ' thisCell.r) range.s.r = thisCell.r; + if(range.e.r < thisCell.r) range.e.r = thisCell.r; + if(range.s.c > thisCell.c) range.s.c = thisCell.c; + if(range.e.c < thisCell.c) range.e.c = thisCell.c; + var encoded = encode_range(range); + if (encoded !== sheet["!ref"]) sheet["!ref"] = encoded; + } + + if (!cell.c) cell.c = []; + var o = {a: comment.author, t: comment.t, r: comment.r}; + if(comment.h) o.h = comment.h; + cell.c.push(o); + }); +} + +/* 18.7.3 CT_Comment */ +function parse_comments_xml(data, opts) { + if(data.match(/<(?:\w+:)?comments *\/>/)) return []; + var authors = []; + var commentList = []; + data.match(/<(?:\w+:)?authors>([^\u2603]*)<\/(?:\w+:)?authors>/)[1].split(/<\/\w*:?author>/).forEach(function(x) { + if(x === "" || x.trim() === "") return; + authors.push(x.match(/<(?:\w+:)?author[^>]*>(.*)/)[1]); + }); + (data.match(/<(?:\w+:)?commentList>([^\u2603]*)<\/(?:\w+:)?commentList>/)||["",""])[1].split(/<\/\w*:?comment>/).forEach(function(x, index) { + if(x === "" || x.trim() === "") return; + var y = parsexmltag(x.match(/<(?:\w+:)?comment[^>]*>/)[0]); + var comment = { author: y.authorId && authors[y.authorId] ? authors[y.authorId] : undefined, ref: y.ref, guid: y.guid }; + var cell = decode_cell(y.ref); + if(opts.sheetRows && opts.sheetRows <= cell.r) return; + var textMatch = x.match(/([^\u2603]*)<\/text>/); + if (!textMatch || !textMatch[1]) return; // a comment may contain an empty text tag. + var rt = parse_si(textMatch[1]); + comment.r = rt.r; + comment.t = rt.t; + if(opts.cellHTML) comment.h = rt.h; + commentList.push(comment); + }); + return commentList; +} + +function write_comments_xml(data, opts) { } +/* [MS-XLSB] 2.4.28 BrtBeginComment */ +function parse_BrtBeginComment(data, length) { + var out = {}; + out.iauthor = data.read_shift(4); + var rfx = parse_UncheckedRfX(data, 16); + out.rfx = rfx.s; + out.ref = encode_cell(rfx.s); + data.l += 16; /*var guid = parse_GUID(data); */ + return out; +} + +/* [MS-XLSB] 2.4.324 BrtCommentAuthor */ +var parse_BrtCommentAuthor = parse_XLWideString; + +/* [MS-XLSB] 2.4.325 BrtCommentText */ +var parse_BrtCommentText = parse_RichStr; + +/* [MS-XLSB] 2.1.7.8 Comments */ +function parse_comments_bin(data, opts) { + var out = []; + var authors = []; + var c = {}; + var pass = false; + recordhopper(data, function hopper_cmnt(val, R, RT) { + switch(R.n) { + case 'BrtCommentAuthor': authors.push(val); break; + case 'BrtBeginComment': c = val; break; + case 'BrtCommentText': c.t = val.t; c.h = val.h; c.r = val.r; break; + case 'BrtEndComment': + c.author = authors[c.iauthor]; + delete c.iauthor; + if(opts.sheetRows && opts.sheetRows <= c.rfx.r) break; + delete c.rfx; out.push(c); break; + case 'BrtBeginComments': break; + case 'BrtEndComments': break; + case 'BrtBeginCommentAuthors': break; + case 'BrtEndCommentAuthors': break; + case 'BrtBeginCommentList': break; + case 'BrtEndCommentList': break; + default: if(!pass || opts.WTF) throw new Error("Unexpected record " + RT + " " + R.n); + } + }); + return out; +} + +function write_comments_bin(data, opts) { } +/* TODO: it will be useful to parse the function str */ +var rc_to_a1 = (function(){ + var rcregex = /(^|[^A-Za-z])R(\[?)(-?\d+|)\]?C(\[?)(-?\d+|)\]?/g; + var rcbase; + function rcfunc($$,$1,$2,$3,$4,$5) { + var R = $3.length>0?parseInt($3,10)|0:0, C = $5.length>0?parseInt($5,10)|0:0; + if(C<0 && $4.length === 0) C=0; + if($4.length > 0) C += rcbase.c; + if($2.length > 0) R += rcbase.r; + return $1 + encode_col(C) + encode_row(R); + } + return function rc_to_a1(fstr, base) { + rcbase = base; + return fstr.replace(rcregex, rcfunc); + }; +})(); + +/* --- formula references point to MS-XLS --- */ +/* Small helpers */ +function parseread(l) { return function(blob, length) { blob.l+=l; return; }; } +function parseread1(blob, length) { blob.l+=1; return; } + +/* Rgce Helpers */ + +/* 2.5.51 */ +function parse_ColRelU(blob, length) { + var c = blob.read_shift(2); + return [c & 0x3FFF, (c >> 14) & 1, (c >> 15) & 1]; +} + +/* 2.5.198.105 */ +function parse_RgceArea(blob, length) { + var r=blob.read_shift(2), R=blob.read_shift(2); + var c=parse_ColRelU(blob, 2); + var C=parse_ColRelU(blob, 2); + return { s:{r:r, c:c[0], cRel:c[1], rRel:c[2]}, e:{r:R, c:C[0], cRel:C[1], rRel:C[2]} }; +} + +/* 2.5.198.105 TODO */ +function parse_RgceAreaRel(blob, length) { + var r=blob.read_shift(2), R=blob.read_shift(2); + var c=parse_ColRelU(blob, 2); + var C=parse_ColRelU(blob, 2); + return { s:{r:r, c:c[0], cRel:c[1], rRel:c[2]}, e:{r:R, c:C[0], cRel:C[1], rRel:C[2]} }; +} + +/* 2.5.198.109 */ +function parse_RgceLoc(blob, length) { + var r = blob.read_shift(2); + var c = parse_ColRelU(blob, 2); + return {r:r, c:c[0], cRel:c[1], rRel:c[2]}; +} + +/* 2.5.198.111 */ +function parse_RgceLocRel(blob, length) { + var r = blob.read_shift(2); + var cl = blob.read_shift(2); + var cRel = (cl & 0x8000) >> 15, rRel = (cl & 0x4000) >> 14; + cl &= 0x3FFF; + if(cRel !== 0) while(cl >= 0x100) cl -= 0x100; + return {r:r,c:cl,cRel:cRel,rRel:rRel}; +} + +/* Ptg Tokens */ + +/* 2.5.198.27 */ +function parse_PtgArea(blob, length) { + var type = (blob[blob.l++] & 0x60) >> 5; + var area = parse_RgceArea(blob, 8); + return [type, area]; +} + +/* 2.5.198.28 */ +function parse_PtgArea3d(blob, length) { + var type = (blob[blob.l++] & 0x60) >> 5; + var ixti = blob.read_shift(2); + var area = parse_RgceArea(blob, 8); + return [type, ixti, area]; +} + +/* 2.5.198.29 */ +function parse_PtgAreaErr(blob, length) { + var type = (blob[blob.l++] & 0x60) >> 5; + blob.l += 8; + return [type]; +} +/* 2.5.198.30 */ +function parse_PtgAreaErr3d(blob, length) { + var type = (blob[blob.l++] & 0x60) >> 5; + var ixti = blob.read_shift(2); + blob.l += 8; + return [type, ixti]; +} + +/* 2.5.198.31 */ +function parse_PtgAreaN(blob, length) { + var type = (blob[blob.l++] & 0x60) >> 5; + var area = parse_RgceAreaRel(blob, 8); + return [type, area]; +} + +/* 2.5.198.32 -- ignore this and look in PtgExtraArray for shape + values */ +function parse_PtgArray(blob, length) { + var type = (blob[blob.l++] & 0x60) >> 5; + blob.l += 7; + return [type]; +} + +/* 2.5.198.33 */ +function parse_PtgAttrBaxcel(blob, length) { + var bitSemi = blob[blob.l+1] & 0x01; /* 1 = volatile */ + var bitBaxcel = 1; + blob.l += 4; + return [bitSemi, bitBaxcel]; +} + +/* 2.5.198.34 */ +function parse_PtgAttrChoose(blob, length) { + blob.l +=2; + var offset = blob.read_shift(2); + var o = []; + /* offset is 1 less than the number of elements */ + for(var i = 0; i <= offset; ++i) o.push(blob.read_shift(2)); + return o; +} + +/* 2.5.198.35 */ +function parse_PtgAttrGoto(blob, length) { + var bitGoto = (blob[blob.l+1] & 0xFF) ? 1 : 0; + blob.l += 2; + return [bitGoto, blob.read_shift(2)]; +} + +/* 2.5.198.36 */ +function parse_PtgAttrIf(blob, length) { + var bitIf = (blob[blob.l+1] & 0xFF) ? 1 : 0; + blob.l += 2; + return [bitIf, blob.read_shift(2)]; +} + +/* 2.5.198.37 */ +function parse_PtgAttrSemi(blob, length) { + var bitSemi = (blob[blob.l+1] & 0xFF) ? 1 : 0; + blob.l += 4; + return [bitSemi]; +} + +/* 2.5.198.40 (used by PtgAttrSpace and PtgAttrSpaceSemi) */ +function parse_PtgAttrSpaceType(blob, length) { + var type = blob.read_shift(1), cch = blob.read_shift(1); + return [type, cch]; +} + +/* 2.5.198.38 */ +function parse_PtgAttrSpace(blob, length) { + blob.read_shift(2); + return parse_PtgAttrSpaceType(blob, 2); +} + +/* 2.5.198.39 */ +function parse_PtgAttrSpaceSemi(blob, length) { + blob.read_shift(2); + return parse_PtgAttrSpaceType(blob, 2); +} + +/* 2.5.198.84 TODO */ +function parse_PtgRef(blob, length) { + var ptg = blob[blob.l] & 0x1F; + var type = (blob[blob.l] & 0x60)>>5; + blob.l += 1; + var loc = parse_RgceLoc(blob,4); + return [type, loc]; +} + +/* 2.5.198.88 TODO */ +function parse_PtgRefN(blob, length) { + var ptg = blob[blob.l] & 0x1F; + var type = (blob[blob.l] & 0x60)>>5; + blob.l += 1; + var loc = parse_RgceLocRel(blob,4); + return [type, loc]; +} + +/* 2.5.198.85 TODO */ +function parse_PtgRef3d(blob, length) { + var ptg = blob[blob.l] & 0x1F; + var type = (blob[blob.l] & 0x60)>>5; + blob.l += 1; + var ixti = blob.read_shift(2); // XtiIndex + var loc = parse_RgceLoc(blob,4); + return [type, ixti, loc]; +} + + +/* 2.5.198.62 TODO */ +function parse_PtgFunc(blob, length) { + var ptg = blob[blob.l] & 0x1F; + var type = (blob[blob.l] & 0x60)>>5; + blob.l += 1; + var iftab = blob.read_shift(2); + return [FtabArgc[iftab], Ftab[iftab]]; +} +/* 2.5.198.63 TODO */ +function parse_PtgFuncVar(blob, length) { + blob.l++; + var cparams = blob.read_shift(1), tab = parsetab(blob); + return [cparams, (tab[0] === 0 ? Ftab : Cetab)[tab[1]]]; +} + +function parsetab(blob, length) { + return [blob[blob.l+1]>>7, blob.read_shift(2) & 0x7FFF]; +} + +/* 2.5.198.41 */ +var parse_PtgAttrSum = parseread(4); +/* 2.5.198.43 */ +var parse_PtgConcat = parseread1; + +/* 2.5.198.58 */ +function parse_PtgExp(blob, length) { + blob.l++; + var row = blob.read_shift(2); + var col = blob.read_shift(2); + return [row, col]; +} + +/* 2.5.198.57 */ +function parse_PtgErr(blob, length) { blob.l++; return BErr[blob.read_shift(1)]; } + +/* 2.5.198.66 TODO */ +function parse_PtgInt(blob, length) { blob.l++; return blob.read_shift(2); } + +/* 2.5.198.42 */ +function parse_PtgBool(blob, length) { blob.l++; return blob.read_shift(1)!==0;} + +/* 2.5.198.79 */ +function parse_PtgNum(blob, length) { blob.l++; return parse_Xnum(blob, 8); } + +/* 2.5.198.89 */ +function parse_PtgStr(blob, length) { blob.l++; return parse_ShortXLUnicodeString(blob); } + +/* 2.5.192.112 + 2.5.192.11{3,4,5,6,7} */ +function parse_SerAr(blob) { + var val = []; + switch((val[0] = blob.read_shift(1))) { + /* 2.5.192.113 */ + case 0x04: /* SerBool -- boolean */ + val[1] = parsebool(blob, 1) ? 'TRUE' : 'FALSE'; + blob.l += 7; break; + /* 2.5.192.114 */ + case 0x10: /* SerErr -- error */ + val[1] = BErr[blob[blob.l]]; + blob.l += 8; break; + /* 2.5.192.115 */ + case 0x00: /* SerNil -- honestly, I'm not sure how to reproduce this */ + blob.l += 8; break; + /* 2.5.192.116 */ + case 0x01: /* SerNum -- Xnum */ + val[1] = parse_Xnum(blob, 8); break; + /* 2.5.192.117 */ + case 0x02: /* SerStr -- XLUnicodeString (<256 chars) */ + val[1] = parse_XLUnicodeString(blob); break; + // default: throw "Bad SerAr: " + val[0]; /* Unreachable */ + } + return val; +} + +/* 2.5.198.61 */ +function parse_PtgExtraMem(blob, cce) { + var count = blob.read_shift(2); + var out = []; + for(var i = 0; i != count; ++i) out.push(parse_Ref8U(blob, 8)); + return out; +} + +/* 2.5.198.59 */ +function parse_PtgExtraArray(blob) { + var cols = 1 + blob.read_shift(1); //DColByteU + var rows = 1 + blob.read_shift(2); //DRw + for(var i = 0, o=[]; i != rows && (o[i] = []); ++i) + for(var j = 0; j != cols; ++j) o[i][j] = parse_SerAr(blob); + return o; +} + +/* 2.5.198.76 */ +function parse_PtgName(blob, length) { + var type = (blob.read_shift(1) >>> 5) & 0x03; + var nameindex = blob.read_shift(4); + return [type, 0, nameindex]; +} + +/* 2.5.198.77 */ +function parse_PtgNameX(blob, length) { + var type = (blob.read_shift(1) >>> 5) & 0x03; + var ixti = blob.read_shift(2); // XtiIndex + var nameindex = blob.read_shift(4); + return [type, ixti, nameindex]; +} + +/* 2.5.198.70 */ +function parse_PtgMemArea(blob, length) { + var type = (blob.read_shift(1) >>> 5) & 0x03; + blob.l += 4; + var cce = blob.read_shift(2); + return [type, cce]; +} + +/* 2.5.198.72 */ +function parse_PtgMemFunc(blob, length) { + var type = (blob.read_shift(1) >>> 5) & 0x03; + var cce = blob.read_shift(2); + return [type, cce]; +} + + +/* 2.5.198.86 */ +function parse_PtgRefErr(blob, length) { + var type = (blob.read_shift(1) >>> 5) & 0x03; + blob.l += 4; + return [type]; +} + +/* 2.5.198.26 */ +var parse_PtgAdd = parseread1; +/* 2.5.198.45 */ +var parse_PtgDiv = parseread1; +/* 2.5.198.56 */ +var parse_PtgEq = parseread1; +/* 2.5.198.64 */ +var parse_PtgGe = parseread1; +/* 2.5.198.65 */ +var parse_PtgGt = parseread1; +/* 2.5.198.67 */ +var parse_PtgIsect = parseread1; +/* 2.5.198.68 */ +var parse_PtgLe = parseread1; +/* 2.5.198.69 */ +var parse_PtgLt = parseread1; +/* 2.5.198.74 */ +var parse_PtgMissArg = parseread1; +/* 2.5.198.75 */ +var parse_PtgMul = parseread1; +/* 2.5.198.78 */ +var parse_PtgNe = parseread1; +/* 2.5.198.80 */ +var parse_PtgParen = parseread1; +/* 2.5.198.81 */ +var parse_PtgPercent = parseread1; +/* 2.5.198.82 */ +var parse_PtgPower = parseread1; +/* 2.5.198.83 */ +var parse_PtgRange = parseread1; +/* 2.5.198.90 */ +var parse_PtgSub = parseread1; +/* 2.5.198.93 */ +var parse_PtgUminus = parseread1; +/* 2.5.198.94 */ +var parse_PtgUnion = parseread1; +/* 2.5.198.95 */ +var parse_PtgUplus = parseread1; + +/* 2.5.198.71 */ +var parse_PtgMemErr = parsenoop; +/* 2.5.198.73 */ +var parse_PtgMemNoMem = parsenoop; +/* 2.5.198.87 */ +var parse_PtgRefErr3d = parsenoop; +/* 2.5.198.92 */ +var parse_PtgTbl = parsenoop; + +/* 2.5.198.25 */ +var PtgTypes = { + 0x01: { n:'PtgExp', f:parse_PtgExp }, + 0x02: { n:'PtgTbl', f:parse_PtgTbl }, + 0x03: { n:'PtgAdd', f:parse_PtgAdd }, + 0x04: { n:'PtgSub', f:parse_PtgSub }, + 0x05: { n:'PtgMul', f:parse_PtgMul }, + 0x06: { n:'PtgDiv', f:parse_PtgDiv }, + 0x07: { n:'PtgPower', f:parse_PtgPower }, + 0x08: { n:'PtgConcat', f:parse_PtgConcat }, + 0x09: { n:'PtgLt', f:parse_PtgLt }, + 0x0A: { n:'PtgLe', f:parse_PtgLe }, + 0x0B: { n:'PtgEq', f:parse_PtgEq }, + 0x0C: { n:'PtgGe', f:parse_PtgGe }, + 0x0D: { n:'PtgGt', f:parse_PtgGt }, + 0x0E: { n:'PtgNe', f:parse_PtgNe }, + 0x0F: { n:'PtgIsect', f:parse_PtgIsect }, + 0x10: { n:'PtgUnion', f:parse_PtgUnion }, + 0x11: { n:'PtgRange', f:parse_PtgRange }, + 0x12: { n:'PtgUplus', f:parse_PtgUplus }, + 0x13: { n:'PtgUminus', f:parse_PtgUminus }, + 0x14: { n:'PtgPercent', f:parse_PtgPercent }, + 0x15: { n:'PtgParen', f:parse_PtgParen }, + 0x16: { n:'PtgMissArg', f:parse_PtgMissArg }, + 0x17: { n:'PtgStr', f:parse_PtgStr }, + 0x1C: { n:'PtgErr', f:parse_PtgErr }, + 0x1D: { n:'PtgBool', f:parse_PtgBool }, + 0x1E: { n:'PtgInt', f:parse_PtgInt }, + 0x1F: { n:'PtgNum', f:parse_PtgNum }, + 0x20: { n:'PtgArray', f:parse_PtgArray }, + 0x21: { n:'PtgFunc', f:parse_PtgFunc }, + 0x22: { n:'PtgFuncVar', f:parse_PtgFuncVar }, + 0x23: { n:'PtgName', f:parse_PtgName }, + 0x24: { n:'PtgRef', f:parse_PtgRef }, + 0x25: { n:'PtgArea', f:parse_PtgArea }, + 0x26: { n:'PtgMemArea', f:parse_PtgMemArea }, + 0x27: { n:'PtgMemErr', f:parse_PtgMemErr }, + 0x28: { n:'PtgMemNoMem', f:parse_PtgMemNoMem }, + 0x29: { n:'PtgMemFunc', f:parse_PtgMemFunc }, + 0x2A: { n:'PtgRefErr', f:parse_PtgRefErr }, + 0x2B: { n:'PtgAreaErr', f:parse_PtgAreaErr }, + 0x2C: { n:'PtgRefN', f:parse_PtgRefN }, + 0x2D: { n:'PtgAreaN', f:parse_PtgAreaN }, + 0x39: { n:'PtgNameX', f:parse_PtgNameX }, + 0x3A: { n:'PtgRef3d', f:parse_PtgRef3d }, + 0x3B: { n:'PtgArea3d', f:parse_PtgArea3d }, + 0x3C: { n:'PtgRefErr3d', f:parse_PtgRefErr3d }, + 0x3D: { n:'PtgAreaErr3d', f:parse_PtgAreaErr3d }, + 0xFF: {} +}; +/* These are duplicated in the PtgTypes table */ +var PtgDupes = { + 0x40: 0x20, 0x60: 0x20, + 0x41: 0x21, 0x61: 0x21, + 0x42: 0x22, 0x62: 0x22, + 0x43: 0x23, 0x63: 0x23, + 0x44: 0x24, 0x64: 0x24, + 0x45: 0x25, 0x65: 0x25, + 0x46: 0x26, 0x66: 0x26, + 0x47: 0x27, 0x67: 0x27, + 0x48: 0x28, 0x68: 0x28, + 0x49: 0x29, 0x69: 0x29, + 0x4A: 0x2A, 0x6A: 0x2A, + 0x4B: 0x2B, 0x6B: 0x2B, + 0x4C: 0x2C, 0x6C: 0x2C, + 0x4D: 0x2D, 0x6D: 0x2D, + 0x59: 0x39, 0x79: 0x39, + 0x5A: 0x3A, 0x7A: 0x3A, + 0x5B: 0x3B, 0x7B: 0x3B, + 0x5C: 0x3C, 0x7C: 0x3C, + 0x5D: 0x3D, 0x7D: 0x3D +}; +(function(){for(var y in PtgDupes) PtgTypes[y] = PtgTypes[PtgDupes[y]];})(); + +var Ptg18 = {}; +var Ptg19 = { + 0x01: { n:'PtgAttrSemi', f:parse_PtgAttrSemi }, + 0x02: { n:'PtgAttrIf', f:parse_PtgAttrIf }, + 0x04: { n:'PtgAttrChoose', f:parse_PtgAttrChoose }, + 0x08: { n:'PtgAttrGoto', f:parse_PtgAttrGoto }, + 0x10: { n:'PtgAttrSum', f:parse_PtgAttrSum }, + 0x20: { n:'PtgAttrBaxcel', f:parse_PtgAttrBaxcel }, + 0x40: { n:'PtgAttrSpace', f:parse_PtgAttrSpace }, + 0x41: { n:'PtgAttrSpaceSemi', f:parse_PtgAttrSpaceSemi }, + 0xFF: {} +}; + +/* 2.4.127 TODO */ +function parse_Formula(blob, length, opts) { + var cell = parse_XLSCell(blob, 6); + var val = parse_FormulaValue(blob,8); + var flags = blob.read_shift(1); + blob.read_shift(1); + var chn = blob.read_shift(4); + var cbf = ""; + if(opts.biff === 5) blob.l += length-20; + else cbf = parse_XLSCellParsedFormula(blob, length-20, opts); + return {cell:cell, val:val[0], formula:cbf, shared: (flags >> 3) & 1, tt:val[1]}; +} + +/* 2.5.133 TODO: how to emit empty strings? */ +function parse_FormulaValue(blob) { + var b; + if(__readUInt16LE(blob,blob.l + 6) !== 0xFFFF) return [parse_Xnum(blob),'n']; + switch(blob[blob.l]) { + case 0x00: blob.l += 8; return ["String", 's']; + case 0x01: b = blob[blob.l+2] === 0x1; blob.l += 8; return [b,'b']; + case 0x02: b = blob[blob.l+2]; blob.l += 8; return [b,'e']; + case 0x03: blob.l += 8; return ["",'s']; + } +} + +/* 2.5.198.103 */ +function parse_RgbExtra(blob, length, rgce, opts) { + if(opts.biff < 8) return parsenoop(blob, length); + var target = blob.l + length; + var o = []; + for(var i = 0; i !== rgce.length; ++i) { + switch(rgce[i][0]) { + case 'PtgArray': /* PtgArray -> PtgExtraArray */ + rgce[i][1] = parse_PtgExtraArray(blob); + o.push(rgce[i][1]); + break; + case 'PtgMemArea': /* PtgMemArea -> PtgExtraMem */ + rgce[i][2] = parse_PtgExtraMem(blob, rgce[i][1]); + o.push(rgce[i][2]); + break; + default: break; + } + } + length = target - blob.l; + if(length !== 0) o.push(parsenoop(blob, length)); + return o; +} + +/* 2.5.198.21 */ +function parse_NameParsedFormula(blob, length, opts, cce) { + var target = blob.l + length; + var rgce = parse_Rgce(blob, cce); + var rgcb; + if(target !== blob.l) rgcb = parse_RgbExtra(blob, target - blob.l, rgce, opts); + return [rgce, rgcb]; +} + +/* 2.5.198.3 TODO */ +function parse_XLSCellParsedFormula(blob, length, opts) { + var target = blob.l + length; + var rgcb, cce = blob.read_shift(2); // length of rgce + if(cce == 0xFFFF) return [[],parsenoop(blob, length-2)]; + var rgce = parse_Rgce(blob, cce); + if(length !== cce + 2) rgcb = parse_RgbExtra(blob, length - cce - 2, rgce, opts); + return [rgce, rgcb]; +} + +/* 2.5.198.118 TODO */ +function parse_SharedParsedFormula(blob, length, opts) { + var target = blob.l + length; + var rgcb, cce = blob.read_shift(2); // length of rgce + var rgce = parse_Rgce(blob, cce); + if(cce == 0xFFFF) return [[],parsenoop(blob, length-2)]; + if(length !== cce + 2) rgcb = parse_RgbExtra(blob, target - cce - 2, rgce, opts); + return [rgce, rgcb]; +} + +/* 2.5.198.1 TODO */ +function parse_ArrayParsedFormula(blob, length, opts, ref) { + var target = blob.l + length; + var rgcb, cce = blob.read_shift(2); // length of rgce + if(cce == 0xFFFF) return [[],parsenoop(blob, length-2)]; + var rgce = parse_Rgce(blob, cce); + if(length !== cce + 2) rgcb = parse_RgbExtra(blob, target - cce - 2, rgce, opts); + return [rgce, rgcb]; +} + +/* 2.5.198.104 */ +function parse_Rgce(blob, length) { + var target = blob.l + length; + var R, id, ptgs = []; + while(target != blob.l) { + length = target - blob.l; + id = blob[blob.l]; + R = PtgTypes[id]; + //console.log("ptg", id, R) + if(id === 0x18 || id === 0x19) { + id = blob[blob.l + 1]; + R = (id === 0x18 ? Ptg18 : Ptg19)[id]; + } + if(!R || !R.f) { ptgs.push(parsenoop(blob, length)); } + else { ptgs.push([R.n, R.f(blob, length)]); } + } + return ptgs; +} + +function mapper(x) { return x.map(function f2(y) { return y[1];}).join(",");} + +/* 2.2.2 + Magic TODO */ +function stringify_formula(formula, range, cell, supbooks, opts) { + if(opts !== undefined && opts.biff === 5) return "BIFF5??"; + var _range = range !== undefined ? range : {s:{c:0, r:0}}; + var stack = [], e1, e2, type, c, ixti, nameidx, r; + if(!formula[0] || !formula[0][0]) return ""; + //console.log("--",cell,formula[0]) + for(var ff = 0, fflen = formula[0].length; ff < fflen; ++ff) { + var f = formula[0][ff]; + //console.log("++",f, stack) + switch(f[0]) { + /* 2.2.2.1 Unary Operator Tokens */ + /* 2.5.198.93 */ + case 'PtgUminus': stack.push("-" + stack.pop()); break; + /* 2.5.198.95 */ + case 'PtgUplus': stack.push("+" + stack.pop()); break; + /* 2.5.198.81 */ + case 'PtgPercent': stack.push(stack.pop() + "%"); break; + + /* 2.2.2.1 Binary Value Operator Token */ + /* 2.5.198.26 */ + case 'PtgAdd': + e1 = stack.pop(); e2 = stack.pop(); + stack.push(e2+"+"+e1); + break; + /* 2.5.198.90 */ + case 'PtgSub': + e1 = stack.pop(); e2 = stack.pop(); + stack.push(e2+"-"+e1); + break; + /* 2.5.198.75 */ + case 'PtgMul': + e1 = stack.pop(); e2 = stack.pop(); + stack.push(e2+"*"+e1); + break; + /* 2.5.198.45 */ + case 'PtgDiv': + e1 = stack.pop(); e2 = stack.pop(); + stack.push(e2+"/"+e1); + break; + /* 2.5.198.82 */ + case 'PtgPower': + e1 = stack.pop(); e2 = stack.pop(); + stack.push(e2+"^"+e1); + break; + /* 2.5.198.43 */ + case 'PtgConcat': + e1 = stack.pop(); e2 = stack.pop(); + stack.push(e2+"&"+e1); + break; + /* 2.5.198.69 */ + case 'PtgLt': + e1 = stack.pop(); e2 = stack.pop(); + stack.push(e2+"<"+e1); + break; + /* 2.5.198.68 */ + case 'PtgLe': + e1 = stack.pop(); e2 = stack.pop(); + stack.push(e2+"<="+e1); + break; + /* 2.5.198.56 */ + case 'PtgEq': + e1 = stack.pop(); e2 = stack.pop(); + stack.push(e2+"="+e1); + break; + /* 2.5.198.64 */ + case 'PtgGe': + e1 = stack.pop(); e2 = stack.pop(); + stack.push(e2+">="+e1); + break; + /* 2.5.198.65 */ + case 'PtgGt': + e1 = stack.pop(); e2 = stack.pop(); + stack.push(e2+">"+e1); + break; + /* 2.5.198.78 */ + case 'PtgNe': + e1 = stack.pop(); e2 = stack.pop(); + stack.push(e2+"<>"+e1); + break; + + /* 2.2.2.1 Binary Reference Operator Token */ + /* 2.5.198.67 */ + case 'PtgIsect': + e1 = stack.pop(); e2 = stack.pop(); + stack.push(e2+" "+e1); + break; + case 'PtgUnion': + e1 = stack.pop(); e2 = stack.pop(); + stack.push(e2+","+e1); + break; + case 'PtgRange': break; + + /* 2.2.2.3 Control Tokens "can be ignored" */ + /* 2.5.198.34 */ + case 'PtgAttrChoose': break; + /* 2.5.198.35 */ + case 'PtgAttrGoto': break; + /* 2.5.198.36 */ + case 'PtgAttrIf': break; + + + /* 2.5.198.84 */ + case 'PtgRef': + type = f[1][0]; c = shift_cell_xls(decode_cell(encode_cell(f[1][1])), _range); + stack.push(encode_cell(c)); + break; + /* 2.5.198.88 */ + case 'PtgRefN': + type = f[1][0]; c = shift_cell_xls(decode_cell(encode_cell(f[1][1])), cell); + stack.push(encode_cell(c)); + break; + case 'PtgRef3d': // TODO: lots of stuff + type = f[1][0]; ixti = f[1][1]; c = shift_cell_xls(f[1][2], _range); + stack.push(supbooks[1][ixti+1]+"!"+encode_cell(c)); + break; + + /* Function Call */ + /* 2.5.198.62 */ + case 'PtgFunc': + /* 2.5.198.63 */ + case 'PtgFuncVar': + /* f[1] = [argc, func] */ + var argc = f[1][0], func = f[1][1]; + if(!argc) argc = 0; + var args = stack.slice(-argc); + stack.length -= argc; + if(func === 'User') func = args.shift(); + stack.push(func + "(" + args.join(",") + ")"); + break; + + /* 2.5.198.42 */ + case 'PtgBool': stack.push(f[1] ? "TRUE" : "FALSE"); break; + /* 2.5.198.66 */ + case 'PtgInt': stack.push(f[1]); break; + /* 2.5.198.79 TODO: precision? */ + case 'PtgNum': stack.push(String(f[1])); break; + /* 2.5.198.89 */ + case 'PtgStr': stack.push('"' + f[1] + '"'); break; + /* 2.5.198.57 */ + case 'PtgErr': stack.push(f[1]); break; + /* 2.5.198.27 TODO: fixed points */ + case 'PtgArea': + type = f[1][0]; r = shift_range_xls(f[1][1], _range); + stack.push(encode_range(r)); + break; + /* 2.5.198.28 */ + case 'PtgArea3d': // TODO: lots of stuff + type = f[1][0]; ixti = f[1][1]; r = f[1][2]; + stack.push(supbooks[1][ixti+1]+"!"+encode_range(r)); + break; + /* 2.5.198.41 */ + case 'PtgAttrSum': + stack.push("SUM(" + stack.pop() + ")"); + break; + + /* Expression Prefixes */ + /* 2.5.198.37 */ + case 'PtgAttrSemi': break; + + /* 2.5.97.60 TODO: do something different for revisions */ + case 'PtgName': + /* f[1] = type, 0, nameindex */ + nameidx = f[1][2]; + var lbl = supbooks[0][nameidx]; + var name = lbl.Name; + if(name in XLSXFutureFunctions) name = XLSXFutureFunctions[name]; + stack.push(name); + break; + + /* 2.5.97.61 TODO: do something different for revisions */ + case 'PtgNameX': + /* f[1] = type, ixti, nameindex */ + var bookidx = f[1][1]; nameidx = f[1][2]; var externbook; + /* TODO: Properly handle missing values */ + if(supbooks[bookidx+1]) externbook = supbooks[bookidx+1][nameidx]; + else if(supbooks[bookidx-1]) externbook = supbooks[bookidx-1][nameidx]; + if(!externbook) externbook = {body: "??NAMEX??"}; + stack.push(externbook.body); + break; + + /* 2.2.2.4 Display Tokens */ + /* 2.5.198.80 */ + case 'PtgParen': stack.push('(' + stack.pop() + ')'); break; + + /* 2.5.198.86 */ + case 'PtgRefErr': stack.push('#REF!'); break; + + /* */ + /* 2.5.198.58 TODO */ + case 'PtgExp': + c = {c:f[1][1],r:f[1][0]}; + var q = {c: cell.c, r:cell.r}; + if(supbooks.sharedf[encode_cell(c)]) { + var parsedf = (supbooks.sharedf[encode_cell(c)]); + stack.push(stringify_formula(parsedf, _range, q, supbooks, opts)); + } + else { + var fnd = false; + for(e1=0;e1!=supbooks.arrayf.length; ++e1) { + /* TODO: should be something like range_has */ + e2 = supbooks.arrayf[e1]; + if(c.c < e2[0].s.c || c.c > e2[0].e.c) continue; + if(c.r < e2[0].s.r || c.r > e2[0].e.r) continue; + stack.push(stringify_formula(e2[1], _range, q, supbooks, opts)); + } + if(!fnd) stack.push(f[1]); + } + break; + + /* 2.5.198.32 TODO */ + case 'PtgArray': + stack.push("{" + f[1].map(mapper).join(";") + "}"); + break; + + /* 2.2.2.5 Mem Tokens */ + /* 2.5.198.70 TODO: confirm this is a non-display */ + case 'PtgMemArea': + //stack.push("(" + f[2].map(encode_range).join(",") + ")"); + break; + + /* 2.5.198.38 TODO */ + case 'PtgAttrSpace': break; + + /* 2.5.198.92 TODO */ + case 'PtgTbl': break; + + /* 2.5.198.71 */ + case 'PtgMemErr': break; + + /* 2.5.198.74 */ + case 'PtgMissArg': + stack.push(""); + break; + + /* 2.5.198.29 TODO */ + case 'PtgAreaErr': break; + + /* 2.5.198.31 TODO */ + case 'PtgAreaN': stack.push(""); break; + + /* 2.5.198.87 TODO */ + case 'PtgRefErr3d': break; + + /* 2.5.198.72 TODO */ + case 'PtgMemFunc': break; + + default: throw 'Unrecognized Formula Token: ' + f; + } + //console.log("::",f, stack) + } + //console.log("--",stack); + return stack[0]; +} + +/* [MS-XLSB] 2.5.97.4 CellParsedFormula TODO: use similar logic to js-xls */ +function parse_XLSBCellParsedFormula(data, length) { + var cce = data.read_shift(4); + return parsenoop(data, length-4); +} +/* [MS-XLS] 2.5.198.44 */ +var PtgDataType = { + 0x1: "REFERENCE", // reference to range + 0x2: "VALUE", // single value + 0x3: "ARRAY" // array of values +}; + +/* [MS-XLS] 2.5.198.4 */ +var Cetab = { + 0x0000: 'BEEP', + 0x0001: 'OPEN', + 0x0002: 'OPEN.LINKS', + 0x0003: 'CLOSE.ALL', + 0x0004: 'SAVE', + 0x0005: 'SAVE.AS', + 0x0006: 'FILE.DELETE', + 0x0007: 'PAGE.SETUP', + 0x0008: 'PRINT', + 0x0009: 'PRINTER.SETUP', + 0x000A: 'QUIT', + 0x000B: 'NEW.WINDOW', + 0x000C: 'ARRANGE.ALL', + 0x000D: 'WINDOW.SIZE', + 0x000E: 'WINDOW.MOVE', + 0x000F: 'FULL', + 0x0010: 'CLOSE', + 0x0011: 'RUN', + 0x0016: 'SET.PRINT.AREA', + 0x0017: 'SET.PRINT.TITLES', + 0x0018: 'SET.PAGE.BREAK', + 0x0019: 'REMOVE.PAGE.BREAK', + 0x001A: 'FONT', + 0x001B: 'DISPLAY', + 0x001C: 'PROTECT.DOCUMENT', + 0x001D: 'PRECISION', + 0x001E: 'A1.R1C1', + 0x001F: 'CALCULATE.NOW', + 0x0020: 'CALCULATION', + 0x0022: 'DATA.FIND', + 0x0023: 'EXTRACT', + 0x0024: 'DATA.DELETE', + 0x0025: 'SET.DATABASE', + 0x0026: 'SET.CRITERIA', + 0x0027: 'SORT', + 0x0028: 'DATA.SERIES', + 0x0029: 'TABLE', + 0x002A: 'FORMAT.NUMBER', + 0x002B: 'ALIGNMENT', + 0x002C: 'STYLE', + 0x002D: 'BORDER', + 0x002E: 'CELL.PROTECTION', + 0x002F: 'COLUMN.WIDTH', + 0x0030: 'UNDO', + 0x0031: 'CUT', + 0x0032: 'COPY', + 0x0033: 'PASTE', + 0x0034: 'CLEAR', + 0x0035: 'PASTE.SPECIAL', + 0x0036: 'EDIT.DELETE', + 0x0037: 'INSERT', + 0x0038: 'FILL.RIGHT', + 0x0039: 'FILL.DOWN', + 0x003D: 'DEFINE.NAME', + 0x003E: 'CREATE.NAMES', + 0x003F: 'FORMULA.GOTO', + 0x0040: 'FORMULA.FIND', + 0x0041: 'SELECT.LAST.CELL', + 0x0042: 'SHOW.ACTIVE.CELL', + 0x0043: 'GALLERY.AREA', + 0x0044: 'GALLERY.BAR', + 0x0045: 'GALLERY.COLUMN', + 0x0046: 'GALLERY.LINE', + 0x0047: 'GALLERY.PIE', + 0x0048: 'GALLERY.SCATTER', + 0x0049: 'COMBINATION', + 0x004A: 'PREFERRED', + 0x004B: 'ADD.OVERLAY', + 0x004C: 'GRIDLINES', + 0x004D: 'SET.PREFERRED', + 0x004E: 'AXES', + 0x004F: 'LEGEND', + 0x0050: 'ATTACH.TEXT', + 0x0051: 'ADD.ARROW', + 0x0052: 'SELECT.CHART', + 0x0053: 'SELECT.PLOT.AREA', + 0x0054: 'PATTERNS', + 0x0055: 'MAIN.CHART', + 0x0056: 'OVERLAY', + 0x0057: 'SCALE', + 0x0058: 'FORMAT.LEGEND', + 0x0059: 'FORMAT.TEXT', + 0x005A: 'EDIT.REPEAT', + 0x005B: 'PARSE', + 0x005C: 'JUSTIFY', + 0x005D: 'HIDE', + 0x005E: 'UNHIDE', + 0x005F: 'WORKSPACE', + 0x0060: 'FORMULA', + 0x0061: 'FORMULA.FILL', + 0x0062: 'FORMULA.ARRAY', + 0x0063: 'DATA.FIND.NEXT', + 0x0064: 'DATA.FIND.PREV', + 0x0065: 'FORMULA.FIND.NEXT', + 0x0066: 'FORMULA.FIND.PREV', + 0x0067: 'ACTIVATE', + 0x0068: 'ACTIVATE.NEXT', + 0x0069: 'ACTIVATE.PREV', + 0x006A: 'UNLOCKED.NEXT', + 0x006B: 'UNLOCKED.PREV', + 0x006C: 'COPY.PICTURE', + 0x006D: 'SELECT', + 0x006E: 'DELETE.NAME', + 0x006F: 'DELETE.FORMAT', + 0x0070: 'VLINE', + 0x0071: 'HLINE', + 0x0072: 'VPAGE', + 0x0073: 'HPAGE', + 0x0074: 'VSCROLL', + 0x0075: 'HSCROLL', + 0x0076: 'ALERT', + 0x0077: 'NEW', + 0x0078: 'CANCEL.COPY', + 0x0079: 'SHOW.CLIPBOARD', + 0x007A: 'MESSAGE', + 0x007C: 'PASTE.LINK', + 0x007D: 'APP.ACTIVATE', + 0x007E: 'DELETE.ARROW', + 0x007F: 'ROW.HEIGHT', + 0x0080: 'FORMAT.MOVE', + 0x0081: 'FORMAT.SIZE', + 0x0082: 'FORMULA.REPLACE', + 0x0083: 'SEND.KEYS', + 0x0084: 'SELECT.SPECIAL', + 0x0085: 'APPLY.NAMES', + 0x0086: 'REPLACE.FONT', + 0x0087: 'FREEZE.PANES', + 0x0088: 'SHOW.INFO', + 0x0089: 'SPLIT', + 0x008A: 'ON.WINDOW', + 0x008B: 'ON.DATA', + 0x008C: 'DISABLE.INPUT', + 0x008E: 'OUTLINE', + 0x008F: 'LIST.NAMES', + 0x0090: 'FILE.CLOSE', + 0x0091: 'SAVE.WORKBOOK', + 0x0092: 'DATA.FORM', + 0x0093: 'COPY.CHART', + 0x0094: 'ON.TIME', + 0x0095: 'WAIT', + 0x0096: 'FORMAT.FONT', + 0x0097: 'FILL.UP', + 0x0098: 'FILL.LEFT', + 0x0099: 'DELETE.OVERLAY', + 0x009B: 'SHORT.MENUS', + 0x009F: 'SET.UPDATE.STATUS', + 0x00A1: 'COLOR.PALETTE', + 0x00A2: 'DELETE.STYLE', + 0x00A3: 'WINDOW.RESTORE', + 0x00A4: 'WINDOW.MAXIMIZE', + 0x00A6: 'CHANGE.LINK', + 0x00A7: 'CALCULATE.DOCUMENT', + 0x00A8: 'ON.KEY', + 0x00A9: 'APP.RESTORE', + 0x00AA: 'APP.MOVE', + 0x00AB: 'APP.SIZE', + 0x00AC: 'APP.MINIMIZE', + 0x00AD: 'APP.MAXIMIZE', + 0x00AE: 'BRING.TO.FRONT', + 0x00AF: 'SEND.TO.BACK', + 0x00B9: 'MAIN.CHART.TYPE', + 0x00BA: 'OVERLAY.CHART.TYPE', + 0x00BB: 'SELECT.END', + 0x00BC: 'OPEN.MAIL', + 0x00BD: 'SEND.MAIL', + 0x00BE: 'STANDARD.FONT', + 0x00BF: 'CONSOLIDATE', + 0x00C0: 'SORT.SPECIAL', + 0x00C1: 'GALLERY.3D.AREA', + 0x00C2: 'GALLERY.3D.COLUMN', + 0x00C3: 'GALLERY.3D.LINE', + 0x00C4: 'GALLERY.3D.PIE', + 0x00C5: 'VIEW.3D', + 0x00C6: 'GOAL.SEEK', + 0x00C7: 'WORKGROUP', + 0x00C8: 'FILL.GROUP', + 0x00C9: 'UPDATE.LINK', + 0x00CA: 'PROMOTE', + 0x00CB: 'DEMOTE', + 0x00CC: 'SHOW.DETAIL', + 0x00CE: 'UNGROUP', + 0x00CF: 'OBJECT.PROPERTIES', + 0x00D0: 'SAVE.NEW.OBJECT', + 0x00D1: 'SHARE', + 0x00D2: 'SHARE.NAME', + 0x00D3: 'DUPLICATE', + 0x00D4: 'APPLY.STYLE', + 0x00D5: 'ASSIGN.TO.OBJECT', + 0x00D6: 'OBJECT.PROTECTION', + 0x00D7: 'HIDE.OBJECT', + 0x00D8: 'SET.EXTRACT', + 0x00D9: 'CREATE.PUBLISHER', + 0x00DA: 'SUBSCRIBE.TO', + 0x00DB: 'ATTRIBUTES', + 0x00DC: 'SHOW.TOOLBAR', + 0x00DE: 'PRINT.PREVIEW', + 0x00DF: 'EDIT.COLOR', + 0x00E0: 'SHOW.LEVELS', + 0x00E1: 'FORMAT.MAIN', + 0x00E2: 'FORMAT.OVERLAY', + 0x00E3: 'ON.RECALC', + 0x00E4: 'EDIT.SERIES', + 0x00E5: 'DEFINE.STYLE', + 0x00F0: 'LINE.PRINT', + 0x00F3: 'ENTER.DATA', + 0x00F9: 'GALLERY.RADAR', + 0x00FA: 'MERGE.STYLES', + 0x00FB: 'EDITION.OPTIONS', + 0x00FC: 'PASTE.PICTURE', + 0x00FD: 'PASTE.PICTURE.LINK', + 0x00FE: 'SPELLING', + 0x0100: 'ZOOM', + 0x0103: 'INSERT.OBJECT', + 0x0104: 'WINDOW.MINIMIZE', + 0x0109: 'SOUND.NOTE', + 0x010A: 'SOUND.PLAY', + 0x010B: 'FORMAT.SHAPE', + 0x010C: 'EXTEND.POLYGON', + 0x010D: 'FORMAT.AUTO', + 0x0110: 'GALLERY.3D.BAR', + 0x0111: 'GALLERY.3D.SURFACE', + 0x0112: 'FILL.AUTO', + 0x0114: 'CUSTOMIZE.TOOLBAR', + 0x0115: 'ADD.TOOL', + 0x0116: 'EDIT.OBJECT', + 0x0117: 'ON.DOUBLECLICK', + 0x0118: 'ON.ENTRY', + 0x0119: 'WORKBOOK.ADD', + 0x011A: 'WORKBOOK.MOVE', + 0x011B: 'WORKBOOK.COPY', + 0x011C: 'WORKBOOK.OPTIONS', + 0x011D: 'SAVE.WORKSPACE', + 0x0120: 'CHART.WIZARD', + 0x0121: 'DELETE.TOOL', + 0x0122: 'MOVE.TOOL', + 0x0123: 'WORKBOOK.SELECT', + 0x0124: 'WORKBOOK.ACTIVATE', + 0x0125: 'ASSIGN.TO.TOOL', + 0x0127: 'COPY.TOOL', + 0x0128: 'RESET.TOOL', + 0x0129: 'CONSTRAIN.NUMERIC', + 0x012A: 'PASTE.TOOL', + 0x012E: 'WORKBOOK.NEW', + 0x0131: 'SCENARIO.CELLS', + 0x0132: 'SCENARIO.DELETE', + 0x0133: 'SCENARIO.ADD', + 0x0134: 'SCENARIO.EDIT', + 0x0135: 'SCENARIO.SHOW', + 0x0136: 'SCENARIO.SHOW.NEXT', + 0x0137: 'SCENARIO.SUMMARY', + 0x0138: 'PIVOT.TABLE.WIZARD', + 0x0139: 'PIVOT.FIELD.PROPERTIES', + 0x013A: 'PIVOT.FIELD', + 0x013B: 'PIVOT.ITEM', + 0x013C: 'PIVOT.ADD.FIELDS', + 0x013E: 'OPTIONS.CALCULATION', + 0x013F: 'OPTIONS.EDIT', + 0x0140: 'OPTIONS.VIEW', + 0x0141: 'ADDIN.MANAGER', + 0x0142: 'MENU.EDITOR', + 0x0143: 'ATTACH.TOOLBARS', + 0x0144: 'VBAActivate', + 0x0145: 'OPTIONS.CHART', + 0x0148: 'VBA.INSERT.FILE', + 0x014A: 'VBA.PROCEDURE.DEFINITION', + 0x0150: 'ROUTING.SLIP', + 0x0152: 'ROUTE.DOCUMENT', + 0x0153: 'MAIL.LOGON', + 0x0156: 'INSERT.PICTURE', + 0x0157: 'EDIT.TOOL', + 0x0158: 'GALLERY.DOUGHNUT', + 0x015E: 'CHART.TREND', + 0x0160: 'PIVOT.ITEM.PROPERTIES', + 0x0162: 'WORKBOOK.INSERT', + 0x0163: 'OPTIONS.TRANSITION', + 0x0164: 'OPTIONS.GENERAL', + 0x0172: 'FILTER.ADVANCED', + 0x0175: 'MAIL.ADD.MAILER', + 0x0176: 'MAIL.DELETE.MAILER', + 0x0177: 'MAIL.REPLY', + 0x0178: 'MAIL.REPLY.ALL', + 0x0179: 'MAIL.FORWARD', + 0x017A: 'MAIL.NEXT.LETTER', + 0x017B: 'DATA.LABEL', + 0x017C: 'INSERT.TITLE', + 0x017D: 'FONT.PROPERTIES', + 0x017E: 'MACRO.OPTIONS', + 0x017F: 'WORKBOOK.HIDE', + 0x0180: 'WORKBOOK.UNHIDE', + 0x0181: 'WORKBOOK.DELETE', + 0x0182: 'WORKBOOK.NAME', + 0x0184: 'GALLERY.CUSTOM', + 0x0186: 'ADD.CHART.AUTOFORMAT', + 0x0187: 'DELETE.CHART.AUTOFORMAT', + 0x0188: 'CHART.ADD.DATA', + 0x0189: 'AUTO.OUTLINE', + 0x018A: 'TAB.ORDER', + 0x018B: 'SHOW.DIALOG', + 0x018C: 'SELECT.ALL', + 0x018D: 'UNGROUP.SHEETS', + 0x018E: 'SUBTOTAL.CREATE', + 0x018F: 'SUBTOTAL.REMOVE', + 0x0190: 'RENAME.OBJECT', + 0x019C: 'WORKBOOK.SCROLL', + 0x019D: 'WORKBOOK.NEXT', + 0x019E: 'WORKBOOK.PREV', + 0x019F: 'WORKBOOK.TAB.SPLIT', + 0x01A0: 'FULL.SCREEN', + 0x01A1: 'WORKBOOK.PROTECT', + 0x01A4: 'SCROLLBAR.PROPERTIES', + 0x01A5: 'PIVOT.SHOW.PAGES', + 0x01A6: 'TEXT.TO.COLUMNS', + 0x01A7: 'FORMAT.CHARTTYPE', + 0x01A8: 'LINK.FORMAT', + 0x01A9: 'TRACER.DISPLAY', + 0x01AE: 'TRACER.NAVIGATE', + 0x01AF: 'TRACER.CLEAR', + 0x01B0: 'TRACER.ERROR', + 0x01B1: 'PIVOT.FIELD.GROUP', + 0x01B2: 'PIVOT.FIELD.UNGROUP', + 0x01B3: 'CHECKBOX.PROPERTIES', + 0x01B4: 'LABEL.PROPERTIES', + 0x01B5: 'LISTBOX.PROPERTIES', + 0x01B6: 'EDITBOX.PROPERTIES', + 0x01B7: 'PIVOT.REFRESH', + 0x01B8: 'LINK.COMBO', + 0x01B9: 'OPEN.TEXT', + 0x01BA: 'HIDE.DIALOG', + 0x01BB: 'SET.DIALOG.FOCUS', + 0x01BC: 'ENABLE.OBJECT', + 0x01BD: 'PUSHBUTTON.PROPERTIES', + 0x01BE: 'SET.DIALOG.DEFAULT', + 0x01BF: 'FILTER', + 0x01C0: 'FILTER.SHOW.ALL', + 0x01C1: 'CLEAR.OUTLINE', + 0x01C2: 'FUNCTION.WIZARD', + 0x01C3: 'ADD.LIST.ITEM', + 0x01C4: 'SET.LIST.ITEM', + 0x01C5: 'REMOVE.LIST.ITEM', + 0x01C6: 'SELECT.LIST.ITEM', + 0x01C7: 'SET.CONTROL.VALUE', + 0x01C8: 'SAVE.COPY.AS', + 0x01CA: 'OPTIONS.LISTS.ADD', + 0x01CB: 'OPTIONS.LISTS.DELETE', + 0x01CC: 'SERIES.AXES', + 0x01CD: 'SERIES.X', + 0x01CE: 'SERIES.Y', + 0x01CF: 'ERRORBAR.X', + 0x01D0: 'ERRORBAR.Y', + 0x01D1: 'FORMAT.CHART', + 0x01D2: 'SERIES.ORDER', + 0x01D3: 'MAIL.LOGOFF', + 0x01D4: 'CLEAR.ROUTING.SLIP', + 0x01D5: 'APP.ACTIVATE.MICROSOFT', + 0x01D6: 'MAIL.EDIT.MAILER', + 0x01D7: 'ON.SHEET', + 0x01D8: 'STANDARD.WIDTH', + 0x01D9: 'SCENARIO.MERGE', + 0x01DA: 'SUMMARY.INFO', + 0x01DB: 'FIND.FILE', + 0x01DC: 'ACTIVE.CELL.FONT', + 0x01DD: 'ENABLE.TIPWIZARD', + 0x01DE: 'VBA.MAKE.ADDIN', + 0x01E0: 'INSERTDATATABLE', + 0x01E1: 'WORKGROUP.OPTIONS', + 0x01E2: 'MAIL.SEND.MAILER', + 0x01E5: 'AUTOCORRECT', + 0x01E9: 'POST.DOCUMENT', + 0x01EB: 'PICKLIST', + 0x01ED: 'VIEW.SHOW', + 0x01EE: 'VIEW.DEFINE', + 0x01EF: 'VIEW.DELETE', + 0x01FD: 'SHEET.BACKGROUND', + 0x01FE: 'INSERT.MAP.OBJECT', + 0x01FF: 'OPTIONS.MENONO', + 0x0205: 'MSOCHECKS', + 0x0206: 'NORMAL', + 0x0207: 'LAYOUT', + 0x0208: 'RM.PRINT.AREA', + 0x0209: 'CLEAR.PRINT.AREA', + 0x020A: 'ADD.PRINT.AREA', + 0x020B: 'MOVE.BRK', + 0x0221: 'HIDECURR.NOTE', + 0x0222: 'HIDEALL.NOTES', + 0x0223: 'DELETE.NOTE', + 0x0224: 'TRAVERSE.NOTES', + 0x0225: 'ACTIVATE.NOTES', + 0x026C: 'PROTECT.REVISIONS', + 0x026D: 'UNPROTECT.REVISIONS', + 0x0287: 'OPTIONS.ME', + 0x028D: 'WEB.PUBLISH', + 0x029B: 'NEWWEBQUERY', + 0x02A1: 'PIVOT.TABLE.CHART', + 0x02F1: 'OPTIONS.SAVE', + 0x02F3: 'OPTIONS.SPELL', + 0x0328: 'HIDEALL.INKANNOTS' +}; + +/* [MS-XLS] 2.5.198.17 */ +var Ftab = { + 0x0000: 'COUNT', + 0x0001: 'IF', + 0x0002: 'ISNA', + 0x0003: 'ISERROR', + 0x0004: 'SUM', + 0x0005: 'AVERAGE', + 0x0006: 'MIN', + 0x0007: 'MAX', + 0x0008: 'ROW', + 0x0009: 'COLUMN', + 0x000A: 'NA', + 0x000B: 'NPV', + 0x000C: 'STDEV', + 0x000D: 'DOLLAR', + 0x000E: 'FIXED', + 0x000F: 'SIN', + 0x0010: 'COS', + 0x0011: 'TAN', + 0x0012: 'ATAN', + 0x0013: 'PI', + 0x0014: 'SQRT', + 0x0015: 'EXP', + 0x0016: 'LN', + 0x0017: 'LOG10', + 0x0018: 'ABS', + 0x0019: 'INT', + 0x001A: 'SIGN', + 0x001B: 'ROUND', + 0x001C: 'LOOKUP', + 0x001D: 'INDEX', + 0x001E: 'REPT', + 0x001F: 'MID', + 0x0020: 'LEN', + 0x0021: 'VALUE', + 0x0022: 'TRUE', + 0x0023: 'FALSE', + 0x0024: 'AND', + 0x0025: 'OR', + 0x0026: 'NOT', + 0x0027: 'MOD', + 0x0028: 'DCOUNT', + 0x0029: 'DSUM', + 0x002A: 'DAVERAGE', + 0x002B: 'DMIN', + 0x002C: 'DMAX', + 0x002D: 'DSTDEV', + 0x002E: 'VAR', + 0x002F: 'DVAR', + 0x0030: 'TEXT', + 0x0031: 'LINEST', + 0x0032: 'TREND', + 0x0033: 'LOGEST', + 0x0034: 'GROWTH', + 0x0035: 'GOTO', + 0x0036: 'HALT', + 0x0037: 'RETURN', + 0x0038: 'PV', + 0x0039: 'FV', + 0x003A: 'NPER', + 0x003B: 'PMT', + 0x003C: 'RATE', + 0x003D: 'MIRR', + 0x003E: 'IRR', + 0x003F: 'RAND', + 0x0040: 'MATCH', + 0x0041: 'DATE', + 0x0042: 'TIME', + 0x0043: 'DAY', + 0x0044: 'MONTH', + 0x0045: 'YEAR', + 0x0046: 'WEEKDAY', + 0x0047: 'HOUR', + 0x0048: 'MINUTE', + 0x0049: 'SECOND', + 0x004A: 'NOW', + 0x004B: 'AREAS', + 0x004C: 'ROWS', + 0x004D: 'COLUMNS', + 0x004E: 'OFFSET', + 0x004F: 'ABSREF', + 0x0050: 'RELREF', + 0x0051: 'ARGUMENT', + 0x0052: 'SEARCH', + 0x0053: 'TRANSPOSE', + 0x0054: 'ERROR', + 0x0055: 'STEP', + 0x0056: 'TYPE', + 0x0057: 'ECHO', + 0x0058: 'SET.NAME', + 0x0059: 'CALLER', + 0x005A: 'DEREF', + 0x005B: 'WINDOWS', + 0x005C: 'SERIES', + 0x005D: 'DOCUMENTS', + 0x005E: 'ACTIVE.CELL', + 0x005F: 'SELECTION', + 0x0060: 'RESULT', + 0x0061: 'ATAN2', + 0x0062: 'ASIN', + 0x0063: 'ACOS', + 0x0064: 'CHOOSE', + 0x0065: 'HLOOKUP', + 0x0066: 'VLOOKUP', + 0x0067: 'LINKS', + 0x0068: 'INPUT', + 0x0069: 'ISREF', + 0x006A: 'GET.FORMULA', + 0x006B: 'GET.NAME', + 0x006C: 'SET.VALUE', + 0x006D: 'LOG', + 0x006E: 'EXEC', + 0x006F: 'CHAR', + 0x0070: 'LOWER', + 0x0071: 'UPPER', + 0x0072: 'PROPER', + 0x0073: 'LEFT', + 0x0074: 'RIGHT', + 0x0075: 'EXACT', + 0x0076: 'TRIM', + 0x0077: 'REPLACE', + 0x0078: 'SUBSTITUTE', + 0x0079: 'CODE', + 0x007A: 'NAMES', + 0x007B: 'DIRECTORY', + 0x007C: 'FIND', + 0x007D: 'CELL', + 0x007E: 'ISERR', + 0x007F: 'ISTEXT', + 0x0080: 'ISNUMBER', + 0x0081: 'ISBLANK', + 0x0082: 'T', + 0x0083: 'N', + 0x0084: 'FOPEN', + 0x0085: 'FCLOSE', + 0x0086: 'FSIZE', + 0x0087: 'FREADLN', + 0x0088: 'FREAD', + 0x0089: 'FWRITELN', + 0x008A: 'FWRITE', + 0x008B: 'FPOS', + 0x008C: 'DATEVALUE', + 0x008D: 'TIMEVALUE', + 0x008E: 'SLN', + 0x008F: 'SYD', + 0x0090: 'DDB', + 0x0091: 'GET.DEF', + 0x0092: 'REFTEXT', + 0x0093: 'TEXTREF', + 0x0094: 'INDIRECT', + 0x0095: 'REGISTER', + 0x0096: 'CALL', + 0x0097: 'ADD.BAR', + 0x0098: 'ADD.MENU', + 0x0099: 'ADD.COMMAND', + 0x009A: 'ENABLE.COMMAND', + 0x009B: 'CHECK.COMMAND', + 0x009C: 'RENAME.COMMAND', + 0x009D: 'SHOW.BAR', + 0x009E: 'DELETE.MENU', + 0x009F: 'DELETE.COMMAND', + 0x00A0: 'GET.CHART.ITEM', + 0x00A1: 'DIALOG.BOX', + 0x00A2: 'CLEAN', + 0x00A3: 'MDETERM', + 0x00A4: 'MINVERSE', + 0x00A5: 'MMULT', + 0x00A6: 'FILES', + 0x00A7: 'IPMT', + 0x00A8: 'PPMT', + 0x00A9: 'COUNTA', + 0x00AA: 'CANCEL.KEY', + 0x00AB: 'FOR', + 0x00AC: 'WHILE', + 0x00AD: 'BREAK', + 0x00AE: 'NEXT', + 0x00AF: 'INITIATE', + 0x00B0: 'REQUEST', + 0x00B1: 'POKE', + 0x00B2: 'EXECUTE', + 0x00B3: 'TERMINATE', + 0x00B4: 'RESTART', + 0x00B5: 'HELP', + 0x00B6: 'GET.BAR', + 0x00B7: 'PRODUCT', + 0x00B8: 'FACT', + 0x00B9: 'GET.CELL', + 0x00BA: 'GET.WORKSPACE', + 0x00BB: 'GET.WINDOW', + 0x00BC: 'GET.DOCUMENT', + 0x00BD: 'DPRODUCT', + 0x00BE: 'ISNONTEXT', + 0x00BF: 'GET.NOTE', + 0x00C0: 'NOTE', + 0x00C1: 'STDEVP', + 0x00C2: 'VARP', + 0x00C3: 'DSTDEVP', + 0x00C4: 'DVARP', + 0x00C5: 'TRUNC', + 0x00C6: 'ISLOGICAL', + 0x00C7: 'DCOUNTA', + 0x00C8: 'DELETE.BAR', + 0x00C9: 'UNREGISTER', + 0x00CC: 'USDOLLAR', + 0x00CD: 'FINDB', + 0x00CE: 'SEARCHB', + 0x00CF: 'REPLACEB', + 0x00D0: 'LEFTB', + 0x00D1: 'RIGHTB', + 0x00D2: 'MIDB', + 0x00D3: 'LENB', + 0x00D4: 'ROUNDUP', + 0x00D5: 'ROUNDDOWN', + 0x00D6: 'ASC', + 0x00D7: 'DBCS', + 0x00D8: 'RANK', + 0x00DB: 'ADDRESS', + 0x00DC: 'DAYS360', + 0x00DD: 'TODAY', + 0x00DE: 'VDB', + 0x00DF: 'ELSE', + 0x00E0: 'ELSE.IF', + 0x00E1: 'END.IF', + 0x00E2: 'FOR.CELL', + 0x00E3: 'MEDIAN', + 0x00E4: 'SUMPRODUCT', + 0x00E5: 'SINH', + 0x00E6: 'COSH', + 0x00E7: 'TANH', + 0x00E8: 'ASINH', + 0x00E9: 'ACOSH', + 0x00EA: 'ATANH', + 0x00EB: 'DGET', + 0x00EC: 'CREATE.OBJECT', + 0x00ED: 'VOLATILE', + 0x00EE: 'LAST.ERROR', + 0x00EF: 'CUSTOM.UNDO', + 0x00F0: 'CUSTOM.REPEAT', + 0x00F1: 'FORMULA.CONVERT', + 0x00F2: 'GET.LINK.INFO', + 0x00F3: 'TEXT.BOX', + 0x00F4: 'INFO', + 0x00F5: 'GROUP', + 0x00F6: 'GET.OBJECT', + 0x00F7: 'DB', + 0x00F8: 'PAUSE', + 0x00FB: 'RESUME', + 0x00FC: 'FREQUENCY', + 0x00FD: 'ADD.TOOLBAR', + 0x00FE: 'DELETE.TOOLBAR', + 0x00FF: 'User', + 0x0100: 'RESET.TOOLBAR', + 0x0101: 'EVALUATE', + 0x0102: 'GET.TOOLBAR', + 0x0103: 'GET.TOOL', + 0x0104: 'SPELLING.CHECK', + 0x0105: 'ERROR.TYPE', + 0x0106: 'APP.TITLE', + 0x0107: 'WINDOW.TITLE', + 0x0108: 'SAVE.TOOLBAR', + 0x0109: 'ENABLE.TOOL', + 0x010A: 'PRESS.TOOL', + 0x010B: 'REGISTER.ID', + 0x010C: 'GET.WORKBOOK', + 0x010D: 'AVEDEV', + 0x010E: 'BETADIST', + 0x010F: 'GAMMALN', + 0x0110: 'BETAINV', + 0x0111: 'BINOMDIST', + 0x0112: 'CHIDIST', + 0x0113: 'CHIINV', + 0x0114: 'COMBIN', + 0x0115: 'CONFIDENCE', + 0x0116: 'CRITBINOM', + 0x0117: 'EVEN', + 0x0118: 'EXPONDIST', + 0x0119: 'FDIST', + 0x011A: 'FINV', + 0x011B: 'FISHER', + 0x011C: 'FISHERINV', + 0x011D: 'FLOOR', + 0x011E: 'GAMMADIST', + 0x011F: 'GAMMAINV', + 0x0120: 'CEILING', + 0x0121: 'HYPGEOMDIST', + 0x0122: 'LOGNORMDIST', + 0x0123: 'LOGINV', + 0x0124: 'NEGBINOMDIST', + 0x0125: 'NORMDIST', + 0x0126: 'NORMSDIST', + 0x0127: 'NORMINV', + 0x0128: 'NORMSINV', + 0x0129: 'STANDARDIZE', + 0x012A: 'ODD', + 0x012B: 'PERMUT', + 0x012C: 'POISSON', + 0x012D: 'TDIST', + 0x012E: 'WEIBULL', + 0x012F: 'SUMXMY2', + 0x0130: 'SUMX2MY2', + 0x0131: 'SUMX2PY2', + 0x0132: 'CHITEST', + 0x0133: 'CORREL', + 0x0134: 'COVAR', + 0x0135: 'FORECAST', + 0x0136: 'FTEST', + 0x0137: 'INTERCEPT', + 0x0138: 'PEARSON', + 0x0139: 'RSQ', + 0x013A: 'STEYX', + 0x013B: 'SLOPE', + 0x013C: 'TTEST', + 0x013D: 'PROB', + 0x013E: 'DEVSQ', + 0x013F: 'GEOMEAN', + 0x0140: 'HARMEAN', + 0x0141: 'SUMSQ', + 0x0142: 'KURT', + 0x0143: 'SKEW', + 0x0144: 'ZTEST', + 0x0145: 'LARGE', + 0x0146: 'SMALL', + 0x0147: 'QUARTILE', + 0x0148: 'PERCENTILE', + 0x0149: 'PERCENTRANK', + 0x014A: 'MODE', + 0x014B: 'TRIMMEAN', + 0x014C: 'TINV', + 0x014E: 'MOVIE.COMMAND', + 0x014F: 'GET.MOVIE', + 0x0150: 'CONCATENATE', + 0x0151: 'POWER', + 0x0152: 'PIVOT.ADD.DATA', + 0x0153: 'GET.PIVOT.TABLE', + 0x0154: 'GET.PIVOT.FIELD', + 0x0155: 'GET.PIVOT.ITEM', + 0x0156: 'RADIANS', + 0x0157: 'DEGREES', + 0x0158: 'SUBTOTAL', + 0x0159: 'SUMIF', + 0x015A: 'COUNTIF', + 0x015B: 'COUNTBLANK', + 0x015C: 'SCENARIO.GET', + 0x015D: 'OPTIONS.LISTS.GET', + 0x015E: 'ISPMT', + 0x015F: 'DATEDIF', + 0x0160: 'DATESTRING', + 0x0161: 'NUMBERSTRING', + 0x0162: 'ROMAN', + 0x0163: 'OPEN.DIALOG', + 0x0164: 'SAVE.DIALOG', + 0x0165: 'VIEW.GET', + 0x0166: 'GETPIVOTDATA', + 0x0167: 'HYPERLINK', + 0x0168: 'PHONETIC', + 0x0169: 'AVERAGEA', + 0x016A: 'MAXA', + 0x016B: 'MINA', + 0x016C: 'STDEVPA', + 0x016D: 'VARPA', + 0x016E: 'STDEVA', + 0x016F: 'VARA', + 0x0170: 'BAHTTEXT', + 0x0171: 'THAIDAYOFWEEK', + 0x0172: 'THAIDIGIT', + 0x0173: 'THAIMONTHOFYEAR', + 0x0174: 'THAINUMSOUND', + 0x0175: 'THAINUMSTRING', + 0x0176: 'THAISTRINGLENGTH', + 0x0177: 'ISTHAIDIGIT', + 0x0178: 'ROUNDBAHTDOWN', + 0x0179: 'ROUNDBAHTUP', + 0x017A: 'THAIYEAR', + 0x017B: 'RTD' +}; +var FtabArgc = { + 0x0002: 1, /* ISNA */ + 0x0003: 1, /* ISERROR */ + 0x000F: 1, /* SIN */ + 0x0010: 1, /* COS */ + 0x0011: 1, /* TAN */ + 0x0012: 1, /* ATAN */ + 0x0014: 1, /* SQRT */ + 0x0015: 1, /* EXP */ + 0x0016: 1, /* LN */ + 0x0017: 1, /* LOG10 */ + 0x0018: 1, /* ABS */ + 0x0019: 1, /* INT */ + 0x001A: 1, /* SIGN */ + 0x001B: 2, /* ROUND */ + 0x001E: 2, /* REPT */ + 0x001F: 3, /* MID */ + 0x0020: 1, /* LEN */ + 0x0021: 1, /* VALUE */ + 0x0026: 1, /* NOT */ + 0x0027: 2, /* MOD */ + 0x0028: 3, /* DCOUNT */ + 0x0029: 3, /* DSUM */ + 0x002A: 3, /* DAVERAGE */ + 0x002B: 3, /* DMIN */ + 0x002C: 3, /* DMAX */ + 0x002D: 3, /* DSTDEV */ + 0x002F: 3, /* DVAR */ + 0x0030: 2, /* TEXT */ + 0x0035: 1, /* GOTO */ + 0x003D: 3, /* MIRR */ + 0x0041: 3, /* DATE */ + 0x0042: 3, /* TIME */ + 0x0043: 1, /* DAY */ + 0x0044: 1, /* MONTH */ + 0x0045: 1, /* YEAR */ + 0x0047: 1, /* HOUR */ + 0x0048: 1, /* MINUTE */ + 0x0049: 1, /* SECOND */ + 0x004B: 1, /* AREAS */ + 0x004C: 1, /* ROWS */ + 0x004D: 1, /* COLUMNS */ + 0x004F: 2, /* ABSREF */ + 0x0050: 2, /* RELREF */ + 0x0053: 1, /* TRANSPOSE */ + 0x0056: 1, /* TYPE */ + 0x005A: 1, /* DEREF */ + 0x0061: 2, /* ATAN2 */ + 0x0062: 1, /* ASIN */ + 0x0063: 1, /* ACOS */ + 0x0069: 1, /* ISREF */ + 0x006F: 1, /* CHAR */ + 0x0070: 1, /* LOWER */ + 0x0071: 1, /* UPPER */ + 0x0072: 1, /* PROPER */ + 0x0075: 2, /* EXACT */ + 0x0076: 1, /* TRIM */ + 0x0077: 4, /* REPLACE */ + 0x0079: 1, /* CODE */ + 0x007E: 1, /* ISERR */ + 0x007F: 1, /* ISTEXT */ + 0x0080: 1, /* ISNUMBER */ + 0x0081: 1, /* ISBLANK */ + 0x0082: 1, /* T */ + 0x0083: 1, /* N */ + 0x0085: 1, /* FCLOSE */ + 0x0086: 1, /* FSIZE */ + 0x0087: 1, /* FREADLN */ + 0x0088: 2, /* FREAD */ + 0x0089: 2, /* FWRITELN */ + 0x008A: 2, /* FWRITE */ + 0x008C: 1, /* DATEVALUE */ + 0x008D: 1, /* TIMEVALUE */ + 0x008E: 3, /* SLN */ + 0x008F: 4, /* SYD */ + 0x00A2: 1, /* CLEAN */ + 0x00A3: 1, /* MDETERM */ + 0x00A4: 1, /* MINVERSE */ + 0x00A5: 2, /* MMULT */ + 0x00AC: 1, /* WHILE */ + 0x00AF: 2, /* INITIATE */ + 0x00B0: 2, /* REQUEST */ + 0x00B1: 3, /* POKE */ + 0x00B2: 2, /* EXECUTE */ + 0x00B3: 1, /* TERMINATE */ + 0x00B8: 1, /* FACT */ + 0x00BD: 3, /* DPRODUCT */ + 0x00BE: 1, /* ISNONTEXT */ + 0x00C3: 3, /* DSTDEVP */ + 0x00C4: 3, /* DVARP */ + 0x00C6: 1, /* ISLOGICAL */ + 0x00C7: 3, /* DCOUNTA */ + 0x00C9: 1, /* UNREGISTER */ + 0x00CF: 4, /* REPLACEB */ + 0x00D2: 3, /* MIDB */ + 0x00D3: 1, /* LENB */ + 0x00D4: 2, /* ROUNDUP */ + 0x00D5: 2, /* ROUNDDOWN */ + 0x00D6: 1, /* ASC */ + 0x00D7: 1, /* DBCS */ + 0x00E5: 1, /* SINH */ + 0x00E6: 1, /* COSH */ + 0x00E7: 1, /* TANH */ + 0x00E8: 1, /* ASINH */ + 0x00E9: 1, /* ACOSH */ + 0x00EA: 1, /* ATANH */ + 0x00EB: 3, /* DGET */ + 0x00F4: 1, /* INFO */ + 0x00FC: 2, /* FREQUENCY */ + 0x0101: 1, /* EVALUATE */ + 0x0105: 1, /* ERROR.TYPE */ + 0x010F: 1, /* GAMMALN */ + 0x0111: 4, /* BINOMDIST */ + 0x0112: 2, /* CHIDIST */ + 0x0113: 2, /* CHIINV */ + 0x0114: 2, /* COMBIN */ + 0x0115: 3, /* CONFIDENCE */ + 0x0116: 3, /* CRITBINOM */ + 0x0117: 1, /* EVEN */ + 0x0118: 3, /* EXPONDIST */ + 0x0119: 3, /* FDIST */ + 0x011A: 3, /* FINV */ + 0x011B: 1, /* FISHER */ + 0x011C: 1, /* FISHERINV */ + 0x011D: 2, /* FLOOR */ + 0x011E: 4, /* GAMMADIST */ + 0x011F: 3, /* GAMMAINV */ + 0x0120: 2, /* CEILING */ + 0x0121: 4, /* HYPGEOMDIST */ + 0x0122: 3, /* LOGNORMDIST */ + 0x0123: 3, /* LOGINV */ + 0x0124: 3, /* NEGBINOMDIST */ + 0x0125: 4, /* NORMDIST */ + 0x0126: 1, /* NORMSDIST */ + 0x0127: 3, /* NORMINV */ + 0x0128: 1, /* NORMSINV */ + 0x0129: 3, /* STANDARDIZE */ + 0x012A: 1, /* ODD */ + 0x012B: 2, /* PERMUT */ + 0x012C: 3, /* POISSON */ + 0x012D: 3, /* TDIST */ + 0x012E: 4, /* WEIBULL */ + 0x012F: 2, /* SUMXMY2 */ + 0x0130: 2, /* SUMX2MY2 */ + 0x0131: 2, /* SUMX2PY2 */ + 0x0132: 2, /* CHITEST */ + 0x0133: 2, /* CORREL */ + 0x0134: 2, /* COVAR */ + 0x0135: 3, /* FORECAST */ + 0x0136: 2, /* FTEST */ + 0x0137: 2, /* INTERCEPT */ + 0x0138: 2, /* PEARSON */ + 0x0139: 2, /* RSQ */ + 0x013A: 2, /* STEYX */ + 0x013B: 2, /* SLOPE */ + 0x013C: 4, /* TTEST */ + 0x0145: 2, /* LARGE */ + 0x0146: 2, /* SMALL */ + 0x0147: 2, /* QUARTILE */ + 0x0148: 2, /* PERCENTILE */ + 0x014B: 2, /* TRIMMEAN */ + 0x014C: 2, /* TINV */ + 0x0151: 2, /* POWER */ + 0x0156: 1, /* RADIANS */ + 0x0157: 1, /* DEGREES */ + 0x015A: 2, /* COUNTIF */ + 0x015B: 1, /* COUNTBLANK */ + 0x015E: 4, /* ISPMT */ + 0x015F: 3, /* DATEDIF */ + 0x0160: 1, /* DATESTRING */ + 0x0161: 2, /* NUMBERSTRING */ + 0x0168: 1, /* PHONETIC */ + 0x0170: 1, /* BAHTTEXT */ + 0x0171: 1, /* THAIDAYOFWEEK */ + 0x0172: 1, /* THAIDIGIT */ + 0x0173: 1, /* THAIMONTHOFYEAR */ + 0x0174: 1, /* THAINUMSOUND */ + 0x0175: 1, /* THAINUMSTRING */ + 0x0176: 1, /* THAISTRINGLENGTH */ + 0x0177: 1, /* ISTHAIDIGIT */ + 0x0178: 1, /* ROUNDBAHTDOWN */ + 0x0179: 1, /* ROUNDBAHTUP */ + 0x017A: 1, /* THAIYEAR */ + 0xFFFF: 0 +}; +/* [MS-XLSX] 2.2.3 Functions */ +var XLSXFutureFunctions = { + "_xlfn.ACOT": "ACOT", + "_xlfn.ACOTH": "ACOTH", + "_xlfn.AGGREGATE": "AGGREGATE", + "_xlfn.ARABIC": "ARABIC", + "_xlfn.AVERAGEIF": "AVERAGEIF", + "_xlfn.AVERAGEIFS": "AVERAGEIFS", + "_xlfn.BASE": "BASE", + "_xlfn.BETA.DIST": "BETA.DIST", + "_xlfn.BETA.INV": "BETA.INV", + "_xlfn.BINOM.DIST": "BINOM.DIST", + "_xlfn.BINOM.DIST.RANGE": "BINOM.DIST.RANGE", + "_xlfn.BINOM.INV": "BINOM.INV", + "_xlfn.BITAND": "BITAND", + "_xlfn.BITLSHIFT": "BITLSHIFT", + "_xlfn.BITOR": "BITOR", + "_xlfn.BITRSHIFT": "BITRSHIFT", + "_xlfn.BITXOR": "BITXOR", + "_xlfn.CEILING.MATH": "CEILING.MATH", + "_xlfn.CEILING.PRECISE": "CEILING.PRECISE", + "_xlfn.CHISQ.DIST": "CHISQ.DIST", + "_xlfn.CHISQ.DIST.RT": "CHISQ.DIST.RT", + "_xlfn.CHISQ.INV": "CHISQ.INV", + "_xlfn.CHISQ.INV.RT": "CHISQ.INV.RT", + "_xlfn.CHISQ.TEST": "CHISQ.TEST", + "_xlfn.COMBINA": "COMBINA", + "_xlfn.CONFIDENCE.NORM": "CONFIDENCE.NORM", + "_xlfn.CONFIDENCE.T": "CONFIDENCE.T", + "_xlfn.COT": "COT", + "_xlfn.COTH": "COTH", + "_xlfn.COUNTIFS": "COUNTIFS", + "_xlfn.COVARIANCE.P": "COVARIANCE.P", + "_xlfn.COVARIANCE.S": "COVARIANCE.S", + "_xlfn.CSC": "CSC", + "_xlfn.CSCH": "CSCH", + "_xlfn.DAYS": "DAYS", + "_xlfn.DECIMAL": "DECIMAL", + "_xlfn.ECMA.CEILING": "ECMA.CEILING", + "_xlfn.ERF.PRECISE": "ERF.PRECISE", + "_xlfn.ERFC.PRECISE": "ERFC.PRECISE", + "_xlfn.EXPON.DIST": "EXPON.DIST", + "_xlfn.F.DIST": "F.DIST", + "_xlfn.F.DIST.RT": "F.DIST.RT", + "_xlfn.F.INV": "F.INV", + "_xlfn.F.INV.RT": "F.INV.RT", + "_xlfn.F.TEST": "F.TEST", + "_xlfn.FILTERXML": "FILTERXML", + "_xlfn.FLOOR.MATH": "FLOOR.MATH", + "_xlfn.FLOOR.PRECISE": "FLOOR.PRECISE", + "_xlfn.FORMULATEXT": "FORMULATEXT", + "_xlfn.GAMMA": "GAMMA", + "_xlfn.GAMMA.DIST": "GAMMA.DIST", + "_xlfn.GAMMA.INV": "GAMMA.INV", + "_xlfn.GAMMALN.PRECISE": "GAMMALN.PRECISE", + "_xlfn.GAUSS": "GAUSS", + "_xlfn.HYPGEOM.DIST": "HYPGEOM.DIST", + "_xlfn.IFNA": "IFNA", + "_xlfn.IFERROR": "IFERROR", + "_xlfn.IMCOSH": "IMCOSH", + "_xlfn.IMCOT": "IMCOT", + "_xlfn.IMCSC": "IMCSC", + "_xlfn.IMCSCH": "IMCSCH", + "_xlfn.IMSEC": "IMSEC", + "_xlfn.IMSECH": "IMSECH", + "_xlfn.IMSINH": "IMSINH", + "_xlfn.IMTAN": "IMTAN", + "_xlfn.ISFORMULA": "ISFORMULA", + "_xlfn.ISO.CEILING": "ISO.CEILING", + "_xlfn.ISOWEEKNUM": "ISOWEEKNUM", + "_xlfn.LOGNORM.DIST": "LOGNORM.DIST", + "_xlfn.LOGNORM.INV": "LOGNORM.INV", + "_xlfn.MODE.MULT": "MODE.MULT", + "_xlfn.MODE.SNGL": "MODE.SNGL", + "_xlfn.MUNIT": "MUNIT", + "_xlfn.NEGBINOM.DIST": "NEGBINOM.DIST", + "_xlfn.NETWORKDAYS.INTL": "NETWORKDAYS.INTL", + "_xlfn.NIGBINOM": "NIGBINOM", + "_xlfn.NORM.DIST": "NORM.DIST", + "_xlfn.NORM.INV": "NORM.INV", + "_xlfn.NORM.S.DIST": "NORM.S.DIST", + "_xlfn.NORM.S.INV": "NORM.S.INV", + "_xlfn.NUMBERVALUE": "NUMBERVALUE", + "_xlfn.PDURATION": "PDURATION", + "_xlfn.PERCENTILE.EXC": "PERCENTILE.EXC", + "_xlfn.PERCENTILE.INC": "PERCENTILE.INC", + "_xlfn.PERCENTRANK.EXC": "PERCENTRANK.EXC", + "_xlfn.PERCENTRANK.INC": "PERCENTRANK.INC", + "_xlfn.PERMUTATIONA": "PERMUTATIONA", + "_xlfn.PHI": "PHI", + "_xlfn.POISSON.DIST": "POISSON.DIST", + "_xlfn.QUARTILE.EXC": "QUARTILE.EXC", + "_xlfn.QUARTILE.INC": "QUARTILE.INC", + "_xlfn.QUERYSTRING": "QUERYSTRING", + "_xlfn.RANK.AVG": "RANK.AVG", + "_xlfn.RANK.EQ": "RANK.EQ", + "_xlfn.RRI": "RRI", + "_xlfn.SEC": "SEC", + "_xlfn.SECH": "SECH", + "_xlfn.SHEET": "SHEET", + "_xlfn.SHEETS": "SHEETS", + "_xlfn.SKEW.P": "SKEW.P", + "_xlfn.STDEV.P": "STDEV.P", + "_xlfn.STDEV.S": "STDEV.S", + "_xlfn.SUMIFS": "SUMIFS", + "_xlfn.T.DIST": "T.DIST", + "_xlfn.T.DIST.2T": "T.DIST.2T", + "_xlfn.T.DIST.RT": "T.DIST.RT", + "_xlfn.T.INV": "T.INV", + "_xlfn.T.INV.2T": "T.INV.2T", + "_xlfn.T.TEST": "T.TEST", + "_xlfn.UNICHAR": "UNICHAR", + "_xlfn.UNICODE": "UNICODE", + "_xlfn.VAR.P": "VAR.P", + "_xlfn.VAR.S": "VAR.S", + "_xlfn.WEBSERVICE": "WEBSERVICE", + "_xlfn.WEIBULL.DIST": "WEIBULL.DIST", + "_xlfn.WORKDAY.INTL": "WORKDAY.INTL", + "_xlfn.XOR": "XOR", + "_xlfn.Z.TEST": "Z.TEST" +}; + +var strs = {}; // shared strings +var _ssfopts = {}; // spreadsheet formatting options + +RELS.WS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet"; + +function get_sst_id(sst, str) { + for(var i = 0, len = sst.length; i < len; ++i) if(sst[i].t === str) { sst.Count ++; return i; } + sst[len] = {t:str}; sst.Count ++; sst.Unique ++; return len; +} + +function get_cell_style(styles, cell, opts) { + var z = opts.revssf[cell.z != null ? cell.z : "General"]; + for(var i = 0, len = styles.length; i != len; ++i) if(styles[i].numFmtId === z) return i; + styles[len] = { + numFmtId:z, + fontId:0, + fillId:0, + borderId:0, + xfId:0, + applyNumberFormat:1 + }; + return len; +} + +function safe_format(p, fmtid, fillid, opts) { + try { + if(p.t === 'e') p.w = p.w || BErr[p.v]; + else if(fmtid === 0) { + if(p.t === 'n') { + if((p.v|0) === p.v) p.w = SSF._general_int(p.v,_ssfopts); + else p.w = SSF._general_num(p.v,_ssfopts); + } + else if(p.t === 'd') { + var dd = datenum(p.v); + if((dd|0) === dd) p.w = SSF._general_int(dd,_ssfopts); + else p.w = SSF._general_num(dd,_ssfopts); + } + else if(p.v === undefined) return ""; + else p.w = SSF._general(p.v,_ssfopts); + } + else if(p.t === 'd') p.w = SSF.format(fmtid,datenum(p.v),_ssfopts); + else p.w = SSF.format(fmtid,p.v,_ssfopts); + if(opts.cellNF) p.z = SSF._table[fmtid]; + } catch(e) { if(opts.WTF) throw e; } + if(fillid) try { + p.s = styles.Fills[fillid]; + if (p.s.fgColor && p.s.fgColor.theme) { + p.s.fgColor.rgb = rgb_tint(themes.themeElements.clrScheme[p.s.fgColor.theme].rgb, p.s.fgColor.tint || 0); + if(opts.WTF) p.s.fgColor.raw_rgb = themes.themeElements.clrScheme[p.s.fgColor.theme].rgb; + } + if (p.s.bgColor && p.s.bgColor.theme) { + p.s.bgColor.rgb = rgb_tint(themes.themeElements.clrScheme[p.s.bgColor.theme].rgb, p.s.bgColor.tint || 0); + if(opts.WTF) p.s.bgColor.raw_rgb = themes.themeElements.clrScheme[p.s.bgColor.theme].rgb; + } + } catch(e) { if(opts.WTF) throw e; } +} +function parse_ws_xml_dim(ws, s) { + var d = safe_decode_range(s); + if(d.s.r<=d.e.r && d.s.c<=d.e.c && d.s.r>=0 && d.s.c>=0) ws["!ref"] = encode_range(d); +} +var mergecregex = //g; +var sheetdataregex = /<(?:\w+:)?sheetData>([^\u2603]*)<\/(?:\w+:)?sheetData>/; +var hlinkregex = /]*\/>/g; +var dimregex = /"(\w*:\w*)"/; +var colregex = /]*\/>/g; +/* 18.3 Worksheets */ +function parse_ws_xml(data, opts, rels) { + if(!data) return data; + /* 18.3.1.99 worksheet CT_Worksheet */ + var s = {}; + + /* 18.3.1.35 dimension CT_SheetDimension ? */ + var ridx = data.indexOf(" 0) { + var ref = data.substr(ridx,50).match(dimregex); + if(ref != null) parse_ws_xml_dim(s, ref[1]); + } + + /* 18.3.1.55 mergeCells CT_MergeCells */ + var mergecells = []; + if(data.indexOf("")!==-1) { + var merges = data.match(mergecregex); + for(ridx = 0; ridx != merges.length; ++ridx) + mergecells[ridx] = safe_decode_range(merges[ridx].substr(merges[ridx].indexOf("\"")+1)); + } + + /* 18.3.1.17 cols CT_Cols */ + var columns = []; + if(opts.cellStyles && data.indexOf("")!==-1) { + /* 18.3.1.13 col CT_Col */ + var cols = data.match(colregex); + parse_ws_xml_cols(columns, cols); + } + + var refguess = {s: {r:1000000, c:1000000}, e: {r:0, c:0} }; + + /* 18.3.1.80 sheetData CT_SheetData ? */ + var mtch=data.match(sheetdataregex); + if(mtch) parse_ws_xml_data(mtch[1], s, opts, refguess); + + /* 18.3.1.48 hyperlinks CT_Hyperlinks */ + if(data.indexOf("")!==-1) parse_ws_xml_hlinks(s, data.match(hlinkregex), rels); + + if(!s["!ref"] && refguess.e.c >= refguess.s.c && refguess.e.r >= refguess.s.r) s["!ref"] = encode_range(refguess); + if(opts.sheetRows > 0 && s["!ref"]) { + var tmpref = safe_decode_range(s["!ref"]); + if(opts.sheetRows < +tmpref.e.r) { + tmpref.e.r = opts.sheetRows - 1; + if(tmpref.e.r > refguess.e.r) tmpref.e.r = refguess.e.r; + if(tmpref.e.r < tmpref.s.r) tmpref.s.r = tmpref.e.r; + if(tmpref.e.c > refguess.e.c) tmpref.e.c = refguess.e.c; + if(tmpref.e.c < tmpref.s.c) tmpref.s.c = tmpref.e.c; + s["!fullref"] = s["!ref"]; + s["!ref"] = encode_range(tmpref); + } + } + if(mergecells.length > 0) s["!merges"] = mergecells; + if(columns.length > 0) s["!cols"] = columns; + return s; +} + +function write_ws_xml_merges(merges) { + if(merges.length == 0) return ""; + var o = ''; + for(var i = 0; i != merges.length; ++i) o += ''; + return o + ''; +} + +function parse_ws_xml_hlinks(s, data, rels) { + for(var i = 0; i != data.length; ++i) { + var val = parsexmltag(data[i], true); + if(!val.ref) return; + var rel = rels ? rels['!id'][val.id] : null; + if(rel) { + val.Target = rel.Target; + if(val.location) val.Target += "#"+val.location; + val.Rel = rel; + } else { + val.Target = val.location; + rel = {Target: val.location, TargetMode: 'Internal'}; + val.Rel = rel; + } + var rng = safe_decode_range(val.ref); + for(var R=rng.s.r;R<=rng.e.r;++R) for(var C=rng.s.c;C<=rng.e.c;++C) { + var addr = encode_cell({c:C,r:R}); + if(!s[addr]) s[addr] = {t:"stub",v:undefined}; + s[addr].l = val; + } + } +} + +function parse_ws_xml_cols(columns, cols) { + var seencol = false; + for(var coli = 0; coli != cols.length; ++coli) { + var coll = parsexmltag(cols[coli], true); + var colm=parseInt(coll.min, 10)-1, colM=parseInt(coll.max,10)-1; + delete coll.min; delete coll.max; + if(!seencol && coll.width) { seencol = true; find_mdw(+coll.width, coll); } + if(coll.width) { + coll.wpx = width2px(+coll.width); + coll.wch = px2char(coll.wpx); + coll.MDW = MDW; + } + while(colm <= colM) columns[colm++] = coll; + } +} + +function write_ws_xml_cols(ws, cols) { + var o = [""], col, width; + for(var i = 0; i != cols.length; ++i) { + if(!(col = cols[i])) continue; + var p = {min:i+1,max:i+1}; + /* wch (chars), wpx (pixels) */ + width = -1; + if(col.wpx) width = px2char(col.wpx); + else if(col.wch) width = col.wch; + if(width > -1) { p.width = char2width(width); p.customWidth= 1; } + o[o.length] = (writextag('col', null, p)); + } + o[o.length] = ""; + return o.join(""); +} + +function write_ws_xml_cell(cell, ref, ws, opts, idx, wb) { + if(cell.v === undefined) return ""; + var vv = ""; + var oldt = cell.t, oldv = cell.v; + switch(cell.t) { + case 'b': vv = cell.v ? "1" : "0"; break; + case 'n': vv = ''+cell.v; break; + case 'e': vv = BErr[cell.v]; break; + case 'd': + if(opts.cellDates) vv = new Date(cell.v).toISOString(); + else { + cell.t = 'n'; + vv = ''+(cell.v = datenum(cell.v)); + if(typeof cell.z === 'undefined') cell.z = SSF._table[14]; + } + break; + default: vv = cell.v; break; + } + var v = writetag('v', escapexml(vv)), o = {r:ref}; + /* TODO: cell style */ + var os = get_cell_style(opts.cellXfs, cell, opts); + if(os !== 0) o.s = os; + switch(cell.t) { + case 'n': break; + case 'd': o.t = "d"; break; + case 'b': o.t = "b"; break; + case 'e': o.t = "e"; break; + default: + if(opts.bookSST) { + v = writetag('v', ''+get_sst_id(opts.Strings, cell.v)); + o.t = "s"; break; + } + o.t = "str"; break; + } + if(cell.t != oldt) { cell.t = oldt; cell.v = oldv; } + return writextag('c', v, o); +} + +var parse_ws_xml_data = (function parse_ws_xml_data_factory() { + var cellregex = /<(?:\w+:)?c[ >]/, rowregex = /<\/(?:\w+:)?row>/; + var rregex = /r=["']([^"']*)["']/, isregex = /([\S\s]*?)<\/is>/; + var match_v = matchtag("v"), match_f = matchtag("f"); + +return function parse_ws_xml_data(sdata, s, opts, guess) { + var ri = 0, x = "", cells = [], cref = [], idx = 0, i=0, cc=0, d="", p; + var tag, tagr = 0, tagc = 0; + var sstr; + var fmtid = 0, fillid = 0, do_format = Array.isArray(styles.CellXf), cf; + for(var marr = sdata.split(rowregex), mt = 0, marrlen = marr.length; mt != marrlen; ++mt) { + x = marr[mt].trim(); + var xlen = x.length; + if(xlen === 0) continue; + + /* 18.3.1.73 row CT_Row */ + for(ri = 0; ri < xlen; ++ri) if(x.charCodeAt(ri) === 62) break; ++ri; + tag = parsexmltag(x.substr(0,ri), true); + /* SpreadSheetGear uses implicit r/c */ + tagr = typeof tag.r !== 'undefined' ? parseInt(tag.r, 10) : tagr+1; tagc = -1; + if(opts.sheetRows && opts.sheetRows < tagr) continue; + if(guess.s.r > tagr - 1) guess.s.r = tagr - 1; + if(guess.e.r < tagr - 1) guess.e.r = tagr - 1; + + /* 18.3.1.4 c CT_Cell */ + cells = x.substr(ri).split(cellregex); + for(ri = typeof tag.r === 'undefined' ? 0 : 1; ri != cells.length; ++ri) { + x = cells[ri].trim(); + if(x.length === 0) continue; + cref = x.match(rregex); idx = ri; i=0; cc=0; + x = "":"") + x; + if(cref !== null && cref.length === 2) { + idx = 0; d=cref[1]; + for(i=0; i != d.length; ++i) { + if((cc=d.charCodeAt(i)-64) < 1 || cc > 26) break; + idx = 26*idx + cc; + } + --idx; + tagc = idx; + } else ++tagc; + for(i = 0; i != x.length; ++i) if(x.charCodeAt(i) === 62) break; ++i; + tag = parsexmltag(x.substr(0,i), true); + if(!tag.r) tag.r = utils.encode_cell({r:tagr-1, c:tagc}); + d = x.substr(i); + p = {t:""}; + + if((cref=d.match(match_v))!== null && cref[1] !== '') p.v=unescapexml(cref[1]); + if(opts.cellFormula && (cref=d.match(match_f))!== null) p.f=unescapexml(cref[1]); + + /* SCHEMA IS ACTUALLY INCORRECT HERE. IF A CELL HAS NO T, EMIT "" */ + if(tag.t === undefined && p.v === undefined) { + if(!opts.sheetStubs) continue; + p.t = "stub"; + } + else p.t = tag.t || "n"; + if(guess.s.c > idx) guess.s.c = idx; + if(guess.e.c < idx) guess.e.c = idx; + /* 18.18.11 t ST_CellType */ + switch(p.t) { + case 'n': p.v = parseFloat(p.v); break; + case 's': + sstr = strs[parseInt(p.v, 10)]; + p.v = sstr.t; + p.r = sstr.r; + if(opts.cellHTML) p.h = sstr.h; + break; + case 'str': + p.t = "s"; + p.v = (p.v!=null) ? utf8read(p.v) : ''; + if(opts.cellHTML) p.h = p.v; + break; + case 'inlineStr': + cref = d.match(isregex); + p.t = 's'; + if(cref !== null) { sstr = parse_si(cref[1]); p.v = sstr.t; } else p.v = ""; + break; // inline string + case 'b': p.v = parsexmlbool(p.v); break; + case 'd': + if(!opts.cellDates) { p.v = datenum(p.v); p.t = 'n'; } + break; + /* error string in .v, number in .v */ + case 'e': p.w = p.v; p.v = RBErr[p.v]; break; + } + /* formatting */ + fmtid = fillid = 0; + if(do_format && tag.s !== undefined) { + cf = styles.CellXf[tag.s]; + if(cf != null) { + if(cf.numFmtId != null) fmtid = cf.numFmtId; + if(opts.cellStyles && cf.fillId != null) fillid = cf.fillId; + } + } + safe_format(p, fmtid, fillid, opts); + s[tag.r] = p; + } + } +}; })(); + +function write_ws_xml_data(ws, opts, idx, wb) { + var o = [], r = [], range = safe_decode_range(ws['!ref']), cell, ref, rr = "", cols = [], R, C; + for(C = range.s.c; C <= range.e.c; ++C) cols[C] = encode_col(C); + for(R = range.s.r; R <= range.e.r; ++R) { + r = []; + rr = encode_row(R); + for(C = range.s.c; C <= range.e.c; ++C) { + ref = cols[C] + rr; + if(ws[ref] === undefined) continue; + if((cell = write_ws_xml_cell(ws[ref], ref, ws, opts, idx, wb)) != null) r.push(cell); + } + if(r.length > 0) o[o.length] = (writextag('row', r.join(""), {r:rr})); + } + return o.join(""); +} + +var WS_XML_ROOT = writextag('worksheet', null, { + 'xmlns': XMLNS.main[0], + 'xmlns:r': XMLNS.r +}); + +function write_ws_xml(idx, opts, wb) { + var o = [XML_HEADER, WS_XML_ROOT]; + var s = wb.SheetNames[idx], sidx = 0, rdata = ""; + var ws = wb.Sheets[s]; + if(ws === undefined) ws = {}; + var ref = ws['!ref']; if(ref === undefined) ref = 'A1'; + o[o.length] = (writextag('dimension', null, {'ref': ref})); + + if(ws['!cols'] !== undefined && ws['!cols'].length > 0) o[o.length] = (write_ws_xml_cols(ws, ws['!cols'])); + o[sidx = o.length] = ''; + if(ws['!ref'] !== undefined) { + rdata = write_ws_xml_data(ws, opts, idx, wb); + if(rdata.length > 0) o[o.length] = (rdata); + } + if(o.length>sidx+1) { o[o.length] = (''); o[sidx]=o[sidx].replace("/>",">"); } + + if(ws['!merges'] !== undefined && ws['!merges'].length > 0) o[o.length] = (write_ws_xml_merges(ws['!merges'])); + + if(o.length>2) { o[o.length] = (''); o[1]=o[1].replace("/>",">"); } + return o.join(""); +} + +/* [MS-XLSB] 2.4.718 BrtRowHdr */ +function parse_BrtRowHdr(data, length) { + var z = []; + z.r = data.read_shift(4); + data.l += length-4; + return z; +} + +/* [MS-XLSB] 2.4.812 BrtWsDim */ +var parse_BrtWsDim = parse_UncheckedRfX; +var write_BrtWsDim = write_UncheckedRfX; + +/* [MS-XLSB] 2.4.815 BrtWsProp */ +function parse_BrtWsProp(data, length) { + var z = {}; + /* TODO: pull flags */ + data.l += 19; + z.name = parse_XLSBCodeName(data, length - 19); + return z; +} + +/* [MS-XLSB] 2.4.303 BrtCellBlank */ +function parse_BrtCellBlank(data, length) { + var cell = parse_XLSBCell(data); + return [cell]; +} +function write_BrtCellBlank(cell, val, o) { + if(o == null) o = new_buf(8); + return write_XLSBCell(val, o); +} + + +/* [MS-XLSB] 2.4.304 BrtCellBool */ +function parse_BrtCellBool(data, length) { + var cell = parse_XLSBCell(data); + var fBool = data.read_shift(1); + return [cell, fBool, 'b']; +} + +/* [MS-XLSB] 2.4.305 BrtCellError */ +function parse_BrtCellError(data, length) { + var cell = parse_XLSBCell(data); + var fBool = data.read_shift(1); + return [cell, fBool, 'e']; +} + +/* [MS-XLSB] 2.4.308 BrtCellIsst */ +function parse_BrtCellIsst(data, length) { + var cell = parse_XLSBCell(data); + var isst = data.read_shift(4); + return [cell, isst, 's']; +} + +/* [MS-XLSB] 2.4.310 BrtCellReal */ +function parse_BrtCellReal(data, length) { + var cell = parse_XLSBCell(data); + var value = parse_Xnum(data); + return [cell, value, 'n']; +} + +/* [MS-XLSB] 2.4.311 BrtCellRk */ +function parse_BrtCellRk(data, length) { + var cell = parse_XLSBCell(data); + var value = parse_RkNumber(data); + return [cell, value, 'n']; +} + +/* [MS-XLSB] 2.4.314 BrtCellSt */ +function parse_BrtCellSt(data, length) { + var cell = parse_XLSBCell(data); + var value = parse_XLWideString(data); + return [cell, value, 'str']; +} + +/* [MS-XLSB] 2.4.647 BrtFmlaBool */ +function parse_BrtFmlaBool(data, length, opts) { + var cell = parse_XLSBCell(data); + var value = data.read_shift(1); + var o = [cell, value, 'b']; + if(opts.cellFormula) { + var formula = parse_XLSBCellParsedFormula(data, length-9); + o[3] = ""; /* TODO */ + } + else data.l += length-9; + return o; +} + +/* [MS-XLSB] 2.4.648 BrtFmlaError */ +function parse_BrtFmlaError(data, length, opts) { + var cell = parse_XLSBCell(data); + var value = data.read_shift(1); + var o = [cell, value, 'e']; + if(opts.cellFormula) { + var formula = parse_XLSBCellParsedFormula(data, length-9); + o[3] = ""; /* TODO */ + } + else data.l += length-9; + return o; +} + +/* [MS-XLSB] 2.4.649 BrtFmlaNum */ +function parse_BrtFmlaNum(data, length, opts) { + var cell = parse_XLSBCell(data); + var value = parse_Xnum(data); + var o = [cell, value, 'n']; + if(opts.cellFormula) { + var formula = parse_XLSBCellParsedFormula(data, length - 16); + o[3] = ""; /* TODO */ + } + else data.l += length-16; + return o; +} + +/* [MS-XLSB] 2.4.650 BrtFmlaString */ +function parse_BrtFmlaString(data, length, opts) { + var start = data.l; + var cell = parse_XLSBCell(data); + var value = parse_XLWideString(data); + var o = [cell, value, 'str']; + if(opts.cellFormula) { + var formula = parse_XLSBCellParsedFormula(data, start + length - data.l); + } + else data.l = start + length; + return o; +} + +/* [MS-XLSB] 2.4.676 BrtMergeCell */ +var parse_BrtMergeCell = parse_UncheckedRfX; + +/* [MS-XLSB] 2.4.656 BrtHLink */ +function parse_BrtHLink(data, length, opts) { + var end = data.l + length; + var rfx = parse_UncheckedRfX(data, 16); + var relId = parse_XLNullableWideString(data); + var loc = parse_XLWideString(data); + var tooltip = parse_XLWideString(data); + var display = parse_XLWideString(data); + data.l = end; + return {rfx:rfx, relId:relId, loc:loc, tooltip:tooltip, display:display}; +} + +/* [MS-XLSB] 2.1.7.61 Worksheet */ +function parse_ws_bin(data, opts, rels) { + if(!data) return data; + if(!rels) rels = {'!id':{}}; + var s = {}; + + var ref; + var refguess = {s: {r:1000000, c:1000000}, e: {r:0, c:0} }; + + var pass = false, end = false; + var row, p, cf, R, C, addr, sstr, rr; + var mergecells = []; + recordhopper(data, function ws_parse(val, R) { + if(end) return; + switch(R.n) { + case 'BrtWsDim': ref = val; break; + case 'BrtRowHdr': + row = val; + if(opts.sheetRows && opts.sheetRows <= row.r) end=true; + rr = encode_row(row.r); + break; + + case 'BrtFmlaBool': + case 'BrtFmlaError': + case 'BrtFmlaNum': + case 'BrtFmlaString': + case 'BrtCellBool': + case 'BrtCellError': + case 'BrtCellIsst': + case 'BrtCellReal': + case 'BrtCellRk': + case 'BrtCellSt': + p = {t:val[2]}; + switch(val[2]) { + case 'n': p.v = val[1]; break; + case 's': sstr = strs[val[1]]; p.v = sstr.t; p.r = sstr.r; break; + case 'b': p.v = val[1] ? true : false; break; + case 'e': p.v = val[1]; p.w = BErr[p.v]; break; + case 'str': p.t = 's'; p.v = utf8read(val[1]); break; + } + if(opts.cellFormula && val.length > 3) p.f = val[3]; + if((cf = styles.CellXf[val[0].iStyleRef])) safe_format(p,cf.ifmt,null,opts); + s[encode_col(C=val[0].c) + rr] = p; + if(refguess.s.r > row.r) refguess.s.r = row.r; + if(refguess.s.c > C) refguess.s.c = C; + if(refguess.e.r < row.r) refguess.e.r = row.r; + if(refguess.e.c < C) refguess.e.c = C; + break; + + case 'BrtCellBlank': if(!opts.sheetStubs) break; + p = {t:'s',v:undefined}; + s[encode_col(C=val[0].c) + rr] = p; + if(refguess.s.r > row.r) refguess.s.r = row.r; + if(refguess.s.c > C) refguess.s.c = C; + if(refguess.e.r < row.r) refguess.e.r = row.r; + if(refguess.e.c < C) refguess.e.c = C; + break; + + /* Merge Cells */ + case 'BrtBeginMergeCells': break; + case 'BrtEndMergeCells': break; + case 'BrtMergeCell': mergecells.push(val); break; + + case 'BrtHLink': + var rel = rels['!id'][val.relId]; + if(rel) { + val.Target = rel.Target; + if(val.loc) val.Target += "#"+val.loc; + val.Rel = rel; + } + for(R=val.rfx.s.r;R<=val.rfx.e.r;++R) for(C=val.rfx.s.c;C<=val.rfx.e.c;++C) { + addr = encode_cell({c:C,r:R}); + if(!s[addr]) s[addr] = {t:'s',v:undefined}; + s[addr].l = val; + } + break; + + case 'BrtArrFmla': break; // TODO + case 'BrtShrFmla': break; // TODO + case 'BrtBeginSheet': break; + case 'BrtWsProp': break; // TODO + case 'BrtSheetCalcProp': break; // TODO + case 'BrtBeginWsViews': break; // TODO + case 'BrtBeginWsView': break; // TODO + case 'BrtPane': break; // TODO + case 'BrtSel': break; // TODO + case 'BrtEndWsView': break; // TODO + case 'BrtEndWsViews': break; // TODO + case 'BrtACBegin': break; // TODO + case 'BrtRwDescent': break; // TODO + case 'BrtACEnd': break; // TODO + case 'BrtWsFmtInfoEx14': break; // TODO + case 'BrtWsFmtInfo': break; // TODO + case 'BrtBeginColInfos': break; // TODO + case 'BrtColInfo': break; // TODO + case 'BrtEndColInfos': break; // TODO + case 'BrtBeginSheetData': break; // TODO + case 'BrtEndSheetData': break; // TODO + case 'BrtSheetProtection': break; // TODO + case 'BrtPrintOptions': break; // TODO + case 'BrtMargins': break; // TODO + case 'BrtPageSetup': break; // TODO + case 'BrtFRTBegin': pass = true; break; + case 'BrtFRTEnd': pass = false; break; + case 'BrtEndSheet': break; // TODO + case 'BrtDrawing': break; // TODO + case 'BrtLegacyDrawing': break; // TODO + case 'BrtLegacyDrawingHF': break; // TODO + case 'BrtPhoneticInfo': break; // TODO + case 'BrtBeginHeaderFooter': break; // TODO + case 'BrtEndHeaderFooter': break; // TODO + case 'BrtBrk': break; // TODO + case 'BrtBeginRwBrk': break; // TODO + case 'BrtEndRwBrk': break; // TODO + case 'BrtBeginColBrk': break; // TODO + case 'BrtEndColBrk': break; // TODO + case 'BrtBeginUserShViews': break; // TODO + case 'BrtBeginUserShView': break; // TODO + case 'BrtEndUserShView': break; // TODO + case 'BrtEndUserShViews': break; // TODO + case 'BrtBkHim': break; // TODO + case 'BrtBeginOleObjects': break; // TODO + case 'BrtOleObject': break; // TODO + case 'BrtEndOleObjects': break; // TODO + case 'BrtBeginListParts': break; // TODO + case 'BrtListPart': break; // TODO + case 'BrtEndListParts': break; // TODO + case 'BrtBeginSortState': break; // TODO + case 'BrtBeginSortCond': break; // TODO + case 'BrtEndSortCond': break; // TODO + case 'BrtEndSortState': break; // TODO + case 'BrtBeginConditionalFormatting': break; // TODO + case 'BrtEndConditionalFormatting': break; // TODO + case 'BrtBeginCFRule': break; // TODO + case 'BrtEndCFRule': break; // TODO + case 'BrtBeginDVals': break; // TODO + case 'BrtDVal': break; // TODO + case 'BrtEndDVals': break; // TODO + case 'BrtRangeProtection': break; // TODO + case 'BrtBeginDCon': break; // TODO + case 'BrtEndDCon': break; // TODO + case 'BrtBeginDRefs': break; + case 'BrtDRef': break; + case 'BrtEndDRefs': break; + + /* ActiveX */ + case 'BrtBeginActiveXControls': break; + case 'BrtActiveX': break; + case 'BrtEndActiveXControls': break; + + /* AutoFilter */ + case 'BrtBeginAFilter': break; + case 'BrtEndAFilter': break; + case 'BrtBeginFilterColumn': break; + case 'BrtBeginFilters': break; + case 'BrtFilter': break; + case 'BrtEndFilters': break; + case 'BrtEndFilterColumn': break; + case 'BrtDynamicFilter': break; + case 'BrtTop10Filter': break; + case 'BrtBeginCustomFilters': break; + case 'BrtCustomFilter': break; + case 'BrtEndCustomFilters': break; + + /* Smart Tags */ + case 'BrtBeginSmartTags': break; + case 'BrtBeginCellSmartTags': break; + case 'BrtBeginCellSmartTag': break; + case 'BrtCellSmartTagProperty': break; + case 'BrtEndCellSmartTag': break; + case 'BrtEndCellSmartTags': break; + case 'BrtEndSmartTags': break; + + /* Cell Watch */ + case 'BrtBeginCellWatches': break; + case 'BrtCellWatch': break; + case 'BrtEndCellWatches': break; + + /* Table */ + case 'BrtTable': break; + + /* Ignore Cell Errors */ + case 'BrtBeginCellIgnoreECs': break; + case 'BrtCellIgnoreEC': break; + case 'BrtEndCellIgnoreECs': break; + + default: if(!pass || opts.WTF) throw new Error("Unexpected record " + R.n); + } + }, opts); + if(!s["!ref"] && (refguess.s.r < 1000000 || ref.e.r > 0 || ref.e.c > 0 || ref.s.r > 0 || ref.s.c > 0)) s["!ref"] = encode_range(ref); + if(opts.sheetRows && s["!ref"]) { + var tmpref = safe_decode_range(s["!ref"]); + if(opts.sheetRows < +tmpref.e.r) { + tmpref.e.r = opts.sheetRows - 1; + if(tmpref.e.r > refguess.e.r) tmpref.e.r = refguess.e.r; + if(tmpref.e.r < tmpref.s.r) tmpref.s.r = tmpref.e.r; + if(tmpref.e.c > refguess.e.c) tmpref.e.c = refguess.e.c; + if(tmpref.e.c < tmpref.s.c) tmpref.s.c = tmpref.e.c; + s["!fullref"] = s["!ref"]; + s["!ref"] = encode_range(tmpref); + } + } + if(mergecells.length > 0) s["!merges"] = mergecells; + return s; +} + +/* TODO: something useful -- this is a stub */ +function write_ws_bin_cell(ba, cell, R, C, opts) { + if(cell.v === undefined) return ""; + var vv = ""; + switch(cell.t) { + case 'b': vv = cell.v ? "1" : "0"; break; + case 'n': case 'e': vv = ''+cell.v; break; + default: vv = cell.v; break; + } + var o = {r:R, c:C}; + /* TODO: cell style */ + o.s = get_cell_style(opts.cellXfs, cell, opts); + switch(cell.t) { + case 's': case 'str': + if(opts.bookSST) { + vv = get_sst_id(opts.Strings, cell.v); + o.t = "s"; break; + } + o.t = "str"; break; + case 'n': break; + case 'b': o.t = "b"; break; + case 'e': o.t = "e"; break; + } + write_record(ba, "BrtCellBlank", write_BrtCellBlank(cell, o)); +} + +function write_CELLTABLE(ba, ws, idx, opts, wb) { + var range = safe_decode_range(ws['!ref'] || "A1"), ref, rr = "", cols = []; + write_record(ba, 'BrtBeginSheetData'); + for(var R = range.s.r; R <= range.e.r; ++R) { + rr = encode_row(R); + /* [ACCELLTABLE] */ + /* BrtRowHdr */ + for(var C = range.s.c; C <= range.e.c; ++C) { + /* *16384CELL */ + if(R === range.s.r) cols[C] = encode_col(C); + ref = cols[C] + rr; + if(!ws[ref]) continue; + /* write cell */ + write_ws_bin_cell(ba, ws[ref], R, C, opts); + } + } + write_record(ba, 'BrtEndSheetData'); +} + +function write_ws_bin(idx, opts, wb) { + var ba = buf_array(); + var s = wb.SheetNames[idx], ws = wb.Sheets[s] || {}; + var r = safe_decode_range(ws['!ref'] || "A1"); + write_record(ba, "BrtBeginSheet"); + /* [BrtWsProp] */ + write_record(ba, "BrtWsDim", write_BrtWsDim(r)); + /* [WSVIEWS2] */ + /* [WSFMTINFO] */ + /* *COLINFOS */ + write_CELLTABLE(ba, ws, idx, opts, wb); + /* [BrtSheetCalcProp] */ + /* [[BrtSheetProtectionIso] BrtSheetProtection] */ + /* *([BrtRangeProtectionIso] BrtRangeProtection) */ + /* [SCENMAN] */ + /* [AUTOFILTER] */ + /* [SORTSTATE] */ + /* [DCON] */ + /* [USERSHVIEWS] */ + /* [MERGECELLS] */ + /* [BrtPhoneticInfo] */ + /* *CONDITIONALFORMATTING */ + /* [DVALS] */ + /* *BrtHLink */ + /* [BrtPrintOptions] */ + /* [BrtMargins] */ + /* [BrtPageSetup] */ + /* [HEADERFOOTER] */ + /* [RWBRK] */ + /* [COLBRK] */ + /* *BrtBigName */ + /* [CELLWATCHES] */ + /* [IGNOREECS] */ + /* [SMARTTAGS] */ + /* [BrtDrawing] */ + /* [BrtLegacyDrawing] */ + /* [BrtLegacyDrawingHF] */ + /* [BrtBkHim] */ + /* [OLEOBJECTS] */ + /* [ACTIVEXCONTROLS] */ + /* [WEBPUBITEMS] */ + /* [LISTPARTS] */ + /* FRTWORKSHEET */ + write_record(ba, "BrtEndSheet"); + return ba.end(); +} +/* 18.2.28 (CT_WorkbookProtection) Defaults */ +var WBPropsDef = [ + ['allowRefreshQuery', '0'], + ['autoCompressPictures', '1'], + ['backupFile', '0'], + ['checkCompatibility', '0'], + ['codeName', ''], + ['date1904', '0'], + ['dateCompatibility', '1'], + //['defaultThemeVersion', '0'], + ['filterPrivacy', '0'], + ['hidePivotFieldList', '0'], + ['promptedSolutions', '0'], + ['publishItems', '0'], + ['refreshAllConnections', false], + ['saveExternalLinkValues', '1'], + ['showBorderUnselectedTables', '1'], + ['showInkAnnotation', '1'], + ['showObjects', 'all'], + ['showPivotChartFilter', '0'] + //['updateLinks', 'userSet'] +]; + +/* 18.2.30 (CT_BookView) Defaults */ +var WBViewDef = [ + ['activeTab', '0'], + ['autoFilterDateGrouping', '1'], + ['firstSheet', '0'], + ['minimized', '0'], + ['showHorizontalScroll', '1'], + ['showSheetTabs', '1'], + ['showVerticalScroll', '1'], + ['tabRatio', '600'], + ['visibility', 'visible'] + //window{Height,Width}, {x,y}Window +]; + +/* 18.2.19 (CT_Sheet) Defaults */ +var SheetDef = [ + ['state', 'visible'] +]; + +/* 18.2.2 (CT_CalcPr) Defaults */ +var CalcPrDef = [ + ['calcCompleted', 'true'], + ['calcMode', 'auto'], + ['calcOnSave', 'true'], + ['concurrentCalc', 'true'], + ['fullCalcOnLoad', 'false'], + ['fullPrecision', 'true'], + ['iterate', 'false'], + ['iterateCount', '100'], + ['iterateDelta', '0.001'], + ['refMode', 'A1'] +]; + +/* 18.2.3 (CT_CustomWorkbookView) Defaults */ +var CustomWBViewDef = [ + ['autoUpdate', 'false'], + ['changesSavedWin', 'false'], + ['includeHiddenRowCol', 'true'], + ['includePrintSettings', 'true'], + ['maximized', 'false'], + ['minimized', 'false'], + ['onlySync', 'false'], + ['personalView', 'false'], + ['showComments', 'commIndicator'], + ['showFormulaBar', 'true'], + ['showHorizontalScroll', 'true'], + ['showObjects', 'all'], + ['showSheetTabs', 'true'], + ['showStatusbar', 'true'], + ['showVerticalScroll', 'true'], + ['tabRatio', '600'], + ['xWindow', '0'], + ['yWindow', '0'] +]; + +function push_defaults_array(target, defaults) { + for(var j = 0; j != target.length; ++j) { var w = target[j]; + for(var i=0; i != defaults.length; ++i) { var z = defaults[i]; + if(w[z[0]] == null) w[z[0]] = z[1]; + } + } +} +function push_defaults(target, defaults) { + for(var i = 0; i != defaults.length; ++i) { var z = defaults[i]; + if(target[z[0]] == null) target[z[0]] = z[1]; + } +} + +function parse_wb_defaults(wb) { + push_defaults(wb.WBProps, WBPropsDef); + push_defaults(wb.CalcPr, CalcPrDef); + + push_defaults_array(wb.WBView, WBViewDef); + push_defaults_array(wb.Sheets, SheetDef); + + _ssfopts.date1904 = parsexmlbool(wb.WBProps.date1904, 'date1904'); +} +/* 18.2 Workbook */ +var wbnsregex = /<\w+:workbook/; +function parse_wb_xml(data, opts) { + var wb = { AppVersion:{}, WBProps:{}, WBView:[], Sheets:[], CalcPr:{}, xmlns: "" }; + var pass = false, xmlns = "xmlns"; + data.match(tagregex).forEach(function xml_wb(x) { + var y = parsexmltag(x); + switch(strip_ns(y[0])) { + case '': break; + + /* 18.2.13 fileVersion CT_FileVersion ? */ + case '': break; + + /* 18.2.12 fileSharing CT_FileSharing ? */ + case '': break; + + /* 18.2.28 workbookPr CT_WorkbookPr ? */ + case '': delete y[0]; wb.WBProps = y; break; + + /* 18.2.29 workbookProtection CT_WorkbookProtection ? */ + case '': break; + + /* 18.2.1 bookViews CT_BookViews ? */ + case '': case '': break; + /* 18.2.30 workbookView CT_BookView + */ + case '': case '': break; // aggregate sheet + /* 18.2.19 sheet CT_Sheet + */ + case '': break; + /* 18.2.14 functionGroup CT_FunctionGroup + */ + case '': case '': break; + /* 18.2.8 externalReference CT_ExternalReference + */ + case '': break; + case '': case '': pass=false; break; + /* 18.2.5 definedName CT_DefinedName + */ + case '': case '': break; + + /* 18.2.2 calcPr CT_CalcPr ? */ + case '': delete y[0]; wb.CalcPr = y; break; + + /* 18.2.16 oleSize CT_OleSize ? (ref required) */ + case '': case '': case '': break; + + /* 18.2.18 pivotCaches CT_PivotCaches ? */ + case '': case '': case '': break; + + /* 18.2.23 smartTagTypes CT_SmartTagTypes ? */ + case '': case '': break; + /* 18.2.22 smartTagType CT_SmartTagType ? */ + case '': break; + + /* 18.2.11 fileRecoveryPr CT_FileRecoveryPr ? */ + case '': break; + + /* 18.2.26 webPublishObjects CT_WebPublishObjects ? */ + case '': case '': break; + /* 18.2.25 webPublishObject CT_WebPublishObject ? */ + case '': case '': case '': break; + /* 18.2.7 ext CT_Extension + */ + case '': pass=false; break; + + /* Others */ + case '': pass=false; break; + + default: if(!pass && opts.WTF) throw 'unrecognized ' + y[0] + ' in workbook'; + } + }); + if(XMLNS.main.indexOf(wb.xmlns) === -1) throw new Error("Unknown Namespace: " + wb.xmlns); + + parse_wb_defaults(wb); + + return wb; +} + +var WB_XML_ROOT = writextag('workbook', null, { + 'xmlns': XMLNS.main[0], + //'xmlns:mx': XMLNS.mx, + //'xmlns:s': XMLNS.main[0], + 'xmlns:r': XMLNS.r +}); + +function safe1904(wb) { + /* TODO: store date1904 somewhere else */ + try { return parsexmlbool(wb.Workbook.WBProps.date1904) ? "true" : "false"; } catch(e) { return "false"; } +} + +function write_wb_xml(wb, opts) { + var o = [XML_HEADER]; + o[o.length] = WB_XML_ROOT; + o[o.length] = (writextag('workbookPr', null, {date1904:safe1904(wb)})); + o[o.length] = ""; + for(var i = 0; i != wb.SheetNames.length; ++i) + o[o.length] = (writextag('sheet',null,{name:wb.SheetNames[i].substr(0,31), sheetId:""+(i+1), "r:id":"rId"+(i+1)})); + o[o.length] = ""; + if(o.length>2){ o[o.length] = ''; o[1]=o[1].replace("/>",">"); } + return o.join(""); +} +/* [MS-XLSB] 2.4.301 BrtBundleSh */ +function parse_BrtBundleSh(data, length) { + var z = {}; + z.hsState = data.read_shift(4); //ST_SheetState + z.iTabID = data.read_shift(4); + z.strRelID = parse_RelID(data,length-8); + z.name = parse_XLWideString(data); + return z; +} +function write_BrtBundleSh(data, o) { + if(!o) o = new_buf(127); + o.write_shift(4, data.hsState); + o.write_shift(4, data.iTabID); + write_RelID(data.strRelID, o); + write_XLWideString(data.name.substr(0,31), o); + return o; +} + +/* [MS-XLSB] 2.4.807 BrtWbProp */ +function parse_BrtWbProp(data, length) { + data.read_shift(4); + var dwThemeVersion = data.read_shift(4); + var strName = (length > 8) ? parse_XLWideString(data) : ""; + return [dwThemeVersion, strName]; +} +function write_BrtWbProp(data, o) { + if(!o) o = new_buf(8); + o.write_shift(4, 0); + o.write_shift(4, 0); + return o; +} + +function parse_BrtFRTArchID$(data, length) { + var o = {}; + data.read_shift(4); + o.ArchID = data.read_shift(4); + data.l += length - 8; + return o; +} + +/* [MS-XLSB] 2.1.7.60 Workbook */ +function parse_wb_bin(data, opts) { + var wb = { AppVersion:{}, WBProps:{}, WBView:[], Sheets:[], CalcPr:{}, xmlns: "" }; + var pass = false, z; + + recordhopper(data, function hopper_wb(val, R) { + switch(R.n) { + case 'BrtBundleSh': wb.Sheets.push(val); break; + + case 'BrtBeginBook': break; + case 'BrtFileVersion': break; + case 'BrtWbProp': break; + case 'BrtACBegin': break; + case 'BrtAbsPath15': break; + case 'BrtACEnd': break; + case 'BrtWbFactoid': break; + /*case 'BrtBookProtectionIso': break;*/ + case 'BrtBookProtection': break; + case 'BrtBeginBookViews': break; + case 'BrtBookView': break; + case 'BrtEndBookViews': break; + case 'BrtBeginBundleShs': break; + case 'BrtEndBundleShs': break; + case 'BrtBeginFnGroup': break; + case 'BrtEndFnGroup': break; + case 'BrtBeginExternals': break; + case 'BrtSupSelf': break; + case 'BrtSupBookSrc': break; + case 'BrtExternSheet': break; + case 'BrtEndExternals': break; + case 'BrtName': break; + case 'BrtCalcProp': break; + case 'BrtUserBookView': break; + case 'BrtBeginPivotCacheIDs': break; + case 'BrtBeginPivotCacheID': break; + case 'BrtEndPivotCacheID': break; + case 'BrtEndPivotCacheIDs': break; + case 'BrtWebOpt': break; + case 'BrtFileRecover': break; + case 'BrtFileSharing': break; + /*case 'BrtBeginWebPubItems': break; + case 'BrtBeginWebPubItem': break; + case 'BrtEndWebPubItem': break; + case 'BrtEndWebPubItems': break;*/ + + /* Smart Tags */ + case 'BrtBeginSmartTagTypes': break; + case 'BrtSmartTagType': break; + case 'BrtEndSmartTagTypes': break; + + case 'BrtFRTBegin': pass = true; break; + case 'BrtFRTArchID$': break; + case 'BrtWorkBookPr15': break; + case 'BrtFRTEnd': pass = false; break; + case 'BrtEndBook': break; + default: if(!pass || opts.WTF) throw new Error("Unexpected record " + R.n); + } + }); + + parse_wb_defaults(wb); + + return wb; +} + +/* [MS-XLSB] 2.1.7.60 Workbook */ +function write_BUNDLESHS(ba, wb, opts) { + write_record(ba, "BrtBeginBundleShs"); + for(var idx = 0; idx != wb.SheetNames.length; ++idx) { + var d = { hsState: 0, iTabID: idx+1, strRelID: 'rId' + (idx+1), name: wb.SheetNames[idx] }; + write_record(ba, "BrtBundleSh", write_BrtBundleSh(d)); + } + write_record(ba, "BrtEndBundleShs"); +} + +/* [MS-XLSB] 2.4.643 BrtFileVersion */ +function write_BrtFileVersion(data, o) { + if(!o) o = new_buf(127); + for(var i = 0; i != 4; ++i) o.write_shift(4, 0); + write_XLWideString("SheetJS", o); + write_XLWideString(XLSX.version, o); + write_XLWideString(XLSX.version, o); + write_XLWideString("7262", o); + o.length = o.l; + return o; +} + +/* [MS-XLSB] 2.1.7.60 Workbook */ +function write_BOOKVIEWS(ba, wb, opts) { + write_record(ba, "BrtBeginBookViews"); + /* 1*(BrtBookView *FRT) */ + write_record(ba, "BrtEndBookViews"); +} + +/* [MS-XLSB] 2.4.302 BrtCalcProp */ +function write_BrtCalcProp(data, o) { + if(!o) o = new_buf(26); + o.write_shift(4,0); /* force recalc */ + o.write_shift(4,1); + o.write_shift(4,0); + write_Xnum(0, o); + o.write_shift(-4, 1023); + o.write_shift(1, 0x33); + o.write_shift(1, 0x00); + return o; +} + +function write_BrtFileRecover(data, o) { + if(!o) o = new_buf(1); + o.write_shift(1,0); + return o; +} + +/* [MS-XLSB] 2.1.7.60 Workbook */ +function write_wb_bin(wb, opts) { + var ba = buf_array(); + write_record(ba, "BrtBeginBook"); + write_record(ba, "BrtFileVersion", write_BrtFileVersion()); + /* [[BrtFileSharingIso] BrtFileSharing] */ + write_record(ba, "BrtWbProp", write_BrtWbProp()); + /* [ACABSPATH] */ + /* [[BrtBookProtectionIso] BrtBookProtection] */ + write_BOOKVIEWS(ba, wb, opts); + write_BUNDLESHS(ba, wb, opts); + /* [FNGROUP] */ + /* [EXTERNALS] */ + /* *BrtName */ + write_record(ba, "BrtCalcProp", write_BrtCalcProp()); + /* [BrtOleSize] */ + /* *(BrtUserBookView *FRT) */ + /* [PIVOTCACHEIDS] */ + /* [BrtWbFactoid] */ + /* [SMARTTAGTYPES] */ + /* [BrtWebOpt] */ + write_record(ba, "BrtFileRecover", write_BrtFileRecover()); + /* [WEBPUBITEMS] */ + /* [CRERRS] */ + /* FRTWORKBOOK */ + write_record(ba, "BrtEndBook"); + + return ba.end(); +} +function parse_wb(data, name, opts) { + return (name.substr(-4)===".bin" ? parse_wb_bin : parse_wb_xml)(data, opts); +} + +function parse_ws(data, name, opts, rels) { + return (name.substr(-4)===".bin" ? parse_ws_bin : parse_ws_xml)(data, opts, rels); +} + +function parse_sty(data, name, opts) { + return (name.substr(-4)===".bin" ? parse_sty_bin : parse_sty_xml)(data, opts); +} + +function parse_theme(data, name, opts) { + return parse_theme_xml(data, opts); +} + +function parse_sst(data, name, opts) { + return (name.substr(-4)===".bin" ? parse_sst_bin : parse_sst_xml)(data, opts); +} + +function parse_cmnt(data, name, opts) { + return (name.substr(-4)===".bin" ? parse_comments_bin : parse_comments_xml)(data, opts); +} + +function parse_cc(data, name, opts) { + return (name.substr(-4)===".bin" ? parse_cc_bin : parse_cc_xml)(data, opts); +} + +function write_wb(wb, name, opts) { + return (name.substr(-4)===".bin" ? write_wb_bin : write_wb_xml)(wb, opts); +} + +function write_ws(data, name, opts, wb) { + return (name.substr(-4)===".bin" ? write_ws_bin : write_ws_xml)(data, opts, wb); +} + +function write_sty(data, name, opts) { + return (name.substr(-4)===".bin" ? write_sty_bin : write_sty_xml)(data, opts); +} + +function write_sst(data, name, opts) { + return (name.substr(-4)===".bin" ? write_sst_bin : write_sst_xml)(data, opts); +} +/* +function write_cmnt(data, name, opts) { + return (name.substr(-4)===".bin" ? write_comments_bin : write_comments_xml)(data, opts); +} + +function write_cc(data, name, opts) { + return (name.substr(-4)===".bin" ? write_cc_bin : write_cc_xml)(data, opts); +} +*/ +var attregexg2=/([\w:]+)=((?:")([^"]*)(?:")|(?:')([^']*)(?:'))/g; +var attregex2=/([\w:]+)=((?:")(?:[^"]*)(?:")|(?:')(?:[^']*)(?:'))/; +var _chr = function(c) { return String.fromCharCode(c); }; +function xlml_parsexmltag(tag, skip_root) { + var words = tag.split(/\s+/); + var z = []; if(!skip_root) z[0] = words[0]; + if(words.length === 1) return z; + var m = tag.match(attregexg2), y, j, w, i; + if(m) for(i = 0; i != m.length; ++i) { + y = m[i].match(attregex2); + if((j=y[1].indexOf(":")) === -1) z[y[1]] = y[2].substr(1,y[2].length-2); + else { + if(y[1].substr(0,6) === "xmlns:") w = "xmlns"+y[1].substr(6); + else w = y[1].substr(j+1); + z[w] = y[2].substr(1,y[2].length-2); + } + } + return z; +} +function xlml_parsexmltagobj(tag) { + var words = tag.split(/\s+/); + var z = {}; + if(words.length === 1) return z; + var m = tag.match(attregexg2), y, j, w, i; + if(m) for(i = 0; i != m.length; ++i) { + y = m[i].match(attregex2); + if((j=y[1].indexOf(":")) === -1) z[y[1]] = y[2].substr(1,y[2].length-2); + else { + if(y[1].substr(0,6) === "xmlns:") w = "xmlns"+y[1].substr(6); + else w = y[1].substr(j+1); + z[w] = y[2].substr(1,y[2].length-2); + } + } + return z; +} + +// ---- + +function xlml_format(format, value) { + var fmt = XLMLFormatMap[format] || unescapexml(format); + if(fmt === "General") return SSF._general(value); + return SSF.format(fmt, value); +} + +function xlml_set_custprop(Custprops, Rn, cp, val) { + switch((cp[0].match(/dt:dt="([\w.]+)"/)||["",""])[1]) { + case "boolean": val = parsexmlbool(val); break; + case "i2": case "int": val = parseInt(val, 10); break; + case "r4": case "float": val = parseFloat(val); break; + case "date": case "dateTime.tz": val = new Date(val); break; + case "i8": case "string": case "fixed": case "uuid": case "bin.base64": break; + default: throw "bad custprop:" + cp[0]; + } + Custprops[unescapexml(Rn[3])] = val; +} + +function safe_format_xlml(cell, nf, o) { + try { + if(cell.t === 'e') { cell.w = cell.w || BErr[cell.v]; } + else if(nf === "General") { + if(cell.t === 'n') { + if((cell.v|0) === cell.v) cell.w = SSF._general_int(cell.v); + else cell.w = SSF._general_num(cell.v); + } + else cell.w = SSF._general(cell.v); + } + else cell.w = xlml_format(nf||"General", cell.v); + if(o.cellNF) cell.z = XLMLFormatMap[nf]||nf||"General"; + } catch(e) { if(o.WTF) throw e; } +} + +function process_style_xlml(styles, stag, opts) { + if(opts.cellStyles) { + if(stag.Interior) { + var I = stag.Interior; + if(I.Pattern) I.patternType = XLMLPatternTypeMap[I.Pattern] || I.Pattern; + } + } + styles[stag.ID] = stag; +} + +/* TODO: there must exist some form of OSP-blessed spec */ +function parse_xlml_data(xml, ss, data, cell, base, styles, csty, row, o) { + var nf = "General", sid = cell.StyleID, S = {}; o = o || {}; + var interiors = []; + if(sid === undefined && row) sid = row.StyleID; + if(sid === undefined && csty) sid = csty.StyleID; + while(styles[sid] !== undefined) { + if(styles[sid].nf) nf = styles[sid].nf; + if(styles[sid].Interior) interiors.push(styles[sid].Interior); + if(!styles[sid].Parent) break; + sid = styles[sid].Parent; + } + switch(data.Type) { + case 'Boolean': + cell.t = 'b'; + cell.v = parsexmlbool(xml); + break; + case 'String': + cell.t = 's'; cell.r = xlml_fixstr(unescapexml(xml)); + cell.v = xml.indexOf("<") > -1 ? ss : cell.r; + break; + case 'DateTime': + cell.v = (Date.parse(xml) - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000); + if(cell.v !== cell.v) cell.v = unescapexml(xml); + else if(cell.v >= 1 && cell.v<60) cell.v = cell.v -1; + if(!nf || nf == "General") nf = "yyyy-mm-dd"; + /* falls through */ + case 'Number': + if(cell.v === undefined) cell.v=+xml; + if(!cell.t) cell.t = 'n'; + break; + case 'Error': cell.t = 'e'; cell.v = RBErr[xml]; cell.w = xml; break; + default: cell.t = 's'; cell.v = xlml_fixstr(ss); break; + } + safe_format_xlml(cell, nf, o); + if(o.cellFormula != null && cell.Formula) { + cell.f = rc_to_a1(unescapexml(cell.Formula), base); + cell.Formula = undefined; + } + if(o.cellStyles) { + interiors.forEach(function(x) { + if(!S.patternType && x.patternType) S.patternType = x.patternType; + }); + cell.s = S; + } + cell.ixfe = cell.StyleID !== undefined ? cell.StyleID : 'Default'; +} + +function xlml_clean_comment(comment) { + comment.t = comment.v; + comment.v = comment.w = comment.ixfe = undefined; +} + +function xlml_normalize(d) { + if(has_buf && Buffer.isBuffer(d)) return d.toString('utf8'); + if(typeof d === 'string') return d; + throw "badf"; +} + +/* TODO: Everything */ +var xlmlregex = /<(\/?)([a-z0-9]*:|)(\w+)[^>]*>/mg; +function parse_xlml_xml(d, opts) { + var str = xlml_normalize(d); + var Rn; + var state = [], tmp; + var sheets = {}, sheetnames = [], cursheet = {}, sheetname = ""; + var table = {}, cell = {}, row = {}, dtag, didx; + var c = 0, r = 0; + var refguess = {s: {r:1000000, c:1000000}, e: {r:0, c:0} }; + var styles = {}, stag = {}; + var ss = "", fidx = 0; + var mergecells = []; + var Props = {}, Custprops = {}, pidx = 0, cp = {}; + var comments = [], comment = {}; + var cstys = [], csty; + xlmlregex.lastIndex = 0; + while((Rn = xlmlregex.exec(str))) switch(Rn[3]) { + case 'Data': + if(state[state.length-1][1]) break; + if(Rn[1]==='/') parse_xlml_data(str.slice(didx, Rn.index), ss, dtag, state[state.length-1][0]=="Comment"?comment:cell, {c:c,r:r}, styles, cstys[c], row, opts); + else { ss = ""; dtag = xlml_parsexmltag(Rn[0]); didx = Rn.index + Rn[0].length; } + break; + case 'Cell': + if(Rn[1]==='/'){ + if(comments.length > 0) cell.c = comments; + if((!opts.sheetRows || opts.sheetRows > r) && cell.v !== undefined) cursheet[encode_col(c) + encode_row(r)] = cell; + if(cell.HRef) { + cell.l = {Target:cell.HRef, tooltip:cell.HRefScreenTip}; + cell.HRef = cell.HRefScreenTip = undefined; + } + if(cell.MergeAcross || cell.MergeDown) { + var cc = c + (parseInt(cell.MergeAcross,10)|0); + var rr = r + (parseInt(cell.MergeDown,10)|0); + mergecells.push({s:{c:c,r:r},e:{c:cc,r:rr}}); + } + ++c; + if(cell.MergeAcross) c += +cell.MergeAcross; + } else { + cell = xlml_parsexmltagobj(Rn[0]); + if(cell.Index) c = +cell.Index - 1; + if(c < refguess.s.c) refguess.s.c = c; + if(c > refguess.e.c) refguess.e.c = c; + if(Rn[0].substr(-2) === "/>") ++c; + comments = []; + } + break; + case 'Row': + if(Rn[1]==='/' || Rn[0].substr(-2) === "/>") { + if(r < refguess.s.r) refguess.s.r = r; + if(r > refguess.e.r) refguess.e.r = r; + if(Rn[0].substr(-2) === "/>") { + row = xlml_parsexmltag(Rn[0]); + if(row.Index) r = +row.Index - 1; + } + c = 0; ++r; + } else { + row = xlml_parsexmltag(Rn[0]); + if(row.Index) r = +row.Index - 1; + } + break; + case 'Worksheet': /* TODO: read range from FullRows/FullColumns */ + if(Rn[1]==='/'){ + if((tmp=state.pop())[0]!==Rn[3]) throw "Bad state: "+tmp; + sheetnames.push(sheetname); + if(refguess.s.r <= refguess.e.r && refguess.s.c <= refguess.e.c) cursheet["!ref"] = encode_range(refguess); + if(mergecells.length) cursheet["!merges"] = mergecells; + sheets[sheetname] = cursheet; + } else { + refguess = {s: {r:1000000, c:1000000}, e: {r:0, c:0} }; + r = c = 0; + state.push([Rn[3], false]); + tmp = xlml_parsexmltag(Rn[0]); + sheetname = tmp.Name; + cursheet = {}; + mergecells = []; + } + break; + case 'Table': + if(Rn[1]==='/'){if((tmp=state.pop())[0]!==Rn[3]) throw "Bad state: "+tmp;} + else if(Rn[0].slice(-2) == "/>") break; + else { + table = xlml_parsexmltag(Rn[0]); + state.push([Rn[3], false]); + cstys = []; + } + break; + + case 'Style': + if(Rn[1]==='/') process_style_xlml(styles, stag, opts); + else stag = xlml_parsexmltag(Rn[0]); + break; + + case 'NumberFormat': + stag.nf = xlml_parsexmltag(Rn[0]).Format || "General"; + break; + + case 'Column': + if(state[state.length-1][0] !== 'Table') break; + csty = xlml_parsexmltag(Rn[0]); + cstys[(csty.Index-1||cstys.length)] = csty; + for(var i = 0; i < +csty.Span; ++i) cstys[cstys.length] = csty; + break; + + case 'NamedRange': break; + case 'NamedCell': break; + case 'B': break; + case 'I': break; + case 'U': break; + case 'S': break; + case 'Sub': break; + case 'Sup': break; + case 'Span': break; + case 'Border': break; + case 'Alignment': break; + case 'Borders': break; + case 'Font': + if(Rn[0].substr(-2) === "/>") break; + else if(Rn[1]==="/") ss += str.slice(fidx, Rn.index); + else fidx = Rn.index + Rn[0].length; + break; + case 'Interior': + if(!opts.cellStyles) break; + stag.Interior = xlml_parsexmltag(Rn[0]); + break; + case 'Protection': break; + + case 'Author': + case 'Title': + case 'Description': + case 'Created': + case 'Keywords': + case 'Subject': + case 'Category': + case 'Company': + case 'LastAuthor': + case 'LastSaved': + case 'LastPrinted': + case 'Version': + case 'Revision': + case 'TotalTime': + case 'HyperlinkBase': + case 'Manager': + if(Rn[0].substr(-2) === "/>") break; + else if(Rn[1]==="/") xlml_set_prop(Props, Rn[3], str.slice(pidx, Rn.index)); + else pidx = Rn.index + Rn[0].length; + break; + case 'Paragraphs': break; + + case 'Styles': + case 'Workbook': + if(Rn[1]==='/'){if((tmp=state.pop())[0]!==Rn[3]) throw "Bad state: "+tmp;} + else state.push([Rn[3], false]); + break; + + case 'Comment': + if(Rn[1]==='/'){ + if((tmp=state.pop())[0]!==Rn[3]) throw "Bad state: "+tmp; + xlml_clean_comment(comment); + comments.push(comment); + } else { + state.push([Rn[3], false]); + tmp = xlml_parsexmltag(Rn[0]); + comment = {a:tmp.Author}; + } + break; + + case 'Name': break; + + case 'ComponentOptions': + case 'DocumentProperties': + case 'CustomDocumentProperties': + case 'OfficeDocumentSettings': + case 'PivotTable': + case 'PivotCache': + case 'Names': + case 'MapInfo': + case 'PageBreaks': + case 'QueryTable': + case 'DataValidation': + case 'AutoFilter': + case 'Sorting': + case 'Schema': + case 'data': + case 'ConditionalFormatting': + case 'SmartTagType': + case 'SmartTags': + case 'ExcelWorkbook': + case 'WorkbookOptions': + case 'WorksheetOptions': + if(Rn[1]==='/'){if((tmp=state.pop())[0]!==Rn[3]) throw "Bad state: "+tmp;} + else if(Rn[0].charAt(Rn[0].length-2) !== '/') state.push([Rn[3], true]); + break; + + default: + var seen = true; + switch(state[state.length-1][0]) { + /* OfficeDocumentSettings */ + case 'OfficeDocumentSettings': switch(Rn[3]) { + case 'AllowPNG': break; + case 'RemovePersonalInformation': break; + case 'DownloadComponents': break; + case 'LocationOfComponents': break; + case 'Colors': break; + case 'Color': break; + case 'Index': break; + case 'RGB': break; + case 'PixelsPerInch': break; + case 'TargetScreenSize': break; + case 'ReadOnlyRecommended': break; + default: seen = false; + } break; + + /* ComponentOptions */ + case 'ComponentOptions': switch(Rn[3]) { + case 'Toolbar': break; + case 'HideOfficeLogo': break; + case 'SpreadsheetAutoFit': break; + case 'Label': break; + case 'Caption': break; + case 'MaxHeight': break; + case 'MaxWidth': break; + case 'NextSheetNumber': break; + default: seen = false; + } break; + + /* ExcelWorkbook */ + case 'ExcelWorkbook': switch(Rn[3]) { + case 'WindowHeight': break; + case 'WindowWidth': break; + case 'WindowTopX': break; + case 'WindowTopY': break; + case 'TabRatio': break; + case 'ProtectStructure': break; + case 'ProtectWindows': break; + case 'ActiveSheet': break; + case 'DisplayInkNotes': break; + case 'FirstVisibleSheet': break; + case 'SupBook': break; + case 'SheetName': break; + case 'SheetIndex': break; + case 'SheetIndexFirst': break; + case 'SheetIndexLast': break; + case 'Dll': break; + case 'AcceptLabelsInFormulas': break; + case 'DoNotSaveLinkValues': break; + case 'Date1904': break; + case 'Iteration': break; + case 'MaxIterations': break; + case 'MaxChange': break; + case 'Path': break; + case 'Xct': break; + case 'Count': break; + case 'SelectedSheets': break; + case 'Calculation': break; + case 'Uncalced': break; + case 'StartupPrompt': break; + case 'Crn': break; + case 'ExternName': break; + case 'Formula': break; + case 'ColFirst': break; + case 'ColLast': break; + case 'WantAdvise': break; + case 'Boolean': break; + case 'Error': break; + case 'Text': break; + case 'OLE': break; + case 'NoAutoRecover': break; + case 'PublishObjects': break; + case 'DoNotCalculateBeforeSave': break; + case 'Number': break; + case 'RefModeR1C1': break; + case 'EmbedSaveSmartTags': break; + default: seen = false; + } break; + + /* WorkbookOptions */ + case 'WorkbookOptions': switch(Rn[3]) { + case 'OWCVersion': break; + case 'Height': break; + case 'Width': break; + default: seen = false; + } break; + + /* WorksheetOptions */ + case 'WorksheetOptions': switch(Rn[3]) { + case 'Unsynced': break; + case 'Visible': break; + case 'Print': break; + case 'Panes': break; + case 'Scale': break; + case 'Pane': break; + case 'Number': break; + case 'Layout': break; + case 'Header': break; + case 'Footer': break; + case 'PageSetup': break; + case 'PageMargins': break; + case 'Selected': break; + case 'ProtectObjects': break; + case 'EnableSelection': break; + case 'ProtectScenarios': break; + case 'ValidPrinterInfo': break; + case 'HorizontalResolution': break; + case 'VerticalResolution': break; + case 'NumberofCopies': break; + case 'ActiveRow': break; + case 'ActiveCol': break; + case 'ActivePane': break; + case 'TopRowVisible': break; + case 'TopRowBottomPane': break; + case 'LeftColumnVisible': break; + case 'LeftColumnRightPane': break; + case 'FitToPage': break; + case 'RangeSelection': break; + case 'PaperSizeIndex': break; + case 'PageLayoutZoom': break; + case 'PageBreakZoom': break; + case 'FilterOn': break; + case 'DoNotDisplayGridlines': break; + case 'SplitHorizontal': break; + case 'SplitVertical': break; + case 'FreezePanes': break; + case 'FrozenNoSplit': break; + case 'FitWidth': break; + case 'FitHeight': break; + case 'CommentsLayout': break; + case 'Zoom': break; + case 'LeftToRight': break; + case 'Gridlines': break; + case 'AllowSort': break; + case 'AllowFilter': break; + case 'AllowInsertRows': break; + case 'AllowDeleteRows': break; + case 'AllowInsertCols': break; + case 'AllowDeleteCols': break; + case 'AllowInsertHyperlinks': break; + case 'AllowFormatCells': break; + case 'AllowSizeCols': break; + case 'AllowSizeRows': break; + case 'NoSummaryRowsBelowDetail': break; + case 'TabColorIndex': break; + case 'DoNotDisplayHeadings': break; + case 'ShowPageLayoutZoom': break; + case 'NoSummaryColumnsRightDetail': break; + case 'BlackAndWhite': break; + case 'DoNotDisplayZeros': break; + case 'DisplayPageBreak': break; + case 'RowColHeadings': break; + case 'DoNotDisplayOutline': break; + case 'NoOrientation': break; + case 'AllowUsePivotTables': break; + case 'ZeroHeight': break; + case 'ViewableRange': break; + case 'Selection': break; + case 'ProtectContents': break; + default: seen = false; + } break; + + /* PivotTable */ + case 'PivotTable': case 'PivotCache': switch(Rn[3]) { + case 'ImmediateItemsOnDrop': break; + case 'ShowPageMultipleItemLabel': break; + case 'CompactRowIndent': break; + case 'Location': break; + case 'PivotField': break; + case 'Orientation': break; + case 'LayoutForm': break; + case 'LayoutSubtotalLocation': break; + case 'LayoutCompactRow': break; + case 'Position': break; + case 'PivotItem': break; + case 'DataType': break; + case 'DataField': break; + case 'SourceName': break; + case 'ParentField': break; + case 'PTLineItems': break; + case 'PTLineItem': break; + case 'CountOfSameItems': break; + case 'Item': break; + case 'ItemType': break; + case 'PTSource': break; + case 'CacheIndex': break; + case 'ConsolidationReference': break; + case 'FileName': break; + case 'Reference': break; + case 'NoColumnGrand': break; + case 'NoRowGrand': break; + case 'BlankLineAfterItems': break; + case 'Hidden': break; + case 'Subtotal': break; + case 'BaseField': break; + case 'MapChildItems': break; + case 'Function': break; + case 'RefreshOnFileOpen': break; + case 'PrintSetTitles': break; + case 'MergeLabels': break; + case 'DefaultVersion': break; + case 'RefreshName': break; + case 'RefreshDate': break; + case 'RefreshDateCopy': break; + case 'VersionLastRefresh': break; + case 'VersionLastUpdate': break; + case 'VersionUpdateableMin': break; + case 'VersionRefreshableMin': break; + case 'Calculation': break; + default: seen = false; + } break; + + /* PageBreaks */ + case 'PageBreaks': switch(Rn[3]) { + case 'ColBreaks': break; + case 'ColBreak': break; + case 'RowBreaks': break; + case 'RowBreak': break; + case 'ColStart': break; + case 'ColEnd': break; + case 'RowEnd': break; + default: seen = false; + } break; + + /* AutoFilter */ + case 'AutoFilter': switch(Rn[3]) { + case 'AutoFilterColumn': break; + case 'AutoFilterCondition': break; + case 'AutoFilterAnd': break; + case 'AutoFilterOr': break; + default: seen = false; + } break; + + /* QueryTable */ + case 'QueryTable': switch(Rn[3]) { + case 'Id': break; + case 'AutoFormatFont': break; + case 'AutoFormatPattern': break; + case 'QuerySource': break; + case 'QueryType': break; + case 'EnableRedirections': break; + case 'RefreshedInXl9': break; + case 'URLString': break; + case 'HTMLTables': break; + case 'Connection': break; + case 'CommandText': break; + case 'RefreshInfo': break; + case 'NoTitles': break; + case 'NextId': break; + case 'ColumnInfo': break; + case 'OverwriteCells': break; + case 'DoNotPromptForFile': break; + case 'TextWizardSettings': break; + case 'Source': break; + case 'Number': break; + case 'Decimal': break; + case 'ThousandSeparator': break; + case 'TrailingMinusNumbers': break; + case 'FormatSettings': break; + case 'FieldType': break; + case 'Delimiters': break; + case 'Tab': break; + case 'Comma': break; + case 'AutoFormatName': break; + case 'VersionLastEdit': break; + case 'VersionLastRefresh': break; + default: seen = false; + } break; + + /* Sorting */ + case 'Sorting': + /* ConditionalFormatting */ + case 'ConditionalFormatting': + /* DataValidation */ + case 'DataValidation': switch(Rn[3]) { + case 'Range': break; + case 'Type': break; + case 'Min': break; + case 'Max': break; + case 'Sort': break; + case 'Descending': break; + case 'Order': break; + case 'CaseSensitive': break; + case 'Value': break; + case 'ErrorStyle': break; + case 'ErrorMessage': break; + case 'ErrorTitle': break; + case 'CellRangeList': break; + case 'InputMessage': break; + case 'InputTitle': break; + case 'ComboHide': break; + case 'InputHide': break; + case 'Condition': break; + case 'Qualifier': break; + case 'UseBlank': break; + case 'Value1': break; + case 'Value2': break; + case 'Format': break; + default: seen = false; + } break; + + /* MapInfo (schema) */ + case 'MapInfo': case 'Schema': case 'data': switch(Rn[3]) { + case 'Map': break; + case 'Entry': break; + case 'Range': break; + case 'XPath': break; + case 'Field': break; + case 'XSDType': break; + case 'FilterOn': break; + case 'Aggregate': break; + case 'ElementType': break; + case 'AttributeType': break; + /* These are from xsd (XML Schema Definition) */ + case 'schema': + case 'element': + case 'complexType': + case 'datatype': + case 'all': + case 'attribute': + case 'extends': break; + + case 'row': break; + default: seen = false; + } break; + + /* SmartTags (can be anything) */ + case 'SmartTags': break; + + default: seen = false; break; + } + if(seen) break; + /* CustomDocumentProperties */ + if(!state[state.length-1][1]) throw 'Unrecognized tag: ' + Rn[3] + "|" + state.join("|"); + if(state[state.length-1][0]==='CustomDocumentProperties') { + if(Rn[0].substr(-2) === "/>") break; + else if(Rn[1]==="/") xlml_set_custprop(Custprops, Rn, cp, str.slice(pidx, Rn.index)); + else { cp = Rn; pidx = Rn.index + Rn[0].length; } + break; + } + if(opts.WTF) throw 'Unrecognized tag: ' + Rn[3] + "|" + state.join("|"); + } + var out = {}; + if(!opts.bookSheets && !opts.bookProps) out.Sheets = sheets; + out.SheetNames = sheetnames; + out.SSF = SSF.get_table(); + out.Props = Props; + out.Custprops = Custprops; + return out; +} + +function parse_xlml(data, opts) { + fix_read_opts(opts=opts||{}); + switch(opts.type||"base64") { + case "base64": return parse_xlml_xml(Base64.decode(data), opts); + case "binary": case "buffer": case "file": return parse_xlml_xml(data, opts); + case "array": return parse_xlml_xml(data.map(_chr).join(""), opts); + } +} + +function write_xlml(wb, opts) { } + +/* [MS-OLEDS] 2.3.8 CompObjStream */ +function parse_compobj(obj) { + var v = {}; + var o = obj.content; + + /* [MS-OLEDS] 2.3.7 CompObjHeader -- All fields MUST be ignored */ + var l = 28, m; + m = __lpstr(o, l); + l += 4 + __readUInt32LE(o,l); + v.UserType = m; + + /* [MS-OLEDS] 2.3.1 ClipboardFormatOrAnsiString */ + m = __readUInt32LE(o,l); l+= 4; + switch(m) { + case 0x00000000: break; + case 0xffffffff: case 0xfffffffe: l+=4; break; + default: + if(m > 0x190) throw new Error("Unsupported Clipboard: " + m.toString(16)); + l += m; + } + + m = __lpstr(o, l); l += m.length === 0 ? 0 : 5 + m.length; v.Reserved1 = m; + + if((m = __readUInt32LE(o,l)) !== 0x71b2e9f4) return v; + throw "Unsupported Unicode Extension"; +} + +/* 2.4.58 Continue logic */ +function slurp(R, blob, length, opts) { + var l = length; + var bufs = []; + var d = blob.slice(blob.l,blob.l+l); + if(opts && opts.enc && opts.enc.insitu_decrypt) switch(R.n) { + case 'BOF': case 'FilePass': case 'FileLock': case 'InterfaceHdr': case 'RRDInfo': case 'RRDHead': case 'UsrExcl': break; + default: + if(d.length === 0) break; + opts.enc.insitu_decrypt(d); + } + bufs.push(d); + blob.l += l; + var next = (XLSRecordEnum[__readUInt16LE(blob,blob.l)]); + while(next != null && next.n === 'Continue') { + l = __readUInt16LE(blob,blob.l+2); + bufs.push(blob.slice(blob.l+4,blob.l+4+l)); + blob.l += 4+l; + next = (XLSRecordEnum[__readUInt16LE(blob, blob.l)]); + } + var b = bconcat(bufs); + prep_blob(b, 0); + var ll = 0; b.lens = []; + for(var j = 0; j < bufs.length; ++j) { b.lens.push(ll); ll += bufs[j].length; } + return R.f(b, b.length, opts); +} + +function safe_format_xf(p, opts, date1904) { + if(!p.XF) return; + try { + var fmtid = p.XF.ifmt||0; + if(p.t === 'e') { p.w = p.w || BErr[p.v]; } + else if(fmtid === 0) { + if(p.t === 'n') { + if((p.v|0) === p.v) p.w = SSF._general_int(p.v); + else p.w = SSF._general_num(p.v); + } + else p.w = SSF._general(p.v); + } + else p.w = SSF.format(fmtid,p.v, {date1904:date1904||false}); + if(opts.cellNF) p.z = SSF._table[fmtid]; + } catch(e) { if(opts.WTF) throw e; } +} + +function make_cell(val, ixfe, t) { + return {v:val, ixfe:ixfe, t:t}; +} + +// 2.3.2 +function parse_workbook(blob, options) { + var wb = {opts:{}}; + var Sheets = {}; + var out = {}; + var Directory = {}; + var found_sheet = false; + var range = {}; + var last_formula = null; + var sst = []; + var cur_sheet = ""; + var Preamble = {}; + var lastcell, last_cell, cc, cmnt, rng, rngC, rngR; + var shared_formulae = {}; + var array_formulae = []; /* TODO: something more clever */ + var temp_val; + var country; + var cell_valid = true; + var XFs = []; /* XF records */ + var palette = []; + var get_rgb = function getrgb(icv) { + if(icv < 8) return XLSIcv[icv]; + if(icv < 64) return palette[icv-8] || XLSIcv[icv]; + return XLSIcv[icv]; + }; + var process_cell_style = function pcs(cell, line) { + var xfd = line.XF.data; + if(!xfd || !xfd.patternType) return; + line.s = {}; + line.s.patternType = xfd.patternType; + var t; + if((t = rgb2Hex(get_rgb(xfd.icvFore)))) { line.s.fgColor = {rgb:t}; } + if((t = rgb2Hex(get_rgb(xfd.icvBack)))) { line.s.bgColor = {rgb:t}; } + }; + var addcell = function addcell(cell, line, options) { + if(!cell_valid) return; + if(options.cellStyles && line.XF && line.XF.data) process_cell_style(cell, line); + lastcell = cell; + last_cell = encode_cell(cell); + if(range.s) { + if(cell.r < range.s.r) range.s.r = cell.r; + if(cell.c < range.s.c) range.s.c = cell.c; + } + if(range.e) { + if(cell.r + 1 > range.e.r) range.e.r = cell.r + 1; + if(cell.c + 1 > range.e.c) range.e.c = cell.c + 1; + } + if(options.sheetRows && lastcell.r >= options.sheetRows) cell_valid = false; + else out[last_cell] = line; + }; + var opts = { + enc: false, // encrypted + sbcch: 0, // cch in the preceding SupBook + snames: [], // sheetnames + sharedf: shared_formulae, // shared formulae by address + arrayf: array_formulae, // array formulae array + rrtabid: [], // RRTabId + lastuser: "", // Last User from WriteAccess + biff: 8, // BIFF version + codepage: 0, // CP from CodePage record + winlocked: 0, // fLockWn from WinProtect + wtf: false + }; + if(options.password) opts.password = options.password; + var mergecells = []; + var objects = []; + var supbooks = [[]]; // 1-indexed, will hold extern names + var sbc = 0, sbci = 0, sbcli = 0; + supbooks.SheetNames = opts.snames; + supbooks.sharedf = opts.sharedf; + supbooks.arrayf = opts.arrayf; + var last_Rn = ''; + var file_depth = 0; /* TODO: make a real stack */ + + /* explicit override for some broken writers */ + opts.codepage = 1200; + set_cp(1200); + + while(blob.l < blob.length - 1) { + var s = blob.l; + var RecordType = blob.read_shift(2); + if(RecordType === 0 && last_Rn === 'EOF') break; + var length = (blob.l === blob.length ? 0 : blob.read_shift(2)), y; + var R = XLSRecordEnum[RecordType]; + if(R && R.f) { + if(options.bookSheets) { + if(last_Rn === 'BoundSheet8' && R.n !== 'BoundSheet8') break; + } + last_Rn = R.n; + if(R.r === 2 || R.r == 12) { + var rt = blob.read_shift(2); length -= 2; + if(!opts.enc && rt !== RecordType) throw "rt mismatch"; + if(R.r == 12){ blob.l += 10; length -= 10; } // skip FRT + } + //console.error(R,blob.l,length,blob.length); + var val; + if(R.n === 'EOF') val = R.f(blob, length, opts); + else val = slurp(R, blob, length, opts); + var Rn = R.n; + /* BIFF5 overrides */ + if(opts.biff === 5 || opts.biff === 2) switch(Rn) { + case 'Lbl': Rn = 'Label'; break; + } + /* nested switch statements to workaround V8 128 limit */ + switch(Rn) { + /* Workbook Options */ + case 'Date1904': wb.opts.Date1904 = val; break; + case 'WriteProtect': wb.opts.WriteProtect = true; break; + case 'FilePass': + if(!opts.enc) blob.l = 0; + opts.enc = val; + if(opts.WTF) console.error(val); + if(!options.password) throw new Error("File is password-protected"); + if(val.Type !== 0) throw new Error("Encryption scheme unsupported"); + if(!val.valid) throw new Error("Password is incorrect"); + break; + case 'WriteAccess': opts.lastuser = val; break; + case 'FileSharing': break; //TODO + case 'CodePage': + /* overrides based on test cases */ + if(val === 0x5212) val = 1200; + else if(val === 0x8001) val = 1252; + opts.codepage = val; + set_cp(val); + break; + case 'RRTabId': opts.rrtabid = val; break; + case 'WinProtect': opts.winlocked = val; break; + case 'Template': break; // TODO + case 'RefreshAll': wb.opts.RefreshAll = val; break; + case 'BookBool': break; // TODO + case 'UsesELFs': /* if(val) console.error("Unsupported ELFs"); */ break; + case 'MTRSettings': { + if(val[0] && val[1]) throw "Unsupported threads: " + val; + } break; // TODO: actually support threads + case 'CalcCount': wb.opts.CalcCount = val; break; + case 'CalcDelta': wb.opts.CalcDelta = val; break; + case 'CalcIter': wb.opts.CalcIter = val; break; + case 'CalcMode': wb.opts.CalcMode = val; break; + case 'CalcPrecision': wb.opts.CalcPrecision = val; break; + case 'CalcSaveRecalc': wb.opts.CalcSaveRecalc = val; break; + case 'CalcRefMode': opts.CalcRefMode = val; break; // TODO: implement R1C1 + case 'Uncalced': break; + case 'ForceFullCalculation': wb.opts.FullCalc = val; break; + case 'WsBool': break; // TODO + case 'XF': XFs.push(val); break; + case 'ExtSST': break; // TODO + case 'BookExt': break; // TODO + case 'RichTextStream': break; + case 'BkHim': break; + + case 'SupBook': supbooks[++sbc] = [val]; sbci = 0; break; + case 'ExternName': supbooks[sbc][++sbci] = val; break; + case 'Index': break; // TODO + case 'Lbl': supbooks[0][++sbcli] = val; break; + case 'ExternSheet': supbooks[sbc] = supbooks[sbc].concat(val); sbci += val.length; break; + + case 'Protect': out["!protect"] = val; break; /* for sheet or book */ + case 'Password': if(val !== 0 && opts.WTF) console.error("Password verifier: " + val); break; + case 'Prot4Rev': case 'Prot4RevPass': break; /*TODO: Revision Control*/ + + case 'BoundSheet8': { + Directory[val.pos] = val; + opts.snames.push(val.name); + } break; + case 'EOF': { + if(--file_depth) break; + if(range.e) { + out["!range"] = range; + if(range.e.r > 0 && range.e.c > 0) { + range.e.r--; range.e.c--; + out["!ref"] = encode_range(range); + range.e.r++; range.e.c++; + } + if(mergecells.length > 0) out["!merges"] = mergecells; + if(objects.length > 0) out["!objects"] = objects; + } + if(cur_sheet === "") Preamble = out; else Sheets[cur_sheet] = out; + out = {}; + } break; + case 'BOF': { + if(opts.biff !== 8); + else if(val.BIFFVer === 0x0500) opts.biff = 5; + else if(val.BIFFVer === 0x0002) opts.biff = 2; + else if(val.BIFFVer === 0x0007) opts.biff = 2; + if(file_depth++) break; + cell_valid = true; + out = {}; + if(opts.biff === 2) { + if(cur_sheet === "") cur_sheet = "Sheet1"; + range = {s:{r:0,c:0},e:{r:0,c:0}}; + } + else cur_sheet = (Directory[s] || {name:""}).name; + mergecells = []; + objects = []; + } break; + case 'Number': case 'BIFF2NUM': { + temp_val = {ixfe: val.ixfe, XF: XFs[val.ixfe], v:val.val, t:'n'}; + if(temp_val.XF) safe_format_xf(temp_val, options, wb.opts.Date1904); + addcell({c:val.c, r:val.r}, temp_val, options); + } break; + case 'BoolErr': { + temp_val = {ixfe: val.ixfe, XF: XFs[val.ixfe], v:val.val, t:val.t}; + if(temp_val.XF) safe_format_xf(temp_val, options, wb.opts.Date1904); + addcell({c:val.c, r:val.r}, temp_val, options); + } break; + case 'RK': { + temp_val = {ixfe: val.ixfe, XF: XFs[val.ixfe], v:val.rknum, t:'n'}; + if(temp_val.XF) safe_format_xf(temp_val, options, wb.opts.Date1904); + addcell({c:val.c, r:val.r}, temp_val, options); + } break; + case 'MulRk': { + for(var j = val.c; j <= val.C; ++j) { + var ixfe = val.rkrec[j-val.c][0]; + temp_val= {ixfe:ixfe, XF:XFs[ixfe], v:val.rkrec[j-val.c][1], t:'n'}; + if(temp_val.XF) safe_format_xf(temp_val, options, wb.opts.Date1904); + addcell({c:j, r:val.r}, temp_val, options); + } + } break; + case 'Formula': { + switch(val.val) { + case 'String': last_formula = val; break; + case 'Array Formula': throw "Array Formula unsupported"; + default: + temp_val = {v:val.val, ixfe:val.cell.ixfe, t:val.tt}; + temp_val.XF = XFs[temp_val.ixfe]; + if(options.cellFormula) temp_val.f = "="+stringify_formula(val.formula,range,val.cell,supbooks, opts); + if(temp_val.XF) safe_format_xf(temp_val, options, wb.opts.Date1904); + addcell(val.cell, temp_val, options); + last_formula = val; + } + } break; + case 'String': { + if(last_formula) { + last_formula.val = val; + temp_val = {v:last_formula.val, ixfe:last_formula.cell.ixfe, t:'s'}; + temp_val.XF = XFs[temp_val.ixfe]; + if(options.cellFormula) temp_val.f = "="+stringify_formula(last_formula.formula, range, last_formula.cell, supbooks, opts); + if(temp_val.XF) safe_format_xf(temp_val, options, wb.opts.Date1904); + addcell(last_formula.cell, temp_val, options); + last_formula = null; + } + } break; + case 'Array': { + array_formulae.push(val); + } break; + case 'ShrFmla': { + if(!cell_valid) break; + //if(options.cellFormula) out[last_cell].f = stringify_formula(val[0], range, lastcell, supbooks, opts); + /* TODO: capture range */ + shared_formulae[encode_cell(last_formula.cell)]= val[0]; + } break; + case 'LabelSst': + //temp_val={v:sst[val.isst].t, ixfe:val.ixfe, t:'s'}; + temp_val=make_cell(sst[val.isst].t, val.ixfe, 's'); + temp_val.XF = XFs[temp_val.ixfe]; + if(temp_val.XF) safe_format_xf(temp_val, options, wb.opts.Date1904); + addcell({c:val.c, r:val.r}, temp_val, options); + break; + case 'Label': case 'BIFF2STR': + /* Some writers erroneously write Label */ + temp_val=make_cell(val.val, val.ixfe, 's'); + temp_val.XF = XFs[temp_val.ixfe]; + if(temp_val.XF) safe_format_xf(temp_val, options, wb.opts.Date1904); + addcell({c:val.c, r:val.r}, temp_val, options); + break; + case 'Dimensions': { + if(file_depth === 1) range = val; /* TODO: stack */ + } break; + case 'SST': { + sst = val; + } break; + case 'Format': { /* val = [id, fmt] */ + SSF.load(val[1], val[0]); + } break; + + case 'MergeCells': mergecells = mergecells.concat(val); break; + + case 'Obj': objects[val.cmo[0]] = opts.lastobj = val; break; + case 'TxO': opts.lastobj.TxO = val; break; + + case 'HLink': { + for(rngR = val[0].s.r; rngR <= val[0].e.r; ++rngR) + for(rngC = val[0].s.c; rngC <= val[0].e.c; ++rngC) + if(out[encode_cell({c:rngC,r:rngR})]) + out[encode_cell({c:rngC,r:rngR})].l = val[1]; + } break; + case 'HLinkTooltip': { + for(rngR = val[0].s.r; rngR <= val[0].e.r; ++rngR) + for(rngC = val[0].s.c; rngC <= val[0].e.c; ++rngC) + if(out[encode_cell({c:rngC,r:rngR})]) + out[encode_cell({c:rngC,r:rngR})].l.tooltip = val[1]; + } break; + + /* Comments */ + case 'Note': { + if(opts.biff <= 5 && opts.biff >= 2) break; /* TODO: BIFF5 */ + cc = out[encode_cell(val[0])]; + var noteobj = objects[val[2]]; + if(!cc) break; + if(!cc.c) cc.c = []; + cmnt = {a:val[1],t:noteobj.TxO.t}; + cc.c.push(cmnt); + } break; + + default: switch(R.n) { /* nested */ + case 'ClrtClient': break; + case 'XFExt': update_xfext(XFs[val.ixfe], val.ext); break; + + case 'NameCmt': break; + case 'Header': break; // TODO + case 'Footer': break; // TODO + case 'HCenter': break; // TODO + case 'VCenter': break; // TODO + case 'Pls': break; // TODO + case 'Setup': break; // TODO + case 'DefColWidth': break; // TODO + case 'GCW': break; + case 'LHRecord': break; + case 'ColInfo': break; // TODO + case 'Row': break; // TODO + case 'DBCell': break; // TODO + case 'MulBlank': break; // TODO + case 'EntExU2': break; // TODO + case 'SxView': break; // TODO + case 'Sxvd': break; // TODO + case 'SXVI': break; // TODO + case 'SXVDEx': break; // TODO + case 'SxIvd': break; // TODO + case 'SXDI': break; // TODO + case 'SXLI': break; // TODO + case 'SXEx': break; // TODO + case 'QsiSXTag': break; // TODO + case 'Selection': break; + case 'Feat': break; + case 'FeatHdr': case 'FeatHdr11': break; + case 'Feature11': case 'Feature12': case 'List12': break; + case 'Blank': break; + case 'Country': country = val; break; + case 'RecalcId': break; + case 'DefaultRowHeight': case 'DxGCol': break; // TODO: htmlify + case 'Fbi': case 'Fbi2': case 'GelFrame': break; + case 'Font': break; // TODO + case 'XFCRC': break; // TODO + case 'Style': break; // TODO + case 'StyleExt': break; // TODO + case 'Palette': palette = val; break; // TODO + case 'Theme': break; // TODO + /* Protection */ + case 'ScenarioProtect': break; + case 'ObjProtect': break; + + /* Conditional Formatting */ + case 'CondFmt12': break; + + /* Table */ + case 'Table': break; // TODO + case 'TableStyles': break; // TODO + case 'TableStyle': break; // TODO + case 'TableStyleElement': break; // TODO + + /* PivotTable */ + case 'SXStreamID': break; // TODO + case 'SXVS': break; // TODO + case 'DConRef': break; // TODO + case 'SXAddl': break; // TODO + case 'DConBin': break; // TODO + case 'DConName': break; // TODO + case 'SXPI': break; // TODO + case 'SxFormat': break; // TODO + case 'SxSelect': break; // TODO + case 'SxRule': break; // TODO + case 'SxFilt': break; // TODO + case 'SxItm': break; // TODO + case 'SxDXF': break; // TODO + + /* Scenario Manager */ + case 'ScenMan': break; + + /* Data Consolidation */ + case 'DCon': break; + + /* Watched Cell */ + case 'CellWatch': break; + + /* Print Settings */ + case 'PrintRowCol': break; + case 'PrintGrid': break; + case 'PrintSize': break; + + case 'XCT': break; + case 'CRN': break; + + case 'Scl': { + //console.log("Zoom Level:", val[0]/val[1],val); + } break; + case 'SheetExt': { + + } break; + case 'SheetExtOptional': { + + } break; + + /* VBA */ + case 'ObNoMacros': { + + } break; + case 'ObProj': { + + } break; + case 'CodeName': { + + } break; + case 'GUIDTypeLib': { + + } break; + + case 'WOpt': break; // TODO: WTF? + case 'PhoneticInfo': break; + + case 'OleObjectSize': break; + + /* Differential Formatting */ + case 'DXF': case 'DXFN': case 'DXFN12': case 'DXFN12List': case 'DXFN12NoCB': break; + + /* Data Validation */ + case 'Dv': case 'DVal': break; + + /* Data Series */ + case 'BRAI': case 'Series': case 'SeriesText': break; + + /* Data Connection */ + case 'DConn': break; + case 'DbOrParamQry': break; + case 'DBQueryExt': break; + + /* Formatting */ + case 'IFmtRecord': break; + case 'CondFmt': case 'CF': case 'CF12': case 'CFEx': break; + + /* Explicitly Ignored */ + case 'Excel9File': break; + case 'Units': break; + case 'InterfaceHdr': case 'Mms': case 'InterfaceEnd': case 'DSF': case 'BuiltInFnGroupCount': + /* View Stuff */ + case 'Window1': case 'Window2': case 'HideObj': case 'GridSet': case 'Guts': + case 'UserBView': case 'UserSViewBegin': case 'UserSViewEnd': + case 'Pane': break; + default: switch(R.n) { /* nested */ + /* Chart */ + case 'Dat': + case 'Begin': case 'End': + case 'StartBlock': case 'EndBlock': + case 'Frame': case 'Area': + case 'Axis': case 'AxisLine': case 'Tick': break; + case 'AxesUsed': + case 'CrtLayout12': case 'CrtLayout12A': case 'CrtLink': case 'CrtLine': case 'CrtMlFrt': case 'CrtMlFrtContinue': break; + case 'LineFormat': case 'AreaFormat': + case 'Chart': case 'Chart3d': case 'Chart3DBarShape': case 'ChartFormat': case 'ChartFrtInfo': break; + case 'PlotArea': case 'PlotGrowth': break; + case 'SeriesList': case 'SerParent': case 'SerAuxTrend': break; + case 'DataFormat': case 'SerToCrt': case 'FontX': break; + case 'CatSerRange': case 'AxcExt': case 'SerFmt': break; + case 'ShtProps': break; + case 'DefaultText': case 'Text': case 'CatLab': break; + case 'DataLabExtContents': break; + case 'Legend': case 'LegendException': break; + case 'Pie': case 'Scatter': break; + case 'PieFormat': case 'MarkerFormat': break; + case 'StartObject': case 'EndObject': break; + case 'AlRuns': case 'ObjectLink': break; + case 'SIIndex': break; + case 'AttachedLabel': case 'YMult': break; + + /* Chart Group */ + case 'Line': case 'Bar': break; + case 'Surf': break; + + /* Axis Group */ + case 'AxisParent': break; + case 'Pos': break; + case 'ValueRange': break; + + /* Pivot Chart */ + case 'SXViewEx9': break; // TODO + case 'SXViewLink': break; + case 'PivotChartBits': break; + case 'SBaseRef': break; + case 'TextPropsStream': break; + + /* Chart Misc */ + case 'LnExt': break; + case 'MkrExt': break; + case 'CrtCoopt': break; + + /* Query Table */ + case 'Qsi': case 'Qsif': case 'Qsir': case 'QsiSXTag': break; + case 'TxtQry': break; + + /* Filter */ + case 'FilterMode': break; + case 'AutoFilter': case 'AutoFilterInfo': break; + case 'AutoFilter12': break; + case 'DropDownObjIds': break; + case 'Sort': break; + case 'SortData': break; + + /* Drawing */ + case 'ShapePropsStream': break; + case 'MsoDrawing': case 'MsoDrawingGroup': case 'MsoDrawingSelection': break; + case 'ImData': break; + /* Pub Stuff */ + case 'WebPub': case 'AutoWebPub': + + /* Print Stuff */ + case 'RightMargin': case 'LeftMargin': case 'TopMargin': case 'BottomMargin': + case 'HeaderFooter': case 'HFPicture': case 'PLV': + case 'HorizontalPageBreaks': case 'VerticalPageBreaks': + /* Behavioral */ + case 'Backup': case 'CompressPictures': case 'Compat12': break; + + /* Should not Happen */ + case 'Continue': case 'ContinueFrt12': break; + + /* Future Records */ + case 'FrtFontList': case 'FrtWrapper': break; + + /* BIFF5 records */ + case 'ExternCount': break; + case 'RString': break; + case 'TabIdConf': case 'Radar': case 'RadarArea': case 'DropBar': case 'Intl': case 'CoordList': case 'SerAuxErrBar': break; + + default: switch(R.n) { /* nested */ + /* Miscellaneous */ + case 'SCENARIO': case 'DConBin': case 'PicF': case 'DataLabExt': + case 'Lel': case 'BopPop': case 'BopPopCustom': case 'RealTimeData': + case 'Name': break; + default: if(options.WTF) throw 'Unrecognized Record ' + R.n; + }}}} + } else blob.l += length; + } + var sheetnamesraw = opts.biff === 2 ? ['Sheet1'] : Object.keys(Directory).sort(function(a,b) { return Number(a) - Number(b); }).map(function(x){return Directory[x].name;}); + var sheetnames = sheetnamesraw.slice(); + wb.Directory=sheetnamesraw; + wb.SheetNames=sheetnamesraw; + if(!options.bookSheets) wb.Sheets=Sheets; + wb.Preamble=Preamble; + wb.Strings = sst; + wb.SSF = SSF.get_table(); + if(opts.enc) wb.Encryption = opts.enc; + wb.Metadata = {}; + if(country !== undefined) wb.Metadata.Country = country; + return wb; +} + +function parse_xlscfb(cfb, options) { +if(!options) options = {}; +fix_read_opts(options); +reset_cp(); +var CompObj, Summary, Workbook; +if(cfb.find) { + CompObj = cfb.find('!CompObj'); + Summary = cfb.find('!SummaryInformation'); + Workbook = cfb.find('/Workbook'); +} else { + prep_blob(cfb, 0); + Workbook = {content: cfb}; +} + +if(!Workbook) Workbook = cfb.find('/Book'); +var CompObjP, SummaryP, WorkbookP; + +if(CompObj) CompObjP = parse_compobj(CompObj); +if(options.bookProps && !options.bookSheets) WorkbookP = {}; +else { + if(Workbook) WorkbookP = parse_workbook(Workbook.content, options, !!Workbook.find); + else throw new Error("Cannot find Workbook stream"); +} + +if(cfb.find) parse_props(cfb); + +var props = {}; +for(var y in cfb.Summary) props[y] = cfb.Summary[y]; +for(y in cfb.DocSummary) props[y] = cfb.DocSummary[y]; +WorkbookP.Props = WorkbookP.Custprops = props; /* TODO: split up properties */ +if(options.bookFiles) WorkbookP.cfb = cfb; +WorkbookP.CompObjP = CompObjP; +return WorkbookP; +} + +/* TODO: WTF */ +function parse_props(cfb) { + /* [MS-OSHARED] 2.3.3.2.2 Document Summary Information Property Set */ + var DSI = cfb.find('!DocumentSummaryInformation'); + if(DSI) try { cfb.DocSummary = parse_PropertySetStream(DSI, DocSummaryPIDDSI); } catch(e) {} + + /* [MS-OSHARED] 2.3.3.2.1 Summary Information Property Set*/ + var SI = cfb.find('!SummaryInformation'); + if(SI) try { cfb.Summary = parse_PropertySetStream(SI, SummaryPIDSI); } catch(e) {} +} + +/* [MS-XLSB] 2.3 Record Enumeration */ +var XLSBRecordEnum = { + 0x0000: { n:"BrtRowHdr", f:parse_BrtRowHdr }, + 0x0001: { n:"BrtCellBlank", f:parse_BrtCellBlank }, + 0x0002: { n:"BrtCellRk", f:parse_BrtCellRk }, + 0x0003: { n:"BrtCellError", f:parse_BrtCellError }, + 0x0004: { n:"BrtCellBool", f:parse_BrtCellBool }, + 0x0005: { n:"BrtCellReal", f:parse_BrtCellReal }, + 0x0006: { n:"BrtCellSt", f:parse_BrtCellSt }, + 0x0007: { n:"BrtCellIsst", f:parse_BrtCellIsst }, + 0x0008: { n:"BrtFmlaString", f:parse_BrtFmlaString }, + 0x0009: { n:"BrtFmlaNum", f:parse_BrtFmlaNum }, + 0x000A: { n:"BrtFmlaBool", f:parse_BrtFmlaBool }, + 0x000B: { n:"BrtFmlaError", f:parse_BrtFmlaError }, + 0x0010: { n:"BrtFRTArchID$", f:parse_BrtFRTArchID$ }, + 0x0013: { n:"BrtSSTItem", f:parse_RichStr }, + 0x0014: { n:"BrtPCDIMissing", f:parsenoop }, + 0x0015: { n:"BrtPCDINumber", f:parsenoop }, + 0x0016: { n:"BrtPCDIBoolean", f:parsenoop }, + 0x0017: { n:"BrtPCDIError", f:parsenoop }, + 0x0018: { n:"BrtPCDIString", f:parsenoop }, + 0x0019: { n:"BrtPCDIDatetime", f:parsenoop }, + 0x001A: { n:"BrtPCDIIndex", f:parsenoop }, + 0x001B: { n:"BrtPCDIAMissing", f:parsenoop }, + 0x001C: { n:"BrtPCDIANumber", f:parsenoop }, + 0x001D: { n:"BrtPCDIABoolean", f:parsenoop }, + 0x001E: { n:"BrtPCDIAError", f:parsenoop }, + 0x001F: { n:"BrtPCDIAString", f:parsenoop }, + 0x0020: { n:"BrtPCDIADatetime", f:parsenoop }, + 0x0021: { n:"BrtPCRRecord", f:parsenoop }, + 0x0022: { n:"BrtPCRRecordDt", f:parsenoop }, + 0x0023: { n:"BrtFRTBegin", f:parsenoop }, + 0x0024: { n:"BrtFRTEnd", f:parsenoop }, + 0x0025: { n:"BrtACBegin", f:parsenoop }, + 0x0026: { n:"BrtACEnd", f:parsenoop }, + 0x0027: { n:"BrtName", f:parsenoop }, + 0x0028: { n:"BrtIndexRowBlock", f:parsenoop }, + 0x002A: { n:"BrtIndexBlock", f:parsenoop }, + 0x002B: { n:"BrtFont", f:parse_BrtFont }, + 0x002C: { n:"BrtFmt", f:parse_BrtFmt }, + 0x002D: { n:"BrtFill", f:parsenoop }, + 0x002E: { n:"BrtBorder", f:parsenoop }, + 0x002F: { n:"BrtXF", f:parse_BrtXF }, + 0x0030: { n:"BrtStyle", f:parsenoop }, + 0x0031: { n:"BrtCellMeta", f:parsenoop }, + 0x0032: { n:"BrtValueMeta", f:parsenoop }, + 0x0033: { n:"BrtMdb", f:parsenoop }, + 0x0034: { n:"BrtBeginFmd", f:parsenoop }, + 0x0035: { n:"BrtEndFmd", f:parsenoop }, + 0x0036: { n:"BrtBeginMdx", f:parsenoop }, + 0x0037: { n:"BrtEndMdx", f:parsenoop }, + 0x0038: { n:"BrtBeginMdxTuple", f:parsenoop }, + 0x0039: { n:"BrtEndMdxTuple", f:parsenoop }, + 0x003A: { n:"BrtMdxMbrIstr", f:parsenoop }, + 0x003B: { n:"BrtStr", f:parsenoop }, + 0x003C: { n:"BrtColInfo", f:parsenoop }, + 0x003E: { n:"BrtCellRString", f:parsenoop }, + 0x003F: { n:"BrtCalcChainItem$", f:parse_BrtCalcChainItem$ }, + 0x0040: { n:"BrtDVal", f:parsenoop }, + 0x0041: { n:"BrtSxvcellNum", f:parsenoop }, + 0x0042: { n:"BrtSxvcellStr", f:parsenoop }, + 0x0043: { n:"BrtSxvcellBool", f:parsenoop }, + 0x0044: { n:"BrtSxvcellErr", f:parsenoop }, + 0x0045: { n:"BrtSxvcellDate", f:parsenoop }, + 0x0046: { n:"BrtSxvcellNil", f:parsenoop }, + 0x0080: { n:"BrtFileVersion", f:parsenoop }, + 0x0081: { n:"BrtBeginSheet", f:parsenoop }, + 0x0082: { n:"BrtEndSheet", f:parsenoop }, + 0x0083: { n:"BrtBeginBook", f:parsenoop, p:0 }, + 0x0084: { n:"BrtEndBook", f:parsenoop }, + 0x0085: { n:"BrtBeginWsViews", f:parsenoop }, + 0x0086: { n:"BrtEndWsViews", f:parsenoop }, + 0x0087: { n:"BrtBeginBookViews", f:parsenoop }, + 0x0088: { n:"BrtEndBookViews", f:parsenoop }, + 0x0089: { n:"BrtBeginWsView", f:parsenoop }, + 0x008A: { n:"BrtEndWsView", f:parsenoop }, + 0x008B: { n:"BrtBeginCsViews", f:parsenoop }, + 0x008C: { n:"BrtEndCsViews", f:parsenoop }, + 0x008D: { n:"BrtBeginCsView", f:parsenoop }, + 0x008E: { n:"BrtEndCsView", f:parsenoop }, + 0x008F: { n:"BrtBeginBundleShs", f:parsenoop }, + 0x0090: { n:"BrtEndBundleShs", f:parsenoop }, + 0x0091: { n:"BrtBeginSheetData", f:parsenoop }, + 0x0092: { n:"BrtEndSheetData", f:parsenoop }, + 0x0093: { n:"BrtWsProp", f:parse_BrtWsProp }, + 0x0094: { n:"BrtWsDim", f:parse_BrtWsDim, p:16 }, + 0x0097: { n:"BrtPane", f:parsenoop }, + 0x0098: { n:"BrtSel", f:parsenoop }, + 0x0099: { n:"BrtWbProp", f:parse_BrtWbProp }, + 0x009A: { n:"BrtWbFactoid", f:parsenoop }, + 0x009B: { n:"BrtFileRecover", f:parsenoop }, + 0x009C: { n:"BrtBundleSh", f:parse_BrtBundleSh }, + 0x009D: { n:"BrtCalcProp", f:parsenoop }, + 0x009E: { n:"BrtBookView", f:parsenoop }, + 0x009F: { n:"BrtBeginSst", f:parse_BrtBeginSst }, + 0x00A0: { n:"BrtEndSst", f:parsenoop }, + 0x00A1: { n:"BrtBeginAFilter", f:parsenoop }, + 0x00A2: { n:"BrtEndAFilter", f:parsenoop }, + 0x00A3: { n:"BrtBeginFilterColumn", f:parsenoop }, + 0x00A4: { n:"BrtEndFilterColumn", f:parsenoop }, + 0x00A5: { n:"BrtBeginFilters", f:parsenoop }, + 0x00A6: { n:"BrtEndFilters", f:parsenoop }, + 0x00A7: { n:"BrtFilter", f:parsenoop }, + 0x00A8: { n:"BrtColorFilter", f:parsenoop }, + 0x00A9: { n:"BrtIconFilter", f:parsenoop }, + 0x00AA: { n:"BrtTop10Filter", f:parsenoop }, + 0x00AB: { n:"BrtDynamicFilter", f:parsenoop }, + 0x00AC: { n:"BrtBeginCustomFilters", f:parsenoop }, + 0x00AD: { n:"BrtEndCustomFilters", f:parsenoop }, + 0x00AE: { n:"BrtCustomFilter", f:parsenoop }, + 0x00AF: { n:"BrtAFilterDateGroupItem", f:parsenoop }, + 0x00B0: { n:"BrtMergeCell", f:parse_BrtMergeCell }, + 0x00B1: { n:"BrtBeginMergeCells", f:parsenoop }, + 0x00B2: { n:"BrtEndMergeCells", f:parsenoop }, + 0x00B3: { n:"BrtBeginPivotCacheDef", f:parsenoop }, + 0x00B4: { n:"BrtEndPivotCacheDef", f:parsenoop }, + 0x00B5: { n:"BrtBeginPCDFields", f:parsenoop }, + 0x00B6: { n:"BrtEndPCDFields", f:parsenoop }, + 0x00B7: { n:"BrtBeginPCDField", f:parsenoop }, + 0x00B8: { n:"BrtEndPCDField", f:parsenoop }, + 0x00B9: { n:"BrtBeginPCDSource", f:parsenoop }, + 0x00BA: { n:"BrtEndPCDSource", f:parsenoop }, + 0x00BB: { n:"BrtBeginPCDSRange", f:parsenoop }, + 0x00BC: { n:"BrtEndPCDSRange", f:parsenoop }, + 0x00BD: { n:"BrtBeginPCDFAtbl", f:parsenoop }, + 0x00BE: { n:"BrtEndPCDFAtbl", f:parsenoop }, + 0x00BF: { n:"BrtBeginPCDIRun", f:parsenoop }, + 0x00C0: { n:"BrtEndPCDIRun", f:parsenoop }, + 0x00C1: { n:"BrtBeginPivotCacheRecords", f:parsenoop }, + 0x00C2: { n:"BrtEndPivotCacheRecords", f:parsenoop }, + 0x00C3: { n:"BrtBeginPCDHierarchies", f:parsenoop }, + 0x00C4: { n:"BrtEndPCDHierarchies", f:parsenoop }, + 0x00C5: { n:"BrtBeginPCDHierarchy", f:parsenoop }, + 0x00C6: { n:"BrtEndPCDHierarchy", f:parsenoop }, + 0x00C7: { n:"BrtBeginPCDHFieldsUsage", f:parsenoop }, + 0x00C8: { n:"BrtEndPCDHFieldsUsage", f:parsenoop }, + 0x00C9: { n:"BrtBeginExtConnection", f:parsenoop }, + 0x00CA: { n:"BrtEndExtConnection", f:parsenoop }, + 0x00CB: { n:"BrtBeginECDbProps", f:parsenoop }, + 0x00CC: { n:"BrtEndECDbProps", f:parsenoop }, + 0x00CD: { n:"BrtBeginECOlapProps", f:parsenoop }, + 0x00CE: { n:"BrtEndECOlapProps", f:parsenoop }, + 0x00CF: { n:"BrtBeginPCDSConsol", f:parsenoop }, + 0x00D0: { n:"BrtEndPCDSConsol", f:parsenoop }, + 0x00D1: { n:"BrtBeginPCDSCPages", f:parsenoop }, + 0x00D2: { n:"BrtEndPCDSCPages", f:parsenoop }, + 0x00D3: { n:"BrtBeginPCDSCPage", f:parsenoop }, + 0x00D4: { n:"BrtEndPCDSCPage", f:parsenoop }, + 0x00D5: { n:"BrtBeginPCDSCPItem", f:parsenoop }, + 0x00D6: { n:"BrtEndPCDSCPItem", f:parsenoop }, + 0x00D7: { n:"BrtBeginPCDSCSets", f:parsenoop }, + 0x00D8: { n:"BrtEndPCDSCSets", f:parsenoop }, + 0x00D9: { n:"BrtBeginPCDSCSet", f:parsenoop }, + 0x00DA: { n:"BrtEndPCDSCSet", f:parsenoop }, + 0x00DB: { n:"BrtBeginPCDFGroup", f:parsenoop }, + 0x00DC: { n:"BrtEndPCDFGroup", f:parsenoop }, + 0x00DD: { n:"BrtBeginPCDFGItems", f:parsenoop }, + 0x00DE: { n:"BrtEndPCDFGItems", f:parsenoop }, + 0x00DF: { n:"BrtBeginPCDFGRange", f:parsenoop }, + 0x00E0: { n:"BrtEndPCDFGRange", f:parsenoop }, + 0x00E1: { n:"BrtBeginPCDFGDiscrete", f:parsenoop }, + 0x00E2: { n:"BrtEndPCDFGDiscrete", f:parsenoop }, + 0x00E3: { n:"BrtBeginPCDSDTupleCache", f:parsenoop }, + 0x00E4: { n:"BrtEndPCDSDTupleCache", f:parsenoop }, + 0x00E5: { n:"BrtBeginPCDSDTCEntries", f:parsenoop }, + 0x00E6: { n:"BrtEndPCDSDTCEntries", f:parsenoop }, + 0x00E7: { n:"BrtBeginPCDSDTCEMembers", f:parsenoop }, + 0x00E8: { n:"BrtEndPCDSDTCEMembers", f:parsenoop }, + 0x00E9: { n:"BrtBeginPCDSDTCEMember", f:parsenoop }, + 0x00EA: { n:"BrtEndPCDSDTCEMember", f:parsenoop }, + 0x00EB: { n:"BrtBeginPCDSDTCQueries", f:parsenoop }, + 0x00EC: { n:"BrtEndPCDSDTCQueries", f:parsenoop }, + 0x00ED: { n:"BrtBeginPCDSDTCQuery", f:parsenoop }, + 0x00EE: { n:"BrtEndPCDSDTCQuery", f:parsenoop }, + 0x00EF: { n:"BrtBeginPCDSDTCSets", f:parsenoop }, + 0x00F0: { n:"BrtEndPCDSDTCSets", f:parsenoop }, + 0x00F1: { n:"BrtBeginPCDSDTCSet", f:parsenoop }, + 0x00F2: { n:"BrtEndPCDSDTCSet", f:parsenoop }, + 0x00F3: { n:"BrtBeginPCDCalcItems", f:parsenoop }, + 0x00F4: { n:"BrtEndPCDCalcItems", f:parsenoop }, + 0x00F5: { n:"BrtBeginPCDCalcItem", f:parsenoop }, + 0x00F6: { n:"BrtEndPCDCalcItem", f:parsenoop }, + 0x00F7: { n:"BrtBeginPRule", f:parsenoop }, + 0x00F8: { n:"BrtEndPRule", f:parsenoop }, + 0x00F9: { n:"BrtBeginPRFilters", f:parsenoop }, + 0x00FA: { n:"BrtEndPRFilters", f:parsenoop }, + 0x00FB: { n:"BrtBeginPRFilter", f:parsenoop }, + 0x00FC: { n:"BrtEndPRFilter", f:parsenoop }, + 0x00FD: { n:"BrtBeginPNames", f:parsenoop }, + 0x00FE: { n:"BrtEndPNames", f:parsenoop }, + 0x00FF: { n:"BrtBeginPName", f:parsenoop }, + 0x0100: { n:"BrtEndPName", f:parsenoop }, + 0x0101: { n:"BrtBeginPNPairs", f:parsenoop }, + 0x0102: { n:"BrtEndPNPairs", f:parsenoop }, + 0x0103: { n:"BrtBeginPNPair", f:parsenoop }, + 0x0104: { n:"BrtEndPNPair", f:parsenoop }, + 0x0105: { n:"BrtBeginECWebProps", f:parsenoop }, + 0x0106: { n:"BrtEndECWebProps", f:parsenoop }, + 0x0107: { n:"BrtBeginEcWpTables", f:parsenoop }, + 0x0108: { n:"BrtEndECWPTables", f:parsenoop }, + 0x0109: { n:"BrtBeginECParams", f:parsenoop }, + 0x010A: { n:"BrtEndECParams", f:parsenoop }, + 0x010B: { n:"BrtBeginECParam", f:parsenoop }, + 0x010C: { n:"BrtEndECParam", f:parsenoop }, + 0x010D: { n:"BrtBeginPCDKPIs", f:parsenoop }, + 0x010E: { n:"BrtEndPCDKPIs", f:parsenoop }, + 0x010F: { n:"BrtBeginPCDKPI", f:parsenoop }, + 0x0110: { n:"BrtEndPCDKPI", f:parsenoop }, + 0x0111: { n:"BrtBeginDims", f:parsenoop }, + 0x0112: { n:"BrtEndDims", f:parsenoop }, + 0x0113: { n:"BrtBeginDim", f:parsenoop }, + 0x0114: { n:"BrtEndDim", f:parsenoop }, + 0x0115: { n:"BrtIndexPartEnd", f:parsenoop }, + 0x0116: { n:"BrtBeginStyleSheet", f:parsenoop }, + 0x0117: { n:"BrtEndStyleSheet", f:parsenoop }, + 0x0118: { n:"BrtBeginSXView", f:parsenoop }, + 0x0119: { n:"BrtEndSXVI", f:parsenoop }, + 0x011A: { n:"BrtBeginSXVI", f:parsenoop }, + 0x011B: { n:"BrtBeginSXVIs", f:parsenoop }, + 0x011C: { n:"BrtEndSXVIs", f:parsenoop }, + 0x011D: { n:"BrtBeginSXVD", f:parsenoop }, + 0x011E: { n:"BrtEndSXVD", f:parsenoop }, + 0x011F: { n:"BrtBeginSXVDs", f:parsenoop }, + 0x0120: { n:"BrtEndSXVDs", f:parsenoop }, + 0x0121: { n:"BrtBeginSXPI", f:parsenoop }, + 0x0122: { n:"BrtEndSXPI", f:parsenoop }, + 0x0123: { n:"BrtBeginSXPIs", f:parsenoop }, + 0x0124: { n:"BrtEndSXPIs", f:parsenoop }, + 0x0125: { n:"BrtBeginSXDI", f:parsenoop }, + 0x0126: { n:"BrtEndSXDI", f:parsenoop }, + 0x0127: { n:"BrtBeginSXDIs", f:parsenoop }, + 0x0128: { n:"BrtEndSXDIs", f:parsenoop }, + 0x0129: { n:"BrtBeginSXLI", f:parsenoop }, + 0x012A: { n:"BrtEndSXLI", f:parsenoop }, + 0x012B: { n:"BrtBeginSXLIRws", f:parsenoop }, + 0x012C: { n:"BrtEndSXLIRws", f:parsenoop }, + 0x012D: { n:"BrtBeginSXLICols", f:parsenoop }, + 0x012E: { n:"BrtEndSXLICols", f:parsenoop }, + 0x012F: { n:"BrtBeginSXFormat", f:parsenoop }, + 0x0130: { n:"BrtEndSXFormat", f:parsenoop }, + 0x0131: { n:"BrtBeginSXFormats", f:parsenoop }, + 0x0132: { n:"BrtEndSxFormats", f:parsenoop }, + 0x0133: { n:"BrtBeginSxSelect", f:parsenoop }, + 0x0134: { n:"BrtEndSxSelect", f:parsenoop }, + 0x0135: { n:"BrtBeginISXVDRws", f:parsenoop }, + 0x0136: { n:"BrtEndISXVDRws", f:parsenoop }, + 0x0137: { n:"BrtBeginISXVDCols", f:parsenoop }, + 0x0138: { n:"BrtEndISXVDCols", f:parsenoop }, + 0x0139: { n:"BrtEndSXLocation", f:parsenoop }, + 0x013A: { n:"BrtBeginSXLocation", f:parsenoop }, + 0x013B: { n:"BrtEndSXView", f:parsenoop }, + 0x013C: { n:"BrtBeginSXTHs", f:parsenoop }, + 0x013D: { n:"BrtEndSXTHs", f:parsenoop }, + 0x013E: { n:"BrtBeginSXTH", f:parsenoop }, + 0x013F: { n:"BrtEndSXTH", f:parsenoop }, + 0x0140: { n:"BrtBeginISXTHRws", f:parsenoop }, + 0x0141: { n:"BrtEndISXTHRws", f:parsenoop }, + 0x0142: { n:"BrtBeginISXTHCols", f:parsenoop }, + 0x0143: { n:"BrtEndISXTHCols", f:parsenoop }, + 0x0144: { n:"BrtBeginSXTDMPS", f:parsenoop }, + 0x0145: { n:"BrtEndSXTDMPs", f:parsenoop }, + 0x0146: { n:"BrtBeginSXTDMP", f:parsenoop }, + 0x0147: { n:"BrtEndSXTDMP", f:parsenoop }, + 0x0148: { n:"BrtBeginSXTHItems", f:parsenoop }, + 0x0149: { n:"BrtEndSXTHItems", f:parsenoop }, + 0x014A: { n:"BrtBeginSXTHItem", f:parsenoop }, + 0x014B: { n:"BrtEndSXTHItem", f:parsenoop }, + 0x014C: { n:"BrtBeginMetadata", f:parsenoop }, + 0x014D: { n:"BrtEndMetadata", f:parsenoop }, + 0x014E: { n:"BrtBeginEsmdtinfo", f:parsenoop }, + 0x014F: { n:"BrtMdtinfo", f:parsenoop }, + 0x0150: { n:"BrtEndEsmdtinfo", f:parsenoop }, + 0x0151: { n:"BrtBeginEsmdb", f:parsenoop }, + 0x0152: { n:"BrtEndEsmdb", f:parsenoop }, + 0x0153: { n:"BrtBeginEsfmd", f:parsenoop }, + 0x0154: { n:"BrtEndEsfmd", f:parsenoop }, + 0x0155: { n:"BrtBeginSingleCells", f:parsenoop }, + 0x0156: { n:"BrtEndSingleCells", f:parsenoop }, + 0x0157: { n:"BrtBeginList", f:parsenoop }, + 0x0158: { n:"BrtEndList", f:parsenoop }, + 0x0159: { n:"BrtBeginListCols", f:parsenoop }, + 0x015A: { n:"BrtEndListCols", f:parsenoop }, + 0x015B: { n:"BrtBeginListCol", f:parsenoop }, + 0x015C: { n:"BrtEndListCol", f:parsenoop }, + 0x015D: { n:"BrtBeginListXmlCPr", f:parsenoop }, + 0x015E: { n:"BrtEndListXmlCPr", f:parsenoop }, + 0x015F: { n:"BrtListCCFmla", f:parsenoop }, + 0x0160: { n:"BrtListTrFmla", f:parsenoop }, + 0x0161: { n:"BrtBeginExternals", f:parsenoop }, + 0x0162: { n:"BrtEndExternals", f:parsenoop }, + 0x0163: { n:"BrtSupBookSrc", f:parsenoop }, + 0x0165: { n:"BrtSupSelf", f:parsenoop }, + 0x0166: { n:"BrtSupSame", f:parsenoop }, + 0x0167: { n:"BrtSupTabs", f:parsenoop }, + 0x0168: { n:"BrtBeginSupBook", f:parsenoop }, + 0x0169: { n:"BrtPlaceholderName", f:parsenoop }, + 0x016A: { n:"BrtExternSheet", f:parsenoop }, + 0x016B: { n:"BrtExternTableStart", f:parsenoop }, + 0x016C: { n:"BrtExternTableEnd", f:parsenoop }, + 0x016E: { n:"BrtExternRowHdr", f:parsenoop }, + 0x016F: { n:"BrtExternCellBlank", f:parsenoop }, + 0x0170: { n:"BrtExternCellReal", f:parsenoop }, + 0x0171: { n:"BrtExternCellBool", f:parsenoop }, + 0x0172: { n:"BrtExternCellError", f:parsenoop }, + 0x0173: { n:"BrtExternCellString", f:parsenoop }, + 0x0174: { n:"BrtBeginEsmdx", f:parsenoop }, + 0x0175: { n:"BrtEndEsmdx", f:parsenoop }, + 0x0176: { n:"BrtBeginMdxSet", f:parsenoop }, + 0x0177: { n:"BrtEndMdxSet", f:parsenoop }, + 0x0178: { n:"BrtBeginMdxMbrProp", f:parsenoop }, + 0x0179: { n:"BrtEndMdxMbrProp", f:parsenoop }, + 0x017A: { n:"BrtBeginMdxKPI", f:parsenoop }, + 0x017B: { n:"BrtEndMdxKPI", f:parsenoop }, + 0x017C: { n:"BrtBeginEsstr", f:parsenoop }, + 0x017D: { n:"BrtEndEsstr", f:parsenoop }, + 0x017E: { n:"BrtBeginPRFItem", f:parsenoop }, + 0x017F: { n:"BrtEndPRFItem", f:parsenoop }, + 0x0180: { n:"BrtBeginPivotCacheIDs", f:parsenoop }, + 0x0181: { n:"BrtEndPivotCacheIDs", f:parsenoop }, + 0x0182: { n:"BrtBeginPivotCacheID", f:parsenoop }, + 0x0183: { n:"BrtEndPivotCacheID", f:parsenoop }, + 0x0184: { n:"BrtBeginISXVIs", f:parsenoop }, + 0x0185: { n:"BrtEndISXVIs", f:parsenoop }, + 0x0186: { n:"BrtBeginColInfos", f:parsenoop }, + 0x0187: { n:"BrtEndColInfos", f:parsenoop }, + 0x0188: { n:"BrtBeginRwBrk", f:parsenoop }, + 0x0189: { n:"BrtEndRwBrk", f:parsenoop }, + 0x018A: { n:"BrtBeginColBrk", f:parsenoop }, + 0x018B: { n:"BrtEndColBrk", f:parsenoop }, + 0x018C: { n:"BrtBrk", f:parsenoop }, + 0x018D: { n:"BrtUserBookView", f:parsenoop }, + 0x018E: { n:"BrtInfo", f:parsenoop }, + 0x018F: { n:"BrtCUsr", f:parsenoop }, + 0x0190: { n:"BrtUsr", f:parsenoop }, + 0x0191: { n:"BrtBeginUsers", f:parsenoop }, + 0x0193: { n:"BrtEOF", f:parsenoop }, + 0x0194: { n:"BrtUCR", f:parsenoop }, + 0x0195: { n:"BrtRRInsDel", f:parsenoop }, + 0x0196: { n:"BrtRREndInsDel", f:parsenoop }, + 0x0197: { n:"BrtRRMove", f:parsenoop }, + 0x0198: { n:"BrtRREndMove", f:parsenoop }, + 0x0199: { n:"BrtRRChgCell", f:parsenoop }, + 0x019A: { n:"BrtRREndChgCell", f:parsenoop }, + 0x019B: { n:"BrtRRHeader", f:parsenoop }, + 0x019C: { n:"BrtRRUserView", f:parsenoop }, + 0x019D: { n:"BrtRRRenSheet", f:parsenoop }, + 0x019E: { n:"BrtRRInsertSh", f:parsenoop }, + 0x019F: { n:"BrtRRDefName", f:parsenoop }, + 0x01A0: { n:"BrtRRNote", f:parsenoop }, + 0x01A1: { n:"BrtRRConflict", f:parsenoop }, + 0x01A2: { n:"BrtRRTQSIF", f:parsenoop }, + 0x01A3: { n:"BrtRRFormat", f:parsenoop }, + 0x01A4: { n:"BrtRREndFormat", f:parsenoop }, + 0x01A5: { n:"BrtRRAutoFmt", f:parsenoop }, + 0x01A6: { n:"BrtBeginUserShViews", f:parsenoop }, + 0x01A7: { n:"BrtBeginUserShView", f:parsenoop }, + 0x01A8: { n:"BrtEndUserShView", f:parsenoop }, + 0x01A9: { n:"BrtEndUserShViews", f:parsenoop }, + 0x01AA: { n:"BrtArrFmla", f:parsenoop }, + 0x01AB: { n:"BrtShrFmla", f:parsenoop }, + 0x01AC: { n:"BrtTable", f:parsenoop }, + 0x01AD: { n:"BrtBeginExtConnections", f:parsenoop }, + 0x01AE: { n:"BrtEndExtConnections", f:parsenoop }, + 0x01AF: { n:"BrtBeginPCDCalcMems", f:parsenoop }, + 0x01B0: { n:"BrtEndPCDCalcMems", f:parsenoop }, + 0x01B1: { n:"BrtBeginPCDCalcMem", f:parsenoop }, + 0x01B2: { n:"BrtEndPCDCalcMem", f:parsenoop }, + 0x01B3: { n:"BrtBeginPCDHGLevels", f:parsenoop }, + 0x01B4: { n:"BrtEndPCDHGLevels", f:parsenoop }, + 0x01B5: { n:"BrtBeginPCDHGLevel", f:parsenoop }, + 0x01B6: { n:"BrtEndPCDHGLevel", f:parsenoop }, + 0x01B7: { n:"BrtBeginPCDHGLGroups", f:parsenoop }, + 0x01B8: { n:"BrtEndPCDHGLGroups", f:parsenoop }, + 0x01B9: { n:"BrtBeginPCDHGLGroup", f:parsenoop }, + 0x01BA: { n:"BrtEndPCDHGLGroup", f:parsenoop }, + 0x01BB: { n:"BrtBeginPCDHGLGMembers", f:parsenoop }, + 0x01BC: { n:"BrtEndPCDHGLGMembers", f:parsenoop }, + 0x01BD: { n:"BrtBeginPCDHGLGMember", f:parsenoop }, + 0x01BE: { n:"BrtEndPCDHGLGMember", f:parsenoop }, + 0x01BF: { n:"BrtBeginQSI", f:parsenoop }, + 0x01C0: { n:"BrtEndQSI", f:parsenoop }, + 0x01C1: { n:"BrtBeginQSIR", f:parsenoop }, + 0x01C2: { n:"BrtEndQSIR", f:parsenoop }, + 0x01C3: { n:"BrtBeginDeletedNames", f:parsenoop }, + 0x01C4: { n:"BrtEndDeletedNames", f:parsenoop }, + 0x01C5: { n:"BrtBeginDeletedName", f:parsenoop }, + 0x01C6: { n:"BrtEndDeletedName", f:parsenoop }, + 0x01C7: { n:"BrtBeginQSIFs", f:parsenoop }, + 0x01C8: { n:"BrtEndQSIFs", f:parsenoop }, + 0x01C9: { n:"BrtBeginQSIF", f:parsenoop }, + 0x01CA: { n:"BrtEndQSIF", f:parsenoop }, + 0x01CB: { n:"BrtBeginAutoSortScope", f:parsenoop }, + 0x01CC: { n:"BrtEndAutoSortScope", f:parsenoop }, + 0x01CD: { n:"BrtBeginConditionalFormatting", f:parsenoop }, + 0x01CE: { n:"BrtEndConditionalFormatting", f:parsenoop }, + 0x01CF: { n:"BrtBeginCFRule", f:parsenoop }, + 0x01D0: { n:"BrtEndCFRule", f:parsenoop }, + 0x01D1: { n:"BrtBeginIconSet", f:parsenoop }, + 0x01D2: { n:"BrtEndIconSet", f:parsenoop }, + 0x01D3: { n:"BrtBeginDatabar", f:parsenoop }, + 0x01D4: { n:"BrtEndDatabar", f:parsenoop }, + 0x01D5: { n:"BrtBeginColorScale", f:parsenoop }, + 0x01D6: { n:"BrtEndColorScale", f:parsenoop }, + 0x01D7: { n:"BrtCFVO", f:parsenoop }, + 0x01D8: { n:"BrtExternValueMeta", f:parsenoop }, + 0x01D9: { n:"BrtBeginColorPalette", f:parsenoop }, + 0x01DA: { n:"BrtEndColorPalette", f:parsenoop }, + 0x01DB: { n:"BrtIndexedColor", f:parsenoop }, + 0x01DC: { n:"BrtMargins", f:parsenoop }, + 0x01DD: { n:"BrtPrintOptions", f:parsenoop }, + 0x01DE: { n:"BrtPageSetup", f:parsenoop }, + 0x01DF: { n:"BrtBeginHeaderFooter", f:parsenoop }, + 0x01E0: { n:"BrtEndHeaderFooter", f:parsenoop }, + 0x01E1: { n:"BrtBeginSXCrtFormat", f:parsenoop }, + 0x01E2: { n:"BrtEndSXCrtFormat", f:parsenoop }, + 0x01E3: { n:"BrtBeginSXCrtFormats", f:parsenoop }, + 0x01E4: { n:"BrtEndSXCrtFormats", f:parsenoop }, + 0x01E5: { n:"BrtWsFmtInfo", f:parsenoop }, + 0x01E6: { n:"BrtBeginMgs", f:parsenoop }, + 0x01E7: { n:"BrtEndMGs", f:parsenoop }, + 0x01E8: { n:"BrtBeginMGMaps", f:parsenoop }, + 0x01E9: { n:"BrtEndMGMaps", f:parsenoop }, + 0x01EA: { n:"BrtBeginMG", f:parsenoop }, + 0x01EB: { n:"BrtEndMG", f:parsenoop }, + 0x01EC: { n:"BrtBeginMap", f:parsenoop }, + 0x01ED: { n:"BrtEndMap", f:parsenoop }, + 0x01EE: { n:"BrtHLink", f:parse_BrtHLink }, + 0x01EF: { n:"BrtBeginDCon", f:parsenoop }, + 0x01F0: { n:"BrtEndDCon", f:parsenoop }, + 0x01F1: { n:"BrtBeginDRefs", f:parsenoop }, + 0x01F2: { n:"BrtEndDRefs", f:parsenoop }, + 0x01F3: { n:"BrtDRef", f:parsenoop }, + 0x01F4: { n:"BrtBeginScenMan", f:parsenoop }, + 0x01F5: { n:"BrtEndScenMan", f:parsenoop }, + 0x01F6: { n:"BrtBeginSct", f:parsenoop }, + 0x01F7: { n:"BrtEndSct", f:parsenoop }, + 0x01F8: { n:"BrtSlc", f:parsenoop }, + 0x01F9: { n:"BrtBeginDXFs", f:parsenoop }, + 0x01FA: { n:"BrtEndDXFs", f:parsenoop }, + 0x01FB: { n:"BrtDXF", f:parsenoop }, + 0x01FC: { n:"BrtBeginTableStyles", f:parsenoop }, + 0x01FD: { n:"BrtEndTableStyles", f:parsenoop }, + 0x01FE: { n:"BrtBeginTableStyle", f:parsenoop }, + 0x01FF: { n:"BrtEndTableStyle", f:parsenoop }, + 0x0200: { n:"BrtTableStyleElement", f:parsenoop }, + 0x0201: { n:"BrtTableStyleClient", f:parsenoop }, + 0x0202: { n:"BrtBeginVolDeps", f:parsenoop }, + 0x0203: { n:"BrtEndVolDeps", f:parsenoop }, + 0x0204: { n:"BrtBeginVolType", f:parsenoop }, + 0x0205: { n:"BrtEndVolType", f:parsenoop }, + 0x0206: { n:"BrtBeginVolMain", f:parsenoop }, + 0x0207: { n:"BrtEndVolMain", f:parsenoop }, + 0x0208: { n:"BrtBeginVolTopic", f:parsenoop }, + 0x0209: { n:"BrtEndVolTopic", f:parsenoop }, + 0x020A: { n:"BrtVolSubtopic", f:parsenoop }, + 0x020B: { n:"BrtVolRef", f:parsenoop }, + 0x020C: { n:"BrtVolNum", f:parsenoop }, + 0x020D: { n:"BrtVolErr", f:parsenoop }, + 0x020E: { n:"BrtVolStr", f:parsenoop }, + 0x020F: { n:"BrtVolBool", f:parsenoop }, + 0x0210: { n:"BrtBeginCalcChain$", f:parsenoop }, + 0x0211: { n:"BrtEndCalcChain$", f:parsenoop }, + 0x0212: { n:"BrtBeginSortState", f:parsenoop }, + 0x0213: { n:"BrtEndSortState", f:parsenoop }, + 0x0214: { n:"BrtBeginSortCond", f:parsenoop }, + 0x0215: { n:"BrtEndSortCond", f:parsenoop }, + 0x0216: { n:"BrtBookProtection", f:parsenoop }, + 0x0217: { n:"BrtSheetProtection", f:parsenoop }, + 0x0218: { n:"BrtRangeProtection", f:parsenoop }, + 0x0219: { n:"BrtPhoneticInfo", f:parsenoop }, + 0x021A: { n:"BrtBeginECTxtWiz", f:parsenoop }, + 0x021B: { n:"BrtEndECTxtWiz", f:parsenoop }, + 0x021C: { n:"BrtBeginECTWFldInfoLst", f:parsenoop }, + 0x021D: { n:"BrtEndECTWFldInfoLst", f:parsenoop }, + 0x021E: { n:"BrtBeginECTwFldInfo", f:parsenoop }, + 0x0224: { n:"BrtFileSharing", f:parsenoop }, + 0x0225: { n:"BrtOleSize", f:parsenoop }, + 0x0226: { n:"BrtDrawing", f:parsenoop }, + 0x0227: { n:"BrtLegacyDrawing", f:parsenoop }, + 0x0228: { n:"BrtLegacyDrawingHF", f:parsenoop }, + 0x0229: { n:"BrtWebOpt", f:parsenoop }, + 0x022A: { n:"BrtBeginWebPubItems", f:parsenoop }, + 0x022B: { n:"BrtEndWebPubItems", f:parsenoop }, + 0x022C: { n:"BrtBeginWebPubItem", f:parsenoop }, + 0x022D: { n:"BrtEndWebPubItem", f:parsenoop }, + 0x022E: { n:"BrtBeginSXCondFmt", f:parsenoop }, + 0x022F: { n:"BrtEndSXCondFmt", f:parsenoop }, + 0x0230: { n:"BrtBeginSXCondFmts", f:parsenoop }, + 0x0231: { n:"BrtEndSXCondFmts", f:parsenoop }, + 0x0232: { n:"BrtBkHim", f:parsenoop }, + 0x0234: { n:"BrtColor", f:parsenoop }, + 0x0235: { n:"BrtBeginIndexedColors", f:parsenoop }, + 0x0236: { n:"BrtEndIndexedColors", f:parsenoop }, + 0x0239: { n:"BrtBeginMRUColors", f:parsenoop }, + 0x023A: { n:"BrtEndMRUColors", f:parsenoop }, + 0x023C: { n:"BrtMRUColor", f:parsenoop }, + 0x023D: { n:"BrtBeginDVals", f:parsenoop }, + 0x023E: { n:"BrtEndDVals", f:parsenoop }, + 0x0241: { n:"BrtSupNameStart", f:parsenoop }, + 0x0242: { n:"BrtSupNameValueStart", f:parsenoop }, + 0x0243: { n:"BrtSupNameValueEnd", f:parsenoop }, + 0x0244: { n:"BrtSupNameNum", f:parsenoop }, + 0x0245: { n:"BrtSupNameErr", f:parsenoop }, + 0x0246: { n:"BrtSupNameSt", f:parsenoop }, + 0x0247: { n:"BrtSupNameNil", f:parsenoop }, + 0x0248: { n:"BrtSupNameBool", f:parsenoop }, + 0x0249: { n:"BrtSupNameFmla", f:parsenoop }, + 0x024A: { n:"BrtSupNameBits", f:parsenoop }, + 0x024B: { n:"BrtSupNameEnd", f:parsenoop }, + 0x024C: { n:"BrtEndSupBook", f:parsenoop }, + 0x024D: { n:"BrtCellSmartTagProperty", f:parsenoop }, + 0x024E: { n:"BrtBeginCellSmartTag", f:parsenoop }, + 0x024F: { n:"BrtEndCellSmartTag", f:parsenoop }, + 0x0250: { n:"BrtBeginCellSmartTags", f:parsenoop }, + 0x0251: { n:"BrtEndCellSmartTags", f:parsenoop }, + 0x0252: { n:"BrtBeginSmartTags", f:parsenoop }, + 0x0253: { n:"BrtEndSmartTags", f:parsenoop }, + 0x0254: { n:"BrtSmartTagType", f:parsenoop }, + 0x0255: { n:"BrtBeginSmartTagTypes", f:parsenoop }, + 0x0256: { n:"BrtEndSmartTagTypes", f:parsenoop }, + 0x0257: { n:"BrtBeginSXFilters", f:parsenoop }, + 0x0258: { n:"BrtEndSXFilters", f:parsenoop }, + 0x0259: { n:"BrtBeginSXFILTER", f:parsenoop }, + 0x025A: { n:"BrtEndSXFilter", f:parsenoop }, + 0x025B: { n:"BrtBeginFills", f:parsenoop }, + 0x025C: { n:"BrtEndFills", f:parsenoop }, + 0x025D: { n:"BrtBeginCellWatches", f:parsenoop }, + 0x025E: { n:"BrtEndCellWatches", f:parsenoop }, + 0x025F: { n:"BrtCellWatch", f:parsenoop }, + 0x0260: { n:"BrtBeginCRErrs", f:parsenoop }, + 0x0261: { n:"BrtEndCRErrs", f:parsenoop }, + 0x0262: { n:"BrtCrashRecErr", f:parsenoop }, + 0x0263: { n:"BrtBeginFonts", f:parsenoop }, + 0x0264: { n:"BrtEndFonts", f:parsenoop }, + 0x0265: { n:"BrtBeginBorders", f:parsenoop }, + 0x0266: { n:"BrtEndBorders", f:parsenoop }, + 0x0267: { n:"BrtBeginFmts", f:parsenoop }, + 0x0268: { n:"BrtEndFmts", f:parsenoop }, + 0x0269: { n:"BrtBeginCellXFs", f:parsenoop }, + 0x026A: { n:"BrtEndCellXFs", f:parsenoop }, + 0x026B: { n:"BrtBeginStyles", f:parsenoop }, + 0x026C: { n:"BrtEndStyles", f:parsenoop }, + 0x0271: { n:"BrtBigName", f:parsenoop }, + 0x0272: { n:"BrtBeginCellStyleXFs", f:parsenoop }, + 0x0273: { n:"BrtEndCellStyleXFs", f:parsenoop }, + 0x0274: { n:"BrtBeginComments", f:parsenoop }, + 0x0275: { n:"BrtEndComments", f:parsenoop }, + 0x0276: { n:"BrtBeginCommentAuthors", f:parsenoop }, + 0x0277: { n:"BrtEndCommentAuthors", f:parsenoop }, + 0x0278: { n:"BrtCommentAuthor", f:parse_BrtCommentAuthor }, + 0x0279: { n:"BrtBeginCommentList", f:parsenoop }, + 0x027A: { n:"BrtEndCommentList", f:parsenoop }, + 0x027B: { n:"BrtBeginComment", f:parse_BrtBeginComment}, + 0x027C: { n:"BrtEndComment", f:parsenoop }, + 0x027D: { n:"BrtCommentText", f:parse_BrtCommentText }, + 0x027E: { n:"BrtBeginOleObjects", f:parsenoop }, + 0x027F: { n:"BrtOleObject", f:parsenoop }, + 0x0280: { n:"BrtEndOleObjects", f:parsenoop }, + 0x0281: { n:"BrtBeginSxrules", f:parsenoop }, + 0x0282: { n:"BrtEndSxRules", f:parsenoop }, + 0x0283: { n:"BrtBeginActiveXControls", f:parsenoop }, + 0x0284: { n:"BrtActiveX", f:parsenoop }, + 0x0285: { n:"BrtEndActiveXControls", f:parsenoop }, + 0x0286: { n:"BrtBeginPCDSDTCEMembersSortBy", f:parsenoop }, + 0x0288: { n:"BrtBeginCellIgnoreECs", f:parsenoop }, + 0x0289: { n:"BrtCellIgnoreEC", f:parsenoop }, + 0x028A: { n:"BrtEndCellIgnoreECs", f:parsenoop }, + 0x028B: { n:"BrtCsProp", f:parsenoop }, + 0x028C: { n:"BrtCsPageSetup", f:parsenoop }, + 0x028D: { n:"BrtBeginUserCsViews", f:parsenoop }, + 0x028E: { n:"BrtEndUserCsViews", f:parsenoop }, + 0x028F: { n:"BrtBeginUserCsView", f:parsenoop }, + 0x0290: { n:"BrtEndUserCsView", f:parsenoop }, + 0x0291: { n:"BrtBeginPcdSFCIEntries", f:parsenoop }, + 0x0292: { n:"BrtEndPCDSFCIEntries", f:parsenoop }, + 0x0293: { n:"BrtPCDSFCIEntry", f:parsenoop }, + 0x0294: { n:"BrtBeginListParts", f:parsenoop }, + 0x0295: { n:"BrtListPart", f:parsenoop }, + 0x0296: { n:"BrtEndListParts", f:parsenoop }, + 0x0297: { n:"BrtSheetCalcProp", f:parsenoop }, + 0x0298: { n:"BrtBeginFnGroup", f:parsenoop }, + 0x0299: { n:"BrtFnGroup", f:parsenoop }, + 0x029A: { n:"BrtEndFnGroup", f:parsenoop }, + 0x029B: { n:"BrtSupAddin", f:parsenoop }, + 0x029C: { n:"BrtSXTDMPOrder", f:parsenoop }, + 0x029D: { n:"BrtCsProtection", f:parsenoop }, + 0x029F: { n:"BrtBeginWsSortMap", f:parsenoop }, + 0x02A0: { n:"BrtEndWsSortMap", f:parsenoop }, + 0x02A1: { n:"BrtBeginRRSort", f:parsenoop }, + 0x02A2: { n:"BrtEndRRSort", f:parsenoop }, + 0x02A3: { n:"BrtRRSortItem", f:parsenoop }, + 0x02A4: { n:"BrtFileSharingIso", f:parsenoop }, + 0x02A5: { n:"BrtBookProtectionIso", f:parsenoop }, + 0x02A6: { n:"BrtSheetProtectionIso", f:parsenoop }, + 0x02A7: { n:"BrtCsProtectionIso", f:parsenoop }, + 0x02A8: { n:"BrtRangeProtectionIso", f:parsenoop }, + 0x0400: { n:"BrtRwDescent", f:parsenoop }, + 0x0401: { n:"BrtKnownFonts", f:parsenoop }, + 0x0402: { n:"BrtBeginSXTupleSet", f:parsenoop }, + 0x0403: { n:"BrtEndSXTupleSet", f:parsenoop }, + 0x0404: { n:"BrtBeginSXTupleSetHeader", f:parsenoop }, + 0x0405: { n:"BrtEndSXTupleSetHeader", f:parsenoop }, + 0x0406: { n:"BrtSXTupleSetHeaderItem", f:parsenoop }, + 0x0407: { n:"BrtBeginSXTupleSetData", f:parsenoop }, + 0x0408: { n:"BrtEndSXTupleSetData", f:parsenoop }, + 0x0409: { n:"BrtBeginSXTupleSetRow", f:parsenoop }, + 0x040A: { n:"BrtEndSXTupleSetRow", f:parsenoop }, + 0x040B: { n:"BrtSXTupleSetRowItem", f:parsenoop }, + 0x040C: { n:"BrtNameExt", f:parsenoop }, + 0x040D: { n:"BrtPCDH14", f:parsenoop }, + 0x040E: { n:"BrtBeginPCDCalcMem14", f:parsenoop }, + 0x040F: { n:"BrtEndPCDCalcMem14", f:parsenoop }, + 0x0410: { n:"BrtSXTH14", f:parsenoop }, + 0x0411: { n:"BrtBeginSparklineGroup", f:parsenoop }, + 0x0412: { n:"BrtEndSparklineGroup", f:parsenoop }, + 0x0413: { n:"BrtSparkline", f:parsenoop }, + 0x0414: { n:"BrtSXDI14", f:parsenoop }, + 0x0415: { n:"BrtWsFmtInfoEx14", f:parsenoop }, + 0x0416: { n:"BrtBeginConditionalFormatting14", f:parsenoop }, + 0x0417: { n:"BrtEndConditionalFormatting14", f:parsenoop }, + 0x0418: { n:"BrtBeginCFRule14", f:parsenoop }, + 0x0419: { n:"BrtEndCFRule14", f:parsenoop }, + 0x041A: { n:"BrtCFVO14", f:parsenoop }, + 0x041B: { n:"BrtBeginDatabar14", f:parsenoop }, + 0x041C: { n:"BrtBeginIconSet14", f:parsenoop }, + 0x041D: { n:"BrtDVal14", f:parsenoop }, + 0x041E: { n:"BrtBeginDVals14", f:parsenoop }, + 0x041F: { n:"BrtColor14", f:parsenoop }, + 0x0420: { n:"BrtBeginSparklines", f:parsenoop }, + 0x0421: { n:"BrtEndSparklines", f:parsenoop }, + 0x0422: { n:"BrtBeginSparklineGroups", f:parsenoop }, + 0x0423: { n:"BrtEndSparklineGroups", f:parsenoop }, + 0x0425: { n:"BrtSXVD14", f:parsenoop }, + 0x0426: { n:"BrtBeginSxview14", f:parsenoop }, + 0x0427: { n:"BrtEndSxview14", f:parsenoop }, + 0x042A: { n:"BrtBeginPCD14", f:parsenoop }, + 0x042B: { n:"BrtEndPCD14", f:parsenoop }, + 0x042C: { n:"BrtBeginExtConn14", f:parsenoop }, + 0x042D: { n:"BrtEndExtConn14", f:parsenoop }, + 0x042E: { n:"BrtBeginSlicerCacheIDs", f:parsenoop }, + 0x042F: { n:"BrtEndSlicerCacheIDs", f:parsenoop }, + 0x0430: { n:"BrtBeginSlicerCacheID", f:parsenoop }, + 0x0431: { n:"BrtEndSlicerCacheID", f:parsenoop }, + 0x0433: { n:"BrtBeginSlicerCache", f:parsenoop }, + 0x0434: { n:"BrtEndSlicerCache", f:parsenoop }, + 0x0435: { n:"BrtBeginSlicerCacheDef", f:parsenoop }, + 0x0436: { n:"BrtEndSlicerCacheDef", f:parsenoop }, + 0x0437: { n:"BrtBeginSlicersEx", f:parsenoop }, + 0x0438: { n:"BrtEndSlicersEx", f:parsenoop }, + 0x0439: { n:"BrtBeginSlicerEx", f:parsenoop }, + 0x043A: { n:"BrtEndSlicerEx", f:parsenoop }, + 0x043B: { n:"BrtBeginSlicer", f:parsenoop }, + 0x043C: { n:"BrtEndSlicer", f:parsenoop }, + 0x043D: { n:"BrtSlicerCachePivotTables", f:parsenoop }, + 0x043E: { n:"BrtBeginSlicerCacheOlapImpl", f:parsenoop }, + 0x043F: { n:"BrtEndSlicerCacheOlapImpl", f:parsenoop }, + 0x0440: { n:"BrtBeginSlicerCacheLevelsData", f:parsenoop }, + 0x0441: { n:"BrtEndSlicerCacheLevelsData", f:parsenoop }, + 0x0442: { n:"BrtBeginSlicerCacheLevelData", f:parsenoop }, + 0x0443: { n:"BrtEndSlicerCacheLevelData", f:parsenoop }, + 0x0444: { n:"BrtBeginSlicerCacheSiRanges", f:parsenoop }, + 0x0445: { n:"BrtEndSlicerCacheSiRanges", f:parsenoop }, + 0x0446: { n:"BrtBeginSlicerCacheSiRange", f:parsenoop }, + 0x0447: { n:"BrtEndSlicerCacheSiRange", f:parsenoop }, + 0x0448: { n:"BrtSlicerCacheOlapItem", f:parsenoop }, + 0x0449: { n:"BrtBeginSlicerCacheSelections", f:parsenoop }, + 0x044A: { n:"BrtSlicerCacheSelection", f:parsenoop }, + 0x044B: { n:"BrtEndSlicerCacheSelections", f:parsenoop }, + 0x044C: { n:"BrtBeginSlicerCacheNative", f:parsenoop }, + 0x044D: { n:"BrtEndSlicerCacheNative", f:parsenoop }, + 0x044E: { n:"BrtSlicerCacheNativeItem", f:parsenoop }, + 0x044F: { n:"BrtRangeProtection14", f:parsenoop }, + 0x0450: { n:"BrtRangeProtectionIso14", f:parsenoop }, + 0x0451: { n:"BrtCellIgnoreEC14", f:parsenoop }, + 0x0457: { n:"BrtList14", f:parsenoop }, + 0x0458: { n:"BrtCFIcon", f:parsenoop }, + 0x0459: { n:"BrtBeginSlicerCachesPivotCacheIDs", f:parsenoop }, + 0x045A: { n:"BrtEndSlicerCachesPivotCacheIDs", f:parsenoop }, + 0x045B: { n:"BrtBeginSlicers", f:parsenoop }, + 0x045C: { n:"BrtEndSlicers", f:parsenoop }, + 0x045D: { n:"BrtWbProp14", f:parsenoop }, + 0x045E: { n:"BrtBeginSXEdit", f:parsenoop }, + 0x045F: { n:"BrtEndSXEdit", f:parsenoop }, + 0x0460: { n:"BrtBeginSXEdits", f:parsenoop }, + 0x0461: { n:"BrtEndSXEdits", f:parsenoop }, + 0x0462: { n:"BrtBeginSXChange", f:parsenoop }, + 0x0463: { n:"BrtEndSXChange", f:parsenoop }, + 0x0464: { n:"BrtBeginSXChanges", f:parsenoop }, + 0x0465: { n:"BrtEndSXChanges", f:parsenoop }, + 0x0466: { n:"BrtSXTupleItems", f:parsenoop }, + 0x0468: { n:"BrtBeginSlicerStyle", f:parsenoop }, + 0x0469: { n:"BrtEndSlicerStyle", f:parsenoop }, + 0x046A: { n:"BrtSlicerStyleElement", f:parsenoop }, + 0x046B: { n:"BrtBeginStyleSheetExt14", f:parsenoop }, + 0x046C: { n:"BrtEndStyleSheetExt14", f:parsenoop }, + 0x046D: { n:"BrtBeginSlicerCachesPivotCacheID", f:parsenoop }, + 0x046E: { n:"BrtEndSlicerCachesPivotCacheID", f:parsenoop }, + 0x046F: { n:"BrtBeginConditionalFormattings", f:parsenoop }, + 0x0470: { n:"BrtEndConditionalFormattings", f:parsenoop }, + 0x0471: { n:"BrtBeginPCDCalcMemExt", f:parsenoop }, + 0x0472: { n:"BrtEndPCDCalcMemExt", f:parsenoop }, + 0x0473: { n:"BrtBeginPCDCalcMemsExt", f:parsenoop }, + 0x0474: { n:"BrtEndPCDCalcMemsExt", f:parsenoop }, + 0x0475: { n:"BrtPCDField14", f:parsenoop }, + 0x0476: { n:"BrtBeginSlicerStyles", f:parsenoop }, + 0x0477: { n:"BrtEndSlicerStyles", f:parsenoop }, + 0x0478: { n:"BrtBeginSlicerStyleElements", f:parsenoop }, + 0x0479: { n:"BrtEndSlicerStyleElements", f:parsenoop }, + 0x047A: { n:"BrtCFRuleExt", f:parsenoop }, + 0x047B: { n:"BrtBeginSXCondFmt14", f:parsenoop }, + 0x047C: { n:"BrtEndSXCondFmt14", f:parsenoop }, + 0x047D: { n:"BrtBeginSXCondFmts14", f:parsenoop }, + 0x047E: { n:"BrtEndSXCondFmts14", f:parsenoop }, + 0x0480: { n:"BrtBeginSortCond14", f:parsenoop }, + 0x0481: { n:"BrtEndSortCond14", f:parsenoop }, + 0x0482: { n:"BrtEndDVals14", f:parsenoop }, + 0x0483: { n:"BrtEndIconSet14", f:parsenoop }, + 0x0484: { n:"BrtEndDatabar14", f:parsenoop }, + 0x0485: { n:"BrtBeginColorScale14", f:parsenoop }, + 0x0486: { n:"BrtEndColorScale14", f:parsenoop }, + 0x0487: { n:"BrtBeginSxrules14", f:parsenoop }, + 0x0488: { n:"BrtEndSxrules14", f:parsenoop }, + 0x0489: { n:"BrtBeginPRule14", f:parsenoop }, + 0x048A: { n:"BrtEndPRule14", f:parsenoop }, + 0x048B: { n:"BrtBeginPRFilters14", f:parsenoop }, + 0x048C: { n:"BrtEndPRFilters14", f:parsenoop }, + 0x048D: { n:"BrtBeginPRFilter14", f:parsenoop }, + 0x048E: { n:"BrtEndPRFilter14", f:parsenoop }, + 0x048F: { n:"BrtBeginPRFItem14", f:parsenoop }, + 0x0490: { n:"BrtEndPRFItem14", f:parsenoop }, + 0x0491: { n:"BrtBeginCellIgnoreECs14", f:parsenoop }, + 0x0492: { n:"BrtEndCellIgnoreECs14", f:parsenoop }, + 0x0493: { n:"BrtDxf14", f:parsenoop }, + 0x0494: { n:"BrtBeginDxF14s", f:parsenoop }, + 0x0495: { n:"BrtEndDxf14s", f:parsenoop }, + 0x0499: { n:"BrtFilter14", f:parsenoop }, + 0x049A: { n:"BrtBeginCustomFilters14", f:parsenoop }, + 0x049C: { n:"BrtCustomFilter14", f:parsenoop }, + 0x049D: { n:"BrtIconFilter14", f:parsenoop }, + 0x049E: { n:"BrtPivotCacheConnectionName", f:parsenoop }, + 0x0800: { n:"BrtBeginDecoupledPivotCacheIDs", f:parsenoop }, + 0x0801: { n:"BrtEndDecoupledPivotCacheIDs", f:parsenoop }, + 0x0802: { n:"BrtDecoupledPivotCacheID", f:parsenoop }, + 0x0803: { n:"BrtBeginPivotTableRefs", f:parsenoop }, + 0x0804: { n:"BrtEndPivotTableRefs", f:parsenoop }, + 0x0805: { n:"BrtPivotTableRef", f:parsenoop }, + 0x0806: { n:"BrtSlicerCacheBookPivotTables", f:parsenoop }, + 0x0807: { n:"BrtBeginSxvcells", f:parsenoop }, + 0x0808: { n:"BrtEndSxvcells", f:parsenoop }, + 0x0809: { n:"BrtBeginSxRow", f:parsenoop }, + 0x080A: { n:"BrtEndSxRow", f:parsenoop }, + 0x080C: { n:"BrtPcdCalcMem15", f:parsenoop }, + 0x0813: { n:"BrtQsi15", f:parsenoop }, + 0x0814: { n:"BrtBeginWebExtensions", f:parsenoop }, + 0x0815: { n:"BrtEndWebExtensions", f:parsenoop }, + 0x0816: { n:"BrtWebExtension", f:parsenoop }, + 0x0817: { n:"BrtAbsPath15", f:parsenoop }, + 0x0818: { n:"BrtBeginPivotTableUISettings", f:parsenoop }, + 0x0819: { n:"BrtEndPivotTableUISettings", f:parsenoop }, + 0x081B: { n:"BrtTableSlicerCacheIDs", f:parsenoop }, + 0x081C: { n:"BrtTableSlicerCacheID", f:parsenoop }, + 0x081D: { n:"BrtBeginTableSlicerCache", f:parsenoop }, + 0x081E: { n:"BrtEndTableSlicerCache", f:parsenoop }, + 0x081F: { n:"BrtSxFilter15", f:parsenoop }, + 0x0820: { n:"BrtBeginTimelineCachePivotCacheIDs", f:parsenoop }, + 0x0821: { n:"BrtEndTimelineCachePivotCacheIDs", f:parsenoop }, + 0x0822: { n:"BrtTimelineCachePivotCacheID", f:parsenoop }, + 0x0823: { n:"BrtBeginTimelineCacheIDs", f:parsenoop }, + 0x0824: { n:"BrtEndTimelineCacheIDs", f:parsenoop }, + 0x0825: { n:"BrtBeginTimelineCacheID", f:parsenoop }, + 0x0826: { n:"BrtEndTimelineCacheID", f:parsenoop }, + 0x0827: { n:"BrtBeginTimelinesEx", f:parsenoop }, + 0x0828: { n:"BrtEndTimelinesEx", f:parsenoop }, + 0x0829: { n:"BrtBeginTimelineEx", f:parsenoop }, + 0x082A: { n:"BrtEndTimelineEx", f:parsenoop }, + 0x082B: { n:"BrtWorkBookPr15", f:parsenoop }, + 0x082C: { n:"BrtPCDH15", f:parsenoop }, + 0x082D: { n:"BrtBeginTimelineStyle", f:parsenoop }, + 0x082E: { n:"BrtEndTimelineStyle", f:parsenoop }, + 0x082F: { n:"BrtTimelineStyleElement", f:parsenoop }, + 0x0830: { n:"BrtBeginTimelineStylesheetExt15", f:parsenoop }, + 0x0831: { n:"BrtEndTimelineStylesheetExt15", f:parsenoop }, + 0x0832: { n:"BrtBeginTimelineStyles", f:parsenoop }, + 0x0833: { n:"BrtEndTimelineStyles", f:parsenoop }, + 0x0834: { n:"BrtBeginTimelineStyleElements", f:parsenoop }, + 0x0835: { n:"BrtEndTimelineStyleElements", f:parsenoop }, + 0x0836: { n:"BrtDxf15", f:parsenoop }, + 0x0837: { n:"BrtBeginDxfs15", f:parsenoop }, + 0x0838: { n:"brtEndDxfs15", f:parsenoop }, + 0x0839: { n:"BrtSlicerCacheHideItemsWithNoData", f:parsenoop }, + 0x083A: { n:"BrtBeginItemUniqueNames", f:parsenoop }, + 0x083B: { n:"BrtEndItemUniqueNames", f:parsenoop }, + 0x083C: { n:"BrtItemUniqueName", f:parsenoop }, + 0x083D: { n:"BrtBeginExtConn15", f:parsenoop }, + 0x083E: { n:"BrtEndExtConn15", f:parsenoop }, + 0x083F: { n:"BrtBeginOledbPr15", f:parsenoop }, + 0x0840: { n:"BrtEndOledbPr15", f:parsenoop }, + 0x0841: { n:"BrtBeginDataFeedPr15", f:parsenoop }, + 0x0842: { n:"BrtEndDataFeedPr15", f:parsenoop }, + 0x0843: { n:"BrtTextPr15", f:parsenoop }, + 0x0844: { n:"BrtRangePr15", f:parsenoop }, + 0x0845: { n:"BrtDbCommand15", f:parsenoop }, + 0x0846: { n:"BrtBeginDbTables15", f:parsenoop }, + 0x0847: { n:"BrtEndDbTables15", f:parsenoop }, + 0x0848: { n:"BrtDbTable15", f:parsenoop }, + 0x0849: { n:"BrtBeginDataModel", f:parsenoop }, + 0x084A: { n:"BrtEndDataModel", f:parsenoop }, + 0x084B: { n:"BrtBeginModelTables", f:parsenoop }, + 0x084C: { n:"BrtEndModelTables", f:parsenoop }, + 0x084D: { n:"BrtModelTable", f:parsenoop }, + 0x084E: { n:"BrtBeginModelRelationships", f:parsenoop }, + 0x084F: { n:"BrtEndModelRelationships", f:parsenoop }, + 0x0850: { n:"BrtModelRelationship", f:parsenoop }, + 0x0851: { n:"BrtBeginECTxtWiz15", f:parsenoop }, + 0x0852: { n:"BrtEndECTxtWiz15", f:parsenoop }, + 0x0853: { n:"BrtBeginECTWFldInfoLst15", f:parsenoop }, + 0x0854: { n:"BrtEndECTWFldInfoLst15", f:parsenoop }, + 0x0855: { n:"BrtBeginECTWFldInfo15", f:parsenoop }, + 0x0856: { n:"BrtFieldListActiveItem", f:parsenoop }, + 0x0857: { n:"BrtPivotCacheIdVersion", f:parsenoop }, + 0x0858: { n:"BrtSXDI15", f:parsenoop }, + 0xFFFF: { n:"", f:parsenoop } +}; + +var evert_RE = evert_key(XLSBRecordEnum, 'n'); + +/* [MS-XLS] 2.3 Record Enumeration */ +var XLSRecordEnum = { + 0x0003: { n:"BIFF2NUM", f:parse_BIFF2NUM }, + 0x0004: { n:"BIFF2STR", f:parse_BIFF2STR }, + 0x0006: { n:"Formula", f:parse_Formula }, + 0x0009: { n:'BOF', f:parse_BOF }, + 0x000a: { n:'EOF', f:parse_EOF }, + 0x000c: { n:"CalcCount", f:parse_CalcCount }, + 0x000d: { n:"CalcMode", f:parse_CalcMode }, + 0x000e: { n:"CalcPrecision", f:parse_CalcPrecision }, + 0x000f: { n:"CalcRefMode", f:parse_CalcRefMode }, + 0x0010: { n:"CalcDelta", f:parse_CalcDelta }, + 0x0011: { n:"CalcIter", f:parse_CalcIter }, + 0x0012: { n:"Protect", f:parse_Protect }, + 0x0013: { n:"Password", f:parse_Password }, + 0x0014: { n:"Header", f:parse_Header }, + 0x0015: { n:"Footer", f:parse_Footer }, + 0x0017: { n:"ExternSheet", f:parse_ExternSheet }, + 0x0018: { n:"Lbl", f:parse_Lbl }, + 0x0019: { n:"WinProtect", f:parse_WinProtect }, + 0x001a: { n:"VerticalPageBreaks", f:parse_VerticalPageBreaks }, + 0x001b: { n:"HorizontalPageBreaks", f:parse_HorizontalPageBreaks }, + 0x001c: { n:"Note", f:parse_Note }, + 0x001d: { n:"Selection", f:parse_Selection }, + 0x0022: { n:"Date1904", f:parse_Date1904 }, + 0x0023: { n:"ExternName", f:parse_ExternName }, + 0x0026: { n:"LeftMargin", f:parse_LeftMargin }, + 0x0027: { n:"RightMargin", f:parse_RightMargin }, + 0x0028: { n:"TopMargin", f:parse_TopMargin }, + 0x0029: { n:"BottomMargin", f:parse_BottomMargin }, + 0x002a: { n:"PrintRowCol", f:parse_PrintRowCol }, + 0x002b: { n:"PrintGrid", f:parse_PrintGrid }, + 0x002f: { n:"FilePass", f:parse_FilePass }, + 0x0031: { n:"Font", f:parse_Font }, + 0x0033: { n:"PrintSize", f:parse_PrintSize }, + 0x003c: { n:"Continue", f:parse_Continue }, + 0x003d: { n:"Window1", f:parse_Window1 }, + 0x0040: { n:"Backup", f:parse_Backup }, + 0x0041: { n:"Pane", f:parse_Pane }, + 0x0042: { n:'CodePage', f:parse_CodePage }, + 0x004d: { n:"Pls", f:parse_Pls }, + 0x0050: { n:"DCon", f:parse_DCon }, + 0x0051: { n:"DConRef", f:parse_DConRef }, + 0x0052: { n:"DConName", f:parse_DConName }, + 0x0055: { n:"DefColWidth", f:parse_DefColWidth }, + 0x0059: { n:"XCT", f:parse_XCT }, + 0x005a: { n:"CRN", f:parse_CRN }, + 0x005b: { n:"FileSharing", f:parse_FileSharing }, + 0x005c: { n:'WriteAccess', f:parse_WriteAccess }, + 0x005d: { n:"Obj", f:parse_Obj }, + 0x005e: { n:"Uncalced", f:parse_Uncalced }, + 0x005f: { n:"CalcSaveRecalc", f:parse_CalcSaveRecalc }, + 0x0060: { n:"Template", f:parse_Template }, + 0x0061: { n:"Intl", f:parse_Intl }, + 0x0063: { n:"ObjProtect", f:parse_ObjProtect }, + 0x007d: { n:"ColInfo", f:parse_ColInfo }, + 0x0080: { n:"Guts", f:parse_Guts }, + 0x0081: { n:"WsBool", f:parse_WsBool }, + 0x0082: { n:"GridSet", f:parse_GridSet }, + 0x0083: { n:"HCenter", f:parse_HCenter }, + 0x0084: { n:"VCenter", f:parse_VCenter }, + 0x0085: { n:'BoundSheet8', f:parse_BoundSheet8 }, + 0x0086: { n:"WriteProtect", f:parse_WriteProtect }, + 0x008c: { n:"Country", f:parse_Country }, + 0x008d: { n:"HideObj", f:parse_HideObj }, + 0x0090: { n:"Sort", f:parse_Sort }, + 0x0092: { n:"Palette", f:parse_Palette }, + 0x0097: { n:"Sync", f:parse_Sync }, + 0x0098: { n:"LPr", f:parse_LPr }, + 0x0099: { n:"DxGCol", f:parse_DxGCol }, + 0x009a: { n:"FnGroupName", f:parse_FnGroupName }, + 0x009b: { n:"FilterMode", f:parse_FilterMode }, + 0x009c: { n:"BuiltInFnGroupCount", f:parse_BuiltInFnGroupCount }, + 0x009d: { n:"AutoFilterInfo", f:parse_AutoFilterInfo }, + 0x009e: { n:"AutoFilter", f:parse_AutoFilter }, + 0x00a0: { n:"Scl", f:parse_Scl }, + 0x00a1: { n:"Setup", f:parse_Setup }, + 0x00ae: { n:"ScenMan", f:parse_ScenMan }, + 0x00af: { n:"SCENARIO", f:parse_SCENARIO }, + 0x00b0: { n:"SxView", f:parse_SxView }, + 0x00b1: { n:"Sxvd", f:parse_Sxvd }, + 0x00b2: { n:"SXVI", f:parse_SXVI }, + 0x00b4: { n:"SxIvd", f:parse_SxIvd }, + 0x00b5: { n:"SXLI", f:parse_SXLI }, + 0x00b6: { n:"SXPI", f:parse_SXPI }, + 0x00b8: { n:"DocRoute", f:parse_DocRoute }, + 0x00b9: { n:"RecipName", f:parse_RecipName }, + 0x00bd: { n:"MulRk", f:parse_MulRk }, + 0x00be: { n:"MulBlank", f:parse_MulBlank }, + 0x00c1: { n:'Mms', f:parse_Mms }, + 0x00c5: { n:"SXDI", f:parse_SXDI }, + 0x00c6: { n:"SXDB", f:parse_SXDB }, + 0x00c7: { n:"SXFDB", f:parse_SXFDB }, + 0x00c8: { n:"SXDBB", f:parse_SXDBB }, + 0x00c9: { n:"SXNum", f:parse_SXNum }, + 0x00ca: { n:"SxBool", f:parse_SxBool }, + 0x00cb: { n:"SxErr", f:parse_SxErr }, + 0x00cc: { n:"SXInt", f:parse_SXInt }, + 0x00cd: { n:"SXString", f:parse_SXString }, + 0x00ce: { n:"SXDtr", f:parse_SXDtr }, + 0x00cf: { n:"SxNil", f:parse_SxNil }, + 0x00d0: { n:"SXTbl", f:parse_SXTbl }, + 0x00d1: { n:"SXTBRGIITM", f:parse_SXTBRGIITM }, + 0x00d2: { n:"SxTbpg", f:parse_SxTbpg }, + 0x00d3: { n:"ObProj", f:parse_ObProj }, + 0x00d5: { n:"SXStreamID", f:parse_SXStreamID }, + 0x00d7: { n:"DBCell", f:parse_DBCell }, + 0x00d8: { n:"SXRng", f:parse_SXRng }, + 0x00d9: { n:"SxIsxoper", f:parse_SxIsxoper }, + 0x00da: { n:"BookBool", f:parse_BookBool }, + 0x00dc: { n:"DbOrParamQry", f:parse_DbOrParamQry }, + 0x00dd: { n:"ScenarioProtect", f:parse_ScenarioProtect }, + 0x00de: { n:"OleObjectSize", f:parse_OleObjectSize }, + 0x00e0: { n:"XF", f:parse_XF }, + 0x00e1: { n:'InterfaceHdr', f:parse_InterfaceHdr }, + 0x00e2: { n:'InterfaceEnd', f:parse_InterfaceEnd }, + 0x00e3: { n:"SXVS", f:parse_SXVS }, + 0x00e5: { n:"MergeCells", f:parse_MergeCells }, + 0x00e9: { n:"BkHim", f:parse_BkHim }, + 0x00eb: { n:"MsoDrawingGroup", f:parse_MsoDrawingGroup }, + 0x00ec: { n:"MsoDrawing", f:parse_MsoDrawing }, + 0x00ed: { n:"MsoDrawingSelection", f:parse_MsoDrawingSelection }, + 0x00ef: { n:"PhoneticInfo", f:parse_PhoneticInfo }, + 0x00f0: { n:"SxRule", f:parse_SxRule }, + 0x00f1: { n:"SXEx", f:parse_SXEx }, + 0x00f2: { n:"SxFilt", f:parse_SxFilt }, + 0x00f4: { n:"SxDXF", f:parse_SxDXF }, + 0x00f5: { n:"SxItm", f:parse_SxItm }, + 0x00f6: { n:"SxName", f:parse_SxName }, + 0x00f7: { n:"SxSelect", f:parse_SxSelect }, + 0x00f8: { n:"SXPair", f:parse_SXPair }, + 0x00f9: { n:"SxFmla", f:parse_SxFmla }, + 0x00fb: { n:"SxFormat", f:parse_SxFormat }, + 0x00fc: { n:"SST", f:parse_SST }, + 0x00fd: { n:"LabelSst", f:parse_LabelSst }, + 0x00ff: { n:"ExtSST", f:parse_ExtSST }, + 0x0100: { n:"SXVDEx", f:parse_SXVDEx }, + 0x0103: { n:"SXFormula", f:parse_SXFormula }, + 0x0122: { n:"SXDBEx", f:parse_SXDBEx }, + 0x0137: { n:"RRDInsDel", f:parse_RRDInsDel }, + 0x0138: { n:"RRDHead", f:parse_RRDHead }, + 0x013b: { n:"RRDChgCell", f:parse_RRDChgCell }, + 0x013d: { n:"RRTabId", f:parse_RRTabId }, + 0x013e: { n:"RRDRenSheet", f:parse_RRDRenSheet }, + 0x013f: { n:"RRSort", f:parse_RRSort }, + 0x0140: { n:"RRDMove", f:parse_RRDMove }, + 0x014a: { n:"RRFormat", f:parse_RRFormat }, + 0x014b: { n:"RRAutoFmt", f:parse_RRAutoFmt }, + 0x014d: { n:"RRInsertSh", f:parse_RRInsertSh }, + 0x014e: { n:"RRDMoveBegin", f:parse_RRDMoveBegin }, + 0x014f: { n:"RRDMoveEnd", f:parse_RRDMoveEnd }, + 0x0150: { n:"RRDInsDelBegin", f:parse_RRDInsDelBegin }, + 0x0151: { n:"RRDInsDelEnd", f:parse_RRDInsDelEnd }, + 0x0152: { n:"RRDConflict", f:parse_RRDConflict }, + 0x0153: { n:"RRDDefName", f:parse_RRDDefName }, + 0x0154: { n:"RRDRstEtxp", f:parse_RRDRstEtxp }, + 0x015f: { n:"LRng", f:parse_LRng }, + 0x0160: { n:"UsesELFs", f:parse_UsesELFs }, + 0x0161: { n:"DSF", f:parse_DSF }, + 0x0191: { n:"CUsr", f:parse_CUsr }, + 0x0192: { n:"CbUsr", f:parse_CbUsr }, + 0x0193: { n:"UsrInfo", f:parse_UsrInfo }, + 0x0194: { n:"UsrExcl", f:parse_UsrExcl }, + 0x0195: { n:"FileLock", f:parse_FileLock }, + 0x0196: { n:"RRDInfo", f:parse_RRDInfo }, + 0x0197: { n:"BCUsrs", f:parse_BCUsrs }, + 0x0198: { n:"UsrChk", f:parse_UsrChk }, + 0x01a9: { n:"UserBView", f:parse_UserBView }, + 0x01aa: { n:"UserSViewBegin", f:parse_UserSViewBegin }, + 0x01ab: { n:"UserSViewEnd", f:parse_UserSViewEnd }, + 0x01ac: { n:"RRDUserView", f:parse_RRDUserView }, + 0x01ad: { n:"Qsi", f:parse_Qsi }, + 0x01ae: { n:"SupBook", f:parse_SupBook }, + 0x01af: { n:"Prot4Rev", f:parse_Prot4Rev }, + 0x01b0: { n:"CondFmt", f:parse_CondFmt }, + 0x01b1: { n:"CF", f:parse_CF }, + 0x01b2: { n:"DVal", f:parse_DVal }, + 0x01b5: { n:"DConBin", f:parse_DConBin }, + 0x01b6: { n:"TxO", f:parse_TxO }, + 0x01b7: { n:"RefreshAll", f:parse_RefreshAll }, + 0x01b8: { n:"HLink", f:parse_HLink }, + 0x01b9: { n:"Lel", f:parse_Lel }, + 0x01ba: { n:"CodeName", f:parse_XLSCodeName }, + 0x01bb: { n:"SXFDBType", f:parse_SXFDBType }, + 0x01bc: { n:"Prot4RevPass", f:parse_Prot4RevPass }, + 0x01bd: { n:"ObNoMacros", f:parse_ObNoMacros }, + 0x01be: { n:"Dv", f:parse_Dv }, + 0x01c0: { n:"Excel9File", f:parse_Excel9File }, + 0x01c1: { n:"RecalcId", f:parse_RecalcId, r:2}, + 0x01c2: { n:"EntExU2", f:parse_EntExU2 }, + 0x0200: { n:"Dimensions", f:parse_Dimensions }, + 0x0201: { n:"Blank", f:parse_Blank }, + 0x0203: { n:"Number", f:parse_Number }, + 0x0204: { n:"Label", f:parse_Label }, + 0x0205: { n:"BoolErr", f:parse_BoolErr }, + 0x0207: { n:"String", f:parse_String }, + 0x0208: { n:'Row', f:parse_Row }, + 0x020b: { n:"Index", f:parse_Index }, + 0x0221: { n:"Array", f:parse_Array }, + 0x0225: { n:"DefaultRowHeight", f:parse_DefaultRowHeight }, + 0x0236: { n:"Table", f:parse_Table }, + 0x023e: { n:"Window2", f:parse_Window2 }, + 0x027e: { n:"RK", f:parse_RK }, + 0x0293: { n:"Style", f:parse_Style }, + 0x0418: { n:"BigName", f:parse_BigName }, + 0x041e: { n:"Format", f:parse_Format }, + 0x043c: { n:"ContinueBigName", f:parse_ContinueBigName }, + 0x04bc: { n:"ShrFmla", f:parse_ShrFmla }, + 0x0800: { n:"HLinkTooltip", f:parse_HLinkTooltip }, + 0x0801: { n:"WebPub", f:parse_WebPub }, + 0x0802: { n:"QsiSXTag", f:parse_QsiSXTag }, + 0x0803: { n:"DBQueryExt", f:parse_DBQueryExt }, + 0x0804: { n:"ExtString", f:parse_ExtString }, + 0x0805: { n:"TxtQry", f:parse_TxtQry }, + 0x0806: { n:"Qsir", f:parse_Qsir }, + 0x0807: { n:"Qsif", f:parse_Qsif }, + 0x0808: { n:"RRDTQSIF", f:parse_RRDTQSIF }, + 0x0809: { n:'BOF', f:parse_BOF }, + 0x080a: { n:"OleDbConn", f:parse_OleDbConn }, + 0x080b: { n:"WOpt", f:parse_WOpt }, + 0x080c: { n:"SXViewEx", f:parse_SXViewEx }, + 0x080d: { n:"SXTH", f:parse_SXTH }, + 0x080e: { n:"SXPIEx", f:parse_SXPIEx }, + 0x080f: { n:"SXVDTEx", f:parse_SXVDTEx }, + 0x0810: { n:"SXViewEx9", f:parse_SXViewEx9 }, + 0x0812: { n:"ContinueFrt", f:parse_ContinueFrt }, + 0x0813: { n:"RealTimeData", f:parse_RealTimeData }, + 0x0850: { n:"ChartFrtInfo", f:parse_ChartFrtInfo }, + 0x0851: { n:"FrtWrapper", f:parse_FrtWrapper }, + 0x0852: { n:"StartBlock", f:parse_StartBlock }, + 0x0853: { n:"EndBlock", f:parse_EndBlock }, + 0x0854: { n:"StartObject", f:parse_StartObject }, + 0x0855: { n:"EndObject", f:parse_EndObject }, + 0x0856: { n:"CatLab", f:parse_CatLab }, + 0x0857: { n:"YMult", f:parse_YMult }, + 0x0858: { n:"SXViewLink", f:parse_SXViewLink }, + 0x0859: { n:"PivotChartBits", f:parse_PivotChartBits }, + 0x085a: { n:"FrtFontList", f:parse_FrtFontList }, + 0x0862: { n:"SheetExt", f:parse_SheetExt }, + 0x0863: { n:"BookExt", f:parse_BookExt, r:12}, + 0x0864: { n:"SXAddl", f:parse_SXAddl }, + 0x0865: { n:"CrErr", f:parse_CrErr }, + 0x0866: { n:"HFPicture", f:parse_HFPicture }, + 0x0867: { n:'FeatHdr', f:parse_FeatHdr }, + 0x0868: { n:"Feat", f:parse_Feat }, + 0x086a: { n:"DataLabExt", f:parse_DataLabExt }, + 0x086b: { n:"DataLabExtContents", f:parse_DataLabExtContents }, + 0x086c: { n:"CellWatch", f:parse_CellWatch }, + 0x0871: { n:"FeatHdr11", f:parse_FeatHdr11 }, + 0x0872: { n:"Feature11", f:parse_Feature11 }, + 0x0874: { n:"DropDownObjIds", f:parse_DropDownObjIds }, + 0x0875: { n:"ContinueFrt11", f:parse_ContinueFrt11 }, + 0x0876: { n:"DConn", f:parse_DConn }, + 0x0877: { n:"List12", f:parse_List12 }, + 0x0878: { n:"Feature12", f:parse_Feature12 }, + 0x0879: { n:"CondFmt12", f:parse_CondFmt12 }, + 0x087a: { n:"CF12", f:parse_CF12 }, + 0x087b: { n:"CFEx", f:parse_CFEx }, + 0x087c: { n:"XFCRC", f:parse_XFCRC, r:12 }, + 0x087d: { n:"XFExt", f:parse_XFExt, r:12 }, + 0x087e: { n:"AutoFilter12", f:parse_AutoFilter12 }, + 0x087f: { n:"ContinueFrt12", f:parse_ContinueFrt12 }, + 0x0884: { n:"MDTInfo", f:parse_MDTInfo }, + 0x0885: { n:"MDXStr", f:parse_MDXStr }, + 0x0886: { n:"MDXTuple", f:parse_MDXTuple }, + 0x0887: { n:"MDXSet", f:parse_MDXSet }, + 0x0888: { n:"MDXProp", f:parse_MDXProp }, + 0x0889: { n:"MDXKPI", f:parse_MDXKPI }, + 0x088a: { n:"MDB", f:parse_MDB }, + 0x088b: { n:"PLV", f:parse_PLV }, + 0x088c: { n:"Compat12", f:parse_Compat12, r:12 }, + 0x088d: { n:"DXF", f:parse_DXF }, + 0x088e: { n:"TableStyles", f:parse_TableStyles, r:12 }, + 0x088f: { n:"TableStyle", f:parse_TableStyle }, + 0x0890: { n:"TableStyleElement", f:parse_TableStyleElement }, + 0x0892: { n:"StyleExt", f:parse_StyleExt }, + 0x0893: { n:"NamePublish", f:parse_NamePublish }, + 0x0894: { n:"NameCmt", f:parse_NameCmt }, + 0x0895: { n:"SortData", f:parse_SortData }, + 0x0896: { n:"Theme", f:parse_Theme, r:12 }, + 0x0897: { n:"GUIDTypeLib", f:parse_GUIDTypeLib }, + 0x0898: { n:"FnGrp12", f:parse_FnGrp12 }, + 0x0899: { n:"NameFnGrp12", f:parse_NameFnGrp12 }, + 0x089a: { n:"MTRSettings", f:parse_MTRSettings, r:12 }, + 0x089b: { n:"CompressPictures", f:parse_CompressPictures }, + 0x089c: { n:"HeaderFooter", f:parse_HeaderFooter }, + 0x089d: { n:"CrtLayout12", f:parse_CrtLayout12 }, + 0x089e: { n:"CrtMlFrt", f:parse_CrtMlFrt }, + 0x089f: { n:"CrtMlFrtContinue", f:parse_CrtMlFrtContinue }, + 0x08a3: { n:"ForceFullCalculation", f:parse_ForceFullCalculation }, + 0x08a4: { n:"ShapePropsStream", f:parse_ShapePropsStream }, + 0x08a5: { n:"TextPropsStream", f:parse_TextPropsStream }, + 0x08a6: { n:"RichTextStream", f:parse_RichTextStream }, + 0x08a7: { n:"CrtLayout12A", f:parse_CrtLayout12A }, + 0x1001: { n:"Units", f:parse_Units }, + 0x1002: { n:"Chart", f:parse_Chart }, + 0x1003: { n:"Series", f:parse_Series }, + 0x1006: { n:"DataFormat", f:parse_DataFormat }, + 0x1007: { n:"LineFormat", f:parse_LineFormat }, + 0x1009: { n:"MarkerFormat", f:parse_MarkerFormat }, + 0x100a: { n:"AreaFormat", f:parse_AreaFormat }, + 0x100b: { n:"PieFormat", f:parse_PieFormat }, + 0x100c: { n:"AttachedLabel", f:parse_AttachedLabel }, + 0x100d: { n:"SeriesText", f:parse_SeriesText }, + 0x1014: { n:"ChartFormat", f:parse_ChartFormat }, + 0x1015: { n:"Legend", f:parse_Legend }, + 0x1016: { n:"SeriesList", f:parse_SeriesList }, + 0x1017: { n:"Bar", f:parse_Bar }, + 0x1018: { n:"Line", f:parse_Line }, + 0x1019: { n:"Pie", f:parse_Pie }, + 0x101a: { n:"Area", f:parse_Area }, + 0x101b: { n:"Scatter", f:parse_Scatter }, + 0x101c: { n:"CrtLine", f:parse_CrtLine }, + 0x101d: { n:"Axis", f:parse_Axis }, + 0x101e: { n:"Tick", f:parse_Tick }, + 0x101f: { n:"ValueRange", f:parse_ValueRange }, + 0x1020: { n:"CatSerRange", f:parse_CatSerRange }, + 0x1021: { n:"AxisLine", f:parse_AxisLine }, + 0x1022: { n:"CrtLink", f:parse_CrtLink }, + 0x1024: { n:"DefaultText", f:parse_DefaultText }, + 0x1025: { n:"Text", f:parse_Text }, + 0x1026: { n:"FontX", f:parse_FontX }, + 0x1027: { n:"ObjectLink", f:parse_ObjectLink }, + 0x1032: { n:"Frame", f:parse_Frame }, + 0x1033: { n:"Begin", f:parse_Begin }, + 0x1034: { n:"End", f:parse_End }, + 0x1035: { n:"PlotArea", f:parse_PlotArea }, + 0x103a: { n:"Chart3d", f:parse_Chart3d }, + 0x103c: { n:"PicF", f:parse_PicF }, + 0x103d: { n:"DropBar", f:parse_DropBar }, + 0x103e: { n:"Radar", f:parse_Radar }, + 0x103f: { n:"Surf", f:parse_Surf }, + 0x1040: { n:"RadarArea", f:parse_RadarArea }, + 0x1041: { n:"AxisParent", f:parse_AxisParent }, + 0x1043: { n:"LegendException", f:parse_LegendException }, + 0x1044: { n:"ShtProps", f:parse_ShtProps }, + 0x1045: { n:"SerToCrt", f:parse_SerToCrt }, + 0x1046: { n:"AxesUsed", f:parse_AxesUsed }, + 0x1048: { n:"SBaseRef", f:parse_SBaseRef }, + 0x104a: { n:"SerParent", f:parse_SerParent }, + 0x104b: { n:"SerAuxTrend", f:parse_SerAuxTrend }, + 0x104e: { n:"IFmtRecord", f:parse_IFmtRecord }, + 0x104f: { n:"Pos", f:parse_Pos }, + 0x1050: { n:"AlRuns", f:parse_AlRuns }, + 0x1051: { n:"BRAI", f:parse_BRAI }, + 0x105b: { n:"SerAuxErrBar", f:parse_SerAuxErrBar }, + 0x105c: { n:"ClrtClient", f:parse_ClrtClient }, + 0x105d: { n:"SerFmt", f:parse_SerFmt }, + 0x105f: { n:"Chart3DBarShape", f:parse_Chart3DBarShape }, + 0x1060: { n:"Fbi", f:parse_Fbi }, + 0x1061: { n:"BopPop", f:parse_BopPop }, + 0x1062: { n:"AxcExt", f:parse_AxcExt }, + 0x1063: { n:"Dat", f:parse_Dat }, + 0x1064: { n:"PlotGrowth", f:parse_PlotGrowth }, + 0x1065: { n:"SIIndex", f:parse_SIIndex }, + 0x1066: { n:"GelFrame", f:parse_GelFrame }, + 0x1067: { n:"BopPopCustom", f:parse_BopPopCustom }, + 0x1068: { n:"Fbi2", f:parse_Fbi2 }, + + /* These are specified in an older version of the spec */ + 0x0016: { n:"ExternCount", f:parsenoop }, + 0x007e: { n:"RK", f:parsenoop }, /* Not necessarily same as 0x027e */ + 0x007f: { n:"ImData", f:parsenoop }, + 0x0087: { n:"Addin", f:parsenoop }, + 0x0088: { n:"Edg", f:parsenoop }, + 0x0089: { n:"Pub", f:parsenoop }, + 0x0091: { n:"Sub", f:parsenoop }, + 0x0094: { n:"LHRecord", f:parsenoop }, + 0x0095: { n:"LHNGraph", f:parsenoop }, + 0x0096: { n:"Sound", f:parsenoop }, + 0x00a9: { n:"CoordList", f:parsenoop }, + 0x00ab: { n:"GCW", f:parsenoop }, + 0x00bc: { n:"ShrFmla", f:parsenoop }, /* Not necessarily same as 0x04bc */ + 0x00c2: { n:"AddMenu", f:parsenoop }, + 0x00c3: { n:"DelMenu", f:parsenoop }, + 0x00d6: { n:"RString", f:parsenoop }, + 0x00df: { n:"UDDesc", f:parsenoop }, + 0x00ea: { n:"TabIdConf", f:parsenoop }, + 0x0162: { n:"XL5Modify", f:parsenoop }, + 0x01a5: { n:"FileSharing2", f:parsenoop }, + 0x0218: { n:"Name", f:parsenoop }, + 0x0223: { n:"ExternName", f:parse_ExternName }, + 0x0231: { n:"Font", f:parsenoop }, + 0x0406: { n:"Formula", f:parse_Formula }, + 0x086d: { n:"FeatInfo", f:parsenoop }, + 0x0873: { n:"FeatInfo11", f:parsenoop }, + 0x0881: { n:"SXAddl12", f:parsenoop }, + 0x08c0: { n:"AutoWebPub", f:parsenoop }, + 0x08c1: { n:"ListObj", f:parsenoop }, + 0x08c2: { n:"ListField", f:parsenoop }, + 0x08c3: { n:"ListDV", f:parsenoop }, + 0x08c4: { n:"ListCondFmt", f:parsenoop }, + 0x08c5: { n:"ListCF", f:parsenoop }, + 0x08c6: { n:"FMQry", f:parsenoop }, + 0x08c7: { n:"FMSQry", f:parsenoop }, + 0x08c8: { n:"PLV", f:parsenoop }, /* supposedly PLV for Excel 11 */ + 0x08c9: { n:"LnExt", f:parsenoop }, + 0x08ca: { n:"MkrExt", f:parsenoop }, + 0x08cb: { n:"CrtCoopt", f:parsenoop }, + + 0x0000: {} +}; + + +/* Helper function to call out to ODS parser */ +function parse_ods(zip, opts) { + if(typeof module !== "undefined" && typeof require !== 'undefined' && typeof ODS === 'undefined') ODS = require('./od' + 's'); + if(typeof ODS === 'undefined' || !ODS.parse_ods) throw new Error("Unsupported ODS"); + return ODS.parse_ods(zip, opts); +} +function fix_opts_func(defaults) { + return function fix_opts(opts) { + for(var i = 0; i != defaults.length; ++i) { + var d = defaults[i]; + if(opts[d[0]] === undefined) opts[d[0]] = d[1]; + if(d[2] === 'n') opts[d[0]] = Number(opts[d[0]]); + } + }; +} + +var fix_read_opts = fix_opts_func([ + ['cellNF', false], /* emit cell number format string as .z */ + ['cellHTML', true], /* emit html string as .h */ + ['cellFormula', true], /* emit formulae as .f */ + ['cellStyles', false], /* emits style/theme as .s */ + ['cellDates', false], /* emit date cells with type `d` */ + + ['sheetStubs', false], /* emit empty cells */ + ['sheetRows', 0, 'n'], /* read n rows (0 = read all rows) */ + + ['bookDeps', false], /* parse calculation chains */ + ['bookSheets', false], /* only try to get sheet names (no Sheets) */ + ['bookProps', false], /* only try to get properties (no Sheets) */ + ['bookFiles', false], /* include raw file structure (keys, files, cfb) */ + ['bookVBA', false], /* include vba raw data (vbaraw) */ + + ['password',''], /* password */ + ['WTF', false] /* WTF mode (throws errors) */ +]); + + +var fix_write_opts = fix_opts_func([ + ['cellDates', false], /* write date cells with type `d` */ + + ['bookSST', false], /* Generate Shared String Table */ + + ['bookType', 'xlsx'], /* Type of workbook (xlsx/m/b) */ + + ['WTF', false] /* WTF mode (throws errors) */ +]); +function safe_parse_wbrels(wbrels, sheets) { + if(!wbrels) return 0; + try { + wbrels = sheets.map(function pwbr(w) { return [w.name, wbrels['!id'][w.id].Target]; }); + } catch(e) { return null; } + return !wbrels || wbrels.length === 0 ? null : wbrels; +} + +function safe_parse_ws(zip, path, relsPath, sheet, sheetRels, sheets, opts) { + try { + sheetRels[sheet]=parse_rels(getzipdata(zip, relsPath, true), path); + sheets[sheet]=parse_ws(getzipdata(zip, path),path,opts,sheetRels[sheet]); + } catch(e) { if(opts.WTF) throw e; } +} + +var nodirs = function nodirs(x){return x.substr(-1) != '/';}; +function parse_zip(zip, opts) { + make_ssf(SSF); + opts = opts || {}; + fix_read_opts(opts); + reset_cp(); + + /* OpenDocument Part 3 Section 2.2.1 OpenDocument Package */ + if(safegetzipfile(zip, 'META-INF/manifest.xml')) return parse_ods(zip, opts); + + var entries = keys(zip.files).filter(nodirs).sort(); + var dir = parse_ct(getzipdata(zip, '[Content_Types].xml'), opts); + var xlsb = false; + var sheets, binname; + if(dir.workbooks.length === 0) { + binname = "xl/workbook.xml"; + if(getzipdata(zip,binname, true)) dir.workbooks.push(binname); + } + if(dir.workbooks.length === 0) { + binname = "xl/workbook.bin"; + if(!getzipfile(zip,binname,true)) throw new Error("Could not find workbook"); + dir.workbooks.push(binname); + xlsb = true; + } + if(dir.workbooks[0].substr(-3) == "bin") xlsb = true; + if(xlsb) set_cp(1200); + + if(!opts.bookSheets && !opts.bookProps) { + strs = []; + if(dir.sst) strs=parse_sst(getzipdata(zip, dir.sst.replace(/^\//,'')), dir.sst, opts); + + styles = {}; + if(dir.style) styles = parse_sty(getzipdata(zip, dir.style.replace(/^\//,'')),dir.style, opts); + + themes = {}; + if(opts.cellStyles && dir.themes.length) themes = parse_theme(getzipdata(zip, dir.themes[0].replace(/^\//,''), true),dir.themes[0], opts); + } + + var wb = parse_wb(getzipdata(zip, dir.workbooks[0].replace(/^\//,'')), dir.workbooks[0], opts); + + var props = {}, propdata = ""; + + if(dir.coreprops.length !== 0) { + propdata = getzipdata(zip, dir.coreprops[0].replace(/^\//,''), true); + if(propdata) props = parse_core_props(propdata); + if(dir.extprops.length !== 0) { + propdata = getzipdata(zip, dir.extprops[0].replace(/^\//,''), true); + if(propdata) parse_ext_props(propdata, props); + } + } + + var custprops = {}; + if(!opts.bookSheets || opts.bookProps) { + if (dir.custprops.length !== 0) { + propdata = getzipdata(zip, dir.custprops[0].replace(/^\//,''), true); + if(propdata) custprops = parse_cust_props(propdata, opts); + } + } + + var out = {}; + if(opts.bookSheets || opts.bookProps) { + if(props.Worksheets && props.SheetNames.length > 0) sheets=props.SheetNames; + else if(wb.Sheets) sheets = wb.Sheets.map(function pluck(x){ return x.name; }); + if(opts.bookProps) { out.Props = props; out.Custprops = custprops; } + if(typeof sheets !== 'undefined') out.SheetNames = sheets; + if(opts.bookSheets ? out.SheetNames : opts.bookProps) return out; + } + sheets = {}; + + var deps = {}; + if(opts.bookDeps && dir.calcchain) deps=parse_cc(getzipdata(zip, dir.calcchain.replace(/^\//,'')),dir.calcchain,opts); + + var i=0; + var sheetRels = {}; + var path, relsPath; + if(!props.Worksheets) { + var wbsheets = wb.Sheets; + props.Worksheets = wbsheets.length; + props.SheetNames = []; + for(var j = 0; j != wbsheets.length; ++j) { + props.SheetNames[j] = wbsheets[j].name; + } + } + + var wbext = xlsb ? "bin" : "xml"; + var wbrelsfile = 'xl/_rels/workbook.' + wbext + '.rels'; + var wbrels = parse_rels(getzipdata(zip, wbrelsfile, true), wbrelsfile); + if(wbrels) wbrels = safe_parse_wbrels(wbrels, wb.Sheets); + /* Numbers iOS hack */ + var nmode = (getzipdata(zip,"xl/worksheets/sheet.xml",true))?1:0; + for(i = 0; i != props.Worksheets; ++i) { + if(wbrels) path = 'xl/' + (wbrels[i][1]).replace(/[\/]?xl\//, ""); + else { + path = 'xl/worksheets/sheet'+(i+1-nmode)+"." + wbext; + path = path.replace(/sheet0\./,"sheet."); + } + relsPath = path.replace(/^(.*)(\/)([^\/]*)$/, "$1/_rels/$3.rels"); + safe_parse_ws(zip, path, relsPath, props.SheetNames[i], sheetRels, sheets, opts); + } + + if(dir.comments) parse_comments(zip, dir.comments, sheets, sheetRels, opts); + + out = { + Directory: dir, + Workbook: wb, + Props: props, + Custprops: custprops, + Deps: deps, + Sheets: sheets, + SheetNames: props.SheetNames, + Strings: strs, + Styles: styles, + Themes: themes, + SSF: SSF.get_table() + }; + if(opts.bookFiles) { + out.keys = entries; + out.files = zip.files; + } + if(opts.bookVBA) { + if(dir.vba.length > 0) out.vbaraw = getzipdata(zip,dir.vba[0],true); + else if(dir.defaults.bin === 'application/vnd.ms-office.vbaProject') out.vbaraw = getzipdata(zip,'xl/vbaProject.bin',true); + } + return out; +} +function add_rels(rels, rId, f, type, relobj) { + if(!relobj) relobj = {}; + if(!rels['!id']) rels['!id'] = {}; + relobj.Id = 'rId' + rId; + relobj.Type = type; + relobj.Target = f; + if(rels['!id'][relobj.Id]) throw new Error("Cannot rewrite rId " + rId); + rels['!id'][relobj.Id] = relobj; + rels[('/' + relobj.Target).replace("//","/")] = relobj; +} + +function write_zip(wb, opts) { + if(wb && !wb.SSF) { + wb.SSF = SSF.get_table(); + } + if(wb && wb.SSF) { + make_ssf(SSF); SSF.load_table(wb.SSF); + opts.revssf = evert_num(wb.SSF); opts.revssf[wb.SSF[65535]] = 0; + } + opts.rels = {}; opts.wbrels = {}; + opts.Strings = []; opts.Strings.Count = 0; opts.Strings.Unique = 0; + var wbext = opts.bookType == "xlsb" ? "bin" : "xml"; + var ct = { workbooks: [], sheets: [], calcchains: [], themes: [], styles: [], + coreprops: [], extprops: [], custprops: [], strs:[], comments: [], vba: [], + TODO:[], rels:[], xmlns: "" }; + fix_write_opts(opts = opts || {}); + var zip = new jszip(); + var f = "", rId = 0; + + opts.cellXfs = []; + get_cell_style(opts.cellXfs, {}, {revssf:{"General":0}}); + + f = "docProps/core.xml"; + zip.file(f, write_core_props(wb.Props, opts)); + ct.coreprops.push(f); + add_rels(opts.rels, 2, f, RELS.CORE_PROPS); + + f = "docProps/app.xml"; + if(!wb.Props) wb.Props = {}; + wb.Props.SheetNames = wb.SheetNames; + wb.Props.Worksheets = wb.SheetNames.length; + zip.file(f, write_ext_props(wb.Props, opts)); + ct.extprops.push(f); + add_rels(opts.rels, 3, f, RELS.EXT_PROPS); + + if(wb.Custprops !== wb.Props && keys(wb.Custprops||{}).length > 0) { + f = "docProps/custom.xml"; + zip.file(f, write_cust_props(wb.Custprops, opts)); + ct.custprops.push(f); + add_rels(opts.rels, 4, f, RELS.CUST_PROPS); + } + + f = "xl/workbook." + wbext; + zip.file(f, write_wb(wb, f, opts)); + ct.workbooks.push(f); + add_rels(opts.rels, 1, f, RELS.WB); + + for(rId=1;rId <= wb.SheetNames.length; ++rId) { + f = "xl/worksheets/sheet" + rId + "." + wbext; + zip.file(f, write_ws(rId-1, f, opts, wb)); + ct.sheets.push(f); + add_rels(opts.wbrels, rId, "worksheets/sheet" + rId + "." + wbext, RELS.WS); + } + + if(opts.Strings != null && opts.Strings.length > 0) { + f = "xl/sharedStrings." + wbext; + zip.file(f, write_sst(opts.Strings, f, opts)); + ct.strs.push(f); + add_rels(opts.wbrels, ++rId, "sharedStrings." + wbext, RELS.SST); + } + + /* TODO: something more intelligent with themes */ + + f = "xl/theme/theme1.xml"; + zip.file(f, write_theme()); + ct.themes.push(f); + add_rels(opts.wbrels, ++rId, "theme/theme1.xml", RELS.THEME); + + /* TODO: something more intelligent with styles */ + + f = "xl/styles." + wbext; + zip.file(f, write_sty(wb, f, opts)); + ct.styles.push(f); + add_rels(opts.wbrels, ++rId, "styles." + wbext, RELS.STY); + + zip.file("[Content_Types].xml", write_ct(ct, opts)); + zip.file('_rels/.rels', write_rels(opts.rels)); + zip.file('xl/_rels/workbook.' + wbext + '.rels', write_rels(opts.wbrels)); + return zip; +} +function firstbyte(f,o) { + switch((o||{}).type || "base64") { + case 'buffer': return f[0]; + case 'base64': return Base64.decode(f.substr(0,12)).charCodeAt(0); + case 'binary': return f.charCodeAt(0); + case 'array': return f[0]; + default: throw new Error("Unrecognized type " + o.type); + } +} + +function read_zip(data, opts) { + var zip, d = data; + var o = opts||{}; + if(!o.type) o.type = (has_buf && Buffer.isBuffer(data)) ? "buffer" : "base64"; + switch(o.type) { + case "base64": zip = new jszip(d, { base64:true }); break; + case "binary": case "array": zip = new jszip(d, { base64:false }); break; + case "buffer": zip = new jszip(d); break; + case "file": zip=new jszip(d=_fs.readFileSync(data)); break; + default: throw new Error("Unrecognized type " + o.type); + } + return parse_zip(zip, o); +} + +function readSync(data, opts) { + var zip, d = data, isfile = false, n; + var o = opts||{}; + if(!o.type) o.type = (has_buf && Buffer.isBuffer(data)) ? "buffer" : "base64"; + if(o.type == "file") { isfile = true; o.type = "buffer"; d = _fs.readFileSync(data); } + switch((n = firstbyte(d, o))) { + case 0xD0: + if(isfile) o.type = "file"; + return parse_xlscfb(CFB.read(data, o), o); + case 0x09: return parse_xlscfb(s2a(o.type === 'base64' ? Base64.decode(data) : data), o); + case 0x3C: return parse_xlml(d, o); + case 0x50: + if(isfile) o.type = "file"; + return read_zip(data, opts); + default: throw new Error("Unsupported file " + n); + } +} + +function readFileSync(data, opts) { + var o = opts||{}; o.type = 'file'; + return readSync(data, o); +} +function write_zip_type(wb, opts) { + var o = opts||{}; + var z = write_zip(wb, o); + switch(o.type) { + case "base64": return z.generate({type:"base64"}); + case "binary": return z.generate({type:"string"}); + case "buffer": return z.generate({type:"nodebuffer"}); + case "file": return _fs.writeFileSync(o.file, z.generate({type:"nodebuffer"})); + default: throw new Error("Unrecognized type " + o.type); + } +} + +function writeSync(wb, opts) { + var o = opts||{}; + switch(o.bookType) { + case 'xml': return write_xlml(wb, o); + default: return write_zip_type(wb, o); + } +} + +function writeFileSync(wb, filename, opts) { + var o = opts||{}; o.type = 'file'; + o.file = filename; + switch(o.file.substr(-5).toLowerCase()) { + case '.xlsx': o.bookType = 'xlsx'; break; + case '.xlsm': o.bookType = 'xlsm'; break; + case '.xlsb': o.bookType = 'xlsb'; break; + default: switch(o.file.substr(-4).toLowerCase()) { + case '.xls': o.bookType = 'xls'; break; + case '.xml': o.bookType = 'xml'; break; + }} + return writeSync(wb, o); +} + +function decode_row(rowstr) { return parseInt(unfix_row(rowstr),10) - 1; } +function encode_row(row) { return "" + (row + 1); } +function fix_row(cstr) { return cstr.replace(/([A-Z]|^)(\d+)$/,"$1$$$2"); } +function unfix_row(cstr) { return cstr.replace(/\$(\d+)$/,"$1"); } + +function decode_col(colstr) { var c = unfix_col(colstr), d = 0, i = 0; for(; i !== c.length; ++i) d = 26*d + c.charCodeAt(i) - 64; return d - 1; } +function encode_col(col) { var s=""; for(++col; col; col=Math.floor((col-1)/26)) s = String.fromCharCode(((col-1)%26) + 65) + s; return s; } +function fix_col(cstr) { return cstr.replace(/^([A-Z])/,"$$$1"); } +function unfix_col(cstr) { return cstr.replace(/^\$([A-Z])/,"$1"); } + +function split_cell(cstr) { return cstr.replace(/(\$?[A-Z]*)(\$?\d*)/,"$1,$2").split(","); } +function decode_cell(cstr) { var splt = split_cell(cstr); return { c:decode_col(splt[0]), r:decode_row(splt[1]) }; } +function encode_cell(cell) { return encode_col(cell.c) + encode_row(cell.r); } +function fix_cell(cstr) { return fix_col(fix_row(cstr)); } +function unfix_cell(cstr) { return unfix_col(unfix_row(cstr)); } +function decode_range(range) { var x =range.split(":").map(decode_cell); return {s:x[0],e:x[x.length-1]}; } +function encode_range(cs,ce) { + if(ce === undefined || typeof ce === 'number') return encode_range(cs.s, cs.e); + if(typeof cs !== 'string') cs = encode_cell(cs); if(typeof ce !== 'string') ce = encode_cell(ce); + return cs == ce ? cs : cs + ":" + ce; +} + +function safe_decode_range(range) { + var o = {s:{c:0,r:0},e:{c:0,r:0}}; + var idx = 0, i = 0, cc = 0; + var len = range.length; + for(idx = 0; i < len; ++i) { + if((cc=range.charCodeAt(i)-64) < 1 || cc > 26) break; + idx = 26*idx + cc; + } + o.s.c = --idx; + + for(idx = 0; i < len; ++i) { + if((cc=range.charCodeAt(i)-48) < 0 || cc > 9) break; + idx = 10*idx + cc; + } + o.s.r = --idx; + + if(i === len || range.charCodeAt(++i) === 58) { o.e.c=o.s.c; o.e.r=o.s.r; return o; } + + for(idx = 0; i != len; ++i) { + if((cc=range.charCodeAt(i)-64) < 1 || cc > 26) break; + idx = 26*idx + cc; + } + o.e.c = --idx; + + for(idx = 0; i != len; ++i) { + if((cc=range.charCodeAt(i)-48) < 0 || cc > 9) break; + idx = 10*idx + cc; + } + o.e.r = --idx; + return o; +} + +function safe_format_cell(cell, v) { + if(cell.z !== undefined) try { return (cell.w = SSF.format(cell.z, v)); } catch(e) { } + if(!cell.XF) return v; + try { return (cell.w = SSF.format(cell.XF.ifmt||0, v)); } catch(e) { return ''+v; } +} + +function format_cell(cell, v) { + if(cell == null || cell.t == null) return ""; + if(cell.w !== undefined) return cell.w; + if(v === undefined) return safe_format_cell(cell, cell.v); + return safe_format_cell(cell, v); +} + +function sheet_to_json(sheet, opts){ + var val, row, range, header = 0, offset = 1, r, hdr = [], isempty, R, C, v; + var o = opts != null ? opts : {}; + var raw = o.raw; + if(sheet == null || sheet["!ref"] == null) return []; + range = o.range !== undefined ? o.range : sheet["!ref"]; + if(o.header === 1) header = 1; + else if(o.header === "A") header = 2; + else if(Array.isArray(o.header)) header = 3; + switch(typeof range) { + case 'string': r = safe_decode_range(range); break; + case 'number': r = safe_decode_range(sheet["!ref"]); r.s.r = range; break; + default: r = range; + } + if(header > 0) offset = 0; + var rr = encode_row(r.s.r); + var cols = new Array(r.e.c-r.s.c+1); + var out = new Array(r.e.r-r.s.r-offset+1); + var outi = 0; + for(C = r.s.c; C <= r.e.c; ++C) { + cols[C] = encode_col(C); + val = sheet[cols[C] + rr]; + switch(header) { + case 1: hdr[C] = C; break; + case 2: hdr[C] = cols[C]; break; + case 3: hdr[C] = o.header[C - r.s.c]; break; + default: + if(val === undefined) continue; + hdr[C] = format_cell(val); + } + } + + for (R = r.s.r + offset; R <= r.e.r; ++R) { + rr = encode_row(R); + isempty = true; + if(header === 1) row = []; + else { + row = {}; + if(Object.defineProperty) Object.defineProperty(row, '__rowNum__', {value:R, enumerable:false}); + else row.__rowNum__ = R; + } + for (C = r.s.c; C <= r.e.c; ++C) { + val = sheet[cols[C] + rr]; + if(val === undefined || val.t === undefined) continue; + v = val.v; + switch(val.t){ + case 'e': continue; + case 's': break; + case 'b': case 'n': break; + default: throw 'unrecognized type ' + val.t; + } + if(v !== undefined) { + row[hdr[C]] = raw ? v : format_cell(val,v); + isempty = false; + } + } + if(isempty === false || header === 1) out[outi++] = row; + } + out.length = outi; + return out; +} + +function sheet_to_row_object_array(sheet, opts) { return sheet_to_json(sheet, opts != null ? opts : {}); } + +function sheet_to_csv(sheet, opts) { + var out = "", txt = "", qreg = /"/g; + var o = opts == null ? {} : opts; + if(sheet == null || sheet["!ref"] == null) return ""; + var r = safe_decode_range(sheet["!ref"]); + var FS = o.FS !== undefined ? o.FS : ",", fs = FS.charCodeAt(0); + var RS = o.RS !== undefined ? o.RS : "\n", rs = RS.charCodeAt(0); + var row = "", rr = "", cols = []; + var i = 0, cc = 0, val; + var R = 0, C = 0; + for(C = r.s.c; C <= r.e.c; ++C) cols[C] = encode_col(C); + for(R = r.s.r; R <= r.e.r; ++R) { + row = ""; + rr = encode_row(R); + for(C = r.s.c; C <= r.e.c; ++C) { + val = sheet[cols[C] + rr]; + txt = val !== undefined ? ''+format_cell(val) : ""; + for(i = 0, cc = 0; i !== txt.length; ++i) if((cc = txt.charCodeAt(i)) === fs || cc === rs || cc === 34) { + txt = "\"" + txt.replace(qreg, '""') + "\""; break; } + row += (C === r.s.c ? "" : FS) + txt; + } + out += row + RS; + } + return out; +} +var make_csv = sheet_to_csv; + +function sheet_to_formulae(sheet) { + var cmds, y = "", x, val=""; + if(sheet == null || sheet["!ref"] == null) return ""; + var r = safe_decode_range(sheet['!ref']), rr = "", cols = [], C; + cmds = new Array((r.e.r-r.s.r+1)*(r.e.c-r.s.c+1)); + var i = 0; + for(C = r.s.c; C <= r.e.c; ++C) cols[C] = encode_col(C); + for(var R = r.s.r; R <= r.e.r; ++R) { + rr = encode_row(R); + for(C = r.s.c; C <= r.e.c; ++C) { + y = cols[C] + rr; + x = sheet[y]; + val = ""; + if(x === undefined) continue; + if(x.f != null) val = x.f; + else if(x.w !== undefined) val = "'" + x.w; + else if(x.v === undefined) continue; + else val = ""+x.v; + cmds[i++] = y + "=" + val; + } + } + cmds.length = i; + return cmds; +} + +var utils = { + encode_col: encode_col, + encode_row: encode_row, + encode_cell: encode_cell, + encode_range: encode_range, + decode_col: decode_col, + decode_row: decode_row, + split_cell: split_cell, + decode_cell: decode_cell, + decode_range: decode_range, + format_cell: format_cell, + get_formulae: sheet_to_formulae, + make_csv: sheet_to_csv, + make_json: sheet_to_json, + make_formulae: sheet_to_formulae, + sheet_to_csv: sheet_to_csv, + sheet_to_json: sheet_to_json, + sheet_to_formulae: sheet_to_formulae, + sheet_to_row_object_array: sheet_to_row_object_array +}; +XLSX.parse_xlscfb = parse_xlscfb; +XLSX.parse_zip = parse_zip; +XLSX.read = readSync; //xlsread +XLSX.readFile = readFileSync; //readFile +XLSX.readFileSync = readFileSync; +XLSX.write = writeSync; +XLSX.writeFile = writeFileSync; +XLSX.writeFileSync = writeFileSync; +XLSX.utils = utils; +XLSX.CFB = CFB; +XLSX.SSF = SSF; +})(typeof exports !== 'undefined' ? exports : XLSX); +var XLS = XLSX; diff --git a/plugins/tiddlywiki/xlsx-utils/help-excel-import.tid b/plugins/tiddlywiki/xlsx-utils/help-excel-import.tid new file mode 100644 index 000000000..5c6c3281c --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/help-excel-import.tid @@ -0,0 +1,11 @@ +title: $:/language/Help/xlsx-import +description: Import tiddlers from an XLSX spreadsheet file + +Imports tiddlers from an XLSX spreadsheet file + +``` +--xlsx-import +``` + +* ''filename'': filename of the `.xlsx` file +* ''title'': title of the import specification tiddler to be used for the import \ No newline at end of file diff --git a/plugins/tiddlywiki/xlsx-utils/importer.js b/plugins/tiddlywiki/xlsx-utils/importer.js new file mode 100644 index 000000000..34524c9e1 --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/importer.js @@ -0,0 +1,201 @@ +/*\ +title: $:/plugins/tiddlywiki/xlsx-utils/importer.js +type: application/javascript +module-type: library + +Class to import an Excel file + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +var DEFAULT_IMPORT_SPEC_TITLE = "$:/config/plugins/tiddlywiki/xlsx-utils/default-import-spec"; + +var XLSX = require("$:/plugins/tiddlywiki/xlsx-utils/xlsx.js"), + JSZip = require("$:/plugins/tiddlywiki/jszip/jszip.js"); + +var XLSXImporter = function(options) { + this.filename = options.filename; + this.text = options.text; + this.importSpec = options.importSpec || $tw.wiki.getTiddlerText(DEFAULT_IMPORT_SPEC_TITLE); + this.logger = new $tw.utils.Logger("xlsx-utils"); + this.results = []; + if(JSZip) { + this.processWorkbook(); + } +}; + +XLSXImporter.prototype.getResults = function() { + return this.results; +}; + +XLSXImporter.prototype.processWorkbook = function() { + // Read the workbook + if(this.filename) { + this.workbook = XLSX.readFile(this.filename); + } else if(this.text) { + this.workbook = XLSX.read(this.text,{type:"base64"}); + } + // Read the root import specification + this.rootImportSpec = $tw.wiki.getTiddler(this.importSpec); + if(this.rootImportSpec) { + // Iterate through the sheets specified in the list field + $tw.utils.each(this.rootImportSpec.fields.list || [],this.processSheet.bind(this)); + } +}; + +XLSXImporter.prototype.processSheet = function(sheetImportSpecTitle) { + // Get the sheet import specifier + this.sheetImportSpec = $tw.wiki.getTiddler(sheetImportSpecTitle); + if(this.sheetImportSpec) { + this.sheetName = this.sheetImportSpec.fields["import-sheet-name"]; + this.sheet = this.workbook.Sheets[this.sheetName]; + if(!this.sheet) { + this.logger.alert("Missing sheet '" + this.sheetName + "'"); + } else { + // Get the size of the sheet + this.sheetSize = this.measureSheet(this.sheet); + // Read the column names from the first row + this.columnsByName = this.findColumns(this.sheet,this.sheetSize); + // Iterate through the rows + for(this.row=this.sheetSize.startRow+1; this.row<=this.sheetSize.endRow; this.row++) { + // Iterate through the row import specifiers + $tw.utils.each(this.sheetImportSpec.fields.list || [],this.processRow.bind(this)); + } + } + } +}; + +XLSXImporter.prototype.processRow = function(rowImportSpecTitle) { + this.rowImportSpec = $tw.wiki.getTiddler(rowImportSpecTitle); + if(this.rowImportSpec) { + this.tiddlerFields = {}; + this.skipTiddler = false; + // Determine the type of row + this.rowType = this.rowImportSpec.fields["import-row-type"] || "by-field"; + switch(this.rowType) { + case "by-column": + this.processRowByColumn(); + break; + case "by-field": + this.processRowByField(); + break; + } + // Save the tiddler if not skipped + if(!this.skipTiddler) { + if(!this.tiddlerFields.title) { + this.logger.alert("Missing title field for " + JSON.stringify(this.tiddlerFields)); + } + this.results.push(this.tiddlerFields); + } + } +}; + +XLSXImporter.prototype.processRowByColumn = function() { + var self = this; + // Iterate through the columns for the row + $tw.utils.each(this.columnsByName,function(index,name) { + var cell = self.sheet[XLSX.utils.encode_cell({c: self.columnsByName[name], r: self.row})]; + name = name.toLowerCase(); + if(cell && cell.w && $tw.utils.isValidFieldName(name)) { + self.tiddlerFields[name] = cell.w; + } + }); + // Skip the tiddler entirely if it doesn't have a title + if(!this.tiddlerFields.title) { + this.skipTiddler = true; + } +}; + +XLSXImporter.prototype.processRowByField = function() { + // Iterate through the fields for the row + $tw.utils.each(this.rowImportSpec.fields.list || [],this.processField.bind(this)); +}; + +XLSXImporter.prototype.processField = function(fieldImportSpecTitle) { + var fieldImportSpec = $tw.wiki.getTiddler(fieldImportSpecTitle); + if(fieldImportSpec) { + var fieldName = fieldImportSpec.fields["import-field-name"], + value; + switch(fieldImportSpec.fields["import-field-source"]) { + case "column": + var columnName = fieldImportSpec.fields["import-field-column"], + cell = this.sheet[XLSX.utils.encode_cell({c: this.columnsByName[columnName], r: this.row})]; + if(cell) { + switch(fieldImportSpec.fields["import-field-type"] || "string") { + case "date": + if(cell.t === "n") { + value = $tw.utils.stringifyDate(new Date((cell.v - (25567 + 2)) * 86400 * 1000)); + } + break; + case "string": + // Intentional fall-through + default: + value = cell.w; + break; + } + } + break; + case "constant": + value = fieldImportSpec.fields["import-field-value"] + break; + } + value = (value || "").trim(); + if(value === "") { + if((fieldImportSpec.fields["import-field-skip-tiddler-if-blank"] || "").trim().toLowerCase() === "yes") { + this.skipTiddler = true; + } + if(fieldImportSpec.fields["import-field-replace-blank"]) { + value = fieldImportSpec.fields["import-field-replace-blank"]; + } + } + if(fieldImportSpec.fields["import-field-prefix"]) { + value = fieldImportSpec.fields["import-field-prefix"] + value; + } + if(fieldImportSpec.fields["import-field-suffix"]) { + value = value + fieldImportSpec.fields["import-field-suffix"]; + } + switch(fieldImportSpec.fields["import-field-list-op"] || "none") { + case "none": + this.tiddlerFields[fieldName] = value; + break; + case "append": + var list = $tw.utils.parseStringArray(this.tiddlerFields[fieldName] || ""); + $tw.utils.pushTop(list,value) + this.tiddlerFields[fieldName] = list; + break; + } + } +} + +XLSXImporter.prototype.measureSheet = function(sheet) { + var sheetRange = XLSX.utils.decode_range(sheet["!ref"]); + return { + startRow: Math.min(sheetRange.s.r,sheetRange.e.r), + endRow: Math.max(sheetRange.s.r,sheetRange.e.r), + startCol: Math.min(sheetRange.s.c,sheetRange.e.c), + endCol: Math.max(sheetRange.s.c,sheetRange.e.c) + } +}; + +XLSXImporter.prototype.findColumns = function(sheet,sheetSize) { + var columnsByName = {}; + for(var col=sheetSize.startCol; col<=sheetSize.endCol; col++) { + var cell = sheet[XLSX.utils.encode_cell({c: col, r: sheetSize.startRow})], + columnName; + if(cell) { + columnName = cell.w; + if(columnName) { + columnsByName[columnName] = col; + } + } + } + return columnsByName; +}; + +exports.XLSXImporter = XLSXImporter; + +})(); diff --git a/plugins/tiddlywiki/xlsx-utils/plugin.info b/plugins/tiddlywiki/xlsx-utils/plugin.info new file mode 100644 index 000000000..93a4202f7 --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/plugin.info @@ -0,0 +1,7 @@ +{ + "title": "$:/plugins/tiddlywiki/xlsx-utils", + "description": "XLSX spreadsheet utilities", + "author": "Jeremy Ruston and SheetJS", + "core-version": ">=5.0.0", + "list": "readme controls license" +} diff --git a/plugins/tiddlywiki/xlsx-utils/readme.tid b/plugins/tiddlywiki/xlsx-utils/readme.tid new file mode 100644 index 000000000..a3117ffa1 --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/readme.tid @@ -0,0 +1,24 @@ +title: $:/plugins/tiddlywiki/xlsx-utils/readme + +This plugin provides a flexible way to import tiddlers from Excel files. It is based on the library [[js-xlsx|https://github.com/SheetJS/js-xlsx]]. + +The plugin uses //import specifications// to determine how incoming spreadsheets are processed. You can view, create and edit import specifications in the control panel "XLSX Utilities" tab, or directly in the [[plugin controls|$:/plugins/tiddlywiki/xlsx-utils]]. This is also where you select which import specification is selected for use during the next import operation. + +Each sheet is expected to consist of a single header row followed by multiple content rows, each consisting of an independent record. The plugin automatically detects the extent of each sheet by looking for the bottom right cell that contains a value. This can lead to unexpected results if a cell is accidentally created with an invisible, blank value. + +Import specifications describe how tiddlers are created from a particular row of a sheet; multiple tiddlers can be generated from a single row. (Conversely, if different rows yield tiddlers with the same title then they will overwrite one another). + +Each field of each tiddler can be assigned a constant value, or a value taken from a named column of the sheet, optionally with a prefix and/or suffix added. There is special support for handling list fields (like the tags field), with the ability to append new items to the list. + +Internally, each import specifier is actually modelled as a hierarchy of connected tiddlers with the field ''import-spec-role'' indicating the following roles: + +* ''workbook'': describes the sheets to be imported from the workbook +* ''sheet'': describes each sheet to be processed +* ''row'': describes the tiddlers to be imported from each row of each sheet +* ''field'': describes the fields to be assigned to each tiddler from each row of each sheet + +The easiest way to understand the structure is to explore the example import specifications, and the corresponding spreadsheets they are designed to handle. + +Note that there are many possible different ways of importing a particular spreadsheet, depending on whether the structures are modelled with fields, tags, prefixes or other mechanisms. The plugin is designed to support a wide range of applications. + +This plugin also requires the JSZip plugin ([[$:/plugins/tiddlywiki/jszip]]) to be installed. diff --git a/plugins/tiddlywiki/xlsx-utils/startup.js b/plugins/tiddlywiki/xlsx-utils/startup.js new file mode 100644 index 000000000..15772384f --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/startup.js @@ -0,0 +1,29 @@ +/*\ +title: $:/plugins/tiddlywiki/xlsx-utils/startup.js +type: application/javascript +module-type: startup + +Initialisation + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +// Export name and synchronous status +exports.name = "xlsx-startup"; +exports.after = ["load-modules"]; +exports.synchronous = true; + +exports.startup = function() { + // Check JSZip is installed + if(!$tw.utils.hop($tw.modules.titles,"$:/plugins/tiddlywiki/jszip/jszip.js")) { + // Make a logger + var logger = new $tw.utils.Logger("xlsx-utils"); + logger.alert("The plugin 'xlsx-utils' requires the 'jszip' plugin to be installed"); + } +}; + +})(); diff --git a/plugins/tiddlywiki/xlsx-utils/styles.tid b/plugins/tiddlywiki/xlsx-utils/styles.tid new file mode 100644 index 000000000..680d2b773 --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/styles.tid @@ -0,0 +1,176 @@ +title: $:/plugins/tiddlywiki/xlsx-utils/styles +tags: [[$:/tags/Stylesheet]] + +\define quick-colour-selector-background() #bac0f1 +\define quick-colour-selector-border() #9196c1 + +\define quick-colour-editor-background() #bae3f1 +\define quick-colour-editor-controls() #d2ffff +\define quick-colour-editor-border() #97b8c3 + +\define quick-colour-workbook-background() #baf1db +\define quick-colour-workbook-controls() #d3fff6 +\define quick-colour-workbook-border() #98c3b2 + +\define quick-colour-sheet-background() #f1ebba +\define quick-colour-sheet-controls() #fffed3 +\define quick-colour-sheet-border() #c4be98 + +\define quick-colour-row-background() #f1baba +\define quick-colour-row-controls() #fed1d2 +\define quick-colour-row-border() #c39697 + +\define quick-colour-field-background() #e0d4fb +\define quick-colour-field-controls() #fcefff +\define quick-colour-field-border() #b6adcb + + +\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline + +.tc-import-spec-selector { + border: 1px solid <>; + background-color: <>; + padding: 0.25em; +} + +.tc-import-spec-editor-wrapper { + border: 1px solid <>; + background-color: <>; + padding: 0.25em; +} + +.tc-import-spec-editor { + border: 1px solid <>; + background-color: <>; + margin: 0.25em; +} + +.tc-import-spec-editor-controls { + display: block; + background-color: <>; + border-bottom: 1px solid <>; + padding: 0; + margin: 0; + list-style: none; +} + +.tc-import-spec-editor-controls li { + padding: 0.25em 0.5em; +} + +.tc-import-spec-editor-controls li:not(:last-child) { + border-bottom: 1px solid <>; +} + +.tc-import-spec-editor-list { +} + +.tc-import-spec-workbook-wrapper { + border: 1px solid <>; + background-color: <>; + padding: 0.25em; + margin: 0.5em; +} + +.tc-import-spec-workbook { + border: 1px solid <>; + background-color: <>; + margin: 0.25em; +} + +.tc-import-spec-workbook-controls { + display: block; + background-color: <>; + border-bottom: 1px solid <>; + padding: 0; + margin: 0; + list-style: none; +} + +.tc-import-spec-workbook-controls li { + padding: 0.25em 0.5em; +} + +.tc-import-spec-workbook-controls li:not(:last-child) { + border-bottom: 1px solid <>; +} + +.tc-import-spec-workbook-list { +} + +.tc-import-spec-sheet-wrapper { + border: 1px solid <>; + background-color: <>; + padding: 0.25em; + margin: 0.5em; +} + +.tc-import-spec-sheet { + border: 1px solid <>; + background-color: <>; + margin: 0.25em; +} + +.tc-import-spec-sheet-controls { + display: block; + background-color: <>; + border-bottom: 1px solid <>; + padding: 0; + margin: 0; + list-style: none; +} + +.tc-import-spec-sheet-controls li { + padding: 0.25em 0.5em; +} + +.tc-import-spec-sheet-controls li:not(:last-child) { + border-bottom: 1px solid <>; +} + +.tc-import-spec-sheet-list { +} + +.tc-import-spec-row-wrapper { + border: 1px solid <>; + background-color: <>; + padding: 0.25em; + margin: 0.5em; +} + +.tc-import-spec-row { + border: 1px solid <>; + background-color: <>; + margin: 0.25em; +} + +.tc-import-spec-row-controls { + display: block; + background-color: <>; + border-bottom: 1px solid <>; + padding: 0; + margin: 0; + list-style: none; +} + +.tc-import-spec-row-controls li { + padding: 0.25em 0.5em; +} + +.tc-import-spec-row-controls li:not(:last-child) { + border-bottom: 1px solid <>; +} + +.tc-import-spec-row-list { + list-style: none; + padding: 0; + margin: 0; +} + +.tc-import-spec-field-wrapper { + font-size: 0.9em; + border: 1px solid <>; + background-color: <>; + padding: 0.25em; + margin: 0.5em; +} diff --git a/plugins/tiddlywiki/xlsx-utils/xlsx-import-command.js b/plugins/tiddlywiki/xlsx-utils/xlsx-import-command.js new file mode 100644 index 000000000..091778ce7 --- /dev/null +++ b/plugins/tiddlywiki/xlsx-utils/xlsx-import-command.js @@ -0,0 +1,45 @@ +/*\ +title: $:/plugins/tiddlywiki/xlsx-utils/xlsx-import-command.js +type: application/javascript +module-type: command + +Command to import an xlsx file + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +exports.info = { + name: "xlsx-import", + synchronous: true +}; + +var Command = function(params,commander,callback) { + this.params = params; + this.commander = commander; + this.callback = callback; +}; + +Command.prototype.execute = function() { + if(this.params.length < 1) { + return "Missing parameters"; + } + var self = this, + wiki = this.commander.wiki, + filename = this.params[0], + importSpec = this.params[1], + XLSXImporter = require("$:/plugins/tiddlywiki/xlsx-utils/importer.js").XLSXImporter, + importer = new XLSXImporter({ + filename: filename, + importSpec: importSpec + }); + $tw.wiki.addTiddlers(importer.getResults()); + return null; +}; + +exports.Command = Command; + +})(); diff --git a/plugins/tiddlywiki/xmldom/files/LICENSE b/plugins/tiddlywiki/xmldom/files/LICENSE old mode 100644 new mode 100755 diff --git a/plugins/tiddlywiki/xmldom/files/dom-parser.js b/plugins/tiddlywiki/xmldom/files/dom-parser.js old mode 100644 new mode 100755 index 44657c507..feaeaaae8 --- a/plugins/tiddlywiki/xmldom/files/dom-parser.js +++ b/plugins/tiddlywiki/xmldom/files/dom-parser.js @@ -2,32 +2,31 @@ function DOMParser(options){ this.options = options ||{locator:{}}; } -DOMParser.prototype.parseFromString = function(source,mimeType){ +DOMParser.prototype.parseFromString = function(source,mimeType){ var options = this.options; var sax = new XMLReader(); var domBuilder = options.domBuilder || new DOMHandler();//contentHandler and LexicalHandler var errorHandler = options.errorHandler; var locator = options.locator; var defaultNSMap = options.xmlns||{}; - var entityMap = {'lt':'<','gt':'>','amp':'&','quot':'"','apos':"'"} + var isHTML = /\/x?html?$/.test(mimeType);//mimeType.toLowerCase().indexOf('html') > -1; + var entityMap = isHTML?require('./entities').entityMap:{'lt':'<','gt':'>','amp':'&','quot':'"','apos':"'"}; if(locator){ domBuilder.setDocumentLocator(locator) } sax.errorHandler = buildErrorHandler(errorHandler,domBuilder,locator); sax.domBuilder = options.domBuilder || domBuilder; - if(/\/x?html?$/.test(mimeType)){ - entityMap.nbsp = '\xa0'; - entityMap.copy = '\xa9'; + if(isHTML){ defaultNSMap['']= 'http://www.w3.org/1999/xhtml'; } defaultNSMap.xml = defaultNSMap.xml || 'http://www.w3.org/XML/1998/namespace'; if(source){ sax.parse(source,defaultNSMap,entityMap); }else{ - sax.errorHandler.error("invalid document source"); + sax.errorHandler.error("invalid doc source"); } - return domBuilder.document; + return domBuilder.doc; } function buildErrorHandler(errorImpl,domBuilder,locator){ if(!errorImpl){ @@ -41,27 +40,20 @@ function buildErrorHandler(errorImpl,domBuilder,locator){ locator = locator||{} function build(key){ var fn = errorImpl[key]; - if(!fn){ - if(isCallback){ - fn = errorImpl.length == 2?function(msg){errorImpl(key,msg)}:errorImpl; - }else{ - var i=arguments.length; - while(--i){ - if(fn = errorImpl[arguments[i]]){ - break; - } - } - } + if(!fn && isCallback){ + fn = errorImpl.length == 2?function(msg){errorImpl(key,msg)}:errorImpl; } errorHandler[key] = fn && function(msg){ - fn(msg+_locator(locator)); + fn('[xmldom '+key+']\t'+msg+_locator(locator)); }||function(){}; } - build('warning','warn'); - build('error','warn','warning'); - build('fatalError','warn','warning','error'); + build('warning'); + build('error'); + build('fatalError'); return errorHandler; } + +//console.log('#\n\n\n\n\n\n\n####') /** * +ContentHandler+ErrorHandler * +LexicalHandler+EntityResolver2 @@ -84,13 +76,13 @@ function position(locator,node){ */ DOMHandler.prototype = { startDocument : function() { - this.document = new DOMImplementation().createDocument(null, null, null); + this.doc = new DOMImplementation().createDocument(null, null, null); if (this.locator) { - this.document.documentURI = this.locator.systemId; + this.doc.documentURI = this.locator.systemId; } }, startElement:function(namespaceURI, localName, qName, attrs) { - var doc = this.document; + var doc = this.doc; var el = doc.createElementNS(namespaceURI, qName||localName); var len = attrs.length; appendElement(this, el); @@ -102,24 +94,22 @@ DOMHandler.prototype = { var value = attrs.getValue(i); var qName = attrs.getQName(i); var attr = doc.createAttributeNS(namespaceURI, qName); - if( attr.getOffset){ - position(attr.getOffset(1),attr) - } + this.locator &&position(attrs.getLocator(i),attr); attr.value = attr.nodeValue = value; el.setAttributeNode(attr) } }, endElement:function(namespaceURI, localName, qName) { var current = this.currentElement - var tagName = current.tagName; - this.currentElement = current.parentNode; + var tagName = current.tagName; + this.currentElement = current.parentNode; }, startPrefixMapping:function(prefix, uri) { }, endPrefixMapping:function(prefix) { }, processingInstruction:function(target, data) { - var ins = this.document.createProcessingInstruction(target, data); + var ins = this.doc.createProcessingInstruction(target, data); this.locator && position(this.locator,ins) appendElement(this, ins); }, @@ -128,13 +118,17 @@ DOMHandler.prototype = { characters:function(chars, start, length) { chars = _toString.apply(this,arguments) //console.log(chars) - if(this.currentElement && chars){ + if(chars){ if (this.cdata) { - var charNode = this.document.createCDATASection(chars); - this.currentElement.appendChild(charNode); + var charNode = this.doc.createCDATASection(chars); } else { - var charNode = this.document.createTextNode(chars); + var charNode = this.doc.createTextNode(chars); + } + if(this.currentElement){ this.currentElement.appendChild(charNode); + }else if(/^\s*$/.test(chars)){ + this.doc.appendChild(charNode); + //process xml } this.locator && position(this.locator,charNode) } @@ -142,7 +136,7 @@ DOMHandler.prototype = { skippedEntity:function(name) { }, endDocument:function() { - this.document.normalize(); + this.doc.normalize(); }, setDocumentLocator:function (locator) { if(this.locator = locator){// && !('lineNumber' in locator)){ @@ -152,7 +146,7 @@ DOMHandler.prototype = { //LexicalHandler comment:function(chars, start, length) { chars = _toString.apply(this,arguments) - var comm = this.document.createComment(chars); + var comm = this.doc.createComment(chars); this.locator && position(this.locator,comm) appendElement(this, comm); }, @@ -166,7 +160,7 @@ DOMHandler.prototype = { }, startDTD:function(name, publicId, systemId) { - var impl = this.document.implementation; + var impl = this.doc.implementation; if (impl && impl.createDocumentType) { var dt = impl.createDocumentType(name, publicId, systemId); this.locator && position(this.locator,dt) @@ -178,13 +172,13 @@ DOMHandler.prototype = { * @link http://www.saxproject.org/apidoc/org/xml/sax/ErrorHandler.html */ warning:function(error) { - console.warn(error,_locator(this.locator)); + console.warn('[xmldom warning]\t'+error,_locator(this.locator)); }, error:function(error) { - console.error(error,_locator(this.locator)); + console.error('[xmldom error]\t'+error,_locator(this.locator)); }, fatalError:function(error) { - console.error(error,_locator(this.locator)); + console.error('[xmldom fatalError]\t'+error,_locator(this.locator)); throw error; } } @@ -242,15 +236,15 @@ function _toString(chars,start,length){ /* Private static helpers treated below as private instance methods, so don't need to add these to the public API; we might use a Relator to also get rid of non-standard public properties */ function appendElement (hander,node) { if (!hander.currentElement) { - hander.document.appendChild(node); + hander.doc.appendChild(node); } else { hander.currentElement.appendChild(node); } }//appendChild and setAttributeNS are preformance key -if(typeof require == 'function'){ +//if(typeof require == 'function'){ var XMLReader = require('./sax').XMLReader; var DOMImplementation = exports.DOMImplementation = require('./dom').DOMImplementation; exports.XMLSerializer = require('./dom').XMLSerializer ; exports.DOMParser = DOMParser; -} +//} diff --git a/plugins/tiddlywiki/xmldom/files/dom.js b/plugins/tiddlywiki/xmldom/files/dom.js old mode 100644 new mode 100755 index 0a3b8add4..6299445a8 --- a/plugins/tiddlywiki/xmldom/files/dom.js +++ b/plugins/tiddlywiki/xmldom/files/dom.js @@ -109,6 +109,12 @@ NodeList.prototype = { */ item: function(index) { return this[index] || null; + }, + toString:function(isHTML,nodeFilter){ + for(var buf = [], i = 0;i=0){ var lastIndex = list.length-1 @@ -179,7 +186,7 @@ function _removeNamedNode(el,list,attr){ } } }else{ - throw DOMException(NOT_FOUND_ERR,new Error()) + throw DOMException(NOT_FOUND_ERR,new Error(el.tagName+'@'+attr)) } } NamedNodeMap.prototype = { @@ -189,9 +196,11 @@ NamedNodeMap.prototype = { // if(key.indexOf(':')>0 || key == 'xmlns'){ // return null; // } + //console.log() var i = this.length; while(i--){ var attr = this[i]; + //console.log(attr.nodeName,key) if(attr.nodeName == key){ return attr; } @@ -373,7 +382,7 @@ Node.prototype = { } } } - el = el.nodeType == 2?el.ownerDocument : el.parentNode; + el = el.nodeType == ATTRIBUTE_NODE?el.ownerDocument : el.parentNode; } return null; }, @@ -388,7 +397,7 @@ Node.prototype = { return map[prefix] ; } } - el = el.nodeType == 2?el.ownerDocument : el.parentNode; + el = el.nodeType == ATTRIBUTE_NODE?el.ownerDocument : el.parentNode; } return null; }, @@ -573,7 +582,7 @@ Document.prototype = { } return newChild; } - if(this.documentElement == null && newChild.nodeType == 1){ + if(this.documentElement == null && newChild.nodeType == ELEMENT_NODE){ this.documentElement = newChild; } @@ -593,7 +602,7 @@ Document.prototype = { getElementById : function(id){ var rtv = null; _visitNode(this.documentElement,function(node){ - if(node.nodeType == 1){ + if(node.nodeType == ELEMENT_NODE){ if(node.getAttribute('id') == id){ rtv = node; return true; @@ -742,6 +751,7 @@ Element.prototype = { return this.attributes.setNamedItemNS(newAttr); }, removeAttributeNode : function(oldAttr){ + //console.log(this == oldAttr.ownerElement) return this.attributes.removeNamedItem(oldAttr.nodeName); }, //get real attribute name,and remove it by removeAttributeNode @@ -786,6 +796,7 @@ Element.prototype = { } }); return ls; + }); } }; @@ -817,10 +828,7 @@ CharacterData.prototype = { }, appendChild:function(newChild){ - //if(!(newChild instanceof CharacterData)){ - throw new Error(ExceptionMessage[3]) - //} - return Node.prototype.appendChild.apply(this,arguments) + throw new Error(ExceptionMessage[HIERARCHY_REQUEST_ERR]) }, deleteData: function(offset, count) { this.replaceData(offset,count,""); @@ -902,39 +910,132 @@ function ProcessingInstruction() { ProcessingInstruction.prototype.nodeType = PROCESSING_INSTRUCTION_NODE; _extends(ProcessingInstruction,Node); function XMLSerializer(){} -XMLSerializer.prototype.serializeToString = function(node,attributeSorter){ - return node.toString(attributeSorter); +XMLSerializer.prototype.serializeToString = function(node,isHtml,nodeFilter){ + return nodeSerializeToString.call(node,isHtml,nodeFilter); } -Node.prototype.toString =function(attributeSorter){ +Node.prototype.toString = nodeSerializeToString; +function nodeSerializeToString(isHtml,nodeFilter){ var buf = []; - serializeToString(this,buf,attributeSorter); + var refNode = this.nodeType == 9 && this.documentElement || this; + var prefix = refNode.prefix; + var uri = refNode.namespaceURI; + + if(uri && prefix == null){ + //console.log(prefix) + var prefix = refNode.lookupPrefix(uri); + if(prefix == null){ + //isHTML = true; + var visibleNamespaces=[ + {namespace:uri,prefix:null} + //{namespace:uri,prefix:''} + ] + } + } + serializeToString(this,buf,isHtml,nodeFilter,visibleNamespaces); + //console.log('###',this.nodeType,uri,prefix,buf.join('')) return buf.join(''); } -function serializeToString(node,buf,attributeSorter,isHTML){ +function needNamespaceDefine(node,isHTML, visibleNamespaces) { + var prefix = node.prefix||''; + var uri = node.namespaceURI; + if (!prefix && !uri){ + return false; + } + if (prefix === "xml" && uri === "http://www.w3.org/XML/1998/namespace" + || uri == 'http://www.w3.org/2000/xmlns/'){ + return false; + } + + var i = visibleNamespaces.length + //console.log('@@@@',node.tagName,prefix,uri,visibleNamespaces) + while (i--) { + var ns = visibleNamespaces[i]; + // get namespace prefix + //console.log(node.nodeType,node.tagName,ns.prefix,prefix) + if (ns.prefix == prefix){ + return ns.namespace != uri; + } + } + //console.log(isHTML,uri,prefix=='') + //if(isHTML && prefix ==null && uri == 'http://www.w3.org/1999/xhtml'){ + // return false; + //} + //node.flag = '11111' + //console.error(3,true,node.flag,node.prefix,node.namespaceURI) + return true; +} +function serializeToString(node,buf,isHTML,nodeFilter,visibleNamespaces){ + if(nodeFilter){ + node = nodeFilter(node); + if(node){ + if(typeof node == 'string'){ + buf.push(node); + return; + } + }else{ + return; + } + //buf.sort.apply(attrs, attributeSorter); + } switch(node.nodeType){ case ELEMENT_NODE: + if (!visibleNamespaces) visibleNamespaces = []; + var startVisibleNamespaces = visibleNamespaces.length; var attrs = node.attributes; var len = attrs.length; var child = node.firstChild; var nodeName = node.tagName; + isHTML = (htmlns === node.namespaceURI) ||isHTML buf.push('<',nodeName); - if(attributeSorter){ - buf.sort.apply(attrs, attributeSorter); + + + + for(var i=0;i'); //if is cdata child node if(isHTML && /^script$/i.test(nodeName)){ - if(child){ - buf.push(child.data); - } - }else{ while(child){ - serializeToString(child,buf,attributeSorter,isHTML); + if(child.data){ + buf.push(child.data); + }else{ + serializeToString(child,buf,isHTML,nodeFilter,visibleNamespaces); + } + child = child.nextSibling; + } + }else + { + while(child){ + serializeToString(child,buf,isHTML,nodeFilter,visibleNamespaces); child = child.nextSibling; } } @@ -942,12 +1043,14 @@ function serializeToString(node,buf,attributeSorter,isHTML){ }else{ buf.push('/>'); } + // remove added visible namespaces + //visibleNamespaces.length = startVisibleNamespaces; return; case DOCUMENT_NODE: case DOCUMENT_FRAGMENT_NODE: var child = node.firstChild; while(child){ - serializeToString(child,buf,attributeSorter,isHTML); + serializeToString(child,buf,isHTML,nodeFilter,visibleNamespaces); child = child.nextSibling; } return; @@ -1092,8 +1195,8 @@ try{ }, set:function(data){ switch(this.nodeType){ - case 1: - case 11: + case ELEMENT_NODE: + case DOCUMENT_FRAGMENT_NODE: while(this.firstChild){ this.removeChild(this.firstChild); } @@ -1104,7 +1207,7 @@ try{ default: //TODO: this.data = data; - this.value = value; + this.value = data; this.nodeValue = data; } } @@ -1112,8 +1215,8 @@ try{ function getTextContent(node){ switch(node.nodeType){ - case 1: - case 11: + case ELEMENT_NODE: + case DOCUMENT_FRAGMENT_NODE: var buf = []; node = node.firstChild; while(node){ @@ -1135,7 +1238,7 @@ try{ }catch(e){//ie8 } -if(typeof require == 'function'){ +//if(typeof require == 'function'){ exports.DOMImplementation = DOMImplementation; exports.XMLSerializer = XMLSerializer; -} +//} diff --git a/plugins/tiddlywiki/xmldom/files/entities.js b/plugins/tiddlywiki/xmldom/files/entities.js new file mode 100755 index 000000000..1f7d605fb --- /dev/null +++ b/plugins/tiddlywiki/xmldom/files/entities.js @@ -0,0 +1,244 @@ +exports.entityMap = { + lt: '<', + gt: '>', + amp: '&', + quot: '"', + apos: "'", + Agrave: "À", + Aacute: "Á", + Acirc: "Â", + Atilde: "Ã", + Auml: "Ä", + Aring: "Å", + AElig: "Æ", + Ccedil: "Ç", + Egrave: "È", + Eacute: "É", + Ecirc: "Ê", + Euml: "Ë", + Igrave: "Ì", + Iacute: "Í", + Icirc: "Î", + Iuml: "Ï", + ETH: "Ð", + Ntilde: "Ñ", + Ograve: "Ò", + Oacute: "Ó", + Ocirc: "Ô", + Otilde: "Õ", + Ouml: "Ö", + Oslash: "Ø", + Ugrave: "Ù", + Uacute: "Ú", + Ucirc: "Û", + Uuml: "Ü", + Yacute: "Ý", + THORN: "Þ", + szlig: "ß", + agrave: "à", + aacute: "á", + acirc: "â", + atilde: "ã", + auml: "ä", + aring: "å", + aelig: "æ", + ccedil: "ç", + egrave: "è", + eacute: "é", + ecirc: "ê", + euml: "ë", + igrave: "ì", + iacute: "í", + icirc: "î", + iuml: "ï", + eth: "ð", + ntilde: "ñ", + ograve: "ò", + oacute: "ó", + ocirc: "ô", + otilde: "õ", + ouml: "ö", + oslash: "ø", + ugrave: "ù", + uacute: "ú", + ucirc: "û", + uuml: "ü", + yacute: "ý", + thorn: "þ", + yuml: "ÿ", + nbsp: " ", + iexcl: "¡", + cent: "¢", + pound: "£", + curren: "¤", + yen: "¥", + brvbar: "¦", + sect: "§", + uml: "¨", + copy: "©", + ordf: "ª", + laquo: "«", + not: "¬", + shy: "­­", + reg: "®", + macr: "¯", + deg: "°", + plusmn: "±", + sup2: "²", + sup3: "³", + acute: "´", + micro: "µ", + para: "¶", + middot: "·", + cedil: "¸", + sup1: "¹", + ordm: "º", + raquo: "»", + frac14: "¼", + frac12: "½", + frac34: "¾", + iquest: "¿", + times: "×", + divide: "÷", + forall: "∀", + part: "∂", + exist: "∃", + empty: "∅", + nabla: "∇", + isin: "∈", + notin: "∉", + ni: "∋", + prod: "∏", + sum: "∑", + minus: "−", + lowast: "∗", + radic: "√", + prop: "∝", + infin: "∞", + ang: "∠", + and: "∧", + or: "∨", + cap: "∩", + cup: "∪", + 'int': "∫", + there4: "∴", + sim: "∼", + cong: "≅", + asymp: "≈", + ne: "≠", + equiv: "≡", + le: "≤", + ge: "≥", + sub: "⊂", + sup: "⊃", + nsub: "⊄", + sube: "⊆", + supe: "⊇", + oplus: "⊕", + otimes: "⊗", + perp: "⊥", + sdot: "⋅", + Alpha: "Α", + Beta: "Β", + Gamma: "Γ", + Delta: "Δ", + Epsilon: "Ε", + Zeta: "Ζ", + Eta: "Η", + Theta: "Θ", + Iota: "Ι", + Kappa: "Κ", + Lambda: "Λ", + Mu: "Μ", + Nu: "Ν", + Xi: "Ξ", + Omicron: "Ο", + Pi: "Π", + Rho: "Ρ", + Sigma: "Σ", + Tau: "Τ", + Upsilon: "Υ", + Phi: "Φ", + Chi: "Χ", + Psi: "Ψ", + Omega: "Ω", + alpha: "α", + beta: "β", + gamma: "γ", + delta: "δ", + epsilon: "ε", + zeta: "ζ", + eta: "η", + theta: "θ", + iota: "ι", + kappa: "κ", + lambda: "λ", + mu: "μ", + nu: "ν", + xi: "ξ", + omicron: "ο", + pi: "π", + rho: "ρ", + sigmaf: "ς", + sigma: "σ", + tau: "τ", + upsilon: "υ", + phi: "φ", + chi: "χ", + psi: "ψ", + omega: "ω", + thetasym: "ϑ", + upsih: "ϒ", + piv: "ϖ", + OElig: "Œ", + oelig: "œ", + Scaron: "Š", + scaron: "š", + Yuml: "Ÿ", + fnof: "ƒ", + circ: "ˆ", + tilde: "˜", + ensp: " ", + emsp: " ", + thinsp: " ", + zwnj: "‌", + zwj: "‍", + lrm: "‎", + rlm: "‏", + ndash: "–", + mdash: "—", + lsquo: "‘", + rsquo: "’", + sbquo: "‚", + ldquo: "“", + rdquo: "”", + bdquo: "„", + dagger: "†", + Dagger: "‡", + bull: "•", + hellip: "…", + permil: "‰", + prime: "′", + Prime: "″", + lsaquo: "‹", + rsaquo: "›", + oline: "‾", + euro: "€", + trade: "™", + larr: "←", + uarr: "↑", + rarr: "→", + darr: "↓", + harr: "↔", + crarr: "↵", + lceil: "⌈", + rceil: "⌉", + lfloor: "⌊", + rfloor: "⌋", + loz: "◊", + spades: "♠", + clubs: "♣", + hearts: "♥", + diams: "♦" +}; +//for(var n in exports.entityMap){console.log(exports.entityMap[n].charCodeAt())} \ No newline at end of file diff --git a/plugins/tiddlywiki/xmldom/files/readme.md b/plugins/tiddlywiki/xmldom/files/readme.md old mode 100644 new mode 100755 diff --git a/plugins/tiddlywiki/xmldom/files/sax.js b/plugins/tiddlywiki/xmldom/files/sax.js old mode 100644 new mode 100755 index 127963f8a..dc17cc251 --- a/plugins/tiddlywiki/xmldom/files/sax.js +++ b/plugins/tiddlywiki/xmldom/files/sax.js @@ -2,21 +2,21 @@ //[4a] NameChar ::= NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040] //[5] Name ::= NameStartChar (NameChar)* var nameStartChar = /[A-Z_a-z\xC0-\xD6\xD8-\xF6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]///\u10000-\uEFFFF -var nameChar = new RegExp("[\\-\\.0-9"+nameStartChar.source.slice(1,-1)+"\u00B7\u0300-\u036F\\u203F-\u2040]"); +var nameChar = new RegExp("[\\-\\.0-9"+nameStartChar.source.slice(1,-1)+"\\u00B7\\u0300-\\u036F\\u203F-\\u2040]"); var tagNamePattern = new RegExp('^'+nameStartChar.source+nameChar.source+'*(?:\:'+nameStartChar.source+nameChar.source+'*)?$'); //var tagNamePattern = /^[a-zA-Z_][\w\-\.]*(?:\:[a-zA-Z_][\w\-\.]*)?$/ //var handlers = 'resolveEntity,getExternalSubset,characters,endDocument,endElement,endPrefixMapping,ignorableWhitespace,processingInstruction,setDocumentLocator,skippedEntity,startDocument,startElement,startPrefixMapping,notationDecl,unparsedEntityDecl,error,fatalError,warning,attributeDecl,elementDecl,externalEntityDecl,internalEntityDecl,comment,endCDATA,endDTD,endEntity,startCDATA,startDTD,startEntity'.split(',') -//S_TAG, S_ATTR, S_EQ, S_V -//S_ATTR_S, S_E, S_S, S_C +//S_TAG, S_ATTR, S_EQ, S_ATTR_NOQUOT_VALUE +//S_ATTR_SPACE, S_ATTR_END, S_TAG_SPACE, S_TAG_CLOSE var S_TAG = 0;//tag name offerring var S_ATTR = 1;//attr name offerring -var S_ATTR_S=2;//attr name end and space offer +var S_ATTR_SPACE=2;//attr name end and space offer var S_EQ = 3;//=space? -var S_V = 4;//attr value(no quot value only) -var S_E = 5;//attr value end and no space(quot end) -var S_S = 6;//(attr value end || tag end ) && (space offer) -var S_C = 7;//closed el +var S_ATTR_NOQUOT_VALUE = 4;//attr value(no quot value only) +var S_ATTR_END = 5;//attr value end and no space(quot end) +var S_TAG_SPACE = 6;//(attr value end || tag end ) && (space offer) +var S_TAG_CLOSE = 7;//closed el function XMLReader(){ @@ -33,7 +33,7 @@ XMLReader.prototype = { } } function parse(source,defaultNSMapCopy,entityMap,domBuilder,errorHandler){ - function fixedFromCharCode(code) { + function fixedFromCharCode(code) { // String.prototype.fromCharCode does not supports // > 2 bytes unicode chars directly if (code > 0xffff) { @@ -76,7 +76,7 @@ function parse(source,defaultNSMapCopy,entityMap,domBuilder,errorHandler){ } var lineStart = 0; var lineEnd = 0; - var linePattern = /.+(?:\r\n?|\n)|.*$/g + var linePattern = /.*(?:\r\n?|\n)|.*$/g var locator = domBuilder.locator; var parseStack = [{currentNSMap:defaultNSMapCopy}] @@ -87,7 +87,7 @@ function parse(source,defaultNSMapCopy,entityMap,domBuilder,errorHandler){ var tagStart = source.indexOf('<',start); if(tagStart<0){ if(!source.substr(start).match(/^\s*$/)){ - var doc = domBuilder.document; + var doc = domBuilder.doc; var text = doc.createTextNode(source.substr(start)); doc.appendChild(text); domBuilder.currentElement = text; @@ -102,16 +102,36 @@ function parse(source,defaultNSMapCopy,entityMap,domBuilder,errorHandler){ var end = source.indexOf('>',tagStart+3); var tagName = source.substring(tagStart+2,end); var config = parseStack.pop(); - var localNSMap = config.localNSMap; - if(config.tagName != tagName){ - errorHandler.fatalError("end tag name: "+tagName+' is not match the current start tagName:'+config.tagName ); - } - domBuilder.endElement(config.uri,config.localName,tagName); - if(localNSMap){ - for(var prefix in localNSMap){ - domBuilder.endPrefixMapping(prefix) ; - } + if(end<0){ + + tagName = source.substring(tagStart+2).replace(/[\s<].*/,''); + //console.error('#@@@@@@'+tagName) + errorHandler.error("end tag name: "+tagName+' is not complete:'+config.tagName); + end = tagStart+1+tagName.length; + }else if(tagName.match(/\sstart){ start = end; @@ -181,7 +210,7 @@ function copyLocator(f,t){ * @see #appendElement(source,elStartEnd,el,selfClosed,entityReplacer,domBuilder,parseStack); * @return end of the elementStartPart(end of elementEndPart for selfClosed el) */ -function parseElementStartPart(source,start,el,entityReplacer,errorHandler){ +function parseElementStartPart(source,start,el,currentNSMap,entityReplacer,errorHandler){ var attrName; var value; var p = ++start; @@ -193,7 +222,7 @@ function parseElementStartPart(source,start,el,entityReplacer,errorHandler){ if(s === S_ATTR){//attrName attrName = source.slice(start,p); s = S_EQ; - }else if(s === S_ATTR_S){ + }else if(s === S_ATTR_SPACE){ s = S_EQ; }else{ //fatalError: equal must after attrName or space after attrName @@ -202,25 +231,30 @@ function parseElementStartPart(source,start,el,entityReplacer,errorHandler){ break; case '\'': case '"': - if(s === S_EQ){//equal + if(s === S_EQ || s === S_ATTR //|| s == S_ATTR_SPACE + ){//equal + if(s === S_ATTR){ + errorHandler.warning('attribute value must after "="') + attrName = source.slice(start,p) + } start = p+1; p = source.indexOf(c,start) if(p>0){ value = source.slice(start,p).replace(/&#?\w+;/g,entityReplacer); el.add(attrName,value,start-1); - s = S_E; + s = S_ATTR_END; }else{ //fatalError: no end quot match throw new Error('attribute value no end \''+c+'\' match'); } - }else if(s == S_V){ + }else if(s == S_ATTR_NOQUOT_VALUE){ value = source.slice(start,p).replace(/&#?\w+;/g,entityReplacer); //console.log(attrName,value,start,p) el.add(attrName,value,start); //console.dir(el) errorHandler.warning('attribute "'+attrName+'" missed start quot('+c+')!!'); start = p+1; - s = S_E + s = S_ATTR_END }else{ //fatalError: no equal before throw new Error('attribute value must after "="'); @@ -230,14 +264,14 @@ function parseElementStartPart(source,start,el,entityReplacer,errorHandler){ switch(s){ case S_TAG: el.setTagName(source.slice(start,p)); - case S_E: - case S_S: - case S_C: - s = S_C; + case S_ATTR_END: + case S_TAG_SPACE: + case S_TAG_CLOSE: + s =S_TAG_CLOSE; el.closed = true; - case S_V: + case S_ATTR_NOQUOT_VALUE: case S_ATTR: - case S_ATTR_S: + case S_ATTR_SPACE: break; //case S_EQ: default: @@ -247,30 +281,36 @@ function parseElementStartPart(source,start,el,entityReplacer,errorHandler){ case ''://end document //throw new Error('unexpected end of input') errorHandler.error('unexpected end of input'); + if(s == S_TAG){ + el.setTagName(source.slice(start,p)); + } + return p; case '>': switch(s){ case S_TAG: el.setTagName(source.slice(start,p)); - case S_E: - case S_S: - case S_C: + case S_ATTR_END: + case S_TAG_SPACE: + case S_TAG_CLOSE: break;//normal - case S_V://Compatible state + case S_ATTR_NOQUOT_VALUE://Compatible state case S_ATTR: value = source.slice(start,p); if(value.slice(-1) === '/'){ el.closed = true; value = value.slice(0,-1) } - case S_ATTR_S: - if(s === S_ATTR_S){ + case S_ATTR_SPACE: + if(s === S_ATTR_SPACE){ value = attrName; } - if(s == S_V){ + if(s == S_ATTR_NOQUOT_VALUE){ errorHandler.warning('attribute "'+value+'" missed quot(")!!'); el.add(attrName,value.replace(/&#?\w+;/g,entityReplacer),start) }else{ - errorHandler.warning('attribute "'+value+'" missed value!! "'+value+'" instead!!') + if(currentNSMap[''] !== 'http://www.w3.org/1999/xhtml' || !value.match(/^(?:disabled|checked|selected)$/i)){ + errorHandler.warning('attribute "'+value+'" missed value!! "'+value+'" instead!!') + } el.add(value,value,start) } break; @@ -287,64 +327,68 @@ function parseElementStartPart(source,start,el,entityReplacer,errorHandler){ switch(s){ case S_TAG: el.setTagName(source.slice(start,p));//tagName - s = S_S; + s = S_TAG_SPACE; break; case S_ATTR: attrName = source.slice(start,p) - s = S_ATTR_S; + s = S_ATTR_SPACE; break; - case S_V: + case S_ATTR_NOQUOT_VALUE: var value = source.slice(start,p).replace(/&#?\w+;/g,entityReplacer); errorHandler.warning('attribute "'+value+'" missed quot(")!!'); el.add(attrName,value,start) - case S_E: - s = S_S; + case S_ATTR_END: + s = S_TAG_SPACE; break; - //case S_S: + //case S_TAG_SPACE: //case S_EQ: - //case S_ATTR_S: + //case S_ATTR_SPACE: // void();break; - //case S_C: + //case S_TAG_CLOSE: //ignore warning } }else{//not space -//S_TAG, S_ATTR, S_EQ, S_V -//S_ATTR_S, S_E, S_S, S_C +//S_TAG, S_ATTR, S_EQ, S_ATTR_NOQUOT_VALUE +//S_ATTR_SPACE, S_ATTR_END, S_TAG_SPACE, S_TAG_CLOSE switch(s){ //case S_TAG:void();break; //case S_ATTR:void();break; - //case S_V:void();break; - case S_ATTR_S: - errorHandler.warning('attribute "'+attrName+'" missed value!! "'+attrName+'" instead!!') + //case S_ATTR_NOQUOT_VALUE:void();break; + case S_ATTR_SPACE: + var tagName = el.tagName; + if(currentNSMap[''] !== 'http://www.w3.org/1999/xhtml' || !attrName.match(/^(?:disabled|checked|selected)$/i)){ + errorHandler.warning('attribute "'+attrName+'" missed value!! "'+attrName+'" instead2!!') + } el.add(attrName,attrName,start); start = p; s = S_ATTR; break; - case S_E: + case S_ATTR_END: errorHandler.warning('attribute space is required"'+attrName+'"!!') - case S_S: + case S_TAG_SPACE: s = S_ATTR; start = p; break; case S_EQ: - s = S_V; + s = S_ATTR_NOQUOT_VALUE; start = p; break; - case S_C: + case S_TAG_CLOSE: throw new Error("elements closed character '/' and '>' must be connected to"); } } - } + }//end outer switch + //console.log('p++',p) p++; } } /** - * @return end of the elementStartPart(end of elementEndPart for selfClosed el) + * @return true if has new namespace define */ -function appendElement(el,domBuilder,parseStack){ +function appendElement(el,domBuilder,currentNSMap){ var tagName = el.tagName; var localNSMap = null; - var currentNSMap = parseStack[parseStack.length-1].currentNSMap; + //var currentNSMap = parseStack[parseStack.length-1].currentNSMap; var i = el.length; while(i--){ var a = el[i]; @@ -383,7 +427,7 @@ function appendElement(el,domBuilder,parseStack){ if(prefix === 'xml'){ a.uri = 'http://www.w3.org/XML/1998/namespace'; }if(prefix !== 'xmlns'){ - a.uri = currentNSMap[prefix] + a.uri = currentNSMap[prefix || ''] //{console.log('###'+a.qName,domBuilder.locator.systemId+'',currentNSMap,a.uri)} } @@ -412,7 +456,8 @@ function appendElement(el,domBuilder,parseStack){ }else{ el.currentNSMap = currentNSMap; el.localNSMap = localNSMap; - parseStack.push(el); + //parseStack.push(el); + return true; } } function parseHtmlSpecialContent(source,elStartEnd,tagName,entityReplacer,domBuilder){ @@ -442,7 +487,11 @@ function fixSelfClosed(source,elStartEnd,tagName,closeMap){ var pos = closeMap[tagName]; if(pos == null){ //console.log(tagName) - pos = closeMap[tagName] = source.lastIndexOf('') + pos = source.lastIndexOf('') + if(posWelcome to TiddlyWiki, a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation.

    TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.

    Learn more and see it in action at http://tiddlywiki.com/

    Developer documentation is in progress at http://tiddlywiki.com/dev/

    Installing TiddlyWiki on Node.js

    1. Install Node.js
      • either from your favourite package manager: typically apt-get install nodejs on Debian/Ubuntu Linux or Termux for Android, or brew install node on a Mac
      • or directly from http://nodejs.org
    2. Open a command line terminal and type:

      npm install -g tiddlywiki

      If it fails with an error you may need to re-run the command as an administrator:

      sudo npm install -g tiddlywiki (Mac/Linux)

    3. Check TiddlyWiki is installed by typing:

      tiddlywiki --version

    4. In response, you should see TiddlyWiki report its current version (eg "5.1.12"; you may also see other debugging information reported)
    5. Try it out:
      1. tiddlywiki mynewwiki --init server to create a folder for a new wiki that includes server-related components
      2. tiddlywiki mynewwiki --server to start TiddlyWiki
      3. Visit http://127.0.0.1:8080/ in your browser
      4. Try editing and creating tiddlers
    6. Optionally, make an offline copy:
      • click the +

        Welcome to TiddlyWiki, a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation.

        TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.

        Learn more and see it in action at https://tiddlywiki.com/

        Developer documentation is in progress at https://tiddlywiki.com/dev/

        Installing TiddlyWiki on Node.js

        1. Install Node.js
          • either from your favourite package manager: typically apt-get install nodejs on Debian/Ubuntu Linux or Termux for Android, or brew install node on a Mac
          • or directly from http://nodejs.org
        2. Open a command line terminal and type:

          npm install -g tiddlywiki

          If it fails with an error you may need to re-run the command as an administrator:

          sudo npm install -g tiddlywiki (Mac/Linux)

        3. Check TiddlyWiki is installed by typing:

          tiddlywiki --version

        4. In response, you should see TiddlyWiki report its current version (eg "5.1.16"; you may also see other debugging information reported)
        5. Try it out:
          1. tiddlywiki mynewwiki --init server to create a folder for a new wiki that includes server-related components
          2. tiddlywiki mynewwiki --server to start TiddlyWiki
          3. Visit http://127.0.0.1:8080/ in your browser
          4. Try editing and creating tiddlers
        6. Optionally, make an offline copy:
          • click the - save changes button in the sidebar, OR
          • tiddlywiki --build index

        The -g flag causes TiddlyWiki to be installed globally. Without it, TiddlyWiki will only be available in the directory where you installed it.

        If you are using Debian or Debian-based Linux and you are receiving a node: command not found error though node.js package is installed, you may need to create a symbolic link between nodejs and node. Consult your distro's manual and whereis to correctly create a link. See github issue 1434

        Example Debian v8.0: sudo ln -s /usr/bin/nodejs /usr/bin/node -

        Using TiddlyWiki on Node.js

        TiddlyWiki5 can be used on the command line to perform an extensive set of operations based on TiddlyWikiFolders, TiddlerFiles and TiddlyWikiFiles.

        For example, the following command loads the tiddlers from a TiddlyWiki HTML file and then saves one of them in static HTML:

        tiddlywiki --verbose --load mywiki.html --rendertiddler ReadMe ./readme.html

        Running tiddlywiki from the command line boots the TiddlyWiki kernel, loads the core plugins and establishes an empty wiki store. It then sequentially processes the command line arguments from left to right. The arguments are separated with spaces.

        The first argument is the optional path to the TiddlyWikiFolder to be loaded. If not present, then the current directory is used.

        The commands and their individual arguments follow, each command being identified by the prefix --.

        tiddlywiki [<wikipath>] [--<command> [<arg>[,<arg>]]]

        The available commands are:

          + save changes button in the sidebar, OR
        • tiddlywiki mynewwiki --build index

    The -g flag causes TiddlyWiki to be installed globally. Without it, TiddlyWiki will only be available in the directory where you installed it.

    If you are using Debian or Debian-based Linux and you are receiving a node: command not found error though node.js package is installed, you may need to create a symbolic link between nodejs and node. Consult your distro's manual and whereis to correctly create a link. See github issue 1434

    Example Debian v8.0: sudo ln -s /usr/bin/nodejs /usr/bin/node

    You can also install prior versions like this:

    npm install -g tiddlywiki@5.1.13

    Using TiddlyWiki on Node.js

    TiddlyWiki5 can be used on the command line to perform an extensive set of operations based on TiddlyWikiFolders, TiddlerFiles and TiddlyWikiFiles.

    For example, the following command loads the tiddlers from a TiddlyWiki HTML file and then saves one of them in static HTML:

    tiddlywiki --verbose --load mywiki.html --rendertiddler ReadMe ./readme.html

    Running tiddlywiki from the command line boots the TiddlyWiki kernel, loads the core plugins and establishes an empty wiki store. It then sequentially processes the command line arguments from left to right. The arguments are separated with spaces.

    The first argument is the optional path to the TiddlyWikiFolder to be loaded. If not present, then the current directory is used.

    The commands and their individual arguments follow, each command being identified by the prefix --.

    tiddlywiki [<wikipath>] [--<command> [<arg>[,<arg>]]]

    The available commands are:

    Upgrading TiddlyWiki on Node.js

    If you've installed TiddlyWiki on Node.js on the usual way, when a new version is released you can upgrade it with this command:

    npm update -g tiddlywiki

    On Mac or Linux you'll need to add sudo like this:

    sudo npm update -g tiddlywiki

    Also see

      +

    Upgrading TiddlyWiki on Node.js

    If you've installed TiddlyWiki on Node.js on the usual way, when a new version is released you can upgrade it with this command:

    npm update -g tiddlywiki

    On Mac or Linux you'll need to add sudo like this:

    sudo npm update -g tiddlywiki

    Also see

    This readme file was automatically generated by TiddlyWiki

    \ No newline at end of file +
  • + +Internet Information Services + +
    • + +

    This readme file was automatically generated by TiddlyWiki

    \ No newline at end of file diff --git a/themes/tiddlywiki/heavier/base.tid b/themes/tiddlywiki/heavier/base.tid new file mode 100644 index 000000000..885664fba --- /dev/null +++ b/themes/tiddlywiki/heavier/base.tid @@ -0,0 +1,35 @@ +title: $:/themes/tiddlywiki/heavier/base +tags: [[$:/tags/Stylesheet]] + +\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline + +html body strong, +html body button.tc-tiddlylink, +html body a.tc-tiddlylink, +html body a.tc-tiddlylink-shadow, +html body .tc-menu-list-count { + font-weight: 700; +} + +html body h1, +html body h2, +html body h3, +html body h4, +html body h5, +html body h6, +html body a.tc-tiddlylink-shadow.tc-tiddlylink-resolves, +html body button.tc-tag-label, +html body span.tc-tag-label, +html body .tc-sidebar-header .tc-title a.tc-tiddlylink-resolves, +html body .tc-site-title, +html body .tc-titlebar, +html body .tc-subtitle, +html body .tc-tiddler-missing .tc-title, +html body .tc-tab-buttons button, +html body .tc-tiddler-frame .tc-tiddler-body { + font-weight: 500; +} + +html body .tc-view-field-name { + font-weight: 400; +} diff --git a/themes/tiddlywiki/heavier/plugin.info b/themes/tiddlywiki/heavier/plugin.info new file mode 100644 index 000000000..d05abbcd8 --- /dev/null +++ b/themes/tiddlywiki/heavier/plugin.info @@ -0,0 +1,9 @@ +{ + "title": "$:/themes/tiddlywiki/heavier", + "name": "Heavier", + "author": "JeremyRuston", + "core-version": ">=5.0.0", + "plugin-type": "theme", + "description": "Heavier font theme", + "dependents": ["$:/themes/tiddlywiki/snowwhite"] +} diff --git a/themes/tiddlywiki/readonly/styles.tid b/themes/tiddlywiki/readonly/styles.tid index 59ec38a1e..baf013338 100644 --- a/themes/tiddlywiki/readonly/styles.tid +++ b/themes/tiddlywiki/readonly/styles.tid @@ -1,8 +1,21 @@ title: $:/themes/tiddlywiki/readonly/styles.tid tags: [[$:/tags/Stylesheet]] +\define button-selector(title) +button.$title$, .tc-drop-down button.$title$, div.$title$ +\end + \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline -svg.tc-image-new-button, svg.tc-image-options-button, svg.tc-image-save-button, svg.tc-image-edit-button, svg.tc-image-delete-button, svg.tc-image-cancel-button, svg.tc-image-done-button { - display: none; -} +<>, +<>, +<>, +<>, +<>, +<>, +<>, +<>, +<>, +<> { + display: none; +} \ No newline at end of file diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid index dff8c9bdc..4bdff613e 100644 --- a/themes/tiddlywiki/snowwhite/base.tid +++ b/themes/tiddlywiki/snowwhite/base.tid @@ -46,6 +46,10 @@ tags: [[$:/tags/Stylesheet]] outline: none; } +textarea.tc-edit-texteditor { + font-family: {{$:/themes/tiddlywiki/vanilla/settings/editorfontfamily}}; +} + canvas.tc-edit-bitmapeditor { <> } @@ -88,11 +92,11 @@ canvas.tc-edit-bitmapeditor { <> } -.tc-more-sidebar .tc-tab-buttons button { +.tc-more-sidebar > .tc-tab-set > .tc-tab-buttons > button { <> } -.tc-more-sidebar .tc-tab-buttons button.tc-tab-selected { +.tc-more-sidebar > .tc-tab-set > .tc-tab-buttons > button.tc-tab-selected { <> } diff --git a/themes/tiddlywiki/snowwhite/plugin.info b/themes/tiddlywiki/snowwhite/plugin.info index 0b2784cba..348802d78 100644 --- a/themes/tiddlywiki/snowwhite/plugin.info +++ b/themes/tiddlywiki/snowwhite/plugin.info @@ -5,5 +5,6 @@ "core-version": ">=5.0.0", "plugin-type": "theme", "description": "Emphasises individual tiddlers", - "dependents": ["$:/themes/tiddlywiki/vanilla"] + "dependents": ["$:/themes/tiddlywiki/vanilla"], + "plugin-priority": "0" } diff --git a/themes/tiddlywiki/tight-heavier/base.tid b/themes/tiddlywiki/tight-heavier/base.tid new file mode 100644 index 000000000..98c6a83bb --- /dev/null +++ b/themes/tiddlywiki/tight-heavier/base.tid @@ -0,0 +1,4 @@ +title: $:/themes/tiddlywiki/tight-heavier/base +tags: [[$:/tags/Stylesheet]] + +\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline diff --git a/themes/tiddlywiki/tight-heavier/plugin.info b/themes/tiddlywiki/tight-heavier/plugin.info new file mode 100644 index 000000000..963fb8e8a --- /dev/null +++ b/themes/tiddlywiki/tight-heavier/plugin.info @@ -0,0 +1,9 @@ +{ + "title": "$:/themes/tiddlywiki/tight-heavier", + "name": "Tight and Heavier", + "author": "JeremyRuston", + "core-version": ">=5.0.0", + "plugin-type": "theme", + "description": "Tight and Heavier font theme", + "dependents": ["$:/themes/tiddlywiki/tight","$:/themes/tiddlywiki/heavier"] +} diff --git a/themes/tiddlywiki/vanilla/ThemeTweaks.tid b/themes/tiddlywiki/vanilla/ThemeTweaks.tid index 486270851..e5d987ca1 100644 --- a/themes/tiddlywiki/vanilla/ThemeTweaks.tid +++ b/themes/tiddlywiki/vanilla/ThemeTweaks.tid @@ -53,6 +53,7 @@ caption: {{$:/language/ThemeTweaks/ThemeTweaks}} |<$link to="$:/themes/tiddlywiki/vanilla/settings/fontfamily"><> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/fontfamily" default="" tag="input"/> | | |<$link to="$:/themes/tiddlywiki/vanilla/settings/codefontfamily"><> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/codefontfamily" default="" tag="input"/> | | +|<$link to="$:/themes/tiddlywiki/vanilla/settings/editorfontfamily"><> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/editorfontfamily" default="" tag="input"/> | | |<$link to="$:/themes/tiddlywiki/vanilla/settings/backgroundimage"><> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" default="" tag="input"/> |<> | |<$link to="$:/themes/tiddlywiki/vanilla/settings/backgroundimageattachment"><> |<> | | |<$link to="$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize"><> |<> | | diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index ddc930f72..8c4906b43 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -6,10 +6,10 @@ tags: [[$:/tags/Stylesheet]] <$list filter="[is[image]]"> `background: url(` <$list filter="[!has[_canonical_uri]]"> -<$macrocall $name="datauri" title={{$:/themes/tiddlywiki/vanilla/settings/backgroundimage}}/> +`"`<$macrocall $name="datauri" title={{$:/themes/tiddlywiki/vanilla/settings/backgroundimage}}/>`"` <$list filter="[has[_canonical_uri]]"> -<$view tiddler={{$:/themes/tiddlywiki/vanilla/settings/backgroundimage}} field="_canonical_uri"/> +`"`<$view tiddler={{$:/themes/tiddlywiki/vanilla/settings/backgroundimage}} field="_canonical_uri"/>`"` `) center center;` `background-attachment: `{{$:/themes/tiddlywiki/vanilla/settings/backgroundimageattachment}}`; @@ -30,6 +30,15 @@ $hiddenSidebarText$ \end +\define if-editor-height-fixed(then,else) +<$reveal state="$:/config/TextEditor/EditorHeight/Mode" type="match" text="fixed"> +$then$ + +<$reveal state="$:/config/TextEditor/EditorHeight/Mode" type="match" text="auto"> +$else$ + +\end + \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock /* @@ -69,13 +78,21 @@ html:-webkit-full-screen { body.tc-body { font-size: {{$:/themes/tiddlywiki/vanilla/metrics/fontsize}}; line-height: {{$:/themes/tiddlywiki/vanilla/metrics/lineheight}}; + word-wrap: break-word; + <> color: <>; background-color: <>; fill: <>; - word-wrap: break-word; - <> } +<> + h1, h2, h3, h4, h5, h6 { line-height: 1.2; font-weight: 300; @@ -110,6 +127,48 @@ blockquote { border-left: 5px solid <>; margin-left: 25px; padding-left: 10px; + quotes: "\201C""\201D""\2018""\2019"; +} + +blockquote.tc-big-quote { + font-family: Georgia, serif; + position: relative; + background: <>; + border-left: none; + margin-left: 50px; + margin-right: 50px; + padding: 10px; + border-radius: 8px; +} + +blockquote.tc-big-quote cite:before { + content: "\2014 \2009"; +} + +blockquote.tc-big-quote:before { + font-family: Georgia, serif; + color: <>; + content: open-quote; + font-size: 8em; + line-height: 0.1em; + margin-right: 0.25em; + vertical-align: -0.4em; + position: absolute; + left: -50px; + top: 42px; +} + +blockquote.tc-big-quote:after { + font-family: Georgia, serif; + color: <>; + content: close-quote; + font-size: 8em; + line-height: 0.1em; + margin-right: 0.25em; + vertical-align: -0.4em; + position: absolute; + right: -80px; + bottom: -20px; } dl dt { @@ -126,6 +185,10 @@ input:not([type]) { background: <>; } +input[type="checkbox"] { + vertical-align: middle; +} + .tc-muted { color: <>; } @@ -134,6 +197,11 @@ svg.tc-image-button { padding: 0px 1px 1px 0px; } +.tc-icon-wrapper > svg { + width: 1em; + height: 1em; +} + kbd { display: inline-block; padding: 3px 5px; @@ -207,7 +275,7 @@ table tfoot tr td { button.tc-tiddlylink, a.tc-tiddlylink { text-decoration: none; - font-weight: normal; + font-weight: 500; color: <>; -webkit-user-select: inherit; /* Otherwise the draggable attribute makes links impossible to select */ } @@ -267,6 +335,8 @@ a.tc-tiddlylink-external:hover { .tc-tiddler-dragger-inner { position: absolute; + top: -1000px; + left: -1000px; display: inline-block; padding: 8px 20px; font-size: 16.9px; @@ -301,6 +371,19 @@ a.tc-tiddlylink-external:hover { content: "<>"; } +.tc-droppable > .tc-droppable-placeholder { + display: none; +} + +.tc-droppable.tc-dragover > .tc-droppable-placeholder { + display: block; + border: 2px dashed <>; +} + +.tc-draggable { + cursor: move; +} + /* ** Plugin reload warning */ @@ -329,6 +412,7 @@ button svg, button img, label svg, label img { margin: 0; background: none; border: none; + cursor: pointer; } .tc-btn-boxed { @@ -390,6 +474,16 @@ html body.tc-body .tc-btn-rounded:hover svg { margin: 0; } +/* used for documentation "fake" buttons */ +.tc-btn-standard { + line-height: 1.8; + color: #667; + background-color: #e0e0e0; + border: 1px solid #888; + padding: 2px 1px 2px 1px; + margin: 1px 4px 1px 4px; +} + .tc-btn-big-green { display: inline-block; padding: 8px; @@ -521,7 +615,7 @@ button.tc-tag-label, span.tc-tag-label { display: inline-block; padding: 0.16em 0.7em; font-size: 0.9em; - font-weight: 300; + font-weight: 400; line-height: 1.2em; color: <>; white-space: nowrap; @@ -547,6 +641,7 @@ button.tc-untagged-label { height: 1em; width: 1em; fill: <>; + vertical-align: text-bottom; } .tc-tag-manager-table .tc-tag-label { @@ -621,6 +716,10 @@ button.tc-untagged-label { font-size: 1.5em; } +.tc-page-controls .tc-drop-down { + font-size: 1rem; +} + .tc-page-controls button { margin-right: 0.5em; } @@ -690,6 +789,11 @@ button.tc-untagged-label { padding: 71px 0 28px 42px; } + html[dir="rtl"] .tc-sidebar-scrollable { + left: auto; + right: {{$:/themes/tiddlywiki/vanilla/metrics/storyright}}; + } + .tc-story-river { position: relative; left: {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}; @@ -857,17 +961,28 @@ button.tc-untagged-label { font-size: 1em; } -.tc-tiddler-controls > span > button { +.tc-tiddler-controls > span > button, +.tc-tiddler-controls > span > span > button, +.tc-tiddler-controls > span > span > span > button { vertical-align: baseline; margin-left:5px; } .tc-tiddler-controls button svg, .tc-tiddler-controls button img, .tc-search button svg, .tc-search a svg { - height: 0.75em; fill: <>; } +.tc-tiddler-controls button svg, .tc-tiddler-controls button img { + height: 0.75em; +} + +.tc-search button svg, .tc-search a svg { + height: 1.2em; + width: 1.2em; + margin: 0 0.25em; +} + .tc-tiddler-controls button.tc-selected svg, .tc-page-controls button.tc-selected svg { fill: <>; @@ -903,8 +1018,10 @@ button.tc-untagged-label { .tc-tiddler-frame iframe.tc-edit-texteditor { padding: 3px 3px 3px 3px; border: 1px solid <>; + background-color: <>; line-height: 1.3em; -webkit-appearance: none; + font-family: {{$:/themes/tiddlywiki/vanilla/settings/editorfontfamily}}; } .tc-tiddler-frame .tc-binary-warning { @@ -916,10 +1033,6 @@ button.tc-untagged-label { border: 1px solid <>; } -.tc-tiddler-frame input.tc-edit-texteditor { - background-color: <>; -} - canvas.tc-edit-bitmapeditor { border: 6px solid <>; cursor: crosshair; @@ -1134,6 +1247,10 @@ html body.tc-body.tc-single-tiddler-window { width: 50%; } +.tc-edit-add-tag .tc-keyboard { + display:inline; +} + .tc-edit-tags .tc-tag-label { display: inline-block; } @@ -1154,10 +1271,19 @@ html body.tc-body.tc-single-tiddler-window { float: right; width: 49%; border: 1px solid <>; - margin: 4px 3px 3px 3px; + margin: 4px 0 3px 3px; padding: 3px 3px 3px 3px; } +<> + .tc-tiddler-frame .tc-tiddler-preview .tc-edit-texteditor { width: 49%; } @@ -1289,11 +1415,6 @@ html body.tc-body.tc-single-tiddler-window { width: 1em; } -.tc-drop-down-language-chooser img { - width: 2em; - vertical-align: baseline; -} - .tc-drop-down a, .tc-drop-down button { display: block; padding: 0 14px 0 14px; @@ -1608,6 +1729,8 @@ html body.tc-body.tc-single-tiddler-window { border-right: 1px solid <>; border-top-left-radius: 2px; border-top-right-radius: 2px; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; } .tc-tab-buttons.tc-vertical button { @@ -1622,6 +1745,8 @@ html body.tc-body.tc-single-tiddler-window { border-right: none; border-top-left-radius: 2px; border-bottom-left-radius: 2px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; } .tc-tab-buttons.tc-vertical button.tc-tab-selected { @@ -1642,6 +1767,7 @@ html body.tc-body.tc-single-tiddler-window { } .tc-tab-content.tc-vertical { + word-break: break-word; display: inline-block; vertical-align: top; padding-top: 0; @@ -1675,7 +1801,7 @@ html body.tc-body.tc-single-tiddler-window { border-top: 1px solid <>; } -.tc-more-sidebar .tc-tab-buttons button { +.tc-more-sidebar > .tc-tab-set > .tc-tab-buttons > button { display: block; width: 100%; background-color: <>; @@ -1686,11 +1812,118 @@ html body.tc-body.tc-single-tiddler-window { margin-bottom: inherit; } -.tc-more-sidebar .tc-tab-buttons button.tc-tab-selected { +.tc-more-sidebar > .tc-tab-set > .tc-tab-buttons > button.tc-tab-selected { background-color: <>; border: none; } +/* +** Manager +*/ + +.tc-manager-wrapper { + +} + +.tc-manager-controls { + +} + +.tc-manager-control { + margin: 0.5em 0; +} + +.tc-manager-list { + width: 100%; + border-top: 1px solid <>; + border-left: 1px solid <>; + border-right: 1px solid <>; +} + +.tc-manager-list-item { + +} + +.tc-manager-list-item-heading { + display: block; + width: 100%; + text-align: left; + border-bottom: 1px solid <>; + padding: 3px; +} + +.tc-manager-list-item-heading-selected { + font-weight: bold; + color: <>; + fill: <>; + background-color: <>; +} + +.tc-manager-list-item-heading:hover { + background: <>; + color: <>; +} + +.tc-manager-list-item-content { + display: flex; +} + +.tc-manager-list-item-content-sidebar { + flex: 1 0; + background: <>; + border-right: 0.5em solid <>; + border-bottom: 0.5em solid <>; + white-space: nowrap; +} + +.tc-manager-list-item-content-item-heading { + display: block; + width: 100%; + text-align: left; + background: <>; + text-transform: uppercase; + font-size: 0.6em; + font-weight: bold; + padding: 0.5em 0 0.5em 0; +} + +.tc-manager-list-item-content-item-body { + padding: 0 0.5em 0 0.5em; +} + +.tc-manager-list-item-content-item-body > pre { + margin: 0.5em 0 0.5em 0; + border: none; + background: inherit; +} + +.tc-manager-list-item-content-tiddler { + flex: 3 1; + border-left: 0.5em solid <>; + border-right: 0.5em solid <>; + border-bottom: 0.5em solid <>; +} + +.tc-manager-list-item-content-item-body > table { + border: none; + padding: 0; + margin: 0; +} + +.tc-manager-list-item-content-item-body > table td { + border: none; +} + +.tc-manager-icon-editor > button { + width: 100%; +} + +.tc-manager-icon-editor > button > svg, +.tc-manager-icon-editor > button > button { + width: 100%; + height: auto; +} + /* ** Alerts */ @@ -1842,6 +2075,14 @@ a.tc-tiddlylink.tc-plugin-info:hover .tc-plugin-info > .tc-plugin-info-chunk > s padding: 1em 1em 1em 1em; } +.tc-check-list { + line-height: 2em; +} + +.tc-check-list .tc-image-button { + height: 1.5em; +} + /* ** Message boxes */ @@ -1855,6 +2096,12 @@ a.tc-tiddlylink.tc-plugin-info:hover .tc-plugin-info > .tc-plugin-info-chunk > s color: <>; } +.tc-message-box svg { + width: 1em; + height: 1em; + vertical-align: text-bottom; +} + /* ** Pictures */ @@ -1878,25 +2125,62 @@ a.tc-tiddlylink.tc-plugin-info:hover .tc-plugin-info > .tc-plugin-info-chunk > s */ .tc-chooser { - border: 1px solid <>; + border-right: 1px solid <>; + border-left: 1px solid <>; } + .tc-chooser-item { - border: 8px; - padding: 2px 4px; + border-bottom: 1px solid <>; + border-top: 1px solid <>; + padding: 2px 4px 2px 14px; } -.tc-chooser-item a.tc-tiddlylink { +.tc-drop-down .tc-chooser-item { + padding: 2px; +} + +.tc-chosen, +.tc-chooser-item:hover { + background-color: <>; + border-color: <>; +} + +.tc-chosen .tc-tiddlylink { + cursor:default; +} + +.tc-chooser-item .tc-tiddlylink { display: block; text-decoration: none; - color: <>; - background-color: <>; + background-color: transparent; } -.tc-chooser-item a.tc-tiddlylink:hover { +.tc-chooser-item:hover .tc-tiddlylink:hover { text-decoration: none; - color: <>; - background-color: <>; +} + +.tc-drop-down .tc-chosen .tc-tiddlylink, +.tc-drop-down .tc-chooser-item .tc-tiddlylink:hover { + color: <>; +} + +.tc-chosen > .tc-tiddlylink:before { + margin-left: -10px; + position: relative; + content: "» "; +} + +.tc-chooser-item svg, +.tc-chooser-item img{ + width: 1em; + height: 1em; + vertical-align: middle; +} + +.tc-language-chooser .tc-image-button img { + width: 2em; + vertical-align: -0.15em; } /* @@ -1970,10 +2254,6 @@ a.tc-tiddlylink.tc-plugin-info:hover .tc-plugin-info > .tc-plugin-info-chunk > s line-height: 1.5; } -.tc-table-of-contents li li li a { - font-weight: bold; -} - .tc-table-of-contents li li li li { font-size: 0.95em; font-weight: 200; @@ -2164,6 +2444,44 @@ body.tc-dirty span.tc-dirty-indicator, body.tc-dirty span.tc-dirty-indicator svg opacity: 1; } +/* +** Diffs +*/ + +.tc-diff-equal { + background-color: <>; + color: <>; +} + +.tc-diff-insert { + background-color: <>; + color: <>; +} + +.tc-diff-delete { + background-color: <>; + color: <>; +} + +.tc-diff-invisible { + background-color: <>; + color: <>; +} + +.tc-diff-tiddlers th { + text-align: right; + background: <>; + font-weight: normal; + font-style: italic; +} + +.tc-diff-tiddlers pre { + margin: 0; + padding: 0; + border: none; + background: none; +} + /* ** Errors */ @@ -2172,3 +2490,39 @@ body.tc-dirty span.tc-dirty-indicator, body.tc-dirty span.tc-dirty-indicator svg background: #f00; color: #fff; } + +/* +** Tree macro +*/ + +.tc-tree div { + padding-left: 14px; +} + +.tc-tree ol { + list-style-type: none; + padding-left: 0; + margin-top: 0; +} + +.tc-tree ol ol { + padding-left: 1em; +} + +.tc-tree button { + color: #acacac; +} + +.tc-tree svg { + fill: #acacac; +} + +.tc-tree span svg { + width: 1em; + height: 1em; + vertical-align: baseline; +} + +.tc-tree li span { + color: lightgray; +} diff --git a/themes/tiddlywiki/vanilla/plugin.info b/themes/tiddlywiki/vanilla/plugin.info index 349fc2e63..2317900a1 100644 --- a/themes/tiddlywiki/vanilla/plugin.info +++ b/themes/tiddlywiki/vanilla/plugin.info @@ -4,5 +4,6 @@ "author": "JeremyRuston", "core-version": ">=5.0.0", "plugin-type": "theme", - "description": "Basic theme" + "description": "Basic theme", + "plugin-priority": "0" } diff --git a/themes/tiddlywiki/vanilla/settings.multids b/themes/tiddlywiki/vanilla/settings.multids index 824745eec..665a9be2e 100644 --- a/themes/tiddlywiki/vanilla/settings.multids +++ b/themes/tiddlywiki/vanilla/settings.multids @@ -1,6 +1,6 @@ title: $:/themes/tiddlywiki/vanilla/settings/ -fontfamily: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", "DejaVu Sans", sans-serif -codefontfamily: Monaco, Consolas, "Lucida Console", "DejaVu Sans Mono", monospace +fontfamily: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" +codefontfamily: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace backgroundimageattachment: fixed backgroundimagesize: auto