From 6d09b2fb9cd40a890a6b9730b23ffad3fbe57cd8 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Thu, 29 Nov 2012 17:23:46 +0000 Subject: [PATCH] Improve syntax for classed runs --- core/modules/parsers/wikitextparser/rules/list.js | 2 +- .../parsers/wikitextparser/wikitextparser.js | 13 +++++++------ core/templates/PageTemplate.tid | 2 +- editions/tw5.com/tiddlers/concepts/WikiText.tid | 6 +++--- readme.md | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/core/modules/parsers/wikitextparser/rules/list.js b/core/modules/parsers/wikitextparser/rules/list.js index 8b406152e..816641d09 100644 --- a/core/modules/parsers/wikitextparser/rules/list.js +++ b/core/modules/parsers/wikitextparser/rules/list.js @@ -35,7 +35,7 @@ A CSS class can be applied to a list item as follows: {{{ * List item one -*{{active}} List item two has the class `active` +*.active List item two has the class `active` * List item three }}} diff --git a/core/modules/parsers/wikitextparser/wikitextparser.js b/core/modules/parsers/wikitextparser/wikitextparser.js index dfd6395ab..a094c5451 100644 --- a/core/modules/parsers/wikitextparser/wikitextparser.js +++ b/core/modules/parsers/wikitextparser/wikitextparser.js @@ -238,20 +238,21 @@ WikiTextRenderer.prototype.parseRunTerminated = function(terminatorRegExp,option }; /* -Parse a run of text preceded by an optional class specifier `{{class}}` +Parse a run of text preceded by an optional class specifier `.classname` */ WikiTextRenderer.prototype.parseClassedRun = function(terminatorRegExp) { - var classRegExp = /\{\{([^\}]*)\}\}/mg, - className; + var classRegExp = /\.([^\s\.]+)/mg, + classNames = []; classRegExp.lastIndex = this.pos; var match = classRegExp.exec(this.source); - if(match && match.index === this.pos) { - className = match[1]; + while(match && match.index === this.pos) { this.pos = match.index + match[0].length; + classNames.push(match[1]); + var match = classRegExp.exec(this.source); } var tree = this.parseRun(terminatorRegExp); return { - "class": className, + "class": classNames.join(" "), tree: tree }; }; diff --git a/core/templates/PageTemplate.tid b/core/templates/PageTemplate.tid index 029d1db03..1c5572e72 100644 --- a/core/templates/PageTemplate.tid +++ b/core/templates/PageTemplate.tid @@ -13,7 +13,7 @@ title: $:/templates/PageTemplate * HelloThere * [[Docs]] -*{{divider-vertical}} +*.divider-vertical
diff --git a/editions/tw5.com/tiddlers/concepts/WikiText.tid b/editions/tw5.com/tiddlers/concepts/WikiText.tid index e804acc8d..6c06929f7 100644 --- a/editions/tw5.com/tiddlers/concepts/WikiText.tid +++ b/editions/tw5.com/tiddlers/concepts/WikiText.tid @@ -169,7 +169,7 @@ You can also assign a CSS class to an individual member of a list with this nota {{{ * List One -*{{MyClass}} List Two +*.MyClass List Two * List Three }}} @@ -186,7 +186,7 @@ The resulting HTML looks like this: The same syntax can be used with headings: {{{ -!{{myStyle}} This heading has the class `myStyle` +!.myStyle This heading has the class `myStyle` }}} ! Typographic Features @@ -288,4 +288,4 @@ Generates the results: This is in red! @@ -See StyleBlockWikiText for more details. \ No newline at end of file +See StyleBlockWikiText for more details. diff --git a/readme.md b/readme.md index 713f3e2ea..5c3549d0e 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -

Welcome to TiddlyWiki5

Welcome to TiddlyWiki5, a reboot of TiddlyWiki, the reusable non-linear personal web notebook first released in 2004. It is a complete interactive wiki in JavaScript that can be run from a single HTML file in the browser or as a powerful node.js application.

TiddlyWiki is designed to fit around your brain, giving you a better way of managing information compared to traditional documents and emails. The fundamental idea is that information is more useful and reusable if we cut it up into the smallest semantically meaningful chunks – tiddlers – and give them titles so that they can be structured with links, tags and macros. TiddlyWiki aims to provide a fluid interface for working with tiddlers, allowing them to be aggregated and composed into longer narratives.

