1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-10-05 02:10:45 +00:00

Merge branch 'master' of https://github.com/Jermolene/TiddlyWiki5 into edit-tags-dom

This commit is contained in:
Mario Pietsch 2014-09-03 14:08:32 +02:00
commit 7f75d651d4
87 changed files with 1937 additions and 438 deletions

View File

@ -94,6 +94,14 @@ node .\tiddlywiki.js ^
--rendertiddler $:/core/save/all markdowndemo.html text/plain ^
|| exit 1
rem classicparserdemo.html: wiki to demo classicparser plugin
node .\tiddlywiki.js ^
.\editions\classicparserdemo ^
--verbose ^
--output %TW5_BUILD_OUTPUT% ^
--rendertiddler $:/core/save/all classicparserdemo.html text/plain ^
|| exit 1
rem highlightdemo.html: wiki to demo highlight plugin

9
bld.sh
View File

@ -95,6 +95,15 @@ node ./tiddlywiki.js \
--rendertiddler $:/core/save/all markdowndemo.html text/plain \
|| exit 1
# classicparserdemo.html: wiki to demo classicparser plugin
node ./tiddlywiki.js \
./editions/classicparserdemo \
--verbose \
--output $TW5_BUILD_OUTPUT \
--rendertiddler $:/core/save/all classicparserdemo.html text/plain \
|| exit 1
# highlightdemo.html: wiki to demo highlight plugin
node ./tiddlywiki.js \

4
core/images/blank.tid Normal file
View File

@ -0,0 +1,4 @@
title: $:/core/images/blank
tags: $:/tags/Image
<svg class="tc-image-blank tc-image-button" viewBox="63 152 64 64" width="22pt" height="22pt"></svg>

View File

@ -1,53 +1,53 @@
title: $:/language/ControlPanel/
Advanced/Caption: Advanced
Advanced/EditorTypes/Caption: Editor Types
Advanced/EditorTypes/Editor/Caption: Editor
Advanced/EditorTypes/Hint: These tiddlers determine which editor is used to edit specific tiddler types.
Advanced/EditorTypes/Type/Caption: Type
EditorTypes/Caption: Editor Types
EditorTypes/Editor/Caption: Editor
EditorTypes/Hint: These tiddlers determine which editor is used to edit specific tiddler types.
EditorTypes/Type/Caption: Type
Advanced/Hint: Internal information about this TiddlyWiki
Advanced/LoadedModules/Caption: Loaded Modules
Advanced/LoadedModules/Hint: These are the currently loaded tiddler modules linked to their source tiddlers. Any italicised modules lack a source tiddler, typically because they were setup during the boot process.
Advanced/Settings/Caption: Settings
Advanced/Settings/Hint: These advanced settings let you customise the behaviour of TiddlyWiki.
Advanced/Settings/NavigationAddressBar/Caption: Navigation Address Bar
Advanced/Settings/NavigationAddressBar/Hint: Behaviour of the browser address bar when navigating to a tiddler:
Advanced/Settings/NavigationAddressBar/No/Description: Do not update the address bar
Advanced/Settings/NavigationAddressBar/Permalink/Description: Include the target tiddler
Advanced/Settings/NavigationAddressBar/Permaview/Description: Include the target tiddler and the current story sequence
Advanced/Settings/NavigationHistory/Caption: Navigation History
Advanced/Settings/NavigationHistory/Hint: Update browser history when navigating to a tiddler:
Advanced/Settings/NavigationHistory/No/Description: Do not update history
Advanced/Settings/NavigationHistory/Yes/Description: Update history
Advanced/Settings/ToolbarButtons/Caption: Toolbar Buttons
Advanced/Settings/ToolbarButtons/Hint: Default toolbar button appearance:
Advanced/Settings/ToolbarButtons/Text/Description: Include text
Advanced/Settings/ToolbarButtons/Icons/Description: Include icon
Advanced/TiddlerFields/Caption: Tiddler Fields
Advanced/TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers).
LoadedModules/Caption: Loaded Modules
LoadedModules/Hint: These are the currently loaded tiddler modules linked to their source tiddlers. Any italicised modules lack a source tiddler, typically because they were setup during the boot process.
Settings/Caption: Settings
Settings/Hint: These advanced 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:
Settings/NavigationAddressBar/No/Description: Do not update the address bar
Settings/NavigationAddressBar/Permalink/Description: Include the target tiddler
Settings/NavigationAddressBar/Permaview/Description: Include the target tiddler and the current story sequence
Settings/NavigationHistory/Caption: Navigation History
Settings/NavigationHistory/Hint: Update browser history when navigating to a tiddler:
Settings/NavigationHistory/No/Description: Do not update history
Settings/NavigationHistory/Yes/Description: Update history
Settings/ToolbarButtons/Caption: Toolbar Buttons
Settings/ToolbarButtons/Hint: Default toolbar button appearance:
Settings/ToolbarButtons/Text/Description: Include text
Settings/ToolbarButtons/Icons/Description: Include icon
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).
Appearance/Caption: Appearance
Appearance/Hint: Ways to customise the appearance of your TiddlyWiki.
Appearance/Palette/Caption: Palette
Appearance/Palette/Editor/Clone/Caption: clone
Appearance/Palette/Editor/Clone/Prompt: It is recommended that you clone this shadow palette before editing it
Appearance/Palette/Editor/Prompt/Modified: This shadow palette has been modified
Appearance/Palette/Editor/Prompt: Editing
Appearance/Palette/Editor/Reset/Caption: reset
Appearance/Palette/HideEditor/Caption: hide editor
Appearance/Palette/Prompt: Current palette:
Appearance/Palette/ShowEditor/Caption: show editor
Appearance/StoryView/Caption: Story View
Appearance/StoryView/Prompt: Current view:
Appearance/Theme/Caption: Theme
Appearance/Theme/Prompt: Current theme:
Appearance/Toolbars/Caption: Toolbars
Appearance/Toolbars/Hint: Select which toolbar buttons are displayed
Appearance/Toolbars/EditToolbar/Caption: Edit Toolbar
Appearance/Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in edit mode
Appearance/Toolbars/ViewToolbar/Caption: View Toolbar
Appearance/Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode
Appearance/Toolbars/PageControls/Caption: Page Toolbar
Appearance/Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar
Palette/Caption: Palette
Palette/Editor/Clone/Caption: clone
Palette/Editor/Clone/Prompt: It is recommended that you clone this shadow palette before editing it
Palette/Editor/Prompt/Modified: This shadow palette has been modified
Palette/Editor/Prompt: Editing
Palette/Editor/Reset/Caption: reset
Palette/HideEditor/Caption: hide editor
Palette/Prompt: Current palette:
Palette/ShowEditor/Caption: show editor
StoryView/Caption: Story View
StoryView/Prompt: Current view:
Theme/Caption: Theme
Theme/Prompt: Current theme:
Toolbars/Caption: Toolbars
Toolbars/Hint: Select which toolbar buttons are displayed
Toolbars/EditToolbar/Caption: Edit Toolbar
Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in edit mode
Toolbars/ViewToolbar/Caption: View Toolbar
Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode
Toolbars/PageControls/Caption: Page Toolbar
Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar
Basics/AnimDuration/Prompt: Animation duration:
Basics/Caption: Basics
Basics/DefaultTiddlers/BottomHint: Use &#91;&#91;double square brackets&#93;&#93; for titles with spaces. Or you can choose to <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">retain story ordering</$button>

View File

@ -0,0 +1,14 @@
title: $:/language/Help/makelibrary
description: Construct library plugin required by upgrade process
Constructs the `$:/UpgradeLibrary` tiddler for the upgrade process.
The upgrade library is formatted as an ordinary plugin tiddler with the plugin type `library`. It contains a copy of each of the plugins, themes and language packs available within the TiddlyWiki5 repository.
This command is intended for internal use; it is only relevant to users constructing a custom upgrade procedure.
```
--makelibrary <title>
```
The title argument defaults to `$:/UpgradeLibrary`.

View File

@ -59,7 +59,7 @@ function SaverHandler(options) {
}
});
// Listen for the autosave event
$tw.rootWidget.addEventListener("tw-auto-save-wiki",function(event) {
$tw.rootWidget.addEventListener("tm-auto-save-wiki",function(event) {
// Do the autosave unless there are outstanding tiddler change events
if(self.wiki.getSizeOfTiddlerEventQueue() === 0) {
// Check if we're dirty

View File

@ -48,6 +48,8 @@ exports.parseKeyDescriptor = function(keyDescriptor) {
info.shiftKey = true;
} else if(s === "alt") {
info.altKey = true;
} else if(s === "meta") {
info.metaKey = true;
}
// Replace named keys with their code
if(namedKeys[s]) {
@ -57,4 +59,13 @@ exports.parseKeyDescriptor = function(keyDescriptor) {
return info;
};
exports.checkKeyDescriptor = function(event,keyInfo) {
var metaKeyStatus = !!keyInfo.metaKey; // Using a temporary variable to keep JSHint happy
return event.keyCode === keyInfo.keyCode &&
event.shiftKey === keyInfo.shiftKey &&
event.altKey === keyInfo.altKey &&
event.ctrlKey === keyInfo.ctrlKey &&
event.metaKey === metaKeyStatus;
};
})();

View File

@ -73,7 +73,7 @@ exports.repackPlugin = function(title,additionalTiddlers,excludeTiddlers) {
}
});
// Trigger an autosave
$tw.rootWidget.dispatchEvent({type: "tw-auto-save-wiki"});
$tw.rootWidget.dispatchEvent({type: "tm-auto-save-wiki"});
// Return a heartwarming confirmation
return "Plugin " + title + " successfully saved";
};

View File

@ -41,10 +41,7 @@ KeyboardWidget.prototype.render = function(parent,nextSibling) {
domNode.className = classes.join(" ");
// Add a keyboard event handler
domNode.addEventListener("keydown",function (event) {
if(event.keyCode === self.keyInfo.keyCode &&
event.shiftKey === self.keyInfo.shiftKey &&
event.altKey === self.keyInfo.altKey &&
event.ctrlKey === self.keyInfo.ctrlKey) {
if($tw.utils.checkKeyDescriptor(event,self.keyInfo)) {
self.dispatchMessage(event);
event.preventDefault();
event.stopPropagation();

View File

@ -244,7 +244,7 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
this.removeTitleFromStory(storyList,title);
this.saveStoryList(storyList);
// Trigger an autosave
$tw.rootWidget.dispatchEvent({type: "tw-auto-save-wiki"});
$tw.rootWidget.dispatchEvent({type: "tm-auto-save-wiki"});
return false;
};
@ -335,7 +335,7 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
this.saveStoryList(storyList);
}
// Trigger an autosave
$tw.rootWidget.dispatchEvent({type: "tw-auto-save-wiki"});
$tw.rootWidget.dispatchEvent({type: "tm-auto-save-wiki"});
}
}
}
@ -484,7 +484,7 @@ NavigatorWidget.prototype.handlePerformImportEvent = function(event) {
// Navigate to the $:/Import tiddler
this.addToHistory([IMPORT_TITLE]);
// Trigger an autosave
$tw.rootWidget.dispatchEvent({type: "tw-auto-save-wiki"});
$tw.rootWidget.dispatchEvent({type: "tm-auto-save-wiki"});
};
exports.navigator = NavigatorWidget;

View File

@ -5,5 +5,5 @@ caption: {{$:/language/ControlPanel/Advanced/Caption}}
{{$:/language/ControlPanel/Advanced/Hint}}
<div class="tc-control-panel">
<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Advanced]!has[draft.of]]" "$:/core/ui/ControlPanel/Advanced/TiddlerFields">>
<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Advanced]!has[draft.of]]" "$:/core/ui/ControlPanel/TiddlerFields">>
</div>

View File

@ -1,8 +1,8 @@
title: $:/core/ui/ControlPanel/Advanced/EditorTypes
title: $:/core/ui/ControlPanel/EditorTypes
tags: $:/tags/ControlPanel/Advanced
caption: {{$:/language/ControlPanel/Advanced/EditorTypes/Caption}}
caption: {{$:/language/ControlPanel/EditorTypes/Caption}}
\define lingo-base() $:/language/ControlPanel/Advanced/EditorTypes/
\define lingo-base() $:/language/ControlPanel/EditorTypes/
<<lingo Hint>>

View File

@ -1,8 +1,8 @@
title: $:/core/ui/ControlPanel/Advanced/LoadedModules
title: $:/core/ui/ControlPanel/LoadedModules
tags: $:/tags/ControlPanel/Advanced
caption: {{$:/language/ControlPanel/Advanced/LoadedModules/Caption}}
caption: {{$:/language/ControlPanel/LoadedModules/Caption}}
\define lingo-base() $:/language/ControlPanel/Advanced/
\define lingo-base() $:/language/ControlPanel/
<<lingo LoadedModules/Hint>>
{{$:/snippets/modules}}

View File

@ -1,12 +1,12 @@
title: $:/core/ui/ControlPanel/Advanced/Settings
title: $:/core/ui/ControlPanel/Settings
tags: $:/tags/ControlPanel/Advanced
caption: {{$:/language/ControlPanel/Advanced/Settings/Caption}}
caption: {{$:/language/ControlPanel/Settings/Caption}}
\define lingo-base() $:/language/ControlPanel/Advanced/Settings/
\define lingo-base() $:/language/ControlPanel/Settings/
<<lingo Hint>>
<$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Advanced/Settings]]">
<$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings]]">
<div style="border-top:1px solid #eee;">

View File

@ -1,8 +1,8 @@
title: $:/core/ui/ControlPanel/Advanced/Settings/NavigationAddressBar
tags: $:/tags/ControlPanel/Advanced/Settings
caption: {{$:/language/ControlPanel/Advanced/Settings/NavigationAddressBar/Caption}}
title: $:/core/ui/ControlPanel/Settings/NavigationAddressBar
tags: $:/tags/ControlPanel/Settings
caption: {{$:/language/ControlPanel/Settings/NavigationAddressBar/Caption}}
\define lingo-base() $:/language/ControlPanel/Advanced/Settings/NavigationAddressBar/
\define lingo-base() $:/language/ControlPanel/Settings/NavigationAddressBar/
<$link to="$:/config/Navigation/UpdateAddressBar"><<lingo Hint>></$link>

View File

@ -1,8 +1,8 @@
title: $:/core/ui/ControlPanel/Advanced/Settings/NavigationHistory
tags: $:/tags/ControlPanel/Advanced/Settings
caption: {{$:/language/ControlPanel/Advanced/Settings/NavigationHistory/Caption}}
title: $:/core/ui/ControlPanel/Settings/NavigationHistory
tags: $:/tags/ControlPanel/Settings
caption: {{$:/language/ControlPanel/Settings/NavigationHistory/Caption}}
\define lingo-base() $:/language/ControlPanel/Advanced/Settings/NavigationHistory/
\define lingo-base() $:/language/ControlPanel/Settings/NavigationHistory/
<$link to="$:/config/Navigation/UpdateHistory"><<lingo Hint>></$link>
<$radio tiddler="$:/config/Navigation/UpdateHistory" value="yes"> <<lingo Yes/Description>> </$radio>

View File

@ -1,8 +1,8 @@
title: $:/core/ui/ControlPanel/Advanced/Settings/ToolbarButtons
tags: $:/tags/ControlPanel/Advanced/Settings
caption: {{$:/language/ControlPanel/Advanced/Settings/ToolbarButtons/Caption}}
title: $:/core/ui/ControlPanel/Settings/ToolbarButtons
tags: $:/tags/ControlPanel/Settings
caption: {{$:/language/ControlPanel/Settings/ToolbarButtons/Caption}}
\define lingo-base() $:/language/ControlPanel/Advanced/Settings/ToolbarButtons/
\define lingo-base() $:/language/ControlPanel/Settings/ToolbarButtons/
<<lingo Hint>>
<$checkbox tiddler="$:/config/Toolbar/Icons" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/Toolbar/Icons"><<lingo Icons/Description>></$link> </$checkbox>

View File

@ -1,8 +1,8 @@
title: $:/core/ui/ControlPanel/Advanced/TiddlerFields
title: $:/core/ui/ControlPanel/TiddlerFields
tags: $:/tags/ControlPanel/Advanced
caption: {{$:/language/ControlPanel/Advanced/TiddlerFields/Caption}}
caption: {{$:/language/ControlPanel/TiddlerFields/Caption}}
\define lingo-base() $:/language/ControlPanel/Advanced/
\define lingo-base() $:/language/ControlPanel/
<<lingo TiddlerFields/Hint>>

View File

@ -5,5 +5,5 @@ caption: {{$:/language/ControlPanel/Appearance/Caption}}
{{$:/language/ControlPanel/Appearance/Hint}}
<div class="tc-control-panel">
<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance]!has[draft.of]]" "$:/core/ui/ControlPanel/Appearance/Theme">>
<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance]!has[draft.of]]" "$:/core/ui/ControlPanel/Theme">>
</div>

View File