TiddlyWiki5 has many improvements over the original. It is currently labelled alpha, meaning it is working but incomplete. It is the best possible time to get involved and support its future development. You can:

Usage

Architecture

Overview

The heart of TiddlyWiki can be seen as an extensible representation transformation engine. Given the text of a tiddler and its associated ContentType, the engine can produce a rendering of the tiddler in a new ContentType. Furthermore, it can efficiently selectively update the rendering to track any changes in the tiddler or its dependents.

The most important transformations are from text/vnd.tiddlywiki wikitext into text/html or text/plain but the engine is used throughout the system for other transformations, such as converting images for display in HTML, sanitising fragments of JavaScript, and processing CSS.

You can explore this mechanism by opening the JavaScript console in your browser. Typing this command will replace the text of the tiddler HelloThere with new content:

$tw.wiki.addTiddler({title: "HelloThere", text: "This is some new content"});

If the tiddler HelloThere is visible then you'll see it instantly change to reflect the new content. If you create a tiddler that doesn't currently exist then you'll see any displayed links to it instantly change from italicised to normal:

$tw.wiki.addTiddler({title: "TiddlyWiki5", text: "This tiddler now exists"});

The power of this mechanism also drives the interactive features of TiddlyWiki. For example, try typing the following into the JavaScript console:

$tw.wiki.addTiddler({title: "ViewDropDownState", text: "(50,50,200,200)"});

You should see the view dropdown appear in the middle of the screen. The underlying mechanism is that the creation of the tiddler with this title triggers the display of the popup at the specified location.

If you're interested in understanding more about the internal operation of TiddlyWiki, it is recommended that you review the Docs and read the code – start with the boot kernel $:/core/boot.js. -

Boot Mechanism

Introduction

TiddlyWiki5 is based on a 1,000 line boot kernel that runs on node.js or in the browser, with all other functionality added via dynamically loaded modules.

The kernel boots just enough of the TiddlyWiki environment to allow it to load tiddlers and execute JavaScript modules. Plugin modules are written like node.js modules.

There are many different types of module: parsers, serializers, deserializers, macros etc. It goes much further than you might expect. For example, individual tiddler fields are modules, too: there's a module that knows how to handle the tags field, and another that knows how to handle the special behaviour of the modified and created fields.

Some plugin modules have further sub-plugins: the wikitext parser, for instance, accepts rules as individual plugin modules.

Plugins and Modules

In TiddlyWiki5, Plugins are bundles of tiddlers that are distributed and managed as one; Modules are JavaScript tiddlers with a module type identifying when and how they should be executed.

The tiddler $:/core/boot.js is a barebones TiddlyWiki kernel that is just sufficient to load the core plugin modules and trigger a startup module to load up the rest of the application.

The kernel includes:

  • Several short shared utility functions
  • A handful of methods implementing the plugin module mechanism
  • The $tw.Tiddler class (and field definition plugins)
  • The $tw.Wiki class (and tiddler deserialization methods)
  • Code for the browser to load tiddlers from the HTML DOM
  • Code for the server to load tiddlers from the file system

Each module is an ordinary node.js-style module, using the require() function to access other modules and the exports global to return JavaScript values. The boot kernel smooths over the differences between node.js and the browser, allowing the same plugin modules to execute in both environments.

In the browser, core/boot.js is packed into a template HTML file that contains the following elements in order:

  • Ordinary and shadow tiddlers, packed as HTML <DIV> elements
  • core/bootprefix.js, containing a few lines to set up the plugin environment
  • JavaScript modules, packed as HTML <SCRIPT> blocks
  • core/boot.js, containing the boot kernel

On the server, core/boot.js is executed directly. It uses the node.js local file API to load plugins directly from the file system in the core/modules directory. The code loading is performed synchronously for brevity (and because the system is in any case inherently blocked until plugins are loaded).

The boot kernel sets up the $tw global variable that is used to store all the state data of the system. +

Welcome to TiddlyWiki5

Welcome to TiddlyWiki5, a reboot of TiddlyWiki, the reusable non-linear personal web notebook first released in 2004. It is a complete interactive wiki in JavaScript that can be run from a single HTML file in the browser or as a powerful node.js application.

TiddlyWiki is designed to fit around your brain, giving you a better way of managing information compared to traditional documents and emails. The fundamental idea is that information is more useful and reusable if we cut it up into the smallest semantically meaningful chunks – tiddlers – and give them titles so that they can be structured with links, tags and macros. TiddlyWiki aims to provide a fluid interface for working with tiddlers, allowing them to be aggregated and composed into longer narratives.

TiddlyWiki5 has many improvements over the original. It is currently labelled alpha, meaning it is working but incomplete. It is the best possible time to get involved and support its future development. You can:

Usage

Architecture

Overview

The heart of TiddlyWiki can be seen as an extensible representation transformation engine. Given the text of a tiddler and its associated ContentType, the engine can produce a rendering of the tiddler in a new ContentType. Furthermore, it can efficiently selectively update the rendering to track any changes in the tiddler or its dependents.

The most important transformations are from text/vnd.tiddlywiki wikitext into text/html or text/plain but the engine is used throughout the system for other transformations, such as converting images for display in HTML, sanitising fragments of JavaScript, and processing CSS.

You can explore this mechanism by opening the JavaScript console in your browser. Typing this command will replace the text of the tiddler HelloThere with new content:

$tw.wiki.addTiddler({title: "HelloThere", text: "This is some new content"});

If the tiddler HelloThere is visible then you'll see it instantly change to reflect the new content. If you create a tiddler that doesn't currently exist then you'll see any displayed links to it instantly change from italicised to normal:

$tw.wiki.addTiddler({title: "TiddlyWiki5", text: "This tiddler now exists"});

The power of this mechanism also drives the interactive features of TiddlyWiki. For example, try typing the following into the JavaScript console:

$tw.wiki.addTiddler({title: "ViewDropDownState", text: "(50,50,200,200)"});

You should see the view dropdown appear in the middle of the screen. The underlying mechanism is that the creation of the tiddler with this title triggers the display of the popup at the specified location.

If you're interested in understanding more about the internal operation of TiddlyWiki, it is recommended that you review the Docs and read the code – start with the boot kernel $:/core/boot.js. +

Boot Mechanism

Introduction

TiddlyWiki5 is based on a 1,000 line boot kernel that runs on node.js or in the browser, with all other functionality added via dynamically loaded modules.

The kernel boots just enough of the TiddlyWiki environment to allow it to load tiddlers and execute JavaScript modules. Plugin modules are written like node.js modules.

There are many different types of module: parsers, serializers, deserializers, macros etc. It goes much further than you might expect. For example, individual tiddler fields are modules, too: there's a module that knows how to handle the tags field, and another that knows how to handle the special behaviour of the modified and created fields.

Some plugin modules have further sub-plugins: the wikitext parser, for instance, accepts rules as individual plugin modules.

Plugins and Modules

In TiddlyWiki5, Plugins are bundles of tiddlers that are distributed and managed as one; Modules are JavaScript tiddlers with a module type identifying when and how they should be executed.

The tiddler $:/core/boot.js is a barebones TiddlyWiki kernel that is just sufficient to load the core plugin modules and trigger a startup module to load up the rest of the application.

The kernel includes:

  • Several short shared utility functions
  • A handful of methods implementing the plugin module mechanism
  • The $tw.Tiddler class (and field definition plugins)
  • The $tw.Wiki class (and tiddler deserialization methods)
  • Code for the browser to load tiddlers from the HTML DOM
  • Code for the server to load tiddlers from the file system

Each module is an ordinary node.js-style module, using the require() function to access other modules and the exports global to return JavaScript values. The boot kernel smooths over the differences between node.js and the browser, allowing the same plugin modules to execute in both environments.

In the browser, core/boot.js is packed into a template HTML file that contains the following elements in order:

  • Ordinary and shadow tiddlers, packed as HTML <DIV> elements
  • core/bootprefix.js, containing a few lines to set up the plugin environment
  • JavaScript modules, packed as HTML <SCRIPT> blocks
  • core/boot.js, containing the boot kernel

On the server, core/boot.js is executed directly. It uses the node.js local file API to load plugins directly from the file system in the core/modules directory. The code loading is performed synchronously for brevity (and because the system is in any case inherently blocked until plugins are loaded).

The boot kernel sets up the $tw global variable that is used to store all the state data of the system.

This readme file was automatically generated by TiddlyWiki5

\ No newline at end of file