@ -1,8 +1,8 @@
title: $:/core/ui/ControlPanel/Appearance/Palette
title: $:/core/ui/ControlPanel/Palette
tags: $:/tags/ControlPanel/Appearance
caption: {{$:/language/ControlPanel/Appearance/Palette/Caption}}
caption: {{$:/language/ControlPanel/Palette/Caption}}
\define lingo-base() $:/language/ControlPanel/Appearance/Palette/
\define lingo-base() $:/language/ControlPanel/Palette/
{{$:/snippets/paletteswitcher}}

View File

@ -1,5 +1,5 @@
title: $:/core/ui/ControlPanel/Appearance/StoryView
title: $:/core/ui/ControlPanel/StoryView
tags: $:/tags/ControlPanel/Appearance
caption: {{$:/language/ControlPanel/Appearance/StoryView/Caption}}
caption: {{$:/language/ControlPanel/StoryView/Caption}}
{{$:/snippets/viewswitcher}}

View File

@ -1,5 +1,5 @@
title: $:/core/ui/ControlPanel/Appearance/Theme
title: $:/core/ui/ControlPanel/Theme
tags: $:/tags/ControlPanel/Appearance
caption: {{$:/language/ControlPanel/Appearance/Theme/Caption}}
caption: {{$:/language/ControlPanel/Theme/Caption}}
{{$:/snippets/themeswitcher}}

View File

@ -1,9 +1,9 @@
title: $:/core/ui/ControlPanel/Appearance/Toolbars
title: $:/core/ui/ControlPanel/Toolbars
tags: $:/tags/ControlPanel/Appearance
caption: {{$:/language/ControlPanel/Appearance/Toolbars/Caption}}
caption: {{$:/language/ControlPanel/Toolbars/Caption}}
{{$:/language/ControlPanel/Appearance/Toolbars/Hint}}
{{$:/language/ControlPanel/Toolbars/Hint}}
<div class="tc-control-panel">
<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance/Toolbars]!has[draft.of]]" "$:/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar" "$:/state/tabs/controlpanel/toolbars" "tc-vertical">>
<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Toolbars]!has[draft.of]]" "$:/core/ui/ControlPanel/Toolbars/ViewToolbar" "$:/state/tabs/controlpanel/toolbars" "tc-vertical">>
</div>

View File

@ -1,13 +1,13 @@
title: $:/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar
tags: $:/tags/ControlPanel/Appearance/Toolbars
caption: {{$:/language/ControlPanel/Appearance/Toolbars/EditToolbar/Caption}}
title: $:/core/ui/ControlPanel/Toolbars/EditToolbar
tags: $:/tags/ControlPanel/Toolbars
caption: {{$:/language/ControlPanel/Toolbars/EditToolbar/Caption}}
\define lingo-base() $:/language/TiddlerInfo/
\define config-title()
$:/config/EditToolbarButtons/Visibility/$(listItem)$
\end
{{$:/language/ControlPanel/Appearance/Toolbars/EditToolbar/Hint}}
{{$:/language/ControlPanel/Toolbars/EditToolbar/Hint}}
<$set name="tv-config-toolbar-icons" value="yes">

View File

@ -1,13 +1,13 @@
title: $:/core/ui/ControlPanel/Appearance/Toolbars/PageControls
tags: $:/tags/ControlPanel/Appearance/Toolbars
caption: {{$:/language/ControlPanel/Appearance/Toolbars/PageControls/Caption}}
title: $:/core/ui/ControlPanel/Toolbars/PageControls
tags: $:/tags/ControlPanel/Toolbars
caption: {{$:/language/ControlPanel/Toolbars/PageControls/Caption}}
\define lingo-base() $:/language/TiddlerInfo/
\define config-title()
$:/config/PageControlButtons/Visibility/$(listItem)$
\end
{{$:/language/ControlPanel/Appearance/Toolbars/PageControls/Hint}}
{{$:/language/ControlPanel/Toolbars/PageControls/Hint}}
<$set name="tv-config-toolbar-icons" value="yes">

View File

@ -1,13 +1,13 @@
title: $:/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar
tags: $:/tags/ControlPanel/Appearance/Toolbars
caption: {{$:/language/ControlPanel/Appearance/Toolbars/ViewToolbar/Caption}}
title: $:/core/ui/ControlPanel/Toolbars/ViewToolbar
tags: $:/tags/ControlPanel/Toolbars
caption: {{$:/language/ControlPanel/Toolbars/ViewToolbar/Caption}}
\define lingo-base() $:/language/TiddlerInfo/
\define config-title()
$:/config/ViewToolbarButtons/Visibility/$(listItem)$
\end
{{$:/language/ControlPanel/Appearance/Toolbars/ViewToolbar/Hint}}
{{$:/language/ControlPanel/Toolbars/ViewToolbar/Hint}}
<$set name="tv-config-toolbar-icons" value="yes">

View File

@ -53,7 +53,7 @@ tags: $:/tags/Macro
<$set name="toc-state" value=<<qualify "$:/state/toc/$tag$-$(currentTiddler)$">>>
<li>
<$link>
<$list filter="[all[current]tagging[]limit[1]]">
<$list filter="[all[current]tagging[]limit[1]]" 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}}

View File

@ -1,6 +1,6 @@
title: $:/snippets/minithemeswitcher
\define lingo-base() $:/language/ControlPanel/Appearance/Theme/
\define lingo-base() $:/language/ControlPanel/Theme/
<<lingo Prompt>> <$select tiddler="$:/theme">
<$list filter="[plugin-type[theme]sort[title]]">
<option value=<<currentTiddler>>><$view field="name"><$view field="title"/></$view></option>

View File

@ -1,6 +1,6 @@
title: $:/snippets/paletteeditor
\define lingo-base() $:/language/ControlPanel/Appearance/Palette/Editor/
\define lingo-base() $:/language/ControlPanel/Palette/Editor/
\define describePaletteColour(colour)
{{$:/language/Docs/PaletteColours/$colour$}}
\end

View File

@ -1,6 +1,6 @@
title: $:/snippets/paletteswitcher
\define lingo-base() $:/language/ControlPanel/Appearance/Palette/
\define lingo-base() $:/language/ControlPanel/Palette/
<<lingo Prompt>> <$view tiddler={{$:/palette}} field="name"/>
<$linkcatcher to="$:/palette">

View File

@ -1,6 +1,6 @@
title: $:/snippets/themeswitcher
\define lingo-base() $:/language/ControlPanel/Appearance/Theme/
\define lingo-base() $:/language/ControlPanel/Theme/
<<lingo Prompt>> <$view tiddler={{$:/theme}} field="name"/>
<$linkcatcher to="$:/theme">

View File

@ -1,6 +1,6 @@
title: $:/snippets/viewswitcher
\define lingo-base() $:/language/ControlPanel/Appearance/StoryView/
\define lingo-base() $:/language/ControlPanel/StoryView/
<<lingo Prompt>> <$select tiddler="$:/view">
<$list filter="[storyviews[]]">
<option><$view field="title"/></option>

View File

@ -0,0 +1,12 @@
created: 20140417191319973
modified: 20140901082708004
title: $:/DefaultTiddlers
type: text/vnd.tiddlywiki
[[Classic Parser Plugin Demo]]
[[Classic Slider Demo]]
[[ClassicTabsDemo]]
[[Classic Transclusion]]
[[text/x-tiddlywiki typeblock]]
[[Markup]]
[[Developers Notes]]

View File

@ -0,0 +1,6 @@
created: 20140416191641926
modified: 20140417181106838
title: $:/ShowEditPreview
type: text/vnd.tiddlywiki
yes

View File

@ -0,0 +1,5 @@
created: 20140417192155748
modified: 20140417192155748
title: $:/SiteSubtitle
type: text/vnd.tiddlywiki

View File

@ -0,0 +1,6 @@
created: 20140417192135107
modified: 20140417192152339
title: $:/SiteTitle
type: text/vnd.tiddlywiki
Classic Parser Demo

View File

@ -0,0 +1,24 @@
created: 20121217004633000
creator: keithb
modified: 20140415164633773
modifier: andrewstern
tags: Formatting
title: Basic Formatting
type: text/x-tiddlywiki
!Summary
//''Emphasizing''// @@text@@ __is easy__!
!Markup
| !Style | !Markup |h
|<html><b><i>bold</i></b></html>|{{{''bold''}}} -- two single-quotes|
|//italics//|{{{//italics//}}}|
|<html><b><i>bold italics</i></b></html>|{{{''//bold italics//''}}}|
|__underline__|{{{__underline__}}}|
|--strikethrough--|{{{--Strikethrough--}}}|
|super^^script^^|{{{super^^script^^}}}|
|sub~~script~~|{{{sub~~script~~}}}|
|@@Highlight@@|{{{@@Highlight@@}}}|
|{{{plain text}}}|<html><code>{{{PlainText No ''Formatting''}}}</code></html>|
|/%this text will be invisible%/hidden text|{{{/%this text will be invisible%/}}}|
|foo -- bar|{{{use two dashes -- between two words to create an Em dash}}}|

View File

@ -0,0 +1,43 @@
created: 20110215174227000
creator: pmario
modified: 20140415164659711
modifier: andrewstern
tags: Formatting
title: Blockquotes
type: text/x-tiddlywiki
!Summary
Use quotations to cite other sources or simply indent content.
!!Blockquotes
Text can be displayed as quotations using three less-than signs:
{{{
<<<
Steve Jobs: "computers are like a bicycle for our minds"
<<<
}}}
<<<
Steve Jobs: "computers are like a bicycle for our minds"
<<<
!Nested Blockquotes
Quotes can be displayed with multi-levels:
{{{
> blockquote, level 1
>> blockquote, level 2
>>> blockquote, level 3
}}}
> blockquote, level 1
>> blockquote, level 2
>>> blockquote, level 3
!!Mixed Blockquotes
{{{
<<<
Steve Jobs: "computers are like a bicycle for our minds"
> blockquote, level 1
Some more text.
<<<
}}}
<<<
Steve Jobs: "computers are like a bicycle for our minds"
> blockquote, level 1
Some more text.
<<<

View File

@ -0,0 +1,39 @@
created: 20130211145116000
creator: tobibeer
modified: 20140415164516606
modifier: andrewstern
tags: Formatting
title: CSS Formatting
type: text/x-tiddlywiki
!Summary
You can directly apply CSS rules inline or use custom classes.
!Markup
!!!Inline Styles
Enclose text using two double @ signs and let the first two follow by your CSS rules.
{{{
@@color:#4bbbbb;Some random text@@
}}}
''Displays as:''
@@color:red;Some random text@@
!!!CSS Classes
CSS classes can be applied to text blocks.
To wrap your text inline in a HTML {{{<span>}}} element use...
{{{
before » {{customClassName{inline content}}} « after
}}}
''Displays as:''
before » {{customClassName{inline content}}} « after
To wrap your text as a block level element -- a HTML {{{<div>}}} -- use line-breaks...
<html><pre>
before » {{customClassName{
box content
}}} « after
</pre></html>''Displays as:''
before » {{customClassName{
box content
}}} « after

View File

@ -0,0 +1,14 @@
created: 20140416201128370
modified: 20140901082657977
title: Classic Parser Plugin Demo
type: text/x-tiddlywiki
This is a demo of the Tiddlywiki Classic parser for Tiddlywiki5 (the tw2parser plugin).
Below is a [[Test card|Markup]] from [[http://tiddlywiki.org]] showing examples of all Classic markup.
Tiddlers that are given the type 'text/x-tiddlywiki' will be interpreted as containing Classic Tiddlywiki markup. In addition Classic Tiddlywiki markup can be embedded in a tiddlywiki5 tiddler by the use of a type block - see [[text/x-tiddlywiki typeblock]] below.
!!Support for Classic macros
At present there is limited support for Classic macros. See below for examples of the [[slider|Classic Slider Demo]], [[tabs|ClassicTabsDemo]] and [[tiddler|Classic Transclusion]] macros.
!!Status
See here for <<slider $:/temp/1 Issues "Issues»" "more" >>
!!See also [[Developers Notes]]

View File

@ -0,0 +1,13 @@
created: 20140831105412236
modified: 20140901072049425
title: Classic Slider Demo
type: text/x-tiddlywiki
!!Demo text:
{{{
<<slider $:/temp/xxx slidertest "click me»" "more" >>
}}}
!!Demo results:
<<slider $:/temp/xxx slidertest "click me»" "more" >>

View File

@ -0,0 +1,12 @@
created: 20140831105630157
modified: 20140901082725277
title: Classic Transclusion
type: text/x-tiddlywiki
!!Demo text:
{{{
<<tiddler [[Classic Parser Plugin Demo##Support for Classic macros]]>>
}}}
!!Demo results:
<<tiddler [[Classic Parser Plugin Demo##Support for Classic macros]]>>

View File

@ -0,0 +1,39 @@
created: 20140603181004793
modified: 20140901071957024
title: ClassicTabsDemo
type: text/x-tiddlywiki
!!Demo text:
{{{
<<tabs $:/state/tabtxtdemo
"show a section" "sec 1" ClassicTabsDemo##Do1
"section 2" "Priority 2" ClassicTabsDemo##Do2
"and a slice" "a slice" [[ClassicTabsDemo::slice]]
>>
/%
!Do1
first section: this is a hidden section below
!Do2
another hidden section of this tiddler
!end
|~slice| a hidden slice of this tiddler|
!end
%/
}}}
!!Demo results:
<<tabs $:/state/tabtxtdemo
"show a section" "sec 1" ClassicTabsDemo##Do1
"section 2" "Priority 2" ClassicTabsDemo##Do2
"and a slice" "a slice" [[ClassicTabsDemo::slice]]
>>
/%
!Do1
first section: this is a hidden section below
!Do2
another hidden section of this tiddler
!end
|~slice| a hidden slice of this tiddler|
!end
%/

View File

@ -0,0 +1,30 @@
created: 20130211142734000
creator: tobibeer
modified: 20140901061201603
modifier: andrewstern
tags: Formatting
title: Code
type: text/x-tiddlywiki
!Summary
You can render text monospaced text, e.g. using the font //Courier//, while preserving line breaks and not applying WikiText formating or turning WikiWords into links.
!!"""Monospaced Text Block"""
<html><pre>
{{{
Some plain text including WikiLinks
}}}
</pre></html>''Displays as:'' a HTML <pre> element
{{{
Some plain text including WikiLinks
}}}
<<<
''Note:'' Code blocks are displayed using a white-space 'as-is', fixed-width font without no word-wrapping -- displayed in a box.
<<<
!!"""Monospaced Inline Text"""
Alternatively, you can also display monospaced text __inline__ by wrapping the text in three braces <html><code>{{{...}}}</code></html>:
<html><pre>{{{inline //code//}}}</pre></html>''Displays as:'' a HTML <code> element
{{{inline //code//}}}
<<<
''Note:'' Inline code uses a white-space 'collapsed', word-wrapped, fixed-width font.

View File

@ -0,0 +1,29 @@
created: 20130213001758000
creator: tobibeer
modified: 20140901061006864
modifier: andrewstern
tags: Formatting
title: Comment Formatting
type: text/x-tiddlywiki
!Summary
Occasionally you want to add notes to your tiddler markup yet don't want it displayed when the tiddler is rendered. To achieve this, wrap the text using {{{/% hidden %/}}}.
!Example
{{{
text before .../%
!HIDDEN SECTION
This is content of a hidden section.
!END%/ text after
}}}
''Display as:''
<<<
text before /%
!HIDDEN SECTION
This is content of a hidden section.
!END%/... text after
<<<
!Also see...
;[[Suppressing Formatting]]
:» when you just don't want that text to be TiddlyWiki markup
:» when you want to prevent WikiWords
:» when you copy & paste from other sources

View File

@ -0,0 +1,26 @@
created: 20140831112438405
modified: 20140901080739956
title: Developers Notes
type: text/x-tiddlywiki
The includes handling of namespace conflicts between Classic and Tw5 macros.
One of the goals of the Tw2parser plugin is to hide the Classic macros from tiddlers of types other than text/x-tiddlywiki. This is achieved by having the parser prepend the macro definitions to the 'local' parse tree (see around line 60 wikitextparser.js), making them only visible in text/x-tiddlywiki tiddlers and typed-blocks. At present all text based Classic macros are in the same file.
As all global Tw5 macros are visible in all tiddlers (including text/x-tiddlywiki tiddlers), there is a name-space conflict between Classic and tw5 macros. For macros that are defined using tiddlytext (ie /define() /end blocks) the local defined Classic definition will override the global Tw5 macros (which is what we want).
For cases where simple overriding is not sufficient, the tw2parser plugin also has a 'macro name adapter' module (macroadapter.js) to move the Classic macros names to a new names -
(in wikitextrules.js around line 490)
{{{tw2on5-name=macroadapter.namedapter[tw2name];}}}
This is invisible to the user.
An example is the {{{tabs()}}} macro which is mapped to {{{__system_tabs()}}}
so the user still types {{{tabs()}}} but this is mapped to {{{__system_tabs()}}} in the parser which is what appears in the file macrodefs.tids
There is also the facility to manipulate the parameters via {{{params=macroadapter.paramadaptername}}}
This is used in the 'tabs' macro where there is a variable number of parameters that must be mapped into fixed number of tw5 macro parameters.
The implementation of the tabs macro is rather sophisticated, the parameters are put into maps from tab-tiddername to tab-property (properties are cookies, prompts and labels) implemented as jsons.

View File

@ -0,0 +1,50 @@
created: 20130204165019000
creator: tobibeer
modified: 20140415164150742
modifier: andrewstern
tags: Formatting
title: HTML Entities
type: text/x-tiddlywiki
!Summary
Use HTML entities to enter characters that can't easily be typed on an ordinary keyboard. They take the form of an ampersand ({{{&}}}), an identifying string, and a terminating semi-colon ({{{;}}}), e.g. {{{&amp;}}}.
!Markup
{{{
The value of Tiddlers&trade; cannot even be expressed in &pound;, &euro; or &dollar;.
}}}
''Displays as:''
The value of Tiddlers&trade; cannot even be expressed in &pound;, &euro; or &dollar;.
!"""Entity References"""
Comprehensive lists of html entities can be found at...
* [[w3schools.com|http://www.w3schools.com/tags/ref_entities.asp]]
* [[htmlhelp.com|http://www.htmlhelp.com/reference/html40/entities]]
!"""Examples Of Common And Eseful Entities"""
|>|>|>|>|>|>| !HTML Entities |
| &amp;nbsp; | &nbsp; | no-break space | &nbsp;&nbsp; | &amp;apos; | &apos; | single quote, apostrophe |
| &amp;ndash; | &ndash; | en dash |~| &amp;quot; | " | quotation mark |
| &amp;mdash; | &mdash; | em dash |~| &amp;prime; | &prime; | prime; minutes; feet |
| &amp;hellip; | &hellip; | horizontal ellipsis |~| &amp;Prime; | &Prime; | double prime; seconds; inches |
| &amp;copy; | &copy; | Copyright symbol |~| &amp;lsquo; | &lsquo; | left single quote |
| &amp;reg; | &reg; | Registered symbol |~| &amp;rsquo; | &rsquo; | right single quote |
| &amp;trade; | &trade; | Trademark symbol |~| &amp;ldquo; | &ldquo; | left double quote |
| &amp;dagger; | &dagger; | dagger |~| &amp;rdquo; | &rdquo; | right double quote |
| &amp;Dagger; | &Dagger; | double dagger |~| &amp;laquo; | &laquo; | left angle quote |
| &amp;para; | &para; | paragraph sign |~| &amp;raquo; | &raquo; | right angle quote |
| &amp;sect; | &sect; | section sign |~| &amp;times; | &times; | multiplication symbol |
| &amp;uarr; | &uarr; | up arrow |~| &amp;darr; | &darr; | down arrow |
| &amp;larr; | &larr; | left arrow |~| &amp;rarr; | &rarr; | right arrow |
| &amp;lArr; | &lArr; | double left arrow |~| &amp;rArr; | &rArr; | double right arrow |
| &amp;harr; | &harr; | left right arrow |~| &amp;hArr; | &hArr; | double left right arrow |
!"""Accented Characters"""
The table below shows how accented characters can be built up by subsituting the underscore (_) into the corresponding character:
|>|>|>|>|>|>|>|>|>|>|>|>|>|>|>|>|>| !Accented Characters |
| grave accent | &amp;_grave; | &Agrave; | &agrave; | &Egrave; | &egrave; | &Igrave; | &igrave; | &Ograve; | &ograve; | &Ugrave; | &ugrave; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; |
| acute accent | &amp;_acute; | &Aacute; | &aacute; | &Eacute; | &eacute; | &Iacute; | &iacute; | &Oacute; | &oacute; | &Uacute; | &uacute; | &nbsp; | &nbsp; | &Yacute; | &yacute; | &nbsp; | &nbsp; |
| circumflex accent | &amp;_circ; | &Acirc; | &acirc; | &Ecirc; | &ecirc; | &Icirc; | &icirc; | &Ocirc; | &ocirc; | &Ucirc; | &ucirc; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; |
| umlaut mark | &amp;_uml; | &Auml; | &auml; | &Euml; | &euml; | &Iuml; | &iuml; | &Ouml; | &ouml; | &Uuml; | &uuml; | &nbsp; | &nbsp; | &Yuml; | &yuml; | &nbsp; | &nbsp; |
| tilde | &amp;_tilde; | &Atilde; | &atilde; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &Otilde; | &otilde; | &nbsp; | &nbsp; | &Ntilde; | &ntilde; | &nbsp; | &nbsp; | &nbsp; | &nbsp; |
| ring | &amp;_ring; | &Aring; | &aring; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; |
| slash | &amp;_slash; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &Oslash; | &oslash; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; |
| cedilla | &amp;_cedil; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &nbsp; | &Ccedil; | &ccedil; |

View File

@ -0,0 +1,29 @@
created: 20130212225913000
creator: tobibeer
modified: 20140415163847476
modifier: andrewstern
tags: Formatting
title: HTML Formatting
type: text/x-tiddlywiki
!Summary
TiddlyWiki provides support for rendering pure HTML markup. To do this, simply wrap your HTML code in {{{<html>your html markup goes here</html>}}}. This way you are able to use embed code using iFrames often suggested by popular media sites like ~YouTube.
!!"""Embedded HTML"""
{{{
<html>
<span style="padding-right:30px;font-size:2em;">any</span><br />
<b>valid</b> <em>xhtml</em>
</html>
}}}
<html><span style="padding-right:30px;font-size:2em;">any</span><br /><b>valid</b> <em>xhtml</em></html>
!!"""Embedded iFrame"""
{{{
<html>
<iframe src="http://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"
width="450" height="315" frameborder="0" allowfullscreen/>
</html>

View File

@ -0,0 +1,26 @@
created: 20130211150503000
creator: tobibeer
modified: 20140831113805090
modifier: andrewstern
tags: Formatting
title: Headings
type: text/x-tiddlywiki
!Summary
Start a line using exclamation marks to create headings.
!Markup
{{{
!Heading Level 1
!!Heading Level 2
!!!Heading Level 3
!!!!Heading Level 4
!!!!!Heading Level 5
!!!!!!Heading Level 6
}}}
!Heading Level 1
!!Heading Level 2
!!!Heading Level 3
!!!!Heading Level 4
!!!!!Heading Level 5
!!!!!!Heading Level 6

View File

@ -0,0 +1,25 @@
created: 20130211150739000
creator: tobibeer
modified: 20140415164242103
modifier: andrewstern
tags: Formatting
title: Horizontal Rules
type: text/x-tiddlywiki
!Summary
Use four dashes on a line or the HTML tag {{{<hr>}}} to produce a horizontal rule.
!Markup
{{{
before
----
after
}}}
or
{{{
before<hr>after
}}}
''Displays as:''
before
----
after

View File

@ -0,0 +1,49 @@
created: 20130211151808000
creator: tobibeer
modified: 20140901062342853
modifier: andrewstern
tags: Formatting
title: Images
type: text/x-tiddlywiki
!Summary
Generally, images are external to TiddlyWiki. You have different means to layout the image flow.
!Markup
!!Simple Images
{{{
[img[http://wikitext.tiddlyspace.com/fractalveg.jpg]]
}}}
[img[http://wikitext.tiddlyspace.com/fractalveg.jpg]]
!!Images Titles
{{{
[img[tooltip|http://wikitext.tiddlyspace.com/fractalveg.jpg]]
}}}
[img[tooltip|http://wikitext.tiddlyspace.com/fractalveg.jpg]]
!!Image Links
{{{
[img[http://wikitext.tiddlyspace.com/fractalveg.jpg][http://www.flickr.com/photos/jermy/10134618/]]
}}}
[img[http://wikitext.tiddlyspace.com/fractalveg.jpg][http://www.flickr.com/photos/jermy/10134618/]]
!!Floating Images
To clear a float, append...
{{{
@@clear:both;display:block; @@
}}}
!!Floating Left...
{{{
[<img[http://wikitext.tiddlyspace.com/fractalveg.jpg]]
@@clear:both;display:block; all clear@@
}}}
[<img[http://wikitext.tiddlyspace.com/fractalveg.jpg]]
@@clear:both;display:block; all clear@@
!!Floating Right
{{{
[>img[http://wikitext.tiddlyspace.com/fractalveg.jpg]]
@@float:right;clear:both;display:block; all clear@@
@@clear:both;display:block; @@
}}}
[>img[http://wikitext.tiddlyspace.com/fractalveg.jpg]]
@@float:right;clear:both;display:block; all clear@@
@@clear:both;display:block; @@

View File

@ -0,0 +1,9 @@
created: 20140416202554189
modified: 20140831091025876
title: Issues
type: text/x-tiddlywiki
*There is problem with table colspan with > to the right of a text filled cell.
*tiddler macro incomplete
*not all classic core macros supported

View File

@ -0,0 +1,24 @@
created: 20130211153646000
creator: tobibeer
modified: 20140415164315536
modifier: andrewstern
tags: Formatting
title: Line Breaks
type: text/x-tiddlywiki
!Summary
Line breaks can be forced explicitly using a {{{<br>}}} -- useful in lists or tables.
!Markup
{{{
|A cell<br> with a line break|
}}}
|A cell<br> with a line break|
!!Avoiding Linebreaks
Sometimes you want to avoid superflous linebreaks and increase readability of your wiki text, e.g. when using @@highlights@@ or the tiddler macro. To achieve that, end the current line by starting a hidden comment and ending it on the next line, e.g.:
{{{
@@highlight@@/%
%/<<tiddler foo>>
}}}
This will prevent from adding a superflous linebreak between the highlight and the transcluded content that follows.
!!Also see
* [[Table Formatting

View File

@ -0,0 +1,51 @@
created: 20130211154140000
creator: tobibeer
modified: 20140831095524601
modifier: tobibeer
tags: Formatting
title: Links
type: text/x-tiddlywiki
!Summary
TiddlyWiki allows different kinds of links, e.g. WikiWords, [[TiddlyLinks|TiddlyLink]], external Links or TiddlySpace links.
!!WikiWords
Any words or phrases that are CamelCase or [[Compound-Words|CamelCase]] - in which the elements are joined without spaces - will result in them becoming wiki links to tiddlers with that name.
{{{
WikiWord
}}}
WikiWord
To prevent this, append a tilde {{{~}}}...
{{{
~WikiWord
}}}
~WikiWord
!![[TiddlyLinks|TiddlyLink]]
A tiddler can also be linked using square brackets encompassing the tiddler title:
{{{
[[Core Macros]]
}}}
[[Core Macros]]
!![[Pretty TiddlyLinks|TiddlyLink]]
Optionally, a custom title can be used, separated by a pipe character (|)
{{{
[[standard macros|Core Macros]]
}}}
[[standard macros|Core Macros]]
!![[External Links|External Link]]
A valid URL directly results in a link to that external site:
{{{
http://tiddlywiki.org
}}}
http://tiddlywiki.org
!![[Pretty External Links|External Link]]
Similar to TiddlyLinks, external links can have a different title as well:
{{{
[[visit TiddlyWiki.org|http://tiddlywiki.org]]
}}}
[[visit TiddlyWiki.org|http://tiddlywiki.org]]

View File

@ -0,0 +1,42 @@
created: 20120131235950000
creator: sandman619
modified: 20140415164107038
modifier: tobibeer
tags: Formatting
title: Lists
type: text/x-tiddlywiki
!Summary
In TiddlyWiki you can make user of different list types, such as unordered lists, ordered or numbered lists, as well as definition lists.
!!Ordered Lists
Lists can be ordered using numbers and letters by starting a line with a hash {{{#}}}...
{{{
#List item one
##List item two
###List item three
}}}
#List item one
##List item two
###List item three
!!Unordered Lists
Create unordered lists by starting a line using an asterisk {{{*}}}...
{{{
*Unordered List Level 1
**Unordered List Level 2
***Unordered List Level 3
}}}
*Unordered List Level 1
**Unordered List Level 2
***Unordered List Level 3
!!Definition Lists
Create definition lists by starting a line using a semi-colon {{{;}}} for the term followed by a line starting with a colon {{{:}}} for the definition...
{{{
;Term 1
:Definition for Term 1
;Term 2
:Definition for Term 2
}}}
;Term 1
:Definition for Term 1
;Term 2
:Definition for Term 2

View File

@ -0,0 +1,101 @@
created: 20130205062501000
creator: tobibeer
modified: 20140831153103538
modifier: tobibeer
title: Markup
type: text/x-tiddlywiki
TiddlyWiki markup is a dedicated markup syntax to <<tag Formatting "format your content">> using WikiText...
|noLinkify|k
|width:250px; !Example | !Example Markup |h
| how the example markup renders | what to enter as tiddler text |
|>| ![[Basic Text Formatting|Basic Formatting]] |
|''bold''|{{{''bold''}}} (two __single__-quotes) |
|//italics//|{{{//italics//}}} |
|''//bold italics//''|{{{''//bold italics//''}}} |
|__underline__|{{{__underline__}}} |
|--strikethrough--|{{{--strikethrough--}}} |
|super^^script^^|{{{super^^script^^}}} |
|sub~~script~~|{{{sub~~script~~}}} |
|@@highlight@@|{{{@@highlight@@}}} |
|foo -- bar|{{{foo -- bar}}} -- two dashes create an Em dash|
|>| ![[Avoiding Wikification|Suppressing Formatting]] |
|to output text as-is (escaping), enclose it in three double quotes or use the {{{<nowiki>}}} markup|>|
|"""plain//text""" |{{{"""plain//text"""}}}|
|<nowiki>not__wikified</nowiki>|{{{<nowiki>not__wikified</nowiki>}}}|
|>| ![[Headings]] |
|start a new line with one or more question marks to create headings |>|
|<html><h1>Heading 1</h1><h2>Heading 2</h2><h3>Heading 3</h3><h4>Heading 4</h4><h5>Heading 5</h5></html>|{{{!Heading 1}}}<br />{{{!!Heading 2}}}<br />{{{!!!Heading 3}}}<br />{{{!!!!Heading 4}}}<br />{{{!!!!!Heading 5}}}|
|>|![[Lists]]|
|>| [[Ordered Lists|Lists]] |
|<html><ol><li>item one</li><li>item two<ol><li>level two<ol><li>level three</li></ol></li></ol></li></ol></li></ol></html>|{{{#item one}}}<br/>{{{#item two}}}<br/>{{{##level two}}}<br/>{{{###level three}}}|
|>| [[Unordered Lists|Lists]] |
|<html><ul><li>item one</li><li>item two<ul><li>level two<ul><li>level three</li></ul></li></ul></li></ul></html>|{{{*item one}}}<br/>{{{*item two}}}<br/>{{{**level two}}}<br/>{{{***level three}}}|
|>| [[Definition List|Lists]] |
|<html><dl><dt>term</dt><dd>definition</dd></dl></html>|{{{;term}}}<br />{{{:definition}}}|
|>| [[Mixed Lists|Lists]] |
|<html><ol><li>ordered<ul><li>unordered<dl><dt>term</dt><dd>definition</dd></dl></li></ul></li></ol></html>|{{{# ordered}}}<br />{{{#* unordered}}}<br />{{{#*;term}}}<br />{{{#*:definition}}}|
| ![[Blockquotes]] |>|
| [[Nested Blockquotes|Blockquotes]] |>|
|<html><blockquote>blockquote<blockquote>level two<blockquote>level three</blockquote></blockquote></blockquote></html>|{{{>blockquote}}}<br />{{{>>level two}}}<br />{{{>>>level three}}}|
|>| [[Multi-line Blockquotes|Blockquotes]] |
|<html><blockquote>multi-line<br/>blockquote</blockquote></html>|{{{<<<}}}<br />{{{multi-line}}}<br />{{{blockquote}}}<br />{{{<<<}}}|
|>| [[Mixed Blockquotes|Blockquotes]] |
|<html><blockquote>foo<br><blockquote>inner foo, level 1<br><blockquote>inner foo, level 2<br></blockquote></blockquote>more foo<br></blockquote></html>|{{{<<<}}}<br />{{{foo}}}<br />{{{> inner foo, level 1}}}<br />{{{>> inner foo, level 2}}}<br />{{{more foo}}}<br />{{{<<<}}}|
|>| ![[Code / Monospaced Text|Code]] |
|>| [[Inline Code|Code]] |
|{{{monospaced text}}}|<html><code>{{{mono space text}}}</code></html>|
|>| [[Code Block|Code]] |
|<html><pre>{{{<br/>multi-line<br/>code block<br/>}}}</pre></html>|<html><code>{{{</code></html><br/>{{{multi-line}}}<br/>{{{code block}}}<br/><html><code>}}}</code></html>|
| ![[Links]] |>|
|>| [[Internal Links|TiddlyLink]] |
|[[WikiWord]]|{{{WikiWord}}}|
|~NoLink|{{{~NoLink}}} -- a tilde {{{~}}} prevents automatic ~WikiWord links|
|[[Plain Link]]|{{{[[Plain Link]]}}}|
|[[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]]}}}|
|>| ![[Filesystem Links|Links]] |
|You can, of course, use file system links both as plain or pretty links.|>|
|''Windows Network Path''|{{{[[file://///server/share]]}}}|
|''Windows Local''|{{{[[file:///c:/folder/file]]}}}|
|''Linux/Unix Local''|{{{[[file:///folder/file]]}}}|
|''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&nbsp;&nbsp;[>img[http://www.tiddlywiki.com/favicon.ico]]|{{{[>img[path/image.jpg]]}}}|
|[<img[http://www.tiddlywiki.com/favicon.ico]]&nbsp;&nbsp;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]]}}}|
|>| ![[Gradients|gradient]] |
|<<gradient horiz #faa #afa #aaf>>&nbsp;&nbsp;__vert__ical or __horiz__ontal<br>&nbsp;&nbsp;see [[gradient macro|http://tiddlywiki.org/#%5B%5Bgradient%20(macro)%5D%5D]]>>|{{{<<gradient horiz #faa #afa #aaf>>wiki text>>}}}|
|>| ![[Tables]] |
|<<tiddler HTML_TABLE>>|<<tiddler HTML_TABLE_MARKUP>>|
|>|<<tiddler HTML_TABLE_RULES>>|
|>| ![[Custom Styles|CSS Formatting]] |
|>|a {{{@@highlight@@}}} element can accept CSS syntax to directly style text.|>|
|@@color:green;green coloured@@|{{{@@color:green;green coloured@@}}}|
|>| ![[Custom CSS Class Wrapper|CSS Formatting]] |
|>|You can define a custom css class wrapper, like {{{.button}}} below. By default, the inner text is placed inline into a {{{<span>}}} of said class(s). If you start and end the inner text with a newline, the content is placed in a {{{<div>}}}. Use the StyleSheet to define the css styles applied to the class.|
|<br>{{button title{Click!}}}|<html><pre>{{button title{Click!}}}</pre></html>|
|>| ![[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">&lt;html&gt;</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">&lt;/html&gt;</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">&lt;html&gt;</code></html>{{{<iframe src="http://the.url"/>}}}<html><code style="font-weight:bold">&lt;/html&gt;</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}}}|
|>| ![[Horizontal Rules]] |
|before<hr>after|{{{<hr>}}} or <br>{{{----}}} on its own line|
|>| ![[HTML Entities]] |
|>|You can use HTML entities...|
|&#632;&trade; |{{{&#632;&trade;}}}|
| ![[Macros]] |>|
|>|macros are called by enclosing the macro name in {{{<<}}} and {{{>>}}}|
|<<version>> |{{{<<version>>}}}|
|>| ![[Hidden Text|Basic Formatting]] |
|This is hidden: |{{{This is hidden: /% secret comment %/}}}|

View File

@ -0,0 +1,10 @@
created: 20130213002736000
creator: tobibeer
modified: 20140415163915430
modifier: andrewstern
tags: Formatting
title: Monospaced Text
type: text/x-tiddlywiki
<<tiddler Code>>

View File

@ -0,0 +1,29 @@
created: 20130211143136000
creator: tobibeer
modified: 20140415164021461
modifier: andrewstern
tags: Formatting
title: Suppressing Formatting
type: text/x-tiddlywiki
!Summary
TiddlyWiki markup rules can be suppressed for any given section of text by enclosing it in three ''double'' quotes or wrapping it using the {{{<nowiki>}}} markup...
* when you just don't want that text to be TiddlyWiki markup
* when you want to prevent WikiWords
* when you copy & paste from other sources
!Markup
{{{
» neither is this italicised or a """//WikiWord//"""
» nor is this <nowiki>__underlined__</nowiki>
}}}
» neither is this italicised or a """//WikiWord//"""
» nor is this <nowiki>__underlined__</nowiki>
In addition, you can suppress auto-linking for WikiWords, use the tilde prefix {{{~}}}:
{{{
~WikiWord
}}}
~WikiWord
!!Also see
*[[Comment Formatting]]
*[[Code Formatting]]

View File

@ -0,0 +1,117 @@
created: 20130205062438000
creator: tobibeer
modified: 20140901062133767
modifier: andrewstern
tags: Formatting
title: Tables
type: text/x-tiddlywiki
!Summary
TiddlyWiki provides flexible means to output tables.
!!"""Simple Tables"""
{{{
|North West|North|North East|
|West|Here|East|
|South West|South|South East|
}}}
|North West|North|North East|
|West|Here|East|
|South West|South|South East|
!!"""Cell Formatting"""
*Insert a space before cell content to right justify cell
*Insert a space after cell content to left justify cell
*Insert spaces before and after cell content to centre justify cell
*Insert an exclamation mark ({{{!}}}) as the first non-space character of a cell to turn it into a header cell
{{{
|!First column|!Second column|!Third column|
|left | centre | right|
}}}
|!First column|!Second column|!Third column|
|left | centre | right|
!!"""Table Headers and Footers"""
* Mark a table row as a header by adding an 'h' to the end
* Mark a table row as a footer by adding an 'f' to the end
{{{
|NW|N|NE|h
|W|X|E|
|SW|S|SE|f
}}}
|NW|N|NE|h
|W|X|E|
|SW|S|SE|f
Use an exclamation mark to turn an individual cell into a header cell of type {{{<th}}}...
{{{
| NW| !N |NE |h
| !W| X |!E |
| SW| !S |SE |f
}}}
| NW| !N |NE |h
| !W| X |!E |
| SW| !S |SE |f
!!"""Table Caption"""
A caption can be added to a table by adding a {{{c}}} after the last column either before the main table...
{{{
|A caption above the table|c
|North West|North|North East|
|West|Here|East|
|South West|South|South East|
}}}
|A caption above the table|c
|North West|North|North East|h
|West|Here|East|
|South West|South|South East|
or after the main table...
{{{
|North West|North|North East|
|West|Here|East|
|South West|South|South East|
|A caption below the table|c
}}}
|North West|North|North East|h
|West|Here|East|
|South West|South|South East|
|A caption below the table|c
!!"""Merging Table Cells"""
Merge a cell horizontally with the one to its right using greater-than {{{>}}}...
{{{
|North West|North|North East|
|>|>|West and Here and East|
|South West|South|South East|
}}}
|North West|North|North East|
|>|>|West and Here and East|
|South West|South|South East|
Merge a cell vertically with the one above using a tilde {{{~}}}...
{{{
|Westerly|North|North East|
|~|Here|East|
|~|South|South East|
}}}
|Westerly|North|North East|
|~|Here|East|
|~|South|South East|
!!"""CSS Formatting for Tables"""
A CSS class can be added to an entire table using a special first row that ends with a {{{k}}}...
{{{
|myClass|k
|North West|North|North East|
|West|Here|East|
|South West|South|South East|
}}}
Use your StyleSheet tiddler to define the desired styles.
CSS properties can also be added to individual table cells by appending the CSS syntax directly after the delimiting pipe {{{|}}}.
{{{
|color:red; North West|opacity:0.5;North|North East|
|color(green):West|Here|East|
|South West|South|South East|
}}}
|color:red; North West|opacity:0.5;North|North East|
|color(green):West|Here|East|
|South West|South|South East|
!!"""Alternating Row Colors"""
TiddlyWiki automatically assigns the classes {{{oddRow}}} and {{{evenRow}}} to table row elements {{{<TR>}}}. These can then be styled using the StyleSheet tiddler:
{{{
tr.oddRow { background-color: #fff; }
tr.evenRow { background-color: #ffe; }
}}}

View File

@ -0,0 +1,8 @@
created: 20140416192513067
modified: 20140416200952144
title: slidertest
type: text/x-tiddlywiki
!!now a transclusion of [[Basic Formatting]]
<hr>
<<tiddler [[Basic Formatting]]>>

View File

@ -0,0 +1,25 @@
created: 20140416193948971
modified: 20140901082129041
title: text/x-tiddlywiki typeblock
type: text/vnd.tiddlywiki
This is a tiddlywiki5 tiddler containing a Classic type-block.
!!Demo text:
```
!!Tw5 Here
$$$text/x-tiddlywiki
!Classic Here
<<slider $:/temp/xxx slidertest "click me»" "more" >>
$$$
```
!!Demo results:
!!Tw5 Here
$$$text/x-tiddlywiki
!Classic Here
<<slider $:/temp/xxx slidertest "click me»" "more" >>
$$$

View File

@ -0,0 +1,15 @@
{
"plugins": [
"tiddlywiki/tw2parser"
],
"themes": [
"tiddlywiki/vanilla",
"tiddlywiki/snowwhite"
],
"includeWikis": [
],
"build": {
"index": [
"--rendertiddler","$:/core/save/all","classicparserdemo.html","text/plain"]
}
}

View File

@ -23,6 +23,7 @@ type: text/vnd.tiddlywiki
* Explore the [[D3.js visualisation plugin|http://tiddlywiki.com/d3demo.html]]
* [[CodeMirror support via a plugin|http://tiddlywiki.com/codemirrordemo.html]]
* [[Markdown support via a plugin|http://tiddlywiki.com/markdowndemo.html]]
* [[Classic TiddlyWiki markup support via a plugin|http://tiddlywiki.com/classicparserdemo.html]]
* Many internal improvements:
** TiddlyWiki can now be run under [[Node.js]] as well as in the browser, allowing it to be used as a personal web server
** An elegant [[microkernel architecture|PluginMechanism]], that allows infinite customisation by replacing and augmenting the core modules

View File

@ -1,5 +1,5 @@
created: 20130822170200000
modified: 20140820153116300
modified: 20140902124037214
tags: introduction
title: HelloThere
type: text/vnd.tiddlywiki

View File

@ -1,9 +1,10 @@
caption: 5.0.16-beta
created: 20140830131615798
modified: 20140830131615798
modified: 20140902124037214
tags: releasenote
title: Release 5.0.16-beta
type: text/vnd.tiddlywiki
released: 20140902124037214
//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.0.15-beta...v5.0.16-beta]]//
@ -16,14 +17,24 @@ type: text/vnd.tiddlywiki
* [[Changed|https://github.com/Jermolene/TiddlyWiki5/commit/89fd5379dd78887fc21746d792072bf5a25f0c56]] all variable prefixes from `tw-` to `tv-` (eg `tw-config-toolbar-icons` has become `tv-config-toolbar-icons`)
* [[Changed|https://github.com/Jermolene/TiddlyWiki5/commit/112a9a95d95e9f62f110c97a4faaf537c5c100b1]] prefix/removeprefix filter operators to be case-sensitive
!! Compatibility with TiddlyWikiClassic
This release includes a preliminary version of a new plugin that provides compatibility with content created for TiddlyWikiClassic:
http://tiddlywiki.com/classicparserdemo.html
Subsequent releases will include end-user documentation with step-by-step instructions for migrating content.
Many thanks to @buggyj for his work on this plugin.
!! Usability Improvements
* [[Amended|https://github.com/Jermolene/TiddlyWiki5/commit/e47852cb141b384ad2a9097eca795545cb5b2494]] behaviour of the [[tw-browser-refresh|WidgetMessage: tw-browser-refresh]] message so that it no longer clears the location hash
* [[Amended|https://github.com/Jermolene/TiddlyWiki5/commit/e47852cb141b384ad2a9097eca795545cb5b2494]] behaviour of the [[tm-browser-refresh|WidgetMessage: tw-browser-refresh]] message so that it no longer clears the location hash
* [[Hide|https://github.com/Jermolene/TiddlyWiki5/commit/88c9c0c3ee115917b8c1a9126452bb0574061857]] toolbar buttons from static renderings
!! Hackability Improvements
* [[Extend|https://github.com/Jermolene/TiddlyWiki5/commit/48312272adb17610db96d50758e6af947cab7b1d]] the [FilterOperator: all]] to be able to select all the source tiddlers
* [[Extend|https://github.com/Jermolene/TiddlyWiki5/commit/48312272adb17610db96d50758e6af947cab7b1d]] the [[FilterOperator: all]] to be able to select all the source tiddlers
* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/43aeb47fc34f1ba424030c4f78ee907fe7b1d5d8]] problem with single line macro definitions incorrectly including whitespace in the value. (For example, `\define mymacro() yes` would set the macro value to " yes", with a leading space)
* [[Extend|https://github.com/Jermolene/TiddlyWiki5/commit/d2a5a12f2d6b6ccc36dd22a70ac2def08d1d3722]] TableOfContentsMacro to use the caption field if present
* [[Configurability|https://github.com/Jermolene/TiddlyWiki5/commit/b437f1b450f5f2a3104a9086f7c674299b53b9bc]] for the default tab shown in the tiddler info panel (see [[Configuring the default TiddlerInfo tab]])
@ -32,11 +43,14 @@ type: text/vnd.tiddlywiki
!! Bug Fixes
* [[Reverted|https://github.com/Jermolene/TiddlyWiki5/commit/ad40223d6b9bed435d9381611cb9de1841b53df6]] incorrect refreshing of the tiddler widget
* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/44228ed9f733217557851150f5ae45d9ebb23420]] indentation of selective expandable TableOfContentsMacro
!! 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]]
* [[@buggyj|https://github.com/buggyj]]
* [[@gernert|https://github.com/gernert]]
* [[@pmario|https://github.com/pmario]]
* [[@xcazin|https://github.com/xcazin]]

View File

@ -0,0 +1,33 @@
caption: 5.0.17-beta
created: 20140830131615798
modified: 20140902124037214
tags: releasenote
title: Release 5.0.17-beta
type: text/vnd.tiddlywiki
//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.0.16-beta...v5.0.17-beta]]//
!! Incompatible Changes
!! Usability Improvements
*
!! Hackability Improvements
*
!! Bug Fixes
*
!! 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]]
* [[@buggyj|https://github.com/buggyj]]
* [[@gernert|https://github.com/gernert]]
* [[@pmario|https://github.com/pmario]]
* [[@xcazin|https://github.com/xcazin]]

View File

@ -5,4 +5,4 @@ type: text/vnd.tiddlywiki
Here are the details of recent releases of TiddlyWiki5. See [[TiddlyWiki5 Versioning]] for details of how releases are named.
<<tabs "[tag[releasenote]!sort[created]]" "Release 5.0.15-beta" "$:/state/tab2" "tc-vertical" "ReleaseHistoryTemplate">>
<<tabs "[tag[releasenote]!sort[created]]" "Release 5.0.17-beta" "$:/state/tab2" "tc-vertical" "ReleaseHistoryTemplate">>

View File

@ -0,0 +1,9 @@
created: 20140903085210479
modified: 20140903085210479
tags: command
title: MakeLibraryCommand
type: text/vnd.tiddlywiki
{{$:/language/Help/makelibrary}}
See the UpgradeMechanism for more details.

View File

@ -24,7 +24,6 @@ Under TiddlyWiki5, the `type` field gives the content type to apply to the main
|~|Cascading Stylesheet text |text/css|
|~|Comma-separated values |text/csv|
|~|Plain text |text/plain|
|~|Plain text |text/plain|
|~|~TiddlyWiki 5 |text/vnd.tiddlywiki|
|~|~TiddlyWiki Classic |text/x-tiddlywiki|

View File

@ -1,5 +1,5 @@
created: 20140828133830424
modified: 20140828133830424
modified: 20140902145613329
tags: filters
title: FilterOperator: removesuffix
type: text/vnd.tiddlywiki
@ -9,6 +9,6 @@ The ''removesuffix'' filter operator returns the titles in the current list that
For example:
|!Filter String |!Description |
|`tid-one tid-two three +[removeprefix[tid-]]` |Returns `one`, `two` |
|`one-tid two-tid three +[removesuffix[-tid]]` |Returns `one`, `two` |
See also [[FilterOperator: suffix]], [[FilterOperator: prefix]] and [[FilterOperator: removeprefix]].

View File

@ -1,53 +1,53 @@
title: $:/language/ControlPanel/
Advanced/Caption: Erweitert
Advanced/EditorTypes/Caption: Editor Typen
Advanced/EditorTypes/Editor/Caption: Editor
Advanced/EditorTypes/Hint: Diese Tiddler definieren, welcher Editor für bestimmte Tiddler Typen (MIME-Type) verwendet werden sollen.
Advanced/EditorTypes/Type/Caption: MIME-Type
EditorTypes/Caption: Editor Typen
EditorTypes/Editor/Caption: Editor
EditorTypes/Hint: Diese Tiddler definieren, welcher Editor für bestimmte Tiddler Typen (MIME-Type) verwendet werden sollen.
EditorTypes/Type/Caption: MIME-Type
Advanced/Hint: Interne Informationen über dieses ~TiddlyWiki.
Advanced/LoadedModules/Caption: Geladene Module
Advanced/LoadedModules/Hint: Hier weden die geladenen Module und ihre Quelltext Komponenten angezeigt. Mit "italic" hervorgehobene Tiddler wurden während des ~Boot-Prozesses erstellt. Diese Tiddler haben keinen Quelltext.
Advanced/Settings/Caption: Einstellungen
Advanced/Settings/Hint: Diese erweiterten Einstellungen ermöglichen ihnen, das Verhalten von TiddlyWiki zu ändern.
Advanced/Settings/NavigationAddressBar/Caption: Navigation Adresszeile
Advanced/Settings/NavigationAddressBar/Hint: Verhalten der Browser Adresszeile, wenn ein Tiddler geöffnet wird:
Advanced/Settings/NavigationAddressBar/No/Description: Die Browser Adresszeile wird nicht verändert.
Advanced/Settings/NavigationAddressBar/Permalink/Description: Den aktuellen Tiddler einbinden.
Advanced/Settings/NavigationAddressBar/Permaview/Description: Alle geöffneten Tiddler einbinden.
Advanced/Settings/NavigationHistory/Caption: Browser Chronik
Advanced/Settings/NavigationHistory/Hint: Die Browser Chronik ändern, wenn ein Tiddler angezeigt wird:
Advanced/Settings/NavigationHistory/No/Description: Browser Chronik nicht ändern.
Advanced/Settings/NavigationHistory/Yes/Description: Browser Chronik ändern.
Advanced/Settings/ToolbarButtons/Caption: Toolbar Buttons
Advanced/Settings/ToolbarButtons/Hint: Standard Toolbar Button Erscheinungsbild:
Advanced/Settings/ToolbarButtons/Text/Description: Text anzeigen
Advanced/Settings/ToolbarButtons/Icons/Description: Icon anzeigen
Advanced/TiddlerFields/Caption: Tiddler Felder
Advanced/TiddlerFields/Hint: Hier finden sie alle [[Felder|TiddlerFields]], die in diesem Wiki verwendet werden. Inklusive der Felder aus System-, exclusive ~Schatten-Tiddler.
LoadedModules/Caption: Geladene Module
LoadedModules/Hint: Hier weden die geladenen Module und ihre Quelltext Komponenten angezeigt. Mit "italic" hervorgehobene Tiddler wurden während des ~Boot-Prozesses erstellt. Diese Tiddler haben keinen Quelltext.
Settings/Caption: Einstellungen
Settings/Hint: Diese erweiterten Einstellungen ermöglichen ihnen, das Verhalten von TiddlyWiki zu ändern.
Settings/NavigationAddressBar/Caption: Navigation Adresszeile
Settings/NavigationAddressBar/Hint: Verhalten der Browser Adresszeile, wenn ein Tiddler geöffnet wird:
Settings/NavigationAddressBar/No/Description: Die Browser Adresszeile wird nicht verändert.
Settings/NavigationAddressBar/Permalink/Description: Den aktuellen Tiddler einbinden.
Settings/NavigationAddressBar/Permaview/Description: Alle geöffneten Tiddler einbinden.
Settings/NavigationHistory/Caption: Browser Chronik
Settings/NavigationHistory/Hint: Die Browser Chronik ändern, wenn ein Tiddler angezeigt wird:
Settings/NavigationHistory/No/Description: Browser Chronik nicht ändern.
Settings/NavigationHistory/Yes/Description: Browser Chronik ändern.
Settings/ToolbarButtons/Caption: Toolbar Buttons
Settings/ToolbarButtons/Hint: Standard Toolbar Button Erscheinungsbild:
Settings/ToolbarButtons/Text/Description: Text anzeigen
Settings/ToolbarButtons/Icons/Description: Icon anzeigen
TiddlerFields/Caption: Tiddler Felder
TiddlerFields/Hint: Hier finden sie alle [[Felder|TiddlerFields]], die in diesem Wiki verwendet werden. Inklusive der Felder aus System-, exclusive ~Schatten-Tiddler.
Appearance/Caption: Design
Appearance/Hint: Möglichkeiten um das Aussehen ihres ~TiddlyWiki's anzupassen.
Appearance/Palette/Caption: Palette
Appearance/Palette/Editor/Clone/Caption: Palette klonen
Appearance/Palette/Editor/Clone/Prompt: Es wird empfohlen, dass sie diese ~Schatten-Palette klonen, bevor sie sie bearbeiten. Der Name der Palette wird im Tiddler Feld "description" eingestellt.
Appearance/Palette/Editor/Prompt/Modified: Diese ~Schatten-Palette wurde bearbeitet.
Appearance/Palette/Editor/Prompt: Bearbeiten
Appearance/Palette/Editor/Reset/Caption: Palette zurücksetzen
Appearance/Palette/ShowEditor/Caption: Editor zeigen
Appearance/Palette/HideEditor/Caption: Editor ausblenden
Appearance/Palette/Prompt: Ausgewählte Farbpalette:
Appearance/StoryView/Caption: Anzeige
Appearance/StoryView/Prompt: Ausgewählte Anzeige:
Appearance/Theme/Caption: Thema
Appearance/Theme/Prompt: Ausgewähltes Thema:
Appearance/Toolbars/Caption: Toolbar
Appearance/Toolbars/Hint: Auswählen, welche "Toolbar Button" angezeigt werden
Appearance/Toolbars/EditToolbar/Caption: Edit Toolbar
Appearance/Toolbars/EditToolbar/Hint: Auswählen, welche Buttons im "Edit Modus" angezeigt werden:
Appearance/Toolbars/ViewToolbar/Caption: View Toolbar
Appearance/Toolbars/ViewToolbar/Hint: Auswählen, welche Buttons im "View Modus" angezeigt werden:
Appearance/Toolbars/PageControls/Caption: Page Toolbar
Appearance/Toolbars/PageControls/Hint: Ausweählen, welche Buttons im Hauptmenü angezeigt werden:
Palette/Caption: Palette
Palette/Editor/Clone/Caption: Palette klonen
Palette/Editor/Clone/Prompt: Es wird empfohlen, dass sie diese ~Schatten-Palette klonen, bevor sie sie bearbeiten. Der Name der Palette wird im Tiddler Feld "description" eingestellt.
Palette/Editor/Prompt/Modified: Diese ~Schatten-Palette wurde bearbeitet.
Palette/Editor/Prompt: Bearbeiten
Palette/Editor/Reset/Caption: Palette zurücksetzen
Palette/ShowEditor/Caption: Editor zeigen
Palette/HideEditor/Caption: Editor ausblenden
Palette/Prompt: Ausgewählte Farbpalette:
StoryView/Caption: Anzeige
StoryView/Prompt: Ausgewählte Anzeige:
Theme/Caption: Thema
Theme/Prompt: Ausgewähltes Thema:
Toolbars/Caption: Toolbar
Toolbars/Hint: Auswählen, welche "Toolbar Button" angezeigt werden
Toolbars/EditToolbar/Caption: Edit Toolbar
Toolbars/EditToolbar/Hint: Auswählen, welche Buttons im "Edit Modus" angezeigt werden:
Toolbars/ViewToolbar/Caption: View Toolbar
Toolbars/ViewToolbar/Hint: Auswählen, welche Buttons im "View Modus" angezeigt werden:
Toolbars/PageControls/Caption: Page Toolbar
Toolbars/PageControls/Hint: Ausweählen, welche Buttons im Hauptmenü angezeigt werden:
Basics/AnimDuration/Prompt: Animation Dauer:
Basics/Caption: Basis
Basics/DefaultTiddlers/BottomHint: Verwenden sie &#91;&#91;doppelte eckige Klammern&#93;&#93; für Titel mit Lehrzeichen oder wählen sie <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">Offene Tiddler beim Laden wiederherstellen.</$button>

View File

@ -1,53 +1,53 @@
title: $:/language/ControlPanel/
Advanced/Caption: Avancé
Advanced/EditorTypes/Caption: Types d'éditeur
Advanced/EditorTypes/Editor/Caption: Éditeur
Advanced/EditorTypes/Hint: Ces tiddlers déterminent l'éditeur à utiliser pour éditer tel ou tel type de tiddler.
Advanced/EditorTypes/Type/Caption: Type
EditorTypes/Caption: Types d'éditeur
EditorTypes/Editor/Caption: Éditeur
EditorTypes/Hint: Ces tiddlers déterminent l'éditeur à utiliser pour éditer tel ou tel type de tiddler.
EditorTypes/Type/Caption: Type
Advanced/Hint: Informations internes sur ce ~TiddlyWiki
Advanced/LoadedModules/Caption: Modules chargés
Advanced/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.
Advanced/Settings/Caption: Paramétrage
Advanced/Settings/Hint: Ce paramétrage avancé vous permet de personnaliser le comportement de TiddlyWiki.
Advanced/Settings/NavigationAddressBar/Caption: Barre d'adresse pendant la navigation
Advanced/Settings/NavigationAddressBar/Hint: Comportement de la barre d'adresse du navigateur lorsqu'on pointe vers un tiddler :
Advanced/Settings/NavigationAddressBar/No/Description: Ne pas modifier la barre d'adresse
Advanced/Settings/NavigationAddressBar/Permalink/Description: Inclure uniquement le titre du tiddler cible
Advanced/Settings/NavigationAddressBar/Permaview/Description: Inclure le titre du tiddler cible ainsi que le déroulé courant
Advanced/Settings/NavigationHistory/Caption: Historique de navigation
Advanced/Settings/NavigationHistory/Hint: Mise à jour de l'historique de navigation du navigateur lorsqu'on pointe vers un tiddler :
Advanced/Settings/NavigationHistory/No/Description: Ne pas mettre à jour l'historique
Advanced/Settings/NavigationHistory/Yes/Description: Mettre à jour l'historique
Advanced/Settings/ToolbarButtons/Caption: Boutons de la barre d'outils
Advanced/Settings/ToolbarButtons/Hint: Apparence par défaut des boutons sur la barre d'outils :
Advanced/Settings/ToolbarButtons/Text/Description: Afficher le texte
Advanced/Settings/ToolbarButtons/Icons/Description: Afficher l'icone
Advanced/TiddlerFields/Caption: Champs
Advanced/TiddlerFields/Hint: Voici la totalité des [[champs|TiddlerFields]] utilisés dans ce wiki (y compris les tiddlers système, mais non compris les tiddlers //shadow//).
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.
Settings/Caption: Paramétrage
Settings/Hint: Ce paramétrage avancé 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 :
Settings/NavigationAddressBar/No/Description: Ne pas modifier la barre d'adresse
Settings/NavigationAddressBar/Permalink/Description: Inclure uniquement le titre du tiddler cible
Settings/NavigationAddressBar/Permaview/Description: Inclure le titre du tiddler cible ainsi que le déroulé courant
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/ToolbarButtons/Caption: Boutons de la barre d'outils
Settings/ToolbarButtons/Hint: Apparence par défaut des boutons sur la barre d'outils :
Settings/ToolbarButtons/Text/Description: Afficher le texte
Settings/ToolbarButtons/Icons/Description: Afficher l'icone
TiddlerFields/Caption: Champs
TiddlerFields/Hint: Voici la totalité des [[champs|TiddlerFields]] utilisés dans ce wiki (y compris les tiddlers système, mais non compris les tiddlers //shadow//).
Appearance/Caption: Apparence
Appearance/Hint: Personnalisation de l'apparence de votre ~TiddlyWiki.
Appearance/Palette/Caption: Palette
Appearance/Palette/Editor/Clone/Caption: Cloner
Appearance/Palette/Editor/Clone/Prompt: Il est recommandé de cloner cette palette « shadow » avant de l'éditer
Appearance/Palette/Editor/Prompt/Modified: Cette palette « shadow » a été modifiée
Appearance/Palette/Editor/Prompt: Édition de
Appearance/Palette/Editor/Reset/Caption: Réinitialiser
Appearance/Palette/ShowEditor/Caption: Afficher l'éditeur
Appearance/Palette/HideEditor/Caption: Masquer l'éditeur
Appearance/Palette/Prompt: Palette en cours :
Appearance/StoryView/Caption: Vue sur le déroulé
Appearance/StoryView/Prompt: Vue courante :
Appearance/Theme/Caption: Thème
Appearance/Theme/Prompt: Thème courant :
Appearance/Toolbars/Caption: Barres d'outils
Appearance/Toolbars/Hint: Choix des boutons à afficher dans les barres d'outils
Appearance/Toolbars/EditToolbar/Caption: Barre d'outils du mode édition
Appearance/Toolbars/EditToolbar/Hint: Choix des boutons à afficher pour les tiddlers en cours d'édition
Appearance/Toolbars/ViewToolbar/Caption: Barre d'outils du mode visualisation
Appearance/Toolbars/ViewToolbar/Hint: Choix des boutons à afficher pour les tiddlers en mode visualisation
Appearance/Toolbars/PageControls/Caption: Barre d'outils de la page
Appearance/Toolbars/PageControls/Hint: Choix des boutons à afficher sur la barre d'outils principale de la page
Palette/Caption: Palette
Palette/Editor/Clone/Caption: Cloner
Palette/Editor/Clone/Prompt: Il est recommandé de cloner cette palette « shadow » avant de l'éditer
Palette/Editor/Prompt/Modified: Cette palette « shadow » a été modifiée
Palette/Editor/Prompt: Édition de
Palette/Editor/Reset/Caption: Réinitialiser
Palette/ShowEditor/Caption: Afficher l'éditeur
Palette/HideEditor/Caption: Masquer l'éditeur
Palette/Prompt: Palette en cours :
StoryView/Caption: Vue sur le déroulé
StoryView/Prompt: Vue courante :
Theme/Caption: Thème
Theme/Prompt: Thème courant :
Toolbars/Caption: Barres d'outils
Toolbars/Hint: Choix des boutons à afficher dans les barres d'outils
Toolbars/EditToolbar/Caption: Barre d'outils du mode édition
Toolbars/EditToolbar/Hint: Choix des boutons à afficher pour les tiddlers en cours d'édition
Toolbars/ViewToolbar/Caption: Barre d'outils du mode visualisation
Toolbars/ViewToolbar/Hint: Choix des boutons à afficher pour les tiddlers en mode visualisation
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
Basics/AnimDuration/Prompt: Durée de l'animation
Basics/Caption: Fondamentaux
Basics/DefaultTiddlers/BottomHint: Utilisez les &#91;&#91;crochets doubles&#93;&#93; pour les titres contenant des espaces. Vous pouvez aussi décider de <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">Conserver le déroulé actuel</$button>

View File

@ -2,25 +2,25 @@ title: $:/language/ControlPanel/
Advanced/Caption: Avanzate
Advanced/Hint: Informazioni interne di questo ~TiddlyWiki
Advanced/LoadedModules/Caption: Moduli caricati
Advanced/LoadedModules/Hint: Elenco dei moduli attualmente caricati e loro collegamento ai frammenti sorgente. I moduli in corsivo mancano di un frammento sorgente perch&eacute; in generale installati durante il processo di avvio.
Advanced/TiddlerFields/Caption: Campi frammenti
Advanced/TiddlerFields/Hint: Questa &egrave; la serie completa dei TiddlerFields utilizzati in questo wiki (sono inclusi i frammenti di sistema ed esclusi i frammenti nascosti).
LoadedModules/Caption: Moduli caricati
LoadedModules/Hint: Elenco dei moduli attualmente caricati e loro collegamento ai frammenti sorgente. I moduli in corsivo mancano di un frammento sorgente perch&eacute; in generale installati durante il processo di avvio.
TiddlerFields/Caption: Campi frammenti
TiddlerFields/Hint: Questa &egrave; la serie completa dei TiddlerFields utilizzati in questo wiki (sono inclusi i frammenti di sistema ed esclusi i frammenti nascosti).
Appearance/Caption: Aspetto
Appearance/Hint: Personalizza l'aspetto di TiddlyWiki
Appearance/Palette/Caption: Tavolozza
Appearance/Palette/Editor/Clone/Caption: Clona
Appearance/Palette/Editor/Clone/Prompt: Si consiglia di clonare questa tavolozza prima di modificarla
Appearance/Palette/Editor/Prompt/Modified: Questa tavolozza &egrave; stata modificata
Appearance/Palette/Editor/Prompt: Modifica
Appearance/Palette/Editor/Reset/Caption: Reset
Appearance/Palette/HideEditor/Caption: Nascondi editor
Appearance/Palette/Prompt: Tavolozza corrente:
Appearance/Palette/ShowEditor/Caption: Mostra editor
Appearance/StoryView/Caption: Vista
Appearance/StoryView/Prompt: Vista corrente:
Appearance/Theme/Caption: Tema
Appearance/Theme/Prompt: Tema corrente:
Palette/Caption: Tavolozza
Palette/Editor/Clone/Caption: Clona
Palette/Editor/Clone/Prompt: Si consiglia di clonare questa tavolozza prima di modificarla
Palette/Editor/Prompt/Modified: Questa tavolozza &egrave; stata modificata
Palette/Editor/Prompt: Modifica
Palette/Editor/Reset/Caption: Reset
Palette/HideEditor/Caption: Nascondi editor
Palette/Prompt: Tavolozza corrente:
Palette/ShowEditor/Caption: Mostra editor
StoryView/Caption: Vista
StoryView/Prompt: Vista corrente:
Theme/Caption: Tema
Theme/Prompt: Tema corrente:
Basics/AnimDuration/Prompt: Durata animazione:
Basics/Caption: Impostazioni base
Basics/DefaultTiddlers/BottomHint: Utilizza &#91;&#91;le doppie parentesi quadre&#93;&#93; per titoli di frammenti con spazi bianchi. In alternativa scegli di visualizzare i frammenti secondo la <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">cronologia</$button>

View File

@ -2,25 +2,25 @@ title: $:/language/ControlPanel/
Advanced/Caption: 詳細設定
Advanced/Hint: この TiddlyWiki の内部情報
Advanced/LoadedModules/Caption: ロード済みモジュール
Advanced/LoadedModules/Hint: 以下は現在ロード済みのモジュールの一覧で、ソースの tiddler にリンクしています。斜体表記のものにはソースがありませんが、これは通常ブートプロセス中に設定されたものです。
Advanced/TiddlerFields/Caption: Tiddlerフィールド
Advanced/TiddlerFields/Hint: 以下はこの TiddlyWiki で使用されているすべての tiddler フィールド の一覧です(システム tiddler も含みますが、隠し tiddler は含んでいません)。
LoadedModules/Caption: ロード済みモジュール
LoadedModules/Hint: 以下は現在ロード済みのモジュールの一覧で、ソースの tiddler にリンクしています。斜体表記のものにはソースがありませんが、これは通常ブートプロセス中に設定されたものです。
TiddlerFields/Caption: Tiddlerフィールド
TiddlerFields/Hint: 以下はこの TiddlyWiki で使用されているすべての tiddler フィールド の一覧です(システム tiddler も含みますが、隠し tiddler は含んでいません)。
Appearance/Caption: 表示形式
Appearance/Hint: この TiddlyWiki の見え方を変更する各種方法です。
Appearance/Palette/Caption: パレット
Appearance/Palette/Editor/Clone/Caption: クローン
Appearance/Palette/Editor/Clone/Prompt: このシャドウパレットを編集する前にクローンを作成することをお勧めします
Appearance/Palette/Editor/Prompt/Modified: このシャドウパレットは更新されました
Appearance/Palette/Editor/Prompt: 編集中
Appearance/Palette/Editor/Reset/Caption: リセット
Appearance/Palette/HideEditor/Caption: エディタを隠す
Appearance/Palette/Prompt: 現在のパレット:
Appearance/Palette/ShowEditor/Caption: エディタを表示
Appearance/StoryView/Caption: 表示スタイル
Appearance/StoryView/Prompt: 現在の表示スタイル:
Appearance/Theme/Caption: テーマ
Appearance/Theme/Prompt: 現在のテーマ:
Palette/Caption: パレット
Palette/Editor/Clone/Caption: クローン
Palette/Editor/Clone/Prompt: このシャドウパレットを編集する前にクローンを作成することをお勧めします
Palette/Editor/Prompt/Modified: このシャドウパレットは更新されました
Palette/Editor/Prompt: 編集中
Palette/Editor/Reset/Caption: リセット
Palette/HideEditor/Caption: エディタを隠す
Palette/Prompt: 現在のパレット:
Palette/ShowEditor/Caption: エディタを表示
StoryView/Caption: 表示スタイル
StoryView/Prompt: 現在の表示スタイル:
Theme/Caption: テーマ
Theme/Prompt: 現在のテーマ:
Basics/AnimDuration/Prompt: アニメーション時間:
Basics/Caption: 基本
Basics/DefaultTiddlers/BottomHint: タイトルに空白を含めたいときは &#91;&#91;二重の角カッコ&#93;&#93; を使用してください。そのほか <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">保存時の表示を維持</$button> することもできます。

View File

@ -1,53 +1,53 @@
title: $:/language/ControlPanel/
Advanced/Caption: 高级
Advanced/EditorTypes/Caption: 编辑器类型
Advanced/EditorTypes/Editor/Caption: 编辑器
Advanced/EditorTypes/Hint: 这些条目决定使用哪个编辑器来编辑特定条目类型。
Advanced/EditorTypes/Type/Caption: 类型
EditorTypes/Caption: 编辑器类型
EditorTypes/Editor/Caption: 编辑器
EditorTypes/Hint: 这些条目决定使用哪个编辑器来编辑特定条目类型。
EditorTypes/Type/Caption: 类型
Advanced/Hint: 关于此 TiddlyWiki 的内部信息
Advanced/LoadedModules/Caption: 已加载的模块
Advanced/LoadedModules/Hint: 这些是当前已加载的模块之源码条目。斜体的模块则无源码条目,通常是因为它们是在引导过程中设置。
Advanced/Settings/Caption: 设置
Advanced/Settings/Hint: 这些高级设置让您定制 TiddlyWiki 的行为。
Advanced/Settings/NavigationAddressBar/Caption: 网址栏导览
Advanced/Settings/NavigationAddressBar/Hint: 在浏览器网址列导览到条目时的行为:
Advanced/Settings/NavigationAddressBar/No/Description: 不更新网址栏
Advanced/Settings/NavigationAddressBar/Permalink/Description: 包含目标条目
Advanced/Settings/NavigationAddressBar/Permaview/Description: 包括目标条目和当前已开启的条目序列
Advanced/Settings/NavigationHistory/Caption: 历史记录导览
Advanced/Settings/NavigationHistory/Hint: 当导览到条目时,更新浏览器历史记录:
Advanced/Settings/NavigationHistory/No/Description: 不更新历史记录
Advanced/Settings/NavigationHistory/Yes/Description: 更新历史记录
Advanced/Settings/ToolbarButtons/Caption: 工具栏按钮
Advanced/Settings/ToolbarButtons/Hint: 默认的工具栏按钮外观:
Advanced/Settings/ToolbarButtons/Text/Description: 包含文字
Advanced/Settings/ToolbarButtons/Icons/Description: 包含图示
Advanced/TiddlerFields/Caption: 条目栏位
Advanced/TiddlerFields/Hint: 这是本维基使用中的所有条目栏位(含系统条目的栏位,但默认条目的栏位除外)。
LoadedModules/Caption: 已加载的模块
LoadedModules/Hint: 这些是当前已加载的模块之源码条目。斜体的模块则无源码条目,通常是因为它们是在引导过程中设置。
Settings/Caption: 设置
Settings/Hint: 这些高级设置让您定制 TiddlyWiki 的行为。
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/ToolbarButtons/Caption: 工具栏按钮
Settings/ToolbarButtons/Hint: 默认的工具栏按钮外观:
Settings/ToolbarButtons/Text/Description: 包含文字
Settings/ToolbarButtons/Icons/Description: 包含图示
TiddlerFields/Caption: 条目栏位
TiddlerFields/Hint: 这是本维基使用中的所有条目栏位(含系统条目的栏位,但默认条目的栏位除外)。
Appearance/Caption: 视觉外观
Appearance/Hint: 自订您的 TiddlyWiki 外观。
Appearance/Palette/Caption: 调色板
Appearance/Palette/Editor/Clone/Caption: 复制
Appearance/Palette/Editor/Clone/Prompt: 建议您修改前先复制此默认调色板
Appearance/Palette/Editor/Prompt/Modified: 此默认调色板已被修改过
Appearance/Palette/Editor/Prompt: 编辑
Appearance/Palette/Editor/Reset/Caption: 重置
Appearance/Palette/HideEditor/Caption: 隐藏编辑器
Appearance/Palette/Prompt: 当前的调色板:
Appearance/Palette/ShowEditor/Caption: 显示编辑器
Appearance/StoryView/Caption: 查看模式
Appearance/StoryView/Prompt: 当前的查看模式:
Appearance/Theme/Caption: 布景主题
Appearance/Theme/Prompt: 当前的布景主题:
Appearance/Toolbars/Caption: 工具栏
Appearance/Toolbars/Hint: 选择将显示哪些工具栏按钮
Appearance/Toolbars/EditToolbar/Caption: 编辑工具栏
Appearance/Toolbars/EditToolbar/Hint: 选择将显示哪些按钮于条目的编辑模式工具栏
Appearance/Toolbars/ViewToolbar/Caption: 检视工具栏
Appearance/Toolbars/ViewToolbar/Hint: 选择将显示哪些按钮于条目的检视模式工具栏
Appearance/Toolbars/PageControls/Caption: 页面工具栏
Appearance/Toolbars/PageControls/Hint: 选择将显示哪些按钮于主页面的工具栏
Palette/Caption: 调色板
Palette/Editor/Clone/Caption: 复制
Palette/Editor/Clone/Prompt: 建议您修改前先复制此默认调色板
Palette/Editor/Prompt/Modified: 此默认调色板已被修改过
Palette/Editor/Prompt: 编辑
Palette/Editor/Reset/Caption: 重置
Palette/HideEditor/Caption: 隐藏编辑器
Palette/Prompt: 当前的调色板:
Palette/ShowEditor/Caption: 显示编辑器
StoryView/Caption: 查看模式
StoryView/Prompt: 当前的查看模式:
Theme/Caption: 布景主题
Theme/Prompt: 当前的布景主题:
Toolbars/Caption: 工具栏
Toolbars/Hint: 选择将显示哪些工具栏按钮
Toolbars/EditToolbar/Caption: 编辑工具栏
Toolbars/EditToolbar/Hint: 选择将显示哪些按钮于条目的编辑模式工具栏
Toolbars/ViewToolbar/Caption: 检视工具栏
Toolbars/ViewToolbar/Hint: 选择将显示哪些按钮于条目的检视模式工具栏
Toolbars/PageControls/Caption: 页面工具栏
Toolbars/PageControls/Hint: 选择将显示哪些按钮于主页面的工具栏
Basics/AnimDuration/Prompt: 动画持续时间:
Basics/Caption: 基本
Basics/DefaultTiddlers/BottomHint: 标题含空白时请使用 &#91;&#91;双中括弧&#93;&#93;<br />或者您可用 <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">保留开启中的条目顺序</$button>

View File

@ -1,53 +1,53 @@
title: $:/language/ControlPanel/
Advanced/Caption: 進階
Advanced/EditorTypes/Caption: 編輯器類型
Advanced/EditorTypes/Editor/Caption: 編輯器
Advanced/EditorTypes/Hint: 這些條目決定使用哪個編輯器來編輯特定條目類型。
Advanced/EditorTypes/Type/Caption: 類型
EditorTypes/Caption: 編輯器類型
EditorTypes/Editor/Caption: 編輯器
EditorTypes/Hint: 這些條目決定使用哪個編輯器來編輯特定條目類型。
EditorTypes/Type/Caption: 類型
Advanced/Hint: 關於此 TiddlyWiki 的內部資訊
Advanced/LoadedModules/Caption: 已載入的模組
Advanced/LoadedModules/Hint: 這些是當前已載入的模組之源碼條目。斜體的模組則無源碼條目,通常是因為它們是在引導過程中設置。
Advanced/Settings/Caption: 設定
Advanced/Settings/Hint: 這些進階設定讓您自訂 TiddlyWiki 的行為。
Advanced/Settings/NavigationAddressBar/Caption: 網址列導覽
Advanced/Settings/NavigationAddressBar/Hint: 在瀏覽器網址列導覽到條目時的行為:
Advanced/Settings/NavigationAddressBar/No/Description: 不更新網址列
Advanced/Settings/NavigationAddressBar/Permalink/Description: 包含目標條目
Advanced/Settings/NavigationAddressBar/Permaview/Description: 包括目標條目和當前已開啟的條目序列
Advanced/Settings/NavigationHistory/Caption: 歷史記錄導覽
Advanced/Settings/NavigationHistory/Hint: 當導覽到條目時,更新瀏覽器歷史記錄:
Advanced/Settings/NavigationHistory/No/Description: 不更新歷史記錄
Advanced/Settings/NavigationHistory/Yes/Description: 更新歷史記錄
Advanced/Settings/ToolbarButtons/Caption: 工具列按鈕
Advanced/Settings/ToolbarButtons/Hint: 預設的工具列按鈕外觀:
Advanced/Settings/ToolbarButtons/Text/Description: 包含文字
Advanced/Settings/ToolbarButtons/Icons/Description: 包含圖示
Advanced/TiddlerFields/Caption: 條目欄位
Advanced/TiddlerFields/Hint: 這是本維基使用中的所有條目欄位(含系統條目的欄位,但預設條目的欄位除外)。
LoadedModules/Caption: 已載入的模組
LoadedModules/Hint: 這些是當前已載入的模組之源碼條目。斜體的模組則無源碼條目,通常是因為它們是在引導過程中設置。
Settings/Caption: 設定
Settings/Hint: 這些進階設定讓您自訂 TiddlyWiki 的行為。
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/ToolbarButtons/Caption: 工具列按鈕
Settings/ToolbarButtons/Hint: 預設的工具列按鈕外觀:
Settings/ToolbarButtons/Text/Description: 包含文字
Settings/ToolbarButtons/Icons/Description: 包含圖示
TiddlerFields/Caption: 條目欄位
TiddlerFields/Hint: 這是本維基使用中的所有條目欄位(含系統條目的欄位,但預設條目的欄位除外)。
Appearance/Caption: 視覺外觀
Appearance/Hint: 自訂您的 TiddlyWiki 外觀。
Appearance/Palette/Caption: 調色盤
Appearance/Palette/Editor/Clone/Caption: 複製
Appearance/Palette/Editor/Clone/Prompt: 建議您修改前先複製此預設調色盤
Appearance/Palette/Editor/Prompt/Modified: 此預設調色盤已被修改過
Appearance/Palette/Editor/Prompt: 編輯
Appearance/Palette/Editor/Reset/Caption: 重置
Appearance/Palette/HideEditor/Caption: 隱藏編輯器
Appearance/Palette/Prompt: 當前的調色盤:
Appearance/Palette/ShowEditor/Caption: 顯示編輯器
Appearance/StoryView/Caption: 檢視模式
Appearance/StoryView/Prompt: 當前的檢視模式:
Appearance/Theme/Caption: 佈景主題
Appearance/Theme/Prompt: 當前的佈景主題:
Appearance/Toolbars/Caption: 工具列
Appearance/Toolbars/Hint: 選擇將顯示哪些工具列按鈕
Appearance/Toolbars/EditToolbar/Caption: 編輯工具列
Appearance/Toolbars/EditToolbar/Hint: 選擇將顯示哪些按鈕於條目的編輯模式工具列
Appearance/Toolbars/ViewToolbar/Caption: 檢視工具列
Appearance/Toolbars/ViewToolbar/Hint: 選擇將顯示哪些按鈕於條目的檢視模式工具列
Appearance/Toolbars/PageControls/Caption: 頁面工具列
Appearance/Toolbars/PageControls/Hint: 選擇將顯示哪些按鈕於主頁面的工具列
Palette/Caption: 調色盤
Palette/Editor/Clone/Caption: 複製
Palette/Editor/Clone/Prompt: 建議您修改前先複製此預設調色盤
Palette/Editor/Prompt/Modified: 此預設調色盤已被修改過
Palette/Editor/Prompt: 編輯
Palette/Editor/Reset/Caption: 重置
Palette/HideEditor/Caption: 隱藏編輯器
Palette/Prompt: 當前的調色盤:
Palette/ShowEditor/Caption: 顯示編輯器
StoryView/Caption: 檢視模式
StoryView/Prompt: 當前的檢視模式:
Theme/Caption: 佈景主題
Theme/Prompt: 當前的佈景主題:
Toolbars/Caption: 工具列
Toolbars/Hint: 選擇將顯示哪些工具列按鈕
Toolbars/EditToolbar/Caption: 編輯工具列
Toolbars/EditToolbar/Hint: 選擇將顯示哪些按鈕於條目的編輯模式工具列
Toolbars/ViewToolbar/Caption: 檢視工具列
Toolbars/ViewToolbar/Hint: 選擇將顯示哪些按鈕於條目的檢視模式工具列
Toolbars/PageControls/Caption: 頁面工具列
Toolbars/PageControls/Hint: 選擇將顯示哪些按鈕於主頁面的工具列
Basics/AnimDuration/Prompt: 動畫持續時間:
Basics/Caption: 基本
Basics/DefaultTiddlers/BottomHint: 標題含空白時請使用 &#91;&#91;雙中括弧&#93;&#93;<br />或者您可用 <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">保留開啟中的條目順序</$button>

View File

@ -1,7 +1,7 @@
{
"name": "tiddlywiki",
"preferGlobal": "true",
"version": "5.0.16-prerelease",
"version": "5.0.17-prerelease",
"author": "Jeremy Ruston <jeremy@jermolene.com>",
"description": "a non-linear personal web notebook",
"contributors": [

View File

@ -0,0 +1,6 @@
tags: $:/tags/ViewTemplate $:/tags/EditTemplate
title: $:/core/ui/ViewTemplate/classic
type: text/vnd.tiddlywiki

View File

@ -0,0 +1,195 @@
/*\
title: $:/core/modules/widgets/classictransclude.js
type: application/javascript
module-type: widget
Transclude widget
\*/
(function(){
/*jslint node: true, browser: true */
/*global $tw: false */
"use strict";
var sliceSeparator = "::";
var sectionSeparator = "##";
function getsectionname(title) {
if(!title)
return "";
var pos = title.indexOf(sectionSeparator);
if(pos != -1) {
return title.substr(pos + sectionSeparator.length);
}
return "";
}
function getslicename(title) {
if(!title)
return "";
var pos = title.indexOf(sliceSeparator);
if(pos != -1) {
return title.substr(pos + sliceSeparator.length);
}
return "";
};
function gettiddlername(title) {
if(!title)
return "";
var pos = title.indexOf(sectionSeparator);
if(pos != -1) {
return title.substr(0,pos);
}
pos = title.indexOf(sliceSeparator);
if(pos != -1) {
return title.substr(0,pos);
}
return title;
}
var Widget = require("$:/core/modules/widgets/widget.js").widget;
var TranscludeWidget = function(parseTreeNode,options) {
this.initialise(parseTreeNode,options);
};
/*
Inherit from the base widget class
*/
TranscludeWidget.prototype = new Widget();
/*
Render this widget into the DOM
*/
TranscludeWidget.prototype.render = function(parent,nextSibling) {
this.parentDomNode = parent;
this.computeAttributes();
this.execute();
this.renderChildren(parent,nextSibling);
};
/*
Compute the internal state of the widget
*/
TranscludeWidget.prototype.execute = function() {
// Get our parameters
this.rawTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler"));
this.transcludeTitle = gettiddlername(this.rawTitle);
this.section = getsectionname(this.rawTitle);
this.slice = getslicename(this.rawTitle);
// Check for recursion
var recursionMarker = this.makeRecursionMarker();
if(this.parentWidget && this.parentWidget.hasVariable("transclusion",recursionMarker)) {
this.makeChildWidgets([{type: "text", text: "Recursive transclusion error in transclude widget"}]);
return;
}
// Check for correct type
var existingTiddler = this.wiki.getTiddler(this.transcludeTitle);
// Check if we're dealing with a classic tiddler
if(existingTiddler && existingTiddler.hasField("type") && existingTiddler.fields.type !== "text/x-tiddlywiki") {
this.makeChildWidgets([{type: "text", text: "Tiddler not of type 'text/x-tiddlywiki'"}]);
return;
}
if(existingTiddler && !existingTiddler.hasField("type")) {
this.makeChildWidgets([{type: "text", text: "Tiddler not of type 'text/x-tiddlywiki'"}]);
return;
}
// Set context variables for recursion detection
this.setVariable("transclusion",recursionMarker);
// Parse
var text = this.wiki.getTiddlerText(this.transcludeTitle);
if (!!this.section||!!this.slice) {
text =this.refineTiddlerText(text, this.section, this.slice);
}
this.options ={};
this.options.parseAsInline = false;
var parser = this.wiki.parseText("text/x-tiddlywiki",text,{});
var parseTreeNodes = parser ? parser.tree : this.parseTreeNode.children;
// Construct the child widgets
this.makeChildWidgets(parseTreeNodes);
};
/*
Compose a string comprising the title, field and/or index to identify this transclusion for recursion detection
*/
TranscludeWidget.prototype.makeRecursionMarker = function() {
var output = [];
output.push("{");
output.push(this.getVariable("currentTiddler",{defaultValue: ""}));
output.push("|");
output.push(this.transcludeTitle || "");
output.push("|");
output.push(this.transcludeField || "");
output.push("|");
output.push(this.transcludeIndex || "");
output.push("|");
output.push(this.section || "");
output.push("|");
output.push(this.slice || "");
output.push("}");
return output.join("");
};
TranscludeWidget.prototype.slicesRE = /(?:^([\'\/]{0,2})~?([\.\w]+)\:\1[\t\x20]*([^\n]*)[\t\x20]*$)|(?:^\|([\'\/]{0,2})~?([\.\w]+)\:?\4\|[\t\x20]*([^\|\n]*)[\t\x20]*\|$)/gm;
TranscludeWidget.prototype.calcAllSlices = function(text)
{
var slices = {};
this.slicesRE.lastIndex = 0;
var m = this.slicesRE.exec(text);
while(m) {
if(m[2])
slices[m[2]] = m[3];
else
slices[m[5]] = m[6];
m = this.slicesRE.exec(text);
}
return slices;
};
// Returns the slice of text of the given name
TranscludeWidget.prototype.getTextSlice = function(text,sliceName)
{
return (this.calcAllSlices(text))[sliceName];
};
TranscludeWidget.prototype.refineTiddlerText = function(text,section,slice)
{
var textsection = null;
if (slice) {
var textslice = this.getTextSlice(text,slice);
if(textslice)
return textslice;
}
if(!section)
return text;
var re = new RegExp("(^!{1,6}[ \t]*" + $tw.utils.escapeRegExp(section) + "[ \t]*\n)","mg");
re.lastIndex = 0;
var match = re.exec(text);
if(match) {
var t = text.substr(match.index+match[1].length);
var re2 = /^!/mg;
re2.lastIndex = 0;
match = re2.exec(t); //# search for the next heading
if(match)
t = t.substr(0,match.index-1);//# don't include final \n
return t;
}
return "";
}
/*
Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
*/
TranscludeWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
if(changedAttributes.tiddler ||changedTiddlers[this.transcludeTitle]) {
this.refreshSelf();
return true;
} else {
return this.refreshChildren(changedTiddlers);
}
};
exports.classictransclude = TranscludeWidget;
})();

View File

@ -0,0 +1,30 @@
/*\
title: $:/macros/tiddlywiki/entry.js
type: application/javascript
module-type: macro
\*/
(function(){
/*jslint node: true, browser: true */
/*global $tw: false */
"use strict";
/*
Information about this macro
returns value of key in a data json tiddler
note that macros are not connected with the refresh mechanism -use with caution.
*/
exports.name = "entryof";
exports.params = [
{ name: "key" }, { name: "map" }
];
/*
Run the macro
*/
exports.run = function(key,map) {
try{
return JSON.parse(map)[key];
} catch(e) {
return "";
}
}
})();

View File

@ -0,0 +1,11 @@
tags: $:/tags/stylesheet
title: $:/plugins/tiddlywiki/tw2parser/image-css
type: text/plain
.classic-image-left{
float: left;
}
.classic-image-right{
float: right;
}

View File

@ -0,0 +1,34 @@
title: $:/plugins/tiddlywiki/tw2parser/macrodefs
\define tiddler(tiddler)
<$classictransclude tiddler = "$tiddler$"/>
\end
\define slider(chkUniqueCookieName tiddler label tooltip)
<span title=$tooltip$><$button popup="$chkUniqueCookieName$" class="btn-invisible tc-slider">$label$</$button>
<$reveal type="nomatch" text="" default="" state="$chkUniqueCookieName$" animate="yes">
<$classictransclude tiddler = "$tiddler$"/>
</$reveal></span>
\end
\define __system_tabinstance(state, currentTab, prompts, labels)
<span title=<<entryof "$currentTab$" """$prompts$""">> ><$button set=<<qualify "$state$">> setTo="$currentTab$" selectedClass="tc-tab-selected">
<<entryof "$currentTab$" """$labels$""" >>
</$button></span>
\end
\define __system_tabs(tabsList,prompts,labels,state:"$:/state/tab")
<div class="tc-tab-buttons">
<$list filter="$tabsList$" variable="currentTab">
<$macrocall $name="__system_tabinstance" state="$state$" prompts="""$prompts$""" labels="""$labels$""" currentTab=<<currentTab>>/>
</$list>
</div>
<div class="tc-tab-divider"/>
<div class="tc-tab-content">
<$list filter="$tabsList$" variable="currentTab">
<$reveal type="match" state=<<qualify "$state$">> text=<<currentTab>> default="$default$">
<$classictransclude tiddler=<<currentTab>> />
</$reveal>
</$list>
</div>
\end

View File

@ -0,0 +1,97 @@
/*\
title: $:/macros/classic/macroadapter.js
type: application/javascript
module-type: module
\*/
(function(){
/*jslint node: true, browser: true */
/*global $tw: false */
"use strict";
/*
Information about this module:
rename macros and
re-jig macro params from tw2 to tw5 style
new macros created as a result of adapting tw2 should be
prepended "__system" to distinguish them from the actual used name
*/
var sliceSeparator = "::";
var sectionSeparator = "##";
function getsectionname(title) {
if(!title)
return "";
var pos = title.indexOf(sectionSeparator);
if(pos != -1) {
return title.substr(pos + sectionSeparator.length);
}
return "";
}
function getslicename(title) {
if(!title)
return "";
var pos = title.indexOf(sliceSeparator);
if(pos != -1) {
return title.substr(pos + sliceSeparator.length);
}
return "";
};
function gettiddlername(title) {
if(!title)
return "";
var pos = title.indexOf(sectionSeparator);
if(pos != -1) {
return title.substr(0,pos);
}
pos = title.indexOf(sliceSeparator);
if(pos != -1) {
return title.substr(0,pos);
}
return title;
}
var parserparams = function(paramString) {
var params = [],
reParam = /\s*(?:([A-Za-z0-9\-_]+)\s*:)?(?:\s*(?:"""([\s\S]*?)"""|"([^"]*)"|'([^']*)'|\[\[([^\]]*)\]\]|([^"'\s]+)))/mg,
paramMatch = reParam.exec(paramString);
while(paramMatch) {
// Process this parameter
var paramInfo = {
value: paramMatch[2] || paramMatch[3] || paramMatch[4] || paramMatch[5] || paramMatch[6]
};
if(paramMatch[1]) {
paramInfo.name = paramMatch[1];
}
params.push(paramInfo);
// Find the next match
paramMatch = reParam.exec(paramString);
}
return params;
}
var tabshandler = function(paramstring) {
var params = parserparams(paramstring);
var cookie = params[0].value;
var numTabs = (params.length-1)/3;
var t;
var tabslist = "";
var labelarray = {};
var promptarray = {};
for(t=0; t<numTabs; t++) {
var contentName = params[t*3+3].value;
tabslist = tabslist+" " + contentName;
labelarray[contentName] = params[t*3+1].value;
promptarray[contentName] = params[t*3+2].value;
}
//Create a list of names (tiddlers, tiddler/sections, tiddler/slices), and create maps from name -> label and name -> prompt
//Use json to implement maps
return '"""'+tabslist +'""" """'+JSON.stringify(promptarray)+'""" """'+JSON.stringify(labelarray)+'""" """'+cookie+'"""';
};
var namedapter = {tabs:'__system_tabs'};
var paramadapter = {
tabs: tabshandler
}
exports.name = 'macroadapter';
exports.namedapter = namedapter;
exports.paramadapter = paramadapter;
})();

View File

@ -1,6 +1,7 @@
{
"title": "$:/plugins/tiddlywiki/tw2parser",
"description": "TiddlyWiki Classic-compatible wikitext parser",
"author": "JeremyRuston",
"core-version": ">=5.0.0"
"authors": "JeremyRuston, JeffreyWilkinson",
"core-version": ">=5.0.15",
"plugin-type": "plugin"
}

View File

@ -48,11 +48,29 @@ Planned:
extraMacros: An array of additional macro handlers to add
*/
var WikiTextParser = function(options) {
var WikiTextParser = function(type,text,options) {
this.wiki = options.wiki;
this.autoLinkWikiWords = true;
this.installRules();
text = text || "no text";
this.source = text;
this.nextMatch = 0;
this.children = [];
//this.children.push({type: "text",text:"hello to the queen"});
this.tree =[];
this.output = null;
this.subWikify(this.children);
var parser = $tw.wiki.old_parseTiddler("$:/plugins/tiddlywiki/tw2parser/macrodefs",{parseAsInline:false});
this.tree = [{
type: "element",
tag: "div",
children:this.children
}];
Array.prototype.push.apply(parser.tree,this.tree);
this.tree = parser.tree;
};
WikiTextParser.prototype.installRules = function() {
var rules = require("./wikitextrules.js").rules,
pattern = [];
@ -63,23 +81,10 @@ WikiTextParser.prototype.installRules = function() {
this.rulesRegExp = new RegExp(pattern.join("|"),"mg");
};
WikiTextParser.prototype.parse = function(type,text) {
text = text || "";
this.source = text;
this.nextMatch = 0;
this.children = [];
this.dependencies = new $tw.Dependencies();
this.output = null;
this.subWikify(this.children);
var tree = new $tw.Renderer(this.children,this.dependencies);
this.source = null;
this.children = null;
return tree;
};
WikiTextParser.prototype.outputText = function(place,startPos,endPos) {
if(startPos < endPos) {
place.push($tw.Tree.Text(this.source.substring(startPos,endPos)));
place.push({type: "text",text:this.source.substring(startPos,endPos)});
}
};

View File

@ -11,7 +11,7 @@ Rule modules for the wikitext parser
/*jslint node: true, browser: true */
/*global $tw: false */
"use strict";
var macroadapter = require("$:/macros/classic/macroadapter.js");
var textPrimitives = {
upperLetter: "[A-Z\u00c0-\u00de\u0150\u0170]",
lowerLetter: "[a-z0-9_\\-\u00df-\u00ff\u0151\u0171]",
@ -51,7 +51,7 @@ var setAttr = function(node,attr,value) {
if(!node.attributes) {
node.attributes = {};
}
node.attributes[attr] = value;
node.attributes[attr] ={type: "string", value:value} ;
};
var inlineCssHelper = function(w) {
@ -80,17 +80,14 @@ var inlineCssHelper = function(w) {
};
var applyCssHelper = function(e,styles) {
if(styles.length > 0) {
if(!e.attributes) {
e.attributes = {};
}
if(!e.attributes.style) {
e.attributes.style = {};
}
for(var t=0; t< styles.length; t++) {
e.attributes.style[styles[t].style] = styles[t].value;
$tw.utils.addStyleToParseTreeNode(e,$tw.utils.roundTripPropertyName(styles[t].style),styles[t].value);
}
}
};
var enclosedTextHelper = function(w) {
@ -98,23 +95,41 @@ var enclosedTextHelper = function(w) {
var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
var text = lookaheadMatch[1];
w.output.push($tw.Tree.Element(this.element,null,[$tw.Tree.Text(text)]));
w.output.push({type:"element",tag:this.element,
children:[{type: "text",text: lookaheadMatch[1]}]});
w.nextMatch = lookaheadMatch.index + lookaheadMatch[0].length;
}
};
var insertMacroCall = function(w,output,name,params,content) {
if(name in w.wiki.macros) {
var macroNode = $tw.Tree.Macro(name,{
srcParams: params,
content: content,
wiki: w.wiki
});
w.dependencies.mergeDependencies(macroNode.dependencies);
output.push(macroNode);
var insertMacroCall = function(w,output,macroName,paramString) {
var params = [],
reParam = /\s*(?:([A-Za-z0-9\-_]+)\s*:)?(?:\s*(?:"""([\s\S]*?)"""|"([^"]*)"|'([^']*)'|\[\[([^\]]*)\]\]|([^"'\s]+)))/mg,
paramMatch = reParam.exec(paramString);
while(paramMatch) {
// Process this parameter
var paramInfo = {
value: paramMatch[2] || paramMatch[3] || paramMatch[4] || paramMatch[5] || paramMatch[6]
};
if(paramMatch[1]) {
paramInfo.name = paramMatch[1];
}
};
params.push(paramInfo);
// Find the next match
paramMatch = reParam.exec(paramString);
}
output.push({
type: "macrocall",
name: macroName,
params: params,
isBlock: false
});
}
var isLinkExternal = function(to) {
var externalRegExp = /(?:file|http|https|mailto|ftp|irc|news|data|skype):[^\s'"]+(?:\/|\b)/i;
return externalRegExp.test(to);
};
var rules = [
{
name: "table",
@ -126,7 +141,9 @@ var rules = [
rowTypes: {"c":"caption", "h":"thead", "":"tbody", "f":"tfoot"},
handler: function(w)
{
var table = $tw.Tree.Element("table",{"class": "table"},[]);
var table = {type:"element",tag:"table",attributes: {"class": {type: "string", value:"table"}},
children: []};
w.output.push(table);
var prevColumns = [];
var currRowType = null;
@ -142,7 +159,7 @@ var rules = [
w.nextMatch += lookaheadMatch[0].length+1;
} else {
if(nextRowType != currRowType) {
rowContainer = $tw.Tree.Element(this.rowTypes[nextRowType],{},[]);
rowContainer = {type:"element",tag:this.rowTypes[nextRowType],children: []};
table.children.push(rowContainer);
currRowType = nextRowType;
}
@ -154,11 +171,14 @@ var rules = [
table.children.pop(); // Take rowContainer out of the children array
table.children.splice(0,0,rowContainer); // Insert it at the bottom
}
rowContainer.attributes={};
rowContainer.attributes.align = rowCount === 0 ? "top" : "bottom";
w.subWikifyTerm(rowContainer.children,this.rowTermRegExp);
} else {
var theRow = $tw.Tree.Element("tr",{},[]);
theRow.attributes["class"] = rowCount%2 ? "oddRow" : "evenRow";
var theRow = {type:"element",tag:"tr",
attributes: {"class": {type: "string", value:rowCount%2 ? "oddRow" : "evenRow"}},
children: []};
rowContainer.children.push(theRow);
this.rowHandler(w,theRow.children,prevColumns);
rowCount++;
@ -181,10 +201,11 @@ var rules = [
var last = prevColumns[col];
if(last) {
last.rowSpanCount++;
last.element.attributes.rowspan = last.rowSpanCount;
last.element.attributes.valign = "center";
$tw.utils.addAttributeToParseTreeNode(last.element,"rowspan",last.rowSpanCount);
var vAlign = $tw.utils.getAttributeValueFromParseTreeNode(last.element,"valign","center");
$tw.utils.addAttributeToParseTreeNode(last.element,"valign",vAlign);
if(colSpanCount > 1) {
last.element.attributes.colspan = colSpanCount;
$tw.utils.addAttributeToParseTreeNode(last.element,"colspan",colSpanCount);
colSpanCount = 1;
}
}
@ -213,25 +234,26 @@ var rules = [
}
var cell;
if(chr == "!") {
cell = $tw.Tree.Element("th",{},[]);
cell = {type:"element",tag:"th",children: []};
e.push(cell);
w.nextMatch++;
} else {
cell = $tw.Tree.Element("td",{},[]);
cell = {type:"element",tag:"td",children: []};
e.push(cell);
}
prevCell = cell;
prevColumns[col] = {rowSpanCount:1,element:cell};
if(colSpanCount > 1) {
cell.attributes.colspan = colSpanCount;
$tw.utils.addAttributeToParseTreeNode(cell,"colspan",colSpanCount);
colSpanCount = 1;
}
applyCssHelper(cell,styles);
w.subWikifyTerm(cell.children,this.cellTermRegExp);
if (!cell.attributes) cell.attributes ={};
if(w.matchText.substr(w.matchText.length-2,1) == " ") // spaceRight
cell.attributes.align = spaceLeft ? "center" : "left";
$tw.utils.addAttributeToParseTreeNode(cell,"align",spaceLeft ? "center" : "left");
else if(spaceLeft)
cell.attributes.align = "right";
$tw.utils.addAttributeToParseTreeNode(cell,"align","right");
w.nextMatch--;
}
col++;
@ -247,7 +269,7 @@ var rules = [
termRegExp: /(\n)/mg,
handler: function(w)
{
var e = $tw.Tree.Element("h" + w.matchLength,{},[]);
var e = {type:"element",tag:"h" + w.matchLength,children: []};
w.output.push(e);
w.subWikifyTerm(e.children,this.termRegExp);
}
@ -291,7 +313,7 @@ var rules = [
if(currLevel !== 0 && target.children) {
target = target.children[target.children.length-1];
}
e = $tw.Tree.Element(listType,{},[]);
e = {type:"element",tag:listType,children: []};
target.push(e);
stack.push(e.children);
}
@ -303,13 +325,13 @@ var rules = [
stack.pop();
} else if(listLevel == currLevel && listType != currType) {
stack.pop();
e = $tw.Tree.Element(listType,{},[]);
e = {type:"element",tag:listType,children: []};
stack[stack.length-1].push(e);
stack.push(e.children);
}
currLevel = listLevel;
currType = listType;
e = $tw.Tree.Element(itemType,{},[]);
e = {type:"element",tag:itemType,children: []};
stack[stack.length-1].push(e);
w.subWikifyTerm(e.children,this.termRegExp);
this.lookaheadRegExp.lastIndex = w.nextMatch;
@ -324,7 +346,7 @@ var rules = [
termRegExp: /(^<<<(\n|$))/mg,
element: "blockquote",
handler: function(w) {
var e = $tw.Tree.Element(this.element,{},[]);
var e = {type:"element",tag:this.element,children: []};
w.output.push(e);
w.subWikifyTerm(e.children,this.termRegExp);
}
@ -338,23 +360,32 @@ var rules = [
element: "blockquote",
handler: function(w)
{
var stack = [w.output];
var stack = [];
var currLevel = 0;
var newLevel = w.matchLength;
var t,matched,e;
do {
if(newLevel > currLevel) {
for(t=currLevel; t<newLevel; t++) {
e = $tw.Tree.Element(this.element,{},[]);
stack[stack.length-1].push(e);
var f = stack[stack.length-1];
e = {type:"element",tag:this.element,children: []};
stack.push(e);
if (t ===0){
w.output.push(e);
}else {
f.children.push(e);
}
}
} else if(newLevel < currLevel) {
for(t=currLevel; t>newLevel; t--)
stack.pop();
}
currLevel = newLevel;
w.subWikifyTerm(stack[stack.length-1],this.termRegExp);
stack[stack.length-1].push($tw.Tree.Element("br"));
w.subWikifyTerm(stack[stack.length-1].children,this.termRegExp);
stack[stack.length-1].children.push({type:"element",tag:"br"});
//e.push({type:"element",tag:"br"});
this.lookaheadRegExp.lastIndex = w.nextMatch;
var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
matched = lookaheadMatch && lookaheadMatch.index == w.nextMatch;
@ -371,7 +402,7 @@ var rules = [
match: "^----+$\\n?|<hr ?/?>\\n?",
handler: function(w)
{
w.output.push($tw.Tree.Element("hr"));
w.output.push({type:"element",tag:"hr"});
}
},
@ -403,28 +434,33 @@ var rules = [
{
name: "typedBlock",
match: "^\\$\\$\\$(?:.*)\\n",
lookaheadRegExp: /^\$\$\$(.*)\n((?:^[^\n]*\n)+?)(^\f*\$\$\$$\n?)/mg,
match: "^\\$\\$\\$(?:[^ >\\r\\n]*)\\r?\\n",
lookaheadRegExp: /^\$\$\$([^ >\r\n]*)\n((?:^[^\n]*\r?\n)+?)(^\f*\$\$\$\r?\n?)/mg,
//match: "^\\$\\$\\$(?:[^ >\\r\\n]*)(?: *> *([^ \\r\\n]+))?\\r?\\n",
//lookaheadRegExp: /^\$\$\$([^ >\r\n]*)(?: *> *([^ \r\n]+))\n((?:^[^\n]*\n)+?)(^\f*\$\$\$$\n?)/mg,
handler: function(w)
{
this.lookaheadRegExp.lastIndex = w.matchStart;
var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
// The wikitext parsing infrastructure is horribly unre-entrant
var mimeType = lookaheadMatch[1],
content = lookaheadMatch[2],
var parseType = lookaheadMatch[1],
renderType ,//= this.match[2],
text = lookaheadMatch[2],
oldOutput = w.output,
oldSource = w.source,
oldNextMatch = w.nextMatch,
oldChildren = w.children,
oldDependencies = w.dependencies,
parseTree = w.wiki.parseText(mimeType,content,{defaultType: "text/plain"}).tree;
oldChildren = w.children;
// Parse the block according to the specified type
var parser = $tw.wiki.parseText(parseType,text.toString(),{defaultType: "text/plain"});
w.output = oldOutput;
w.source = oldSource;
w.nextMatch = oldNextMatch;
w.children = oldChildren;
w.dependencies = oldDependencies;
w.output.push.apply(w.output,parseTree);
for (var i=0; i<parser.tree.length; i++) {
w.output.push(parser.tree[i]);
}
w.nextMatch = this.lookaheadRegExp.lastIndex;
}
}
@ -448,14 +484,26 @@ var rules = [
{
this.lookaheadRegExp.lastIndex = w.matchStart;
var lookaheadMatch = this.lookaheadRegExp.exec(w.source),
name;
if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
name = lookaheadMatch[1] || lookaheadMatch[2];
if(lookaheadMatch && lookaheadMatch.index == w.matchStart && name) {
var params = lookaheadMatch[3], nameold =name;
if (name) {
if (!!macroadapter.paramadapter[name]) {
params=macroadapter.paramadapter[name](params);
//alert("going out as "+params);
}
if (!!macroadapter.namedapter[name]) {
name=macroadapter.namedapter[name];
}
w.nextMatch = this.lookaheadRegExp.lastIndex;
insertMacroCall(w,w.output,name,lookaheadMatch[3]);
insertMacroCall(w,w.output,name,params);
}
}
}
},
{
name: "prettyLink",
match: "\\[\\[",
@ -471,12 +519,35 @@ var rules = [
// Pretty bracketted link
link = lookaheadMatch[3];
}
insertMacroCall(w,w.output,"link",{to: link},[$tw.Tree.Text(text)]);
if(isLinkExternal(link)) {
w.output.push({
type: "element",
tag: "a",
attributes: {
href: {type: "string", value: link},
"class": {type: "string", value: "tc-tiddlylink-external"},
target: {type: "string", value: "_blank"}
},
children: [{
type: "text", text: text
}]
});
} else {
w.output.push({
type: "link",
attributes: {
to: {type: "string", value: link}
},
children: [{
type: "text", text: text
}]
});
}
w.nextMatch = this.lookaheadRegExp.lastIndex;
}
}
},
{
name: "wikiLink",
match: textPrimitives.unWikiLink+"?"+textPrimitives.wikiLink,
@ -496,7 +567,16 @@ var rules = [
}
}
if(w.autoLinkWikiWords) {
insertMacroCall(w,w.output,"link",{to: w.matchText},[$tw.Tree.Text(w.source.substring(w.matchStart,w.nextMatch))]);
w.output.push({
type: "link",
attributes: {
to: {type: "string", value: w.matchText}
},
children: [{
type: "text",
text: w.source.substring(w.matchStart,w.nextMatch)
}]
});
} else {
w.outputText(w.output,w.matchStart,w.nextMatch);
}
@ -508,7 +588,19 @@ var rules = [
match: textPrimitives.urlPattern,
handler: function(w)
{
insertMacroCall(w,w.output,"link",{to: w.matchText},[$tw.Tree.Text(w.source.substring(w.matchStart,w.nextMatch))]);
w.output.push({
type: "element",
tag: "a",
attributes: {
href: {type: "string", value: w.matchText},
"class": {type: "string", value: "tc-tiddlylink-external"},
target: {type: "string", value: "_blank"}
},
children: [{
type: "text", text: w.source.substring(w.matchStart,w.nextMatch)
}]
});
}
},
@ -519,27 +611,47 @@ var rules = [
lookaheadRegExp: /\[([<]?)(>?)[Ii][Mm][Gg]\[(?:([^\|\]]+)\|)?([^\[\]\|]+)\](?:\[([^\]]*)\])?\]/mg,
handler: function(w)
{
var node = {
type: "image",
attributes: {}
};
this.lookaheadRegExp.lastIndex = w.matchStart;
var lookaheadMatch = this.lookaheadRegExp.exec(w.source),
imageParams = {},
linkParams = {};
if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
if(lookaheadMatch[1]) {
imageParams.alignment = "left";
node.attributes.class = {type: "string", value: "classic-image-left"};
} else if(lookaheadMatch[2]) {
imageParams.alignment = "right";
node.attributes.class = {type: "string", value: "classic-image-right"};
}
if(lookaheadMatch[3]) {
imageParams.text = lookaheadMatch[3];
node.attributes.tooltip = {type: "string", value: lookaheadMatch[3]};
}
imageParams.src = lookaheadMatch[4];
node.attributes.source = {type: "string", value: lookaheadMatch[4]};
if(lookaheadMatch[5]) {
linkParams.target = lookaheadMatch[5];
var linkChildren = [];
insertMacroCall(w,w.output,"link",linkParams,linkChildren);
insertMacroCall(w,linkChildren,"image",imageParams);
if(isLinkExternal(lookaheadMatch[5])) {
w.output.push({
type: "element",
tag: "a",
attributes: {
href: {type: "string", value:lookaheadMatch[5]},
"class": {type: "string", value: "tc-tiddlylink-external"},
target: {type: "string", value: "_blank"}
},
children: [node]
});
} else {
insertMacroCall(w,w.output,"image",imageParams);
w.output.push({
type: "link",
attributes: {
to: {type: "string", value: lookaheadMatch[5]}
},
children: [node]
});
}
} else {
w.output.push(node);
}
w.nextMatch = this.lookaheadRegExp.lastIndex;
}
@ -555,7 +667,7 @@ var rules = [
this.lookaheadRegExp.lastIndex = w.matchStart;
var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
w.output.push($tw.Tree.Element("html",{},[$tw.Tree.Raw(lookaheadMatch[1])]));
w.output.push({ type:"raw", html:lookaheadMatch[1]});
w.nextMatch = this.lookaheadRegExp.lastIndex;
}
}
@ -582,32 +694,32 @@ var rules = [
var e,lookaheadRegExp,lookaheadMatch;
switch(w.matchText) {
case "''":
e = $tw.Tree.Element("strong",null,[]);
e = {type:"element",tag:"strong",children: []};
w.output.push(e);
w.subWikifyTerm(e.children,/('')/mg);
break;
case "//":
e = $tw.Tree.Element("em",null,[]);
e = {type:"element",tag:"em",children: []};
w.output.push(e);
w.subWikifyTerm(e.children,/(\/\/)/mg);
break;
case "__":
e = $tw.Tree.Element("u",null,[]);
e = {type:"element",tag:"u",children: []};
w.output.push(e);
w.subWikifyTerm(e.children,/(__)/mg);
break;
case "^^":
e = $tw.Tree.Element("sup",null,[]);
e = {type:"element",tag:"sup",children: []};
w.output.push(e);
w.subWikifyTerm(e.children,/(\^\^)/mg);
break;
case "~~":
e = $tw.Tree.Element("sub",null,[]);
e = {type:"element",tag:"sub",children: []};
w.output.push(e);
w.subWikifyTerm(e.children,/(~~)/mg);
break;
case "--":
e = $tw.Tree.Element("strike",null,[]);
e = {type:"element",tag:"strike",children: []};
w.output.push(e);
w.subWikifyTerm(e.children,/(--)/mg);
break;
@ -616,8 +728,8 @@ var rules = [
lookaheadRegExp.lastIndex = w.matchStart;
lookaheadMatch = lookaheadRegExp.exec(w.source);
if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
w.output.push($tw.Tree.Element("code",null,[$tw.Tree.Text(lookaheadMatch[1])]));
w.nextMatch = lookaheadRegExp.lastIndex;
w.output.push({type:"element",tag:"code",
children:[{type: "text",text: lookaheadMatch[1]}]});
}
break;
case "{{{":
@ -625,7 +737,8 @@ var rules = [
lookaheadRegExp.lastIndex = w.matchStart;
lookaheadMatch = lookaheadRegExp.exec(w.source);
if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
w.output.push($tw.Tree.Element("code",null,[$tw.Tree.Text(lookaheadMatch[1])]));
w.output.push({type:"element",tag:"code",
children:[{type: "text",text: lookaheadMatch[1]}]});
w.nextMatch = lookaheadRegExp.lastIndex;
}
break;
@ -640,7 +753,7 @@ var rules = [
{
switch(w.matchText) {
case "@@":
var e = $tw.Tree.Element("span",null,[]);
var e = {type:"element",tag:"span",children: []};
w.output.push(e);
var styles = inlineCssHelper(w);
if(styles.length === 0)
@ -655,9 +768,8 @@ var rules = [
var lookaheadMatch = lookaheadRegExp.exec(w.source);
if(lookaheadMatch) {
w.nextMatch = lookaheadRegExp.lastIndex;
e = $tw.Tree.Element(lookaheadMatch[2] == "\n" ? "div" : "span",{
"class": lookaheadMatch[1]
},[]);
e = {type:"element",tag:lookaheadMatch[2] == "\n" ? "div" : "span",
attributes: {"class": {type: "string", value:lookaheadMatch[1]}},children: []};
w.output.push(e);
w.subWikifyTerm(e.children,/(\}\}\})/mg);
}
@ -671,7 +783,7 @@ var rules = [
match: "--",
handler: function(w)
{
w.output.push($tw.Tree.Entity("&mdash;"));
w.output.push({type: "entity", entity: "&mdash;"});
}
},
@ -680,7 +792,7 @@ var rules = [
match: "\\n|<br ?/?>",
handler: function(w)
{
w.output.push($tw.Tree.Element("br"));
w.output.push({type:"element",tag:"br"});
}
},
@ -693,7 +805,8 @@ var rules = [
this.lookaheadRegExp.lastIndex = w.matchStart;
var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
w.output.push($tw.Tree.Text(lookaheadMatch[1]));
w.output.push({type: "text",text: lookaheadMatch[1]
});
w.nextMatch = this.lookaheadRegExp.lastIndex;
}
}
@ -704,7 +817,7 @@ var rules = [
match: "&#?[a-zA-Z0-9]{2,8};",
handler: function(w)
{
w.output.push($tw.Tree.Entity(w.matchText));
w.output.push({type: "entity", entity: w.matchText});
}
}

File diff suppressed because one or more lines are too